remove ulong from wifi and do not call ahci iahci Reference: /n/atom/patch/applied/nixahciwifitidy Date: Thu May 1 18:17:26 CES 2014 Signed-off-by: quanstro@quanstro.net --- /sys/src/nix/k10/sdahci.c Thu May 1 18:17:26 2014 +++ /sys/src/nix/k10/sdahci.c Thu May 1 18:17:26 2014 @@ -1876,7 +1876,7 @@ d->ctlr = c; if((c->pi & 1<name, sizeof d->name, "iahci%d.%d", niactlr, i); + snprint(d->name, sizeof d->name, "ahci%d.%d", niactlr, i); d->port = (Aport*)(c->mmio + 0x80*i + 0x100); d->portc.p = d->port; d->portc.m = &d->portm; --- /sys/src/nix/k10/wifi.c Thu May 1 18:17:26 2014 +++ /sys/src/nix/k10/wifi.c Thu May 1 18:17:26 2014 @@ -870,7 +870,7 @@ } long -wifistat(Wifi *wifi, void *buf, long n, ulong off) +wifistat(Wifi *wifi, void *buf, long n, uvlong off) { static uchar zeros[Eaddrlen]; char *s, *p, *e; @@ -1231,7 +1231,7 @@ } static void -micupdate(MICstate *s, uchar *data, ulong len) +micupdate(MICstate *s, uchar *data, uint len) { u32int l, r, m, n, e; @@ -1287,7 +1287,7 @@ uchar seed[16]; RC4state rs; MICstate ms; - ulong crc; + u32int crc; micsetup(&ms, k->key+24); micupdate(&ms, dstaddr(w), Eaddrlen); @@ -1331,10 +1331,10 @@ rc4(&rs, b->rp, BLEN(b)); b->wp -= 4; - crc = (ulong)b->wp[0] | - (ulong)b->wp[1]<<8 | - (ulong)b->wp[2]<<16 | - (ulong)b->wp[3]<<24; + crc = b->wp[0] | + b->wp[1]<<8 | + b->wp[2]<<16 | + b->wp[3]<<24; crc = ~crc; if(ethercrc(b->rp, BLEN(b)) != crc) return -1; --- /sys/src/nix/k10/wifi.h Thu May 1 18:17:26 2014 +++ /sys/src/nix/k10/wifi.h Thu May 1 18:17:26 2014 @@ -81,5 +81,5 @@ void wifiiq(Wifi*, Block*); int wifihdrlen(Wifipkt*); -long wifistat(Wifi*, void*, long, ulong); +long wifistat(Wifi*, void*, long, uvlong); long wifictl(Wifi*, void*, long);