Fixed printf format errors. Only one left in LINT on i386's.

32 files changed, 198 insertions, 160 deletions

diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index d36835d..04e3c69 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.77 1998/08/16 00:41:40 bde Exp $
+ *	$Id: mp_machdep.c,v 1.78 1998/08/18 07:46:58 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -2113,7 +2113,7 @@ ap_init()
 	if (cpuid != apic_id) {
 		printf("SMP: cpuid = %d\n", cpuid);
 		printf("SMP: apic_id = %d\n", apic_id);
-		printf("PTD[MPPTDI] = %08x\n", PTD[MPPTDI]);
+		printf("PTD[MPPTDI] = %p\n", (void *)PTD[MPPTDI]);
 		panic("cpuid mismatch! boom!!");
 	}
 
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index d36835d..04e3c69 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.77 1998/08/16 00:41:40 bde Exp $
+ *	$Id: mp_machdep.c,v 1.78 1998/08/18 07:46:58 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -2113,7 +2113,7 @@ ap_init()
 	if (cpuid != apic_id) {
 		printf("SMP: cpuid = %d\n", cpuid);
 		printf("SMP: apic_id = %d\n", apic_id);
-		printf("PTD[MPPTDI] = %08x\n", PTD[MPPTDI]);
+		printf("PTD[MPPTDI] = %p\n", (void *)PTD[MPPTDI]);
 		panic("cpuid mismatch! boom!!");
 	}
 
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 573052e..0f569f2 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id: sys_machdep.c,v 1.35 1998/07/28 03:29:32 jlemon Exp $
+ *	$Id: sys_machdep.c,v 1.36 1998/08/18 07:46:58 msmith Exp $
  *
  */
 
@@ -290,8 +290,8 @@ i386_get_ldt(p, args)
 		return(error);
 
 #ifdef	DEBUG
-	printf("i386_get_ldt: start=%d num=%d descs=%x\n", uap->start,
-		uap->num, uap->desc);
+	printf("i386_get_ldt: start=%d num=%d descs=%p\n",
+	    uap->start, uap->num, (void *)uap->desc);
 #endif
 
 	/* verify range of LDTs exist */
@@ -345,7 +345,8 @@ i386_set_ldt(p, args)
 	uap = &ua;
 
 #ifdef	DEBUG
-	printf("i386_set_ldt: start=%d num=%d descs=%x\n", uap->start, uap->num, uap->desc);
+	printf("i386_set_ldt: start=%d num=%d descs=%p\n",
+	    uap->start, uap->num, (void *)uap->desc);
 #endif
 
  	/* verify range of descriptors to modify */
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index d36835d..04e3c69 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.77 1998/08/16 00:41:40 bde Exp $
+ *	$Id: mp_machdep.c,v 1.78 1998/08/18 07:46:58 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -2113,7 +2113,7 @@ ap_init()
 	if (cpuid != apic_id) {
 		printf("SMP: cpuid = %d\n", cpuid);
 		printf("SMP: apic_id = %d\n", apic_id);
-		printf("PTD[MPPTDI] = %08x\n", PTD[MPPTDI]);
+		printf("PTD[MPPTDI] = %p\n", (void *)PTD[MPPTDI]);
 		panic("cpuid mismatch! boom!!");
 	}
 
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 964684e..adebd22 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.20 1998/06/17 13:54:56 bde Exp $
+ * $Id: if_ar.c,v 1.21 1998/06/21 14:53:10 bde Exp $
  */
 
 /*
@@ -1240,12 +1240,12 @@ ar_eat_packet(struct ar_softc *sc, int single)
 	while(rxdesc != cda) {
 		loopcnt++;
 		if(loopcnt > sc->rxmax) {
-			printf("ar%d: eat pkt %d loop, cda %x, "
-			       "rxdesc %x, stat %x.\n",
+			printf("ar%d: eat pkt %d loop, cda %p, "
+			       "rxdesc %p, stat %x.\n",
 			       sc->unit,
 			       loopcnt,
-			       cda,
-			       rxdesc,
+			       (void *)cda,
+			       (void *)rxdesc,
 			       rxdesc->stat);
 			break;
 		}
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 964684e..adebd22 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.20 1998/06/17 13:54:56 bde Exp $
+ * $Id: if_ar.c,v 1.21 1998/06/21 14:53:10 bde Exp $
  */
 
 /*
@@ -1240,12 +1240,12 @@ ar_eat_packet(struct ar_softc *sc, int single)
 	while(rxdesc != cda) {
 		loopcnt++;
 		if(loopcnt > sc->rxmax) {
-			printf("ar%d: eat pkt %d loop, cda %x, "
-			       "rxdesc %x, stat %x.\n",
+			printf("ar%d: eat pkt %d loop, cda %p, "
+			       "rxdesc %p, stat %x.\n",
 			       sc->unit,
 			       loopcnt,
-			       cda,
-			       rxdesc,
+			       (void *)cda,
+			       (void *)rxdesc,
 			       rxdesc->stat);
 			break;
 		}
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 83f537d..8f4bfcb 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.142 1998/06/17 14:01:00 bde Exp $
+ *	$Id: if_ed.c,v 1.143 1998/06/21 18:02:35 bde Exp $
  */
 
 /*
@@ -3440,7 +3440,7 @@ edpnp_probe(u_long csn, u_long vend_id)
 		struct pnp_cinfo d;
 		read_pnp_parms(&d, 0);
 		if (d.enable == 0 || d.flags & 1) {
-			printf("CSN %d is disabled.\n", csn);
+			printf("CSN %lu is disabled.\n", csn);
 			return (NULL);
 		}
 
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index dd201a3..b8e3fbc 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.c,v 1.43 1998/06/07 17:10:36 dfr Exp $
+ * $Id: if_lnc.c,v 1.44 1998/07/20 17:32:56 msmith Exp $
  */
 
 /*
@@ -1869,21 +1869,23 @@ lnc_dump_state(struct lnc_softc *sc)
 	printf("Host memory\n");
 	printf("-----------\n");
 
-	printf("Receive ring: base = %x, next = %x\n",
-	    sc->recv_ring, (sc->recv_ring + sc->recv_next));
+	printf("Receive ring: base = %p, next = %p\n",
+	    (void *)sc->recv_ring, (void *)(sc->recv_ring + sc->recv_next));
 	for (i = 0; i < NDESC(sc->nrdre); i++)
-		printf("\t%d:%x md = %x buff = %x\n",
-		  i, sc->recv_ring + i, (sc->recv_ring + i)->md,
-		    (sc->recv_ring + i)->buff);
+		printf("\t%d:%p md = %p buff = %p\n",
+		    i, (void *)(sc->recv_ring + i),
+		    (void *)(sc->recv_ring + i)->md,
+		    (void *)(sc->recv_ring + i)->buff.data);
 
-	printf("Transmit ring: base = %x, next = %x\n",
-	    sc->trans_ring, (sc->trans_ring + sc->trans_next));
+	printf("Transmit ring: base = %p, next = %p\n",
+	    (void *)sc->trans_ring, (void *)(sc->trans_ring + sc->trans_next));
 	for (i = 0; i < NDESC(sc->ntdre); i++)
-		printf("\t%d:%x md = %x buff = %x\n",
-		i, sc->trans_ring + i, (sc->trans_ring + i)->md,
-		    (sc->trans_ring + i)->buff);
+		printf("\t%d:%p md = %p buff = %p\n",
+		    i, (void *)(sc->trans_ring + i),
+		    (void *)(sc->trans_ring + i)->md,
+		    (void *)(sc->trans_ring + i)->buff.data);
 	printf("Lance memory (may be on host(DMA) or card(SHMEM))\n");
-	printf("Init block = %x\n", sc->init_block);
+	printf("Init block = %p\n", (void *)sc->init_block);
 	printf("\tmode = %b rlen:rdra = %x:%x tlen:tdra = %x:%x\n",
 	    sc->init_block->mode, INIT_MODE, sc->init_block->rlen,
 	  sc->init_block->rdra, sc->init_block->tlen, sc->init_block->tdra);
@@ -1904,7 +1906,9 @@ lnc_dump_state(struct lnc_softc *sc)
 		    ((sc->trans_ring + i)->md->md1 >> 8), TRANS_MD1,
 		    ((sc->trans_ring + i)->md->md3 >> 10), TRANS_MD3);
 	printf("\nnext_to_send = %x\n", sc->next_to_send);
-	printf("\n CSR0 = %b CSR1 = %x CSR2 = %x CSR3 = %x\n\n", read_csr(sc, CSR0), CSR0_FLAGS, read_csr(sc, CSR1), read_csr(sc, CSR2), read_csr(sc, CSR3));
+	printf("\n CSR0 = %b CSR1 = %x CSR2 = %x CSR3 = %x\n\n",
+	    read_csr(sc, CSR0), CSR0_FLAGS, read_csr(sc, CSR1),
+	    read_csr(sc, CSR2), read_csr(sc, CSR3));
 	/* Set RAP back to CSR0 */
 	outw(sc->rap, CSR0);
 }
@@ -1919,26 +1923,42 @@ mbuf_dump_chain(struct mbuf * m)
 	if (!m)
 		log(LOG_DEBUG, "m == NULL\n");
 	do {
-		log(LOG_DEBUG, "m = %x\n", m);
-		log(LOG_DEBUG, "m_hdr.mh_next = %x\n", m->m_hdr.mh_next);
-		log(LOG_DEBUG, "m_hdr.mh_nextpkt = %x\n", m->m_hdr.mh_nextpkt);
+		log(LOG_DEBUG, "m = %p\n", (void *)m);
+		log(LOG_DEBUG, "m_hdr.mh_next = %p\n",
+		    (void *)m->m_hdr.mh_next);
+		log(LOG_DEBUG, "m_hdr.mh_nextpkt = %p\n",
+		    (void *)m->m_hdr.mh_nextpkt);
 		log(LOG_DEBUG, "m_hdr.mh_len = %d\n", m->m_hdr.mh_len);
-		log(LOG_DEBUG, "m_hdr.mh_data = %x\n", m->m_hdr.mh_data);
+		log(LOG_DEBUG, "m_hdr.mh_data = %p\n",
+		    (void *)m->m_hdr.mh_data);
 		log(LOG_DEBUG, "m_hdr.mh_type = %d\n", m->m_hdr.mh_type);
-		log(LOG_DEBUG, "m_hdr.mh_flags = %b\n", m->m_hdr.mh_flags, MBUF_FLAGS);
+		log(LOG_DEBUG, "m_hdr.mh_flags = %b\n", m->m_hdr.mh_flags,
+		    MBUF_FLAGS);
 		if (!(m->m_hdr.mh_flags & (M_PKTHDR | M_EXT)))
-			log(LOG_DEBUG, "M_dat.M_databuf = %x\n", m->M_dat.M_databuf);
+			log(LOG_DEBUG, "M_dat.M_databuf = %p\n",
+			    (void *)m->M_dat.M_databuf);
 		else {
 			if (m->m_hdr.mh_flags & M_PKTHDR) {
-				log(LOG_DEBUG, "M_dat.MH.MH_pkthdr.len = %d\n", m->M_dat.MH.MH_pkthdr.len);
-				log(LOG_DEBUG, "M_dat.MH.MH_pkthdr.rcvif = %x\n", m->M_dat.MH.MH_pkthdr.rcvif);
+				log(LOG_DEBUG, "M_dat.MH.MH_pkthdr.len = %d\n",
+				    m->M_dat.MH.MH_pkthdr.len);
+				log(LOG_DEBUG,
+				    "M_dat.MH.MH_pkthdr.rcvif = %p\n",
+				    (void *)m->M_dat.MH.MH_pkthdr.rcvif);
 				if (!(m->m_hdr.mh_flags & M_EXT))
-					log(LOG_DEBUG, "M_dat.MH.MH_dat.MH_databuf = %x\n", m->M_dat.MH.MH_dat.MH_databuf);
+					log(LOG_DEBUG,
+					    "M_dat.MH.MH_dat.MH_databuf = %p\n",
+					(void *)m->M_dat.MH.MH_dat.MH_databuf);
 			}
 			if (m->m_hdr.mh_flags & M_EXT) {
-				log(LOG_DEBUG, "M_dat.MH.MH_dat.MH_ext.ext_buff %x\n", m->M_dat.MH.MH_dat.MH_ext.ext_buf);
-				log(LOG_DEBUG, "M_dat.MH.MH_dat.MH_ext.ext_free %x\n", m->M_dat.MH.MH_dat.MH_ext.ext_free);
-				log(LOG_DEBUG, "M_dat.MH.MH_dat.MH_ext.ext_size %d\n", m->M_dat.MH.MH_dat.MH_ext.ext_size);
+				log(LOG_DEBUG,
+				    "M_dat.MH.MH_dat.MH_ext.ext_buff %p\n",
+				    (void *)m->M_dat.MH.MH_dat.MH_ext.ext_buf);
+				log(LOG_DEBUG,
+				    "M_dat.MH.MH_dat.MH_ext.ext_free %p\n",
+				    (void *)m->M_dat.MH.MH_dat.MH_ext.ext_free);
+				log(LOG_DEBUG,
+				    "M_dat.MH.MH_dat.MH_ext.ext_size %d\n",
+				    m->M_dat.MH.MH_dat.MH_ext.ext_size);
 			}
 		}
 	} while (m = m->m_next);
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index b13b18f..4113b1a 100644
--- a/sys/dev/pdq/if_fea.c
+++ b/sys/dev/pdq/if_fea.c
@@ -21,7 +21,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: if_fea.c,v 1.8 1998/01/08 23:40:33 eivind Exp $
+ * $Id: if_fea.c,v 1.9 1998/02/20 13:11:46 bde Exp $
  */
 
 /*
@@ -228,19 +228,19 @@ pdq_eisa_attach(
     sc->sc_iobase = (pdq_bus_ioport_t) iospace->addr;
     sc->sc_membase = (pdq_bus_memaddr_t) pmap_mapdev(mspace->addr, mspace->size);
     if (sc->sc_membase == NULL) {
-	printf("fea%d: failed to map memory 0x%x-0x%x!\n",
+	printf("fea%d: failed to map memory 0x%lx-0x%lx!\n",
 	       sc->sc_if.if_unit, mspace->addr, mspace->addr + mspace->size - 1);
 	return -1;
     }
 
     eisa_reg_start(ed);
     if (eisa_reg_iospace(ed, iospace)) {
-	printf("fea%d: failed to register iospace 0x%x-0x%x!\n",
+	printf("fea%d: failed to register iospace 0x%lx-0x%lx!\n",
 	       sc->sc_if.if_unit, iospace->addr, iospace->addr + iospace->size - 1);
 	return -1;
     }
     if (eisa_reg_mspace(ed, mspace)) {
-	printf("fea%d: failed to register memory 0x%x-0x%x!\n",
+	printf("fea%d: failed to register memory 0x%lx-0x%lx!\n",
 	       sc->sc_if.if_unit, mspace->addr, mspace->addr + mspace->size - 1);
 	return -1;
     }
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index 71daa85..6828d92 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppc.c,v 1.3 1998/04/17 22:36:37 des Exp $
+ *	$Id: ppc.c,v 1.4 1998/08/03 19:14:32 msmith Exp $
  *
  */
 #include "ppc.h"
@@ -449,8 +449,7 @@ config:
 
 	if (bootverbose) {
 		outb(csr, 0x1);
-		printf("SMC registers CR1=0x%x", ppc->ppc_unit,
-			inb(cio) & 0xff);
+		printf("SMC registers CR1=0x%x", inb(cio) & 0xff);
 
 		outb(csr, 0x4);
 		printf(" CR4=0x%x", inb(cio) & 0xff);
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index e090bc8..460ef78 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.33 1998/02/20 13:46:55 bde Exp $
+ *    $Id: spkr.c,v 1.34 1998/06/07 17:11:00 dfr Exp $
  */
 
 #include "speaker.h"
@@ -540,13 +540,14 @@ spkrclose(dev, flags, fmt, p)
 int
 spkrioctl(dev, cmd, cmdarg, flags, p)
 	dev_t		dev;
-	u_long		cmd;
+	unsigned long	cmd;
 	caddr_t		cmdarg;
 	int		flags;
 	struct proc	*p;
 {
 #ifdef DEBUG
-    (void) printf("spkrioctl: entering with dev = %x, cmd = %x\n");
+    (void) printf("spkrioctl: entering with dev = %lx, cmd = %lx\n",
+    	(unsigned long)dev, cmd);
 #endif /* DEBUG */
 
     if (minor(dev) != 0)
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 867c42e..66dbffd 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.13 1998/06/17 14:58:00 bde Exp $ */
+/* $Id: if_wl.c,v 1.14 1998/08/20 05:49:59 msmith Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -1777,7 +1777,7 @@ wlxmt(int unit, struct mbuf *m)
 #ifdef	WLDEBUG
     if (sc->wl_if.if_flags & IFF_DEBUG) {
 	if (xmt_debug) {
-	    printf("XMT    mbuf: L%d @%x ", count, mb_p);
+	    printf("XMT    mbuf: L%d @%p ", count, (void *)mb_p);
 	    printf("ether type %x\n", eh_p->ether_type);
 	}
     }
@@ -1835,7 +1835,7 @@ wlxmt(int unit, struct mbuf *m)
 #ifdef	WLDEBUG
 	if (sc->wl_if.if_flags & IFF_DEBUG)
 	    if (xmt_debug)
-		printf("mbuf+ L%d @%x ", count, mb_p);
+		printf("mbuf+ L%d @%p ", count, (void *)mb_p);
 #endif	WLDEBUG
     }
 #ifdef	WLDEBUG
diff --git a/sys/gnu/i386/fpemul/errors.c b/sys/gnu/i386/fpemul/errors.c
index 2c9bf36..f16b6a0 100644
--- a/sys/gnu/i386/fpemul/errors.c
+++ b/sys/gnu/i386/fpemul/errors.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: errors.c,v 1.7 1997/02/22 09:29:01 peter Exp $
+ *    $Id: errors.c,v 1.8 1997/06/14 15:11:03 bde Exp $
  *
  */
 
@@ -98,7 +98,7 @@ Un_impl(void)
 	byte1 = fubyte((unsigned char *) FPU_ORIG_EIP);
 	FPU_modrm = fubyte(1 + (unsigned char *) FPU_ORIG_EIP);
 
-	printf("Unimplemented FPU Opcode at eip=%p : %02x ",
+	printf("Unimplemented FPU Opcode at eip=%#08x : %02x ",
 	    FPU_ORIG_EIP, byte1);
 
 	if (FPU_modrm >= 0300)
@@ -158,7 +158,7 @@ emu_printall()
 	status_word = status_word & ~SW_Top;
 	status_word |= (top & 7) << SW_Top_Shift;
 
-	printf("At %p: %02x ", FPU_ORIG_EIP, byte1);
+	printf("At %#08x: %02x ", FPU_ORIG_EIP, byte1);
 	if (FPU_modrm >= 0300)
 		printf("%02x (%02x+%d)\n", FPU_modrm, FPU_modrm & 0xf8, FPU_modrm & 7);
 	else
@@ -167,7 +167,7 @@ emu_printall()
 
 	printf(" SW: b=%d st=%d es=%d sf=%d cc=%d%d%d%d ef=%d%d%d%d%d%d\n",
 	    status_word & 0x8000 ? 1 : 0,	/* busy */
-	    (status_word & 0x3800) >> 11,	/* stack top pointer */
+	    (int)((status_word & 0x3800) >> 11),	/* stack top pointer */
 	    status_word & 0x80 ? 1 : 0,	/* Error summary status */
 	    status_word & 0x40 ? 1 : 0,	/* Stack flag */
 	    status_word & SW_C3 ? 1 : 0, status_word & SW_C2 ? 1 : 0,	/* cc */
@@ -178,8 +178,10 @@ emu_printall()
 
 	printf(" CW: ic=%d rc=%d%d pc=%d%d iem=%d     ef=%d%d%d%d%d%d\n",
 	    control_word & 0x1000 ? 1 : 0,
-	    (control_word & 0x800) >> 11, (control_word & 0x400) >> 10,
-	    (control_word & 0x200) >> 9, (control_word & 0x100) >> 8,
+	    (int)((control_word & 0x800) >> 11),
+	    (int)((control_word & 0x400) >> 10),
+	    (int)((control_word & 0x200) >> 9),
+	    (int)((control_word & 0x100) >> 8),
 	    control_word & 0x80 ? 1 : 0,
 	    control_word & SW_Precision ? 1 : 0, control_word & SW_Underflow ? 1 : 0,
 	    control_word & SW_Overflow ? 1 : 0, control_word & SW_Zero_Div ? 1 : 0,
@@ -199,12 +201,9 @@ emu_printall()
 		case TW_NaN:
 		case TW_Denormal:
 		case TW_Infinity:
-			printf("st(%d)  %c .%04x %04x %04x %04x e%+-6d ", i,
-			    r->sign ? '-' : '+',
-			    (long) (r->sigh >> 16),
-			    (long) (r->sigh & 0xFFFF),
-			    (long) (r->sigl >> 16),
-			    (long) (r->sigl & 0xFFFF),
+			printf("st(%d)  %c .%04lx %04lx %04lx %04lx e%+-6ld ",
+			    i, r->sign ? '-' : '+', r->sigh >> 16,
+			    r->sigh & 0xFFFF, r->sigl >> 16, r->sigl & 0xFFFF,
 			    r->exp - EXP_BIAS + 1);
 			break;
 		default:
@@ -214,13 +213,10 @@ emu_printall()
 		printf("%s\n", tag_desc[(int) (unsigned) r->tag]);
 	}
 
-	printf("[data] %c .%04x %04x %04x %04x e%+-6d ",
-	    FPU_loaded_data.sign ? '-' : '+',
-	    (long) (FPU_loaded_data.sigh >> 16),
-	    (long) (FPU_loaded_data.sigh & 0xFFFF),
-	    (long) (FPU_loaded_data.sigl >> 16),
-	    (long) (FPU_loaded_data.sigl & 0xFFFF),
-	    FPU_loaded_data.exp - EXP_BIAS + 1);
+	printf("[data] %c .%04lx %04lx %04lx %04lx e%+-6ld ",
+	    FPU_loaded_data.sign ? '-' : '+', FPU_loaded_data.sigh >> 16,
+	    FPU_loaded_data.sigh & 0xFFFF, FPU_loaded_data.sigl >> 16,
+	    FPU_loaded_data.sigl & 0xFFFF, FPU_loaded_data.exp - EXP_BIAS + 1);
 	printf("%s\n", tag_desc[(int) (unsigned) FPU_loaded_data.tag]);
 	REENTRANT_CHECK(ON);
 
diff --git a/sys/gnu/i386/isa/sound/awe_wave.c b/sys/gnu/i386/isa/sound/awe_wave.c
index c4f3cbf..3dc591e 100644
--- a/sys/gnu/i386/isa/sound/awe_wave.c
+++ b/sys/gnu/i386/isa/sound/awe_wave.c
@@ -3306,7 +3306,7 @@ awe_load_guspatch(const char *addr, int offs, int size, int pmgr_flag)
 	COPY_FROM_USER(((char*)&patch) + offs, addr, offs, sizeof_patch - offs);
 	size -= sizeof_patch;
 	if (size < patch.len) {
-		printk("AWE32 Warning: Patch record too short (%d<%d)\n",
+		printk("AWE32 Warning: Patch record too short (%d<%ld)\n",
 		       size, patch.len);
 		return RET_ERROR(EINVAL);
 	}
@@ -3369,7 +3369,7 @@ awe_load_guspatch(const char *addr, int offs, int size, int pmgr_flag)
 	rec->tune = -(note % 100);
 	rec->low = freq_to_note(patch.low_note) / 100;
 	rec->high = freq_to_note(patch.high_note) / 100;
-	DEBUG(1,printk("AWE32: [gus base offset=%d, note=%d, range=%d-%d(%d-%d)]\n",
+	DEBUG(1,printk("AWE32: [gus base offset=%d, note=%d, range=%d-%d(%lu-%lu)]\n",
 		       rec->rate_offset, note,
 		       rec->low, rec->high,
 	      patch.low_note, patch.high_note));
diff --git a/sys/i386/eisa/if_fea.c b/sys/i386/eisa/if_fea.c
index b13b18f..4113b1a 100644
--- a/sys/i386/eisa/if_fea.c
+++ b/sys/i386/eisa/if_fea.c
@@ -21,7 +21,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: if_fea.c,v 1.8 1998/01/08 23:40:33 eivind Exp $
+ * $Id: if_fea.c,v 1.9 1998/02/20 13:11:46 bde Exp $
  */
 
 /*
@@ -228,19 +228,19 @@ pdq_eisa_attach(
     sc->sc_iobase = (pdq_bus_ioport_t) iospace->addr;
     sc->sc_membase = (pdq_bus_memaddr_t) pmap_mapdev(mspace->addr, mspace->size);
     if (sc->sc_membase == NULL) {
-	printf("fea%d: failed to map memory 0x%x-0x%x!\n",
+	printf("fea%d: failed to map memory 0x%lx-0x%lx!\n",
 	       sc->sc_if.if_unit, mspace->addr, mspace->addr + mspace->size - 1);
 	return -1;
     }
 
     eisa_reg_start(ed);
     if (eisa_reg_iospace(ed, iospace)) {
-	printf("fea%d: failed to register iospace 0x%x-0x%x!\n",
+	printf("fea%d: failed to register iospace 0x%lx-0x%lx!\n",
 	       sc->sc_if.if_unit, iospace->addr, iospace->addr + iospace->size - 1);
 	return -1;
     }
     if (eisa_reg_mspace(ed, mspace)) {
-	printf("fea%d: failed to register memory 0x%x-0x%x!\n",
+	printf("fea%d: failed to register memory 0x%lx-0x%lx!\n",
 	       sc->sc_if.if_unit, mspace->addr, mspace->addr + mspace->size - 1);
 	return -1;
     }
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index d36835d..04e3c69 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.77 1998/08/16 00:41:40 bde Exp $
+ *	$Id: mp_machdep.c,v 1.78 1998/08/18 07:46:58 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -2113,7 +2113,7 @@ ap_init()
 	if (cpuid != apic_id) {
 		printf("SMP: cpuid = %d\n", cpuid);
 		printf("SMP: apic_id = %d\n", apic_id);
-		printf("PTD[MPPTDI] = %08x\n", PTD[MPPTDI]);
+		printf("PTD[MPPTDI] = %p\n", (void *)PTD[MPPTDI]);
 		panic("cpuid mismatch! boom!!");
 	}
 
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index d36835d..04e3c69 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.77 1998/08/16 00:41:40 bde Exp $
+ *	$Id: mp_machdep.c,v 1.78 1998/08/18 07:46:58 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -2113,7 +2113,7 @@ ap_init()
 	if (cpuid != apic_id) {
 		printf("SMP: cpuid = %d\n", cpuid);
 		printf("SMP: apic_id = %d\n", apic_id);
-		printf("PTD[MPPTDI] = %08x\n", PTD[MPPTDI]);
+		printf("PTD[MPPTDI] = %p\n", (void *)PTD[MPPTDI]);
 		panic("cpuid mismatch! boom!!");
 	}
 
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 573052e..0f569f2 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id: sys_machdep.c,v 1.35 1998/07/28 03:29:32 jlemon Exp $
+ *	$Id: sys_machdep.c,v 1.36 1998/08/18 07:46:58 msmith Exp $
  *
  */
 
@@ -290,8 +290,8 @@ i386_get_ldt(p, args)
 		return(error);
 
 #ifdef	DEBUG
-	printf("i386_get_ldt: start=%d num=%d descs=%x\n", uap->start,
-		uap->num, uap->desc);
+	printf("i386_get_ldt: start=%d num=%d descs=%p\n",
+	    uap->start, uap->num, (void *)uap->desc);
 #endif
 
 	/* verify range of LDTs exist */
@@ -345,7 +345,8 @@ i386_set_ldt(p, args)
 	uap = &ua;
 
 #ifdef	DEBUG
-	printf("i386_set_ldt: start=%d num=%d descs=%x\n", uap->start, uap->num, uap->desc);
+	printf("i386_set_ldt: start=%d num=%d descs=%p\n",
+	    uap->start, uap->num, (void *)uap->desc);
 #endif
 
  	/* verify range of descriptors to modify */
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index d36835d..04e3c69 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.77 1998/08/16 00:41:40 bde Exp $
+ *	$Id: mp_machdep.c,v 1.78 1998/08/18 07:46:58 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -2113,7 +2113,7 @@ ap_init()
 	if (cpuid != apic_id) {
 		printf("SMP: cpuid = %d\n", cpuid);
 		printf("SMP: apic_id = %d\n", apic_id);
-		printf("PTD[MPPTDI] = %08x\n", PTD[MPPTDI]);
+		printf("PTD[MPPTDI] = %p\n", (void *)PTD[MPPTDI]);
 		panic("cpuid mismatch! boom!!");
 	}
 
diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index 964684e..adebd22 100644
--- a/sys/i386/isa/if_ar.c
+++ b/sys/i386/isa/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.20 1998/06/17 13:54:56 bde Exp $
+ * $Id: if_ar.c,v 1.21 1998/06/21 14:53:10 bde Exp $
  */
 
 /*
@@ -1240,12 +1240,12 @@ ar_eat_packet(struct ar_softc *sc, int single)
 	while(rxdesc != cda) {
 		loopcnt++;
 		if(loopcnt > sc->rxmax) {
-			printf("ar%d: eat pkt %d loop, cda %x, "
-			       "rxdesc %x, stat %x.\n",
+			printf("ar%d: eat pkt %d loop, cda %p, "
+			       "rxdesc %p, stat %x.\n",
 			       sc->unit,
 			       loopcnt,
-			       cda,
-			       rxdesc,
+			       (void *)cda,
+			       (void *)rxdesc,
 			       rxdesc->stat);
 			break;
 		}
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 83f537d..8f4bfcb 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.142 1998/06/17 14:01:00 bde Exp $
+ *	$Id: if_ed.c,v 1.143 1998/06/21 18:02:35 bde Exp $
  */
 
 /*
@@ -3440,7 +3440,7 @@ edpnp_probe(u_long csn, u_long vend_id)
 		struct pnp_cinfo d;
 		read_pnp_parms(&d, 0);
 		if (d.enable == 0 || d.flags & 1) {
-			printf("CSN %d is disabled.\n", csn);
+			printf("CSN %lu is disabled.\n", csn);
 			return (NULL);
 		}
 
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index dd201a3..b8e3fbc 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.c,v 1.43 1998/06/07 17:10:36 dfr Exp $
+ * $Id: if_lnc.c,v 1.44 1998/07/20 17:32:56 msmith Exp $
  */
 
 /*
@@ -1869,21 +1869,23 @@ lnc_dump_state(struct lnc_softc *sc)
 	printf("Host memory\n");
 	printf("-----------\n");
 
-	printf("Receive ring: base = %x, next = %x\n",
-	    sc->recv_ring, (sc->recv_ring + sc->recv_next));
+	printf("Receive ring: base = %p, next = %p\n",
+	    (void *)sc->recv_ring, (void *)(sc->recv_ring + sc->recv_next));
 	for (i = 0; i < NDESC(sc->nrdre); i++)
-		printf("\t%d:%x md = %x buff = %x\n",
-		  i, sc->recv_ring + i, (sc->recv_ring + i)->md,
-		    (sc->recv_ring + i)->buff);
+		printf("\t%d:%p md = %p buff = %p\n",
+		    i, (void *)(sc->recv_ring + i),
+		    (void *)(sc->recv_ring + i)->md,
+		    (void *)(sc->recv_ring + i)->buff.data);
 
-	printf("Transmit ring: base = %x, next = %x\n",
-	    sc->trans_ring, (sc->trans_ring + sc->trans_next));
+	printf("Transmit ring: base = %p, next = %p\n",
+	    (void *)sc->trans_ring, (void *)(sc->trans_ring + sc->trans_next));
 	for (i = 0; i < NDESC(sc->ntdre); i++)
-		printf("\t%d:%x md = %x buff = %x\n",
-		i, sc->trans_ring + i, (sc->trans_ring + i)->md,
-		    (sc->trans_ring + i)->buff);
+		printf("\t%d:%p md = %p buff = %p\n",
+		    i, (void *)(sc->trans_ring + i),
+		    (void *)(sc->trans_ring + i)->md,
+		    (void *)(sc->trans_ring + i)->buff.data);
 	printf("Lance memory (may be on host(DMA) or card(SHMEM))\n");
-	printf("Init block = %x\n", sc->init_block);
+	printf("Init block = %p\n", (void *)sc->init_block);
 	printf("\tmode = %b rlen:rdra = %x:%x tlen:tdra = %x:%x\n",
 	    sc->init_block->mode, INIT_MODE, sc->init_block->rlen,
 	  sc->init_block->rdra, sc->init_block->tlen, sc->init_block->tdra);
@@ -1904,7 +1906,9 @@ lnc_dump_state(struct lnc_softc *sc)
 		    ((sc->trans_ring + i)->md->md1 >> 8), TRANS_MD1,
 		    ((sc->trans_ring + i)->md->md3 >> 10), TRANS_MD3);
 	printf("\nnext_to_send = %x\n", sc->next_to_send);
-	printf("\n CSR0 = %b CSR1 = %x CSR2 = %x CSR3 = %x\n\n", read_csr(sc, CSR0), CSR0_FLAGS, read_csr(sc, CSR1), read_csr(sc, CSR2), read_csr(sc, CSR3));
+	printf("\n CSR0 = %b CSR1 = %x CSR2 = %x CSR3 = %x\n\n",
+	    read_csr(sc, CSR0), CSR0_FLAGS, read_csr(sc, CSR1),
+	    read_csr(sc, CSR2), read_csr(sc, CSR3));
 	/* Set RAP back to CSR0 */
 	outw(sc->rap, CSR0);
 }
@@ -1919,26 +1923,42 @@ mbuf_dump_chain(struct mbuf * m)
 	if (!m)
 		log(LOG_DEBUG, "m == NULL\n");
 	do {
-		log(LOG_DEBUG, "m = %x\n", m);
-		log(LOG_DEBUG, "m_hdr.mh_next = %x\n", m->m_hdr.mh_next);
-		log(LOG_DEBUG, "m_hdr.mh_nextpkt = %x\n", m->m_hdr.mh_nextpkt);
+		log(LOG_DEBUG, "m = %p\n", (void *)m);
+		log(LOG_DEBUG, "m_hdr.mh_next = %p\n",
+		    (void *)m->m_hdr.mh_next);
+		log(LOG_DEBUG, "m_hdr.mh_nextpkt = %p\n",
+		    (void *)m->m_hdr.mh_nextpkt);
 		log(LOG_DEBUG, "m_hdr.mh_len = %d\n", m->m_hdr.mh_len);
-		log(LOG_DEBUG, "m_hdr.mh_data = %x\n", m->m_hdr.mh_data);
+		log(LOG_DEBUG, "m_hdr.mh_data = %p\n",
+		    (void *)m->m_hdr.mh_data);
 		log(LOG_DEBUG, "m_hdr.mh_type = %d\n", m->m_hdr.mh_type);
-		log(LOG_DEBUG, "m_hdr.mh_flags = %b\n", m->m_hdr.mh_flags, MBUF_FLAGS);
+		log(LOG_DEBUG, "m_hdr.mh_flags = %b\n", m->m_hdr.mh_flags,
+		    MBUF_FLAGS);
 		if (!(m->m_hdr.mh_flags & (M_PKTHDR | M_EXT)))
-			log(LOG_DEBUG, "M_dat.M_databuf = %x\n", m->M_dat.M_databuf);
+			log(LOG_DEBUG, "M_dat.M_databuf = %p\n",
+			    (void *)m->M_dat.M_databuf);
 		else {
 			if (m->m_hdr.mh_flags & M_PKTHDR) {
-				log(LOG_DEBUG, "M_dat.MH.MH_pkthdr.len = %d\n", m->M_dat.MH.MH_pkthdr.len);
-				log(LOG_DEBUG, "M_dat.MH.MH_pkthdr.rcvif = %x\n", m->M_dat.MH.MH_pkthdr.rcvif);
+				log(LOG_DEBUG, "M_dat.MH.MH_pkthdr.len = %d\n",
+				    m->M_dat.MH.MH_pkthdr.len);
+				log(LOG_DEBUG,
+				    "M_dat.MH.MH_pkthdr.rcvif = %p\n",
+				    (void *)m->M_dat.MH.MH_pkthdr.rcvif);
 				if (!(m->m_hdr.mh_flags & M_EXT))
-					log(LOG_DEBUG, "M_dat.MH.MH_dat.MH_databuf = %x\n", m->M_dat.MH.MH_dat.MH_databuf);
+					log(LOG_DEBUG,
+					    "M_dat.MH.MH_dat.MH_databuf = %p\n",
+					(void *)m->M_dat.MH.MH_dat.MH_databuf);
 			}
 			if (m->m_hdr.mh_flags & M_EXT) {
-				log(LOG_DEBUG, "M_dat.MH.MH_dat.MH_ext.ext_buff %x\n", m->M_dat.MH.MH_dat.MH_ext.ext_buf);
-				log(LOG_DEBUG, "M_dat.MH.MH_dat.MH_ext.ext_free %x\n", m->M_dat.MH.MH_dat.MH_ext.ext_free);
-				log(LOG_DEBUG, "M_dat.MH.MH_dat.MH_ext.ext_size %d\n", m->M_dat.MH.MH_dat.MH_ext.ext_size);
+				log(LOG_DEBUG,
+				    "M_dat.MH.MH_dat.MH_ext.ext_buff %p\n",
+				    (void *)m->M_dat.MH.MH_dat.MH_ext.ext_buf);
+				log(LOG_DEBUG,
+				    "M_dat.MH.MH_dat.MH_ext.ext_free %p\n",
+				    (void *)m->M_dat.MH.MH_dat.MH_ext.ext_free);
+				log(LOG_DEBUG,
+				    "M_dat.MH.MH_dat.MH_ext.ext_size %d\n",
+				    m->M_dat.MH.MH_dat.MH_ext.ext_size);
 			}
 		}
 	} while (m = m->m_next);
diff --git a/sys/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c
index 867c42e..66dbffd 100644
--- a/sys/i386/isa/if_wl.c
+++ b/sys/i386/isa/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.13 1998/06/17 14:58:00 bde Exp $ */
+/* $Id: if_wl.c,v 1.14 1998/08/20 05:49:59 msmith Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -1777,7 +1777,7 @@ wlxmt(int unit, struct mbuf *m)
 #ifdef	WLDEBUG
     if (sc->wl_if.if_flags & IFF_DEBUG) {
 	if (xmt_debug) {
-	    printf("XMT    mbuf: L%d @%x ", count, mb_p);
+	    printf("XMT    mbuf: L%d @%p ", count, (void *)mb_p);
 	    printf("ether type %x\n", eh_p->ether_type);
 	}
     }
@@ -1835,7 +1835,7 @@ wlxmt(int unit, struct mbuf *m)
 #ifdef	WLDEBUG
 	if (sc->wl_if.if_flags & IFF_DEBUG)
 	    if (xmt_debug)
-		printf("mbuf+ L%d @%x ", count, mb_p);
+		printf("mbuf+ L%d @%p ", count, (void *)mb_p);
 #endif	WLDEBUG
     }
 #ifdef	WLDEBUG
diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index c77d3fc..4e19b64 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -641,8 +641,8 @@ static void ad_intr(struct ctlr *ctlr)
 		{
 			struct buf *bp = ctlr->start_queue.b_actf;
 
-			printf("ad_intr: error: bp %0p, data %0p, status %x",
-			bp, ctlr->data, status);
+			printf("ad_intr: error: bp %p, data %p, status %x",
+			    (void *)bp, (void *)ctlr->data, status);
 
 			if (status & OVERRUN)
 				printf(" Conversion overrun (multiple A-D trigger)");
@@ -682,8 +682,8 @@ static void ad_intr(struct ctlr *ctlr)
 				printf("ad_intr: (should not happen) dropped input.\n");
 				(void)inb(ADFIFO(ctlr));
 
-				printf("bp %0p, status %x, cr3 %x\n", bp, status,
-				ctlr->cr_image[2]);
+				printf("bp %p, status %x, cr3 %x\n",
+				    (void *)bp, status, ctlr->cr_image[2]);
 
 				ctlr->err = DROPPED_INPUT;
 				return;
diff --git a/sys/i386/isa/ppc.c b/sys/i386/isa/ppc.c
index 71daa85..6828d92 100644
--- a/sys/i386/isa/ppc.c
+++ b/sys/i386/isa/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppc.c,v 1.3 1998/04/17 22:36:37 des Exp $
+ *	$Id: ppc.c,v 1.4 1998/08/03 19:14:32 msmith Exp $
  *
  */
 #include "ppc.h"
@@ -449,8 +449,7 @@ config:
 
 	if (bootverbose) {
 		outb(csr, 0x1);
-		printf("SMC registers CR1=0x%x", ppc->ppc_unit,
-			inb(cio) & 0xff);
+		printf("SMC registers CR1=0x%x", inb(cio) & 0xff);
 
 		outb(csr, 0x4);
 		printf(" CR4=0x%x", inb(cio) & 0xff);
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index e090bc8..460ef78 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.33 1998/02/20 13:46:55 bde Exp $
+ *    $Id: spkr.c,v 1.34 1998/06/07 17:11:00 dfr Exp $
  */
 
 #include "speaker.h"
@@ -540,13 +540,14 @@ spkrclose(dev, flags, fmt, p)
 int
 spkrioctl(dev, cmd, cmdarg, flags, p)
 	dev_t		dev;
-	u_long		cmd;
+	unsigned long	cmd;
 	caddr_t		cmdarg;
 	int		flags;
 	struct proc	*p;
 {
 #ifdef DEBUG
-    (void) printf("spkrioctl: entering with dev = %x, cmd = %x\n");
+    (void) printf("spkrioctl: entering with dev = %lx, cmd = %lx\n",
+    	(unsigned long)dev, cmd);
 #endif /* DEBUG */
 
     if (minor(dev) != 0)
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index 5e7376c..5c2a661 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -1083,7 +1083,7 @@ int unit;
     twputpkt(sc, pkt);
     untimeout(twabortrcv, (caddr_t)sc, sc->abortrcv_ch);
     if(sc->sc_flags & TW_RCV_ERROR) {
-      log(LOG_ERR, "TWRCV: invalid packet: (%d, %x) %c %d\n",
+      log(LOG_ERR, "TWRCV: invalid packet: (%d, %x) %c %s\n",
 	  sc->sc_rcount, sc->sc_bits, 'A' + pkt[1], X10_KEY_LABEL[pkt[2]]);
       twdebugtimes(sc);
     } else {
diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c
index b0c8c0f..f0a026f 100644
--- a/sys/i386/isa/wst.c
+++ b/sys/i386/isa/wst.c
@@ -25,7 +25,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: wst.c,v 1.8 1998/07/04 22:30:19 julian Exp $
+ *	$Id: wst.c,v 1.9 1998/08/14 15:54:57 sos Exp $
  */
 
 #include "wdc.h"
@@ -353,8 +353,8 @@ wstopen(dev_t dev, int flags, int fmt, struct proc *p)
 
     /* Check that the device number and that the ATAPI driver is loaded. */
     if (lun >= wstnlun || !atapi_request_immediate) {
-        printf("ENXIO lun=%d, wstnlun=%d, im=%d\n",
-               lun, wstnlun, atapi_request_immediate);
+        printf("ENXIO lun=%d, wstnlun=%d, im=%p\n",
+               lun, wstnlun, (void *)atapi_request_immediate);
         return(ENXIO);
     }
     t = wsttab[lun];
@@ -428,7 +428,7 @@ wststrategy(struct buf *bp)
     }
 
     if (bp->b_bcount > t->blksize*t->cap.ctl) {  
-        printf("wst%d: WARNING: CTL exceeded %d>%d\n", 
+        printf("wst%d: WARNING: CTL exceeded %ld>%d\n", 
 		lun, bp->b_bcount, t->blksize*t->cap.ctl);
     }
 
@@ -585,8 +585,8 @@ wst_error(struct wst *t, struct atapires result)
         printf("wst%d: i/o error, status=%b, error=%b\n", t->lun,
         	result.status, ARS_BITS, result.error, AER_BITS);
     }
-    printf("total=%ud ERR=%x len=%d ASC=%x ASCQ=%x\n", 
-	   wst_total, sense.error_code, ntohl(sense.info), 
+    printf("total=%u ERR=%x len=%ld ASC=%x ASCQ=%x\n", 
+	   wst_total, sense.error_code, (long)ntohl(sense.info), 
 	   sense.asc, sense.ascq);
     return 1;
 }
diff --git a/sys/i386/scsi/bt.c b/sys/i386/scsi/bt.c
index 3196dad..d3d0ec0 100644
--- a/sys/i386/scsi/bt.c
+++ b/sys/i386/scsi/bt.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: bt.c,v 1.15 1997/09/21 21:43:54 gibbs Exp $
+ *      $Id: bt.c,v 1.16 1998/02/20 13:37:37 bde Exp $
  */
 
 /*
@@ -659,7 +659,8 @@ bt_intr(arg)
 		}
 		if (!found) {
 #ifdef DEBUG
-			printf("bt%d: mbi at 0x%08x should be found, stat=%02x..resync\n",
+			printf(
+			"bt%d: mbi at %p should be found, stat=%02x..resync\n",
 			    bt->unit, wmbi, stat);
 #endif
 		} else {
diff --git a/sys/isa/ppc.c b/sys/isa/ppc.c
index 71daa85..6828d92 100644
--- a/sys/isa/ppc.c
+++ b/sys/isa/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppc.c,v 1.3 1998/04/17 22:36:37 des Exp $
+ *	$Id: ppc.c,v 1.4 1998/08/03 19:14:32 msmith Exp $
  *
  */
 #include "ppc.h"
@@ -449,8 +449,7 @@ config:
 
 	if (bootverbose) {
 		outb(csr, 0x1);
-		printf("SMC registers CR1=0x%x", ppc->ppc_unit,
-			inb(cio) & 0xff);
+		printf("SMC registers CR1=0x%x", inb(cio) & 0xff);
 
 		outb(csr, 0x4);
 		printf(" CR4=0x%x", inb(cio) & 0xff);
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index d36835d..04e3c69 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.77 1998/08/16 00:41:40 bde Exp $
+ *	$Id: mp_machdep.c,v 1.78 1998/08/18 07:46:58 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -2113,7 +2113,7 @@ ap_init()
 	if (cpuid != apic_id) {
 		printf("SMP: cpuid = %d\n", cpuid);
 		printf("SMP: apic_id = %d\n", apic_id);
-		printf("PTD[MPPTDI] = %08x\n", PTD[MPPTDI]);
+		printf("PTD[MPPTDI] = %p\n", (void *)PTD[MPPTDI]);
 		panic("cpuid mismatch! boom!!");
 	}
 
diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c
index b0c8c0f..f0a026f 100644
--- a/sys/pc98/pc98/wst.c
+++ b/sys/pc98/pc98/wst.c
@@ -25,7 +25,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: wst.c,v 1.8 1998/07/04 22:30:19 julian Exp $
+ *	$Id: wst.c,v 1.9 1998/08/14 15:54:57 sos Exp $
  */
 
 #include "wdc.h"
@@ -353,8 +353,8 @@ wstopen(dev_t dev, int flags, int fmt, struct proc *p)
 
     /* Check that the device number and that the ATAPI driver is loaded. */
     if (lun >= wstnlun || !atapi_request_immediate) {
-        printf("ENXIO lun=%d, wstnlun=%d, im=%d\n",
-               lun, wstnlun, atapi_request_immediate);
+        printf("ENXIO lun=%d, wstnlun=%d, im=%p\n",
+               lun, wstnlun, (void *)atapi_request_immediate);
         return(ENXIO);
     }
     t = wsttab[lun];
@@ -428,7 +428,7 @@ wststrategy(struct buf *bp)
     }
 
     if (bp->b_bcount > t->blksize*t->cap.ctl) {  
-        printf("wst%d: WARNING: CTL exceeded %d>%d\n", 
+        printf("wst%d: WARNING: CTL exceeded %ld>%d\n", 
 		lun, bp->b_bcount, t->blksize*t->cap.ctl);
     }
 
@@ -585,8 +585,8 @@ wst_error(struct wst *t, struct atapires result)
         printf("wst%d: i/o error, status=%b, error=%b\n", t->lun,
         	result.status, ARS_BITS, result.error, AER_BITS);
     }
-    printf("total=%ud ERR=%x len=%d ASC=%x ASCQ=%x\n", 
-	   wst_total, sense.error_code, ntohl(sense.info), 
+    printf("total=%u ERR=%x len=%ld ASC=%x ASCQ=%x\n", 
+	   wst_total, sense.error_code, (long)ntohl(sense.info), 
 	   sense.asc, sense.ascq);
     return 1;
 }