diff options
author | bde <bde@FreeBSD.org> | 1998-08-24 02:28:16 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1998-08-24 02:28:16 +0000 |
commit | f45ec220062c45b6f53f7eddeb3892a2df54ca63 (patch) | |
tree | add7f3aff956758872236d008a575411ee01f80a /sys/i386/isa | |
parent | d39f49e72d9eed2771f3bb23e90fdaa965286143 (diff) | |
download | FreeBSD-src-f45ec220062c45b6f53f7eddeb3892a2df54ca63.zip FreeBSD-src-f45ec220062c45b6f53f7eddeb3892a2df54ca63.tar.gz |
Fixed printf format errors. Only one left in LINT on i386's.
Diffstat (limited to 'sys/i386/isa')
-rw-r--r-- | sys/i386/isa/if_ar.c | 10 | ||||
-rw-r--r-- | sys/i386/isa/if_ed.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/if_lnc.c | 70 | ||||
-rw-r--r-- | sys/i386/isa/if_wl.c | 6 | ||||
-rw-r--r-- | sys/i386/isa/labpc.c | 8 | ||||
-rw-r--r-- | sys/i386/isa/ppc.c | 5 | ||||
-rw-r--r-- | sys/i386/isa/spkr.c | 7 | ||||
-rw-r--r-- | sys/i386/isa/tw.c | 2 | ||||
-rw-r--r-- | sys/i386/isa/wst.c | 12 |
9 files changed, 72 insertions, 52 deletions
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; } |