6 files changed, 32 insertions, 28 deletions

diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 11a2afe1d1d2..bc7e7c647388 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ *      $Id: cam_xpt.c,v 1.1 1998/09/15 06:33:23 gibbs Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -5360,7 +5360,7 @@ xptfinishconfigfunc(struct cam_ed *device, void *arg)
 				      device->target->target_id,
 				      device->lun_id)) != CAM_REQ_CMP) {
 		printf("xptfinishconfig: xpt_create_path failed with status"
-		       " %#x, halting bus configuration\n");
+		       " %#x, halting bus configuration\n", status);
 		return(0);
 	}
 
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index 5600de53c22f..4c50f140e160 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ *      $Id: scsi_target.c,v 1.1 1998/09/15 06:36:34 gibbs Exp $
  */
 #include <stddef.h>	/* For offsetof */
 
@@ -906,7 +906,7 @@ targrunqueue(struct cam_periph *periph, struct targ_softc *softc)
 			softc->flags &= ~TARG_FLAG_SEND_EOF;
 		else {
 			xpt_print_path(periph->path);
-			printf("De-Queued a SEND buffer %d\n",
+			printf("De-Queued a SEND buffer %ld\n",
 			       bp->b_bcount);
 		}
 		bufq = &softc->snd_buf_queue;
@@ -919,7 +919,8 @@ targrunqueue(struct cam_periph *periph, struct targ_softc *softc)
 			softc->flags &= ~TARG_FLAG_RECEIVE_EOF;
 		else {
 			xpt_print_path(periph->path);
-			printf("De-Queued a RECEIVE buffer %d\n", bp->b_bcount);
+			printf("De-Queued a RECEIVE buffer %ld\n",
+			       bp->b_bcount);
 		}
 		bufq = &softc->rcv_buf_queue;
 		pending_queue = &softc->rcv_ccb_queue;
@@ -945,8 +946,8 @@ targrunqueue(struct cam_periph *periph, struct targ_softc *softc)
 			    MIN(desc->data_resid, bp->b_resid);
 		}
 		xpt_print_path(periph->path);
-		printf("Buffer command: data %x: datacnt %d\n", desc->data,
-		       desc->data_increment);
+		printf("Buffer command: data %x: datacnt %d\n",
+		       (intptr_t)desc->data, desc->data_increment);
 		TAILQ_INSERT_TAIL(&softc->work_queue, &atio->ccb_h,
 				  periph_links.tqe);
 	}
@@ -1299,7 +1300,7 @@ targdone(struct cam_periph *periph, union ccb *done_ccb)
 			bp->b_error = 0;
 
 			xpt_print_path(done_ccb->ccb_h.path);
-			printf("Buffer I/O Completed - Resid %d:%d\n",
+			printf("Buffer I/O Completed - Resid %ld:%d\n",
 			       bp->b_resid, desc->data_resid);
 			/*
 			 * Send the buffer back to the client if
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index 99dea4586320..9c60dd1fdf4c 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -43,7 +43,7 @@
  *	       arrays that span controllers (Wow!).
  */
 
-#ident "$Id: dpt_scsi.c,v 1.12 1998/08/26 19:11:22 gibbs Exp $"
+#ident "$Id: dpt_scsi.c,v 1.13 1998/09/15 08:33:31 gibbs Exp $"
 
 #define _DPT_C_
 
@@ -620,7 +620,7 @@ dptexecuteccb(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
 	if (error != 0) {
 		if (error != EFBIG)
 			printf("dpt%d: Unexepected error 0x%x returned from "
-			       "bus_dmamap_load\n", dpt->unit);
+			       "bus_dmamap_load\n", dpt->unit, error);
 		if (ccb->ccb_h.status == CAM_REQ_INPROG) {
 			xpt_freeze_devq(ccb->ccb_h.path, /*count*/1);
 			ccb->ccb_h.status = CAM_REQ_TOO_BIG|CAM_DEV_QFRZN;
@@ -1603,13 +1603,14 @@ dpttimeout(void *arg)
 	ccb = dccb->ccb;
 	dpt = (struct dpt_softc *)ccb->ccb_h.ccb_dpt_ptr;
 	xpt_print_path(ccb->ccb_h.path);
-	printf("CCB 0x%x - timed out\n", dccb);
+	printf("CCB 0x%x - timed out\n", (intptr_t)dccb);
 
 	s = splcam();
 
 	if ((dccb->state & DCCB_ACTIVE) == 0) {
 		xpt_print_path(ccb->ccb_h.path);
-		printf("CCB 0x%x - timed out CCB already completed\n", dccb);
+		printf("CCB 0x%x - timed out CCB already completed\n",
+		       (intptr_t)dccb);
 		splx(s);
 		return;
 	}
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index afc9a5929ae3..b9bdecde9650 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci.c,v 1.86 1998/09/06 22:41:41 tegge Exp $
+ * $Id: pci.c,v 1.87 1998/09/15 08:21:08 gibbs Exp $
  *
  */
 
@@ -760,9 +760,9 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 			 */
 			if ((error = useracc((caddr_t)cio->patterns,
 			                     cio->pat_buf_len, B_READ)) != 1){
-				printf("pci_ioctl: pattern buffer %#lx, "
+				printf("pci_ioctl: pattern buffer %#x, "
 				       "length %u isn't user accessible for"
-				       " READ\n", cio->patterns,
+				       " READ\n", (intptr_t)cio->patterns,
 				       cio->pat_buf_len);
 				error = EACCES;
 				break;
@@ -796,9 +796,9 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 		 */
 		if ((error = useracc((caddr_t)cio->matches, cio->match_buf_len,
 				     B_WRITE)) != 1) {
-			printf("pci_ioctl: match buffer %#lx, length %u "
+			printf("pci_ioctl: match buffer %#x, length %u "
 			       "isn't user accessible for WRITE\n",
-			       cio->matches, cio->match_buf_len);
+			       (intptr_t)cio->matches, cio->match_buf_len);
 			error = EACCES;
 			break;
 		}
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 1a8aa5be6479..3cb9842554b7 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncr.c,v 1.123 1998/08/10 14:27:34 bde Exp $
+**  $Id: ncr.c,v 1.124 1998/09/15 10:06:22 gibbs Exp $
 **
 **  Device driver for the   NCR 53C8XX   PCI-SCSI-Controller Family.
 **
@@ -1288,7 +1288,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 
 static char ident[] =
-	"\n$Id: ncr.c,v 1.123 1998/08/10 14:27:34 bde Exp $\n";
+	"\n$Id: ncr.c,v 1.124 1998/09/15 10:06:22 gibbs Exp $\n";
 
 static const u_long	ncr_version = NCR_VERSION	* 11
 	+ (u_long) sizeof (struct ncb)	*  7
@@ -5605,8 +5605,10 @@ static void ncr_int_ma (ncb_p np, u_char dstat)
 	    return;
 	}
 	if (cp != np->header.cp) {
-	    printf ("%s: SCSI phase error fixup: CCB address mismatch (0x%08lx != 0x%08lx) np->nccb = 0x%08lx\n", 
-		    ncr_name (np), (u_long) cp, (u_long) np->header.cp, np->link_nccb);
+	    printf ("%s: SCSI phase error fixup: CCB address mismatch "
+		    "(0x%08x != 0x%08x) np->nccb = 0x%08x\n", 
+		    ncr_name (np), (intptr_t)cp, (intptr_t)np->header.cp,
+		    (intptr_t)np->link_nccb);
 /*	    return;*/
 	}
 
@@ -6899,7 +6901,7 @@ ncrgetfreq (ncb_p np, int gen)
 	OUTB (nc_scntl3, 0);
 
 	if (bootverbose >= 2)
-	  	printf ("\tDelay (GEN=%d): %lu msec\n", gen, ms);
+	  	printf ("\tDelay (GEN=%d): %u msec\n", gen, ms);
 	/*
 	 * adjust for prescaler, and convert into KHz 
 	 */
@@ -6927,7 +6929,7 @@ static void ncr_getclock (ncb_p np, u_char multiplier)
 			f2 = ncrgetfreq (np, 11);
 
 			if (bootverbose >= 2)
-			  printf ("\tNCR clock is %luKHz, %luKHz\n", f1, f2);
+			  printf ("\tNCR clock is %uKHz, %uKHz\n", f1, f2);
 			if (f1 > f2) f1 = f2;	/* trust lower result	*/
 			if (f1 > 45000) {
 				scntl3 = 5;	/* >45Mhz: assume 80MHz	*/
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index afc9a5929ae3..b9bdecde9650 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci.c,v 1.86 1998/09/06 22:41:41 tegge Exp $
+ * $Id: pci.c,v 1.87 1998/09/15 08:21:08 gibbs Exp $
  *
  */
 
@@ -760,9 +760,9 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 			 */
 			if ((error = useracc((caddr_t)cio->patterns,
 			                     cio->pat_buf_len, B_READ)) != 1){
-				printf("pci_ioctl: pattern buffer %#lx, "
+				printf("pci_ioctl: pattern buffer %#x, "
 				       "length %u isn't user accessible for"
-				       " READ\n", cio->patterns,
+				       " READ\n", (intptr_t)cio->patterns,
 				       cio->pat_buf_len);
 				error = EACCES;
 				break;
@@ -796,9 +796,9 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 		 */
 		if ((error = useracc((caddr_t)cio->matches, cio->match_buf_len,
 				     B_WRITE)) != 1) {
-			printf("pci_ioctl: match buffer %#lx, length %u "
+			printf("pci_ioctl: match buffer %#x, length %u "
 			       "isn't user accessible for WRITE\n",
-			       cio->matches, cio->match_buf_len);
+			       (intptr_t)cio->matches, cio->match_buf_len);
 			error = EACCES;
 			break;
 		}