diff options
author | rgrimes <rgrimes@FreeBSD.org> | 1995-05-11 19:26:53 +0000 |
---|---|---|
committer | rgrimes <rgrimes@FreeBSD.org> | 1995-05-11 19:26:53 +0000 |
commit | 0e1db07cf9044a3bbfd713ff85528c129ed754ba (patch) | |
tree | 461a2b653690a240b421c8d7ee556596a41c3c5b /sys/i386 | |
parent | e3b120088fc0412693845ad0df34cf1d3551744d (diff) | |
download | FreeBSD-src-0e1db07cf9044a3bbfd713ff85528c129ed754ba.zip FreeBSD-src-0e1db07cf9044a3bbfd713ff85528c129ed754ba.tar.gz |
Fix -Wformat warnings from LINT kernel.
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/eisa/aha1742.c | 9 | ||||
-rw-r--r-- | sys/i386/i386/autoconf.c | 4 | ||||
-rw-r--r-- | sys/i386/i386/machdep.c | 8 | ||||
-rw-r--r-- | sys/i386/i386/math_emulate.c | 4 | ||||
-rw-r--r-- | sys/i386/i386/pmap.c | 5 | ||||
-rw-r--r-- | sys/i386/isa/aha1742.c | 9 | ||||
-rw-r--r-- | sys/i386/isa/bt742a.c | 8 | ||||
-rw-r--r-- | sys/i386/isa/mcd.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/sio.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/sound/soundcard.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/ultra14f.c | 9 | ||||
-rw-r--r-- | sys/i386/scsi/aic7xxx.c | 9 |
12 files changed, 41 insertions, 36 deletions
diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c index 1bbe374..0d31e01 100644 --- a/sys/i386/eisa/aha1742.c +++ b/sys/i386/eisa/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 <sys/types.h> @@ -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/i386/autoconf.c b/sys/i386/i386/autoconf.c index 65a505e..1a2e489 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.27 1995/04/25 03:41:12 phk Exp $ + * $Id: autoconf.c,v 1.28 1995/05/11 02:50:11 wpaul Exp $ */ /* @@ -118,7 +118,7 @@ find_cdrom_root() for (j = 0 ; j < 2; j++) for (k = 0 ; try_cdrom[k].name ; k++) { rootdev = makedev(try_cdrom[k].major,j*8); - printf("trying rootdev=%x (%s%d)\n", + printf("trying rootdev=0x%lx (%s%d)\n", rootdev, try_cdrom[k].name,j); i = (*cd9660_mountroot)(); if (!i) return i; diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index d662d23..400b90e 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.123 1995/05/11 00:12:54 wollman Exp $ + * $Id: machdep.c,v 1.124 1995/05/11 00:16:36 wollman Exp $ */ #include "npx.h" @@ -532,7 +532,7 @@ identifycpu() printf(" Id = 0x%lx",cpu_id); if (!strcmp(cpu_vendor, "GenuineIntel")) { - printf(" Stepping=%d", cpu_id & 0xf); + printf(" Stepping=%ld", cpu_id & 0xf); if (cpu_high > 0) { #define FEATUREFMT "\020\001FPU\002VME\003PSE\004MCE\005CX8\006APIC" printf("\n Features=0x%b", cpu_feature, FEATUREFMT); @@ -1361,10 +1361,10 @@ init386(first) */ if (bootinfo.bi_memsizes_valid) { if (bootinfo.bi_basemem != biosbasemem) - printf("BIOS basemem (%dK) != RTC basemem (%dK)\n", + printf("BIOS basemem (%ldK) != RTC basemem (%dK)\n", bootinfo.bi_basemem, biosbasemem); if (bootinfo.bi_extmem != biosextmem) - printf("BIOS extmem (%dK) != RTC extmem (%dK)\n", + printf("BIOS extmem (%ldK) != RTC extmem (%dK)\n", bootinfo.bi_extmem, biosextmem); } diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c index e1b8269..6c10020 100644 --- a/sys/i386/i386/math_emulate.c +++ b/sys/i386/i386/math_emulate.c @@ -6,7 +6,7 @@ * [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj] * * from: 386BSD 0.1 - * $Id: math_emulate.c,v 1.9 1994/05/25 08:54:14 rgrimes Exp $ + * $Id: math_emulate.c,v 1.10 1994/09/15 10:58:35 davidg Exp $ */ /* @@ -94,7 +94,7 @@ math_emulate(struct trapframe * info) oldeip = info->tf_eip; /* 0x001f means user code space */ if ((u_short)info->tf_cs != 0x001F) { - printf("math_emulate: %04x:%08x\n\r", (u_short)info->tf_cs, + printf("math_emulate: %04x:%08lx\n\r", (u_short)info->tf_cs, oldeip); panic("?Math emulation needed in kernel?"); } diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 968c87c..bb4858f 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.55 1995/03/30 08:55:39 davidg Exp $ + * $Id: pmap.c,v 1.56 1995/04/09 05:40:38 davidg Exp $ */ /* @@ -1180,7 +1180,8 @@ pmap_enter(pmap, va, pa, prot, wired) * Page Directory table entry not valid, we need a new PT page */ if (*pmap_pde(pmap, va) == 0) { - printf("kernel page directory invalid pdir=0x%x, va=0x%x\n", pmap->pm_pdir[PTDPTDI], va); + printf("kernel page directory invalid pdir=%p, va=0x%lx\n", + pmap->pm_pdir[PTDPTDI], va); panic("invalid kernel page directory"); } pte = pmap_pte(pmap, va); 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 <sys/types.h> @@ -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 <sys/types.h> @@ -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; diff --git a/sys/i386/scsi/aic7xxx.c b/sys/i386/scsi/aic7xxx.c index cd1be68..f896702 100644 --- a/sys/i386/scsi/aic7xxx.c +++ b/sys/i386/scsi/aic7xxx.c @@ -24,7 +24,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aic7xxx.c,v 1.24 1995/05/01 09:49:45 gibbs Exp $ + * $Id: aic7xxx.c,v 1.25 1995/05/01 18:43:14 gibbs Exp $ */ /* * TODO: @@ -1747,7 +1747,7 @@ ahc_scsi_cmd(xs) xs->error = XS_DRIVER_STUFFUP; return (TRY_AGAIN_LATER); } - SC_DEBUG(xs->sc_link, SDEV_DB3, ("start scb(%x)\n", scb)); + SC_DEBUG(xs->sc_link, SDEV_DB3, ("start scb(%p)\n", scb)); scb->xs = xs; if (flags & SCSI_RESET) { /* XXX: Needs Implementation */ @@ -1784,7 +1784,7 @@ ahc_scsi_cmd(xs) * Set up the scatter gather block */ 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); @@ -1795,7 +1795,8 @@ ahc_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; |