From 0e1db07cf9044a3bbfd713ff85528c129ed754ba Mon Sep 17 00:00:00 2001 From: rgrimes Date: Thu, 11 May 1995 19:26:53 +0000 Subject: Fix -Wformat warnings from LINT kernel. --- sys/i386/isa/aha1742.c | 9 +++++---- sys/i386/isa/bt742a.c | 8 ++++---- sys/i386/isa/mcd.c | 4 ++-- sys/i386/isa/sio.c | 4 ++-- sys/i386/isa/sound/soundcard.c | 4 ++-- sys/i386/isa/ultra14f.c | 9 +++++---- 6 files changed, 20 insertions(+), 18 deletions(-) (limited to 'sys/i386/isa') diff --git a/sys/i386/isa/aha1742.c b/sys/i386/isa/aha1742.c index 1bbe374..0d31e01 100644 --- a/sys/i386/isa/aha1742.c +++ b/sys/i386/isa/aha1742.c @@ -14,7 +14,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aha1742.c,v 1.31 1995/04/12 20:47:34 wollman Exp $ + * $Id: aha1742.c,v 1.32 1995/05/09 12:25:50 rgrimes Exp $ */ #include @@ -996,7 +996,7 @@ ahb_scsi_cmd(xs) return (TRY_AGAIN_LATER); } cheat = ecb; - SC_DEBUG(xs->sc_link, SDEV_DB3, ("start ecb(%x)\n", ecb)); + SC_DEBUG(xs->sc_link, SDEV_DB3, ("start ecb(%p)\n", ecb)); ecb->xs = xs; /* * If it's a reset, we need to do an 'immediate' @@ -1073,7 +1073,7 @@ ahb_scsi_cmd(xs) */ SC_DEBUG(xs->sc_link, SDEV_DB4, - ("%d @0x%x:- ", xs->datalen, xs->data)); + ("%ld @%p:- ", xs->datalen, xs->data)); datalen = xs->datalen; thiskv = (int) xs->data; thisphys = KVTOPHYS(thiskv); @@ -1084,7 +1084,8 @@ ahb_scsi_cmd(xs) /* put in the base address */ sg->addr = thisphys; - SC_DEBUGN(xs->sc_link, SDEV_DB4, ("0x%x", thisphys)); + SC_DEBUGN(xs->sc_link, SDEV_DB4, ("0x%lx", + thisphys)); /* do it at least once */ nextphys = thisphys; diff --git a/sys/i386/isa/bt742a.c b/sys/i386/isa/bt742a.c index c3d841d..b2fed05 100644 --- a/sys/i386/isa/bt742a.c +++ b/sys/i386/isa/bt742a.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: bt742a.c,v 1.33 1995/04/23 09:13:05 julian Exp $ + * $Id: bt742a.c,v 1.34 1995/04/23 21:58:35 gibbs Exp $ */ /* @@ -1446,7 +1446,7 @@ bt_scsi_cmd(xs) return (TRY_AGAIN_LATER); } SC_DEBUG(xs->sc_link, SDEV_DB3, - ("start ccb(%x)\n", ccb)); + ("start ccb(%p)\n", ccb)); /* * Put all the arguments for the xfer in the ccb */ @@ -1494,7 +1494,7 @@ bt_scsi_cmd(xs) */ SC_DEBUG(xs->sc_link, SDEV_DB4, - ("%d @0x%x:- ", xs->datalen, xs->data)); + ("%ld @%p:- ", xs->datalen, xs->data)); datalen = xs->datalen; thiskv = (int) xs->data; thisphys = KVTOPHYS(thiskv); @@ -1506,7 +1506,7 @@ bt_scsi_cmd(xs) sg->seg_addr = thisphys; SC_DEBUGN(xs->sc_link, SDEV_DB4, - ("0x%x", thisphys)); + ("0x%lx", thisphys)); /* do it at least once */ nextphys = thisphys; diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index 11a9344..fbe6b13 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.41 1995/04/12 20:47:58 wollman Exp $ + * $Id: mcd.c,v 1.42 1995/05/09 11:39:40 rgrimes Exp $ */ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -1075,7 +1075,7 @@ nextblock: blknum = (bp->b_blkno / (mbx->sz/DEV_BSIZE)) + mbx->p_offset + mbx->skip/mbx->sz; - MCD_TRACE("mcd_doread: read blknum=%d for bp=0x%x\n", + MCD_TRACE("mcd_doread: read blknum=%d for bp=%p\n", blknum, bp); /* build parameter block */ diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index 2834092..9764ef6 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.96 1995/04/23 12:41:57 bde Exp $ + * $Id: sio.c,v 1.97 1995/05/07 23:00:02 ache Exp $ */ #include "sio.h" @@ -2329,7 +2329,7 @@ LoadSoftModem(int unit, int base_io, u_long size, u_char *ptr) return 0; error: - printf("sio%d: DSI SoftModem microcode load failed: <%s>\n",ptr); + printf("sio%d: DSI SoftModem microcode load failed: <%s>\n",unit,ptr); outb(base_io+7,0x00); \ outb(base_io+3,data_0187); \ outb(base_io+4,data_0188); \ diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c index 83cf06e..254f49f 100644 --- a/sys/i386/isa/sound/soundcard.c +++ b/sys/i386/isa/sound/soundcard.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: soundcard.c,v 1.23 1995/03/05 04:01:29 jkh Exp $ + * $Id: soundcard.c,v 1.24 1995/03/12 23:34:10 swallace Exp $ */ #include "sound_config.h" @@ -400,7 +400,7 @@ sound_mem_init (void) if (tmpbuf == NULL) { - printk ("snd: Unable to allocate %d bytes of buffer\n", + printk ("snd: Unable to allocate %ld bytes of buffer\n", audio_devs[dev]->buffsize); return; } diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c index f80e800..4024a05 100644 --- a/sys/i386/isa/ultra14f.c +++ b/sys/i386/isa/ultra14f.c @@ -22,7 +22,7 @@ * today: Fri Jun 2 17:21:03 EST 1994 * added 24F support ++sg * - * $Id: ultra14f.c,v 1.30 1995/04/12 20:48:09 wollman Exp $ + * $Id: ultra14f.c,v 1.31 1995/05/07 06:54:01 bde Exp $ */ #include @@ -1103,7 +1103,7 @@ uha_scsi_cmd(xs) return (TRY_AGAIN_LATER); } cheat = mscp; - SC_DEBUG(xs->sc_link, SDEV_DB3, ("start mscp(%x)\n", mscp)); + SC_DEBUG(xs->sc_link, SDEV_DB3, ("start mscp(%p)\n", mscp)); mscp->xs = xs; /* @@ -1186,7 +1186,7 @@ uha_scsi_cmd(xs) */ SC_DEBUG(xs->sc_link, SDEV_DB4, - ("%d @0x%x:- ", xs->datalen, xs->data)); + ("%ld @%p:- ", xs->datalen, xs->data)); datalen = xs->datalen; thiskv = (int) xs->data; thisphys = KVTOPHYS(thiskv); @@ -1201,7 +1201,8 @@ uha_scsi_cmd(xs) sg->addr.addr[2] = ((thisphys >> 16) & 0xff); sg->addr.addr[3] = ((thisphys >> 24) & 0xff); - SC_DEBUGN(xs->sc_link, SDEV_DB4, ("0x%x", thisphys)); + SC_DEBUGN(xs->sc_link, SDEV_DB4, ("0x%lx", + thisphys)); /* do it at least once */ nextphys = thisphys; -- cgit v1.1