From 6a62fdc1c97772e77ca2ef9353ae4595c2c1f1b1 Mon Sep 17 00:00:00 2001 From: jhb Date: Thu, 7 Nov 2002 22:25:13 +0000 Subject: - Use %p to print pointers instead of casting pointers to an int and using 0x%x. - Add a cast to quiet a warning. --- sys/dev/wds/wd7000.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/wds/wd7000.c b/sys/dev/wds/wd7000.c index 0040ef6..0a627e5 100644 --- a/sys/dev/wds/wd7000.c +++ b/sys/dev/wds/wd7000.c @@ -898,7 +898,7 @@ wds_done(struct wds *wp, struct wds_req *r, u_int8_t stat) wp->wdsr_free |= (1 << r->id); } - DBG(DBX "wds%d: request 0x%x done\n", wp->unit, (u_int) r); + DBG(DBX "wds%d: request %p done\n", wp->unit, r); } /* command returned bad status, request sense */ @@ -940,8 +940,8 @@ wds_runsense(struct wds *wp, struct wds_req *r) wdsr_ccb_done(wp, r, r->ccb, CAM_AUTOSENSE_FAIL); return CAM_AUTOSENSE_FAIL; } else { - DBG(DBX "wds%d: enqueued status cmd 0x%x, r=0x%x\n", - wp->unit, r->cmd.scb[0] & 0xFF, (u_int) r); + DBG(DBX "wds%d: enqueued status cmd 0x%x, r=%p\n", + wp->unit, r->cmd.scb[0] & 0xFF, r); /* don't free CCB yet */ smallog3('*', ccb_h->target_id + '0', ccb_h->target_lun + '0'); @@ -1155,8 +1155,8 @@ wds_scsi_io(struct cam_sim * sim, struct ccb_scsiio * csio) wdsr_ccb_done(wp, r, r->ccb, CAM_RESRC_UNAVAIL); return; } - DBG(DBX "wds%d: enqueued cmd 0x%x, r=0x%x\n", unit, - r->cmd.scb[0] & 0xFF, (u_int) r); + DBG(DBX "wds%d: enqueued cmd 0x%x, r=%p\n", unit, + r->cmd.scb[0] & 0xFF, r); smallog3('+', ccb_h->target_id + '0', ccb_h->target_lun + '0'); } @@ -1366,7 +1366,7 @@ cmdtovirt(struct wds *wp, u_int32_t phys) { char *a; - a = WDSTOVIRT(wp, phys); + a = WDSTOVIRT(wp, (uintptr_t)phys); if( a < (char *)&wp->dx->req[0] || a>= (char *)&wp->dx->req[MAXSIMUL]) { device_printf(wp->dev, "weird phys address 0x%x\n", phys); return (NULL); -- cgit v1.1