shithub: riscv

Info  •  Files  •  Log  •  Branches

pc64: add etheryuk driver

--- a/sys/src/9/pc/etheryuk.c

+++ b/sys/src/9/pc/etheryuk.c

@@ -1207,11 +1207,11 @@

 	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 @@

 		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)

--- a/sys/src/9/pc64/mkfile

+++ b/sys/src/9/pc64/mkfile

@@ -83,7 +83,8 @@

 # 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

--- a/sys/src/9/pc64/pc64

+++ b/sys/src/9/pc64/pc64

@@ -65,7 +65,7 @@

 #	ethervt6105m	pci ethermii

 #	ethersink

 #	ethersmc	devi82365 cis

-#	etheryuk	pci

+	etheryuk	pci

 #	etherwavelan	wavelan devi82365 cis pci

 	etheriwl	pci wifi

 	etherwpi	pci wifi