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

merge

Browse source
This commit is contained in:
cinap_lenrek 2013-03-12 21:08:47 +01:00
parent da66a67a94 f28ccb0ed9
commit f0303b65ca
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sys/src/9/pc/etheriwl.c
View file

@ -87,6 +87,10 @@ enum {
Gio = 0x03c,
EnaL0S = 1<<1,
GpDrv = 0x050,
GpDrvCalV6 = 1<<2,
GpDrv1X2 = 1<<3,
Led = 0x094,
LedBsmCtrl = 1<<5,
LedOn = 0x38,
@ -1161,6 +1165,14 @@ reset(Ctlr *ctlr)
}
nicunlock(ctlr);
if((err = niclock(ctlr)) != nil)
return err;
if((ctlr->type == Type6005 || ctlr->type == Type6050) && ctlr->eeprom.version == 6)
csr32w(ctlr, GpDrv, csr32r(ctlr, GpDrv) | GpDrvCalV6);
if(ctlr->type == Type6005)
csr32w(ctlr, GpDrv, csr32r(ctlr, GpDrv) | GpDrv1X2);
nicunlock(ctlr);
if((err = niclock(ctlr)) != nil)
return err;
csr32w(ctlr, FhRxConfig, 0);
@ -1347,6 +1359,18 @@ postboot(Ctlr *ctlr)
return err;
}
if(ctlr->type == Type6005){
/* temperature sensor offset */
memset(c, 0, sizeof(c));
c[0] = 18;
c[1] = 0;
c[2] = 1;
c[3] = 1;
put16(c + 4, 2700);
if((err = cmd(ctlr, 176, c, 4+2+2)) != nil)
return err;
}
if(ctlr->type == Type6005 || ctlr->type == Type6050){
/* runtime DC calibration */
memset(c, 0, sizeof(c));