diff options
| author | Charles.Forsyth <devnull@localhost> | 2007-04-07 12:52:27 +0000 |
|---|---|---|
| committer | Charles.Forsyth <devnull@localhost> | 2007-04-07 12:52:27 +0000 |
| commit | e1bd49a1e1823eab71c293efd1bd0c9b83c350c9 (patch) | |
| tree | a9424cde16004cb9e591045225bc61beed339dd5 /os/pc/ether2114x.c | |
| parent | 15345f9c75c069d3e2e362af5d6f931eef7772ef (diff) | |
20070407-1350 more updates from plan 9 pc kernel, and a few unreachable fixes(!)
Diffstat (limited to 'os/pc/ether2114x.c')
| -rw-r--r-- | os/pc/ether2114x.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/os/pc/ether2114x.c b/os/pc/ether2114x.c index 43bae880..f71773c0 100644 --- a/os/pc/ether2114x.c +++ b/os/pc/ether2114x.c @@ -190,6 +190,7 @@ enum { /* Variants */ Pnic = (0x0002<<16)|0x11AD, Pnic2 = (0xC115<<16)|0x11AD, CentaurP = (0x0985<<16)|0x1317, + CentaurPcb = (0x1985<<16)|0x1317, }; typedef struct Ctlr Ctlr; @@ -1515,7 +1516,7 @@ srom(Ctlr* ctlr) ctlr->srom[20+i+1] = ctlr->srom[i]; } } - if(ctlr->id == CentaurP){ + if(ctlr->id == CentaurP || ctlr->id == CentaurPcb){ memmove(&ctlr->srom[20], leafpnic, sizeof(leafpnic)); for(i = 0; i < Eaddrlen; i += 2){ ctlr->srom[20+i] = ctlr->srom[8+i]; @@ -1603,7 +1604,7 @@ srom(Ctlr* ctlr) if(phy){ x = 0; for(k = 0; k < nelem(ctlr->phy); k++){ - if(ctlr->id == CentaurP && k != 1) + if((ctlr->id == CentaurP || ctlr->id == CentaurPcb) && k != 1) continue; if((oui = miir(ctlr, k, 2)) == -1 || oui == 0) continue; @@ -1655,6 +1656,7 @@ dec2114xpci(void) case Pnic: /* PNIC */ case Pnic2: /* PNIC-II */ case CentaurP: /* ADMtek */ + case CentaurPcb: /* ADMtek CardBus */ break; } @@ -1690,7 +1692,6 @@ dec2114xpci(void) switch(ctlr->id){ default: break; - case Pnic: /* PNIC */ /* * Turn off the jabber timer. @@ -1698,6 +1699,7 @@ dec2114xpci(void) csr32w(ctlr, 15, 0x00000001); break; case CentaurP: + case CentaurPcb: /* * Nice - the register offsets change from *8 to *4 * for CSR16 and up... @@ -1823,6 +1825,6 @@ reset(Ether* ether) void ether2114xlink(void) { - addethercard("21140", reset); addethercard("2114x", reset); + addethercard("21140", reset); } |