clean up a few nits that have crept into the the drivers that aren't in the default kernels. Reference: /n/atom/patch/applied/pcpaenits Date: Sat Jan 11 22:42:15 CET 2014 Signed-off-by: quanstro@quanstro.net --- /sys/src/9/pcpae/ether8139.c Sat Jan 11 22:41:49 2014 +++ /sys/src/9/pcpae/ether8139.c Sat Jan 11 22:41:49 2014 @@ -324,7 +324,7 @@ ctlr->rec += csr16r(ctlr, Rec); l += snprint(p+l, READSTR-l, "rec %d\n", ctlr->rec); - l += snprint(p+l, READSTR-l, "Tcr %#8.8lux\n", csr32r(ctlr, Tcr)); + l += snprint(p+l, READSTR-l, "Tcr %#.8ux\n", csr32r(ctlr, Tcr)); l += snprint(p+l, READSTR-l, "Config0 %#2.2ux\n", csr8r(ctlr, Config0)); l += snprint(p+l, READSTR-l, "Config1 %#2.2ux\n", csr8r(ctlr, Config1)); l += snprint(p+l, READSTR-l, "Msr %#2.2ux\n", csr8r(ctlr, Msr)); --- /sys/src/9/pcpae/ether2114x.c Sat Jan 11 22:41:49 2014 +++ /sys/src/9/pcpae/ether2114x.c Sat Jan 11 22:41:49 2014 @@ -240,28 +240,28 @@ int ntqmax; Block* setupbp; - ulong of; /* receive statistics */ - ulong ce; - ulong cs; - ulong tl; - ulong rf; - ulong de; - - ulong ru; - ulong rps; - ulong rwt; - - ulong uf; /* transmit statistics */ - ulong ec; - ulong lc; - ulong nc; - ulong lo; - ulong to; - - ulong tps; - ulong tu; - ulong tjt; - ulong unf; + uint of; /* receive statistics */ + uint ce; + uint cs; + uint tl; + uint rf; + uint de; + + uint ru; + uint rps; + uint rwt; + + uint uf; /* transmit statistics */ + uint ec; + uint lc; + uint nc; + uint lo; + uint to; + + uint tps; + uint tu; + uint tjt; + uint unf; } Ctlr; static Ctlr* ctlrhead; @@ -325,27 +325,27 @@ p = malloc(READSTR); if(p == nil) error(Enomem); - l = snprint(p, READSTR, "Overflow: %lud\n", ctlr->of); - l += snprint(p+l, READSTR-l, "Ru: %lud\n", ctlr->ru); - l += snprint(p+l, READSTR-l, "Rps: %lud\n", ctlr->rps); - l += snprint(p+l, READSTR-l, "Rwt: %lud\n", ctlr->rwt); - l += snprint(p+l, READSTR-l, "Tps: %lud\n", ctlr->tps); - l += snprint(p+l, READSTR-l, "Tu: %lud\n", ctlr->tu); - l += snprint(p+l, READSTR-l, "Tjt: %lud\n", ctlr->tjt); - l += snprint(p+l, READSTR-l, "Unf: %lud\n", ctlr->unf); - l += snprint(p+l, READSTR-l, "CRC Error: %lud\n", ctlr->ce); - l += snprint(p+l, READSTR-l, "Collision Seen: %lud\n", ctlr->cs); - l += snprint(p+l, READSTR-l, "Frame Too Long: %lud\n", ctlr->tl); - l += snprint(p+l, READSTR-l, "Runt Frame: %lud\n", ctlr->rf); - l += snprint(p+l, READSTR-l, "Descriptor Error: %lud\n", ctlr->de); - l += snprint(p+l, READSTR-l, "Underflow Error: %lud\n", ctlr->uf); - l += snprint(p+l, READSTR-l, "Excessive Collisions: %lud\n", ctlr->ec); - l += snprint(p+l, READSTR-l, "Late Collision: %lud\n", ctlr->lc); - l += snprint(p+l, READSTR-l, "No Carrier: %lud\n", ctlr->nc); - l += snprint(p+l, READSTR-l, "Loss of Carrier: %lud\n", ctlr->lo); - l += snprint(p+l, READSTR-l, "Transmit Jabber Timeout: %lud\n", + l = snprint(p, READSTR, "Overflow: %ud\n", ctlr->of); + l += snprint(p+l, READSTR-l, "Ru: %ud\n", ctlr->ru); + l += snprint(p+l, READSTR-l, "Rps: %ud\n", ctlr->rps); + l += snprint(p+l, READSTR-l, "Rwt: %ud\n", ctlr->rwt); + l += snprint(p+l, READSTR-l, "Tps: %ud\n", ctlr->tps); + l += snprint(p+l, READSTR-l, "Tu: %ud\n", ctlr->tu); + l += snprint(p+l, READSTR-l, "Tjt: %ud\n", ctlr->tjt); + l += snprint(p+l, READSTR-l, "Unf: %ud\n", ctlr->unf); + l += snprint(p+l, READSTR-l, "CRC Error: %ud\n", ctlr->ce); + l += snprint(p+l, READSTR-l, "Collision Seen: %ud\n", ctlr->cs); + l += snprint(p+l, READSTR-l, "Frame Too Long: %ud\n", ctlr->tl); + l += snprint(p+l, READSTR-l, "Runt Frame: %ud\n", ctlr->rf); + l += snprint(p+l, READSTR-l, "Descriptor Error: %ud\n", ctlr->de); + l += snprint(p+l, READSTR-l, "Underflow Error: %ud\n", ctlr->uf); + l += snprint(p+l, READSTR-l, "Excessive Collisions: %ud\n", ctlr->ec); + l += snprint(p+l, READSTR-l, "Late Collision: %ud\n", ctlr->lc); + l += snprint(p+l, READSTR-l, "No Carrier: %ud\n", ctlr->nc); + l += snprint(p+l, READSTR-l, "Loss of Carrier: %ud\n", ctlr->lo); + l += snprint(p+l, READSTR-l, "Transmit Jabber Timeout: %ud\n", ctlr->to); - l += snprint(p+l, READSTR-l, "csr6: %luX %uX\n", csr32r(ctlr, 6), + l += snprint(p+l, READSTR-l, "csr6: %ux %ux\n", csr32r(ctlr, 6), ctlr->csr6); snprint(p+l, READSTR-l, "ntqmax: %d\n", ctlr->ntqmax); ctlr->ntqmax = 0; @@ -925,7 +925,7 @@ csr6 |= Fd; if(ctlr->ttm & x) csr6 |= Ttm; - debug("csr6 0x%8.8uX 0x%8.8uX 0x%8.8luX\n", + debug("csr6 %#.8ux %#.8ux %#.8ux\n", csr6, ctlr->csr6, csr32r(ctlr, 6)); if(csr6 != ctlr->csr6){ ctlr->csr6 = csr6; @@ -1257,13 +1257,13 @@ for(timeo = 0; timeo < 30; timeo++){ if(!(csr32r(ctlr, 12) & 0x0002)){ - debug("media21041: ok: csr12 %4.4luX timeo %d\n", + debug("media21041: ok: csr12 %.4ux timeo %d\n", csr32r(ctlr, 12), timeo); return 10; } delay(100); } - debug("media21041: !ok: csr12 %4.4luX\n", csr32r(ctlr, 12)); + debug("media21041: !ok: csr12 %.4ux\n", csr32r(ctlr, 12)); return -1; } @@ -1710,9 +1710,9 @@ * the SROM will be read in anyway so the value there * can be used directly. */ - debug("csr25 %8.8luX csr26 %8.8luX\n", + debug("csr25 %.8ux csr26 %.8ux\n", inl(ctlr->port+0xA4), inl(ctlr->port+0xA8)); - debug("phyidr1 %4.4luX phyidr2 %4.4luX\n", + debug("phyidr1 %.4ux phyidr2 %.4ux\n", inl(ctlr->port+0xBC), inl(ctlr->port+0xC0)); break; } --- /sys/src/9/pcpae/etherelnk3.c Sat Jan 11 22:41:49 2014 +++ /sys/src/9/pcpae/etherelnk3.c Sat Jan 11 22:41:49 2014 @@ -558,7 +558,7 @@ /* On the 575B and C, interrupts need to be acknowledged in CardBus memory space */ static void -intrackcb(ulong *cbfn) +intrackcb(u32int *cbfn) { cbfn[1] = 0x8000; } --- /sys/src/9/pcpae/sdmv50xx.c Sat Jan 11 22:41:49 2014 +++ /sys/src/9/pcpae/sdmv50xx.c Sat Jan 11 22:41:49 2014 @@ -1177,7 +1177,7 @@ io = p->mem[0].bar & ~(uintmem)0xf; mem = (ulong*)vmap(io, p->mem[0].size); if(mem == 0){ - print("sdmv50xx: address 0x%luX in use\n", io); + print("sdmv50xx: address %#P in use\n", io); free(sdev); free(ctlr); continue; --- /sys/src/9/pcpae/etheryuk.c Sat Jan 11 22:41:49 2014 +++ /sys/src/9/pcpae/etheryuk.c Sat Jan 11 22:41:49 2014 @@ -2198,7 +2198,7 @@ c->io = p->mem[0].bar & ~(uintmem)0xf; mem = vmap(c->io, p->mem[0].size); if(mem == nil){ - print("yuk: cant map %#p\n", c->io); + print("yuk: cant map %#P\n", c->io); return -1; } c->p = p; --- /sys/src/9/pc/ether2114x.c Sat Jan 11 22:41:49 2014 +++ /sys/src/9/pc/ether2114x.c Sat Jan 11 22:41:49 2014 @@ -240,28 +240,28 @@ int ntqmax; Block* setupbp; - ulong of; /* receive statistics */ - ulong ce; - ulong cs; - ulong tl; - ulong rf; - ulong de; - - ulong ru; - ulong rps; - ulong rwt; - - ulong uf; /* transmit statistics */ - ulong ec; - ulong lc; - ulong nc; - ulong lo; - ulong to; - - ulong tps; - ulong tu; - ulong tjt; - ulong unf; + uint of; /* receive statistics */ + uint ce; + uint cs; + uint tl; + uint rf; + uint de; + + uint ru; + uint rps; + uint rwt; + + uint uf; /* transmit statistics */ + uint ec; + uint lc; + uint nc; + uint lo; + uint to; + + uint tps; + uint tu; + uint tjt; + uint unf; } Ctlr; static Ctlr* ctlrhead; @@ -325,25 +325,25 @@ p = malloc(READSTR); if(p == nil) error(Enomem); - l = snprint(p, READSTR, "Overflow: %lud\n", ctlr->of); - l += snprint(p+l, READSTR-l, "Ru: %lud\n", ctlr->ru); - l += snprint(p+l, READSTR-l, "Rps: %lud\n", ctlr->rps); - l += snprint(p+l, READSTR-l, "Rwt: %lud\n", ctlr->rwt); - l += snprint(p+l, READSTR-l, "Tps: %lud\n", ctlr->tps); - l += snprint(p+l, READSTR-l, "Tu: %lud\n", ctlr->tu); - l += snprint(p+l, READSTR-l, "Tjt: %lud\n", ctlr->tjt); - l += snprint(p+l, READSTR-l, "Unf: %lud\n", ctlr->unf); - l += snprint(p+l, READSTR-l, "CRC Error: %lud\n", ctlr->ce); - l += snprint(p+l, READSTR-l, "Collision Seen: %lud\n", ctlr->cs); - l += snprint(p+l, READSTR-l, "Frame Too Long: %lud\n", ctlr->tl); - l += snprint(p+l, READSTR-l, "Runt Frame: %lud\n", ctlr->rf); - l += snprint(p+l, READSTR-l, "Descriptor Error: %lud\n", ctlr->de); - l += snprint(p+l, READSTR-l, "Underflow Error: %lud\n", ctlr->uf); - l += snprint(p+l, READSTR-l, "Excessive Collisions: %lud\n", ctlr->ec); - l += snprint(p+l, READSTR-l, "Late Collision: %lud\n", ctlr->lc); - l += snprint(p+l, READSTR-l, "No Carrier: %lud\n", ctlr->nc); - l += snprint(p+l, READSTR-l, "Loss of Carrier: %lud\n", ctlr->lo); - l += snprint(p+l, READSTR-l, "Transmit Jabber Timeout: %lud\n", + l = snprint(p, READSTR, "Overflow: %ud\n", ctlr->of); + l += snprint(p+l, READSTR-l, "Ru: %ud\n", ctlr->ru); + l += snprint(p+l, READSTR-l, "Rps: %ud\n", ctlr->rps); + l += snprint(p+l, READSTR-l, "Rwt: %ud\n", ctlr->rwt); + l += snprint(p+l, READSTR-l, "Tps: %ud\n", ctlr->tps); + l += snprint(p+l, READSTR-l, "Tu: %ud\n", ctlr->tu); + l += snprint(p+l, READSTR-l, "Tjt: %ud\n", ctlr->tjt); + l += snprint(p+l, READSTR-l, "Unf: %ud\n", ctlr->unf); + l += snprint(p+l, READSTR-l, "CRC Error: %ud\n", ctlr->ce); + l += snprint(p+l, READSTR-l, "Collision Seen: %ud\n", ctlr->cs); + l += snprint(p+l, READSTR-l, "Frame Too Long: %ud\n", ctlr->tl); + l += snprint(p+l, READSTR-l, "Runt Frame: %ud\n", ctlr->rf); + l += snprint(p+l, READSTR-l, "Descriptor Error: %ud\n", ctlr->de); + l += snprint(p+l, READSTR-l, "Underflow Error: %ud\n", ctlr->uf); + l += snprint(p+l, READSTR-l, "Excessive Collisions: %ud\n", ctlr->ec); + l += snprint(p+l, READSTR-l, "Late Collision: %ud\n", ctlr->lc); + l += snprint(p+l, READSTR-l, "No Carrier: %ud\n", ctlr->nc); + l += snprint(p+l, READSTR-l, "Loss of Carrier: %ud\n", ctlr->lo); + l += snprint(p+l, READSTR-l, "Transmit Jabber Timeout: %ud\n", ctlr->to); l += snprint(p+l, READSTR-l, "csr6: %ux %ux\n", csr32r(ctlr, 6), ctlr->csr6); --- /sys/src/9/pc/sdmv50xx.c Sat Jan 11 22:41:49 2014 +++ /sys/src/9/pc/sdmv50xx.c Sat Jan 11 22:41:50 2014 @@ -1177,7 +1177,7 @@ io = p->mem[0].bar & ~(uintmem)0xf; mem = (ulong*)vmap(io, p->mem[0].size); if(mem == 0){ - print("sdmv50xx: address 0x%luX in use\n", io); + print("sdmv50xx: address %#P in use\n", io); free(sdev); free(ctlr); continue; --- /sys/src/9/pc/etheryuk.c Sat Jan 11 22:41:50 2014 +++ /sys/src/9/pc/etheryuk.c Sat Jan 11 22:41:50 2014 @@ -2198,7 +2198,7 @@ c->io = p->mem[0].bar & ~(uintmem)0xf; mem = vmap(c->io, p->mem[0].size); if(mem == nil){ - print("yuk: cant map %#p\n", c->io); + print("yuk: cant map %#P\n", c->io); return -1; } c->p = p;