Browse Source

Plan 9 from Bell Labs 2005-01-17

David du Colombier 19 years ago
parent
commit
2595250971
4 changed files with 7 additions and 2 deletions
  1. 1 1
      dist/replica/_plan9.db
  2. 1 1
      dist/replica/plan9.db
  3. 1 0
      dist/replica/plan9.log
  4. 4 0
      sys/src/9/pc/ether8169.c

+ 1 - 1
dist/replica/_plan9.db

@@ -5373,7 +5373,7 @@ sys/src/9/pc/ether589.c - 664 sys sys 1015014516 4644
 sys/src/9/pc/ether79c970.c - 664 sys sys 1071245466 14094
 sys/src/9/pc/ether8003.c - 664 sys sys 1015014516 6665
 sys/src/9/pc/ether8139.c - 664 sys sys 1086987324 18362
-sys/src/9/pc/ether8169.c - 664 sys sys 1105109291 22498
+sys/src/9/pc/ether8169.c - 664 sys sys 1105912215 22703
 sys/src/9/pc/ether82543gc.c - 664 sys sys 1055689887 32296
 sys/src/9/pc/ether82557.c - 664 sys sys 1098848151 30040
 sys/src/9/pc/ether83815.c - 664 sys sys 1081706477 23479

+ 1 - 1
dist/replica/plan9.db

@@ -5373,7 +5373,7 @@ sys/src/9/pc/ether589.c - 664 sys sys 1015014516 4644
 sys/src/9/pc/ether79c970.c - 664 sys sys 1071245466 14094
 sys/src/9/pc/ether8003.c - 664 sys sys 1015014516 6665
 sys/src/9/pc/ether8139.c - 664 sys sys 1086987324 18362
-sys/src/9/pc/ether8169.c - 664 sys sys 1105109291 22498
+sys/src/9/pc/ether8169.c - 664 sys sys 1105912215 22703
 sys/src/9/pc/ether82543gc.c - 664 sys sys 1055689887 32296
 sys/src/9/pc/ether82557.c - 664 sys sys 1098848151 30040
 sys/src/9/pc/ether83815.c - 664 sys sys 1081706477 23479

+ 1 - 0
dist/replica/plan9.log

@@ -13234,3 +13234,4 @@
 1105799458 0 c sys/src/9/port/devfs.c - 664 sys sys 1105799131 10783
 1105799458 1 c sys/src/cmd/kl/asm.c - 664 sys sys 1105798985 26122
 1105799458 2 c sys/src/cmd/kl/optab.c - 664 sys sys 1105798985 7369
+1105912881 0 c sys/src/9/pc/ether8169.c - 664 sys sys 1105912215 22703

+ 4 - 0
sys/src/9/pc/ether8169.c

@@ -260,6 +260,7 @@ typedef struct Ctlr {
 	int	rdt;			/* tail - consumer index (host) */
 	int	nrdfree;
 
+	int	tcr;			/* receive configuration register */
 	int	rcr;			/* receive configuration register */
 
 	QLock	slock;			/* statistics */
@@ -450,6 +451,7 @@ rtl8169ifstat(Ether* edev, void* a, long n, ulong offset)
 	l += snprint(p+l, READSTR-l, "punlc: %ud\n", ctlr->punlc);
 	l += snprint(p+l, READSTR-l, "fovw: %ud\n", ctlr->fovw);
 
+	l += snprint(p+l, READSTR-l, "tcr: %8.8uX\n", ctlr->tcr);
 	l += snprint(p+l, READSTR-l, "rcr: %8.8uX\n", ctlr->rcr);
 
 	if(ctlr->mii != nil && ctlr->mii->curphy != nil){
@@ -622,6 +624,7 @@ rtl8169init(Ether* edev)
 	 * Set configuration.
 	 */
 	csr32w(ctlr, Tcr, Ifg1|Ifg0|Mtxdmaunlimited);
+	ctlr->tcr = csr32r(ctlr, Tcr);
 	csr32w(ctlr, Rcr, ctlr->rcr);
 	csr16w(ctlr, 0xE2, 0);			/* magic */
 
@@ -924,6 +927,7 @@ static struct {
 	int	id;
 } rtl8169pci[] = {
 	{ "rtl8169",	(0x8169<<16)|0x10EC, },	/* generic */
+	{ "CG-LAPCIGT",	(0xC107<<16)|0x1259, },	/* Corega CG-LAPCIGT */
 	{ nil },
 };