2 files changed, 10 insertions, 9 deletions

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;
 		}