8 files changed, 70 insertions, 50 deletions

diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 964684ef3b76..adebd22e5489 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 964684ef3b76..adebd22e5489 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 83f537d1312a..8f4bfcbbca8c 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 dd201a3805ed..b8e3fbc1d2e1 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 b13b18fb762b..4113b1ac7ca0 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 71daa8579710..6828d925e587 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 e090bc8f6d9d..460ef789a393 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 867c42e4723a..66dbffd40786 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