summaryrefslogtreecommitdiff
path: root/sys/src/9
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2016-05-05 16:18:57 +0200
committercinap_lenrek <cinap_lenrek@felloff.net>2016-05-05 16:18:57 +0200
commit8d9a94a66ed80605cb21be1a091a9b6fe02bd023 (patch)
tree1ef27b7020561a3efbbe9fb7ea62676170121988 /sys/src/9
parent36d70eb5a797527cbd11d1f318cd6ca6bd5ebd5a (diff)
pc64: add etheryuk driver
Diffstat (limited to 'sys/src/9')
-rw-r--r--sys/src/9/pc/etheryuk.c6
-rw-r--r--sys/src/9/pc64/mkfile3
-rw-r--r--sys/src/9/pc64/pc642
3 files changed, 6 insertions, 5 deletions
diff --git a/sys/src/9/pc/etheryuk.c b/sys/src/9/pc/etheryuk.c
index 96409cbc3..d679b83b5 100644
--- a/sys/src/9/pc/etheryuk.c
+++ b/sys/src/9/pc/etheryuk.c
@@ -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)
diff --git a/sys/src/9/pc64/mkfile b/sys/src/9/pc64/mkfile
index b9ab0efdd..30b40daf1 100644
--- a/sys/src/9/pc64/mkfile
+++ b/sys/src/9/pc64/mkfile
@@ -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
diff --git a/sys/src/9/pc64/pc64 b/sys/src/9/pc64/pc64
index 3db977e06..7faa134e1 100644
--- a/sys/src/9/pc64/pc64
+++ b/sys/src/9/pc64/pc64
@@ -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