xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pc64: add etheryuk driver

Browse source
This commit is contained in:
cinap_lenrek 2016-05-05 16:18:57 +02:00
parent 36d70eb5a7
commit 8d9a94a66e
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/src/9/pc/etheryuk.c
View file

@ -1207,11 +1207,11 @@ rxscrew(Ether *e, Sring *r, Status *t, uint wp)
c = e->ctlr;
if((int)(wp - r->rp) >= r->cnt){
print("rxscrew1 wp %ud(%ud) rp %ud %lud\n", wp, r->wp, r->rp, t-r->r);
print("rxscrew1 wp %ud(%ud) rp %ud %zd\n", wp, r->wp, r->rp, t-r->r);
return -1;
}
if(c->rbring[t - r->r]){
print("rxscrew2 wp %ud rp %ud %lud\n", wp, r->rp, t-r->r);
print("rxscrew2 wp %ud rp %ud %zd\n", wp, r->rp, t-r->r);
descriptorfu(e, Qr);
return -1;
}
@ -2229,7 +2229,7 @@ pnp(Ether *e)
c = ctlrtab[i];
if(c == nil || c->flag&Fprobe)
continue;
if(e->port != 0 && e->port != (ulong)c->reg)
if(e->port != 0 && e->port != (ulong)(uintptr)c->reg)
continue;
c->flag |= Fprobe;
if(setup(c) != 0)

3
sys/src/9/pc64/mkfile
View file

@ -83,7 +83,8 @@ install:V: $p$CONF
# copies generated by the rule below
PCHEADERS=wifi.h usbehci.h screen.h etherif.h ethermii.h mp.h io.h ahci.h
PCHEADERS=wifi.h usbehci.h screen.h etherif.h ethermii.h mp.h io.h ahci.h \
yukdump.h
REPCH=`{echo $PCHEADERS | sed 's/\.h//g; s/ /|/g'}
^($REPCH)\.h:R: ../pc/\1.h

2
sys/src/9/pc64/pc64
View file

@ -65,7 +65,7 @@ link
# ethervt6105m pci ethermii
# ethersink
# ethersmc devi82365 cis
# etheryuk pci
etheryuk pci
# etherwavelan wavelan devi82365 cis pci
etheriwl pci wifi
etherwpi pci wifi