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

etheriwl: check the bluetooth co-existance errors (thanks qeed)

Browse source
This commit is contained in:
cinap_lenrek 2015-04-26 18:02:49 +02:00
parent e10287042e
commit 64849ab5f3
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -864,10 +864,10 @@ iwlinit(Ether *edev)
ctlr->eeprom.temp = 0; ctlr->eeprom.temp = 0;
ctlr->eeprom.rawtemp = 0; ctlr->eeprom.rawtemp = 0;
if(ctlr->type == Type2030){ if(ctlr->type == Type2030){
if ((err = eepromread(ctlr, b, 2, caloff + 0x12a)) != nil) if((err = eepromread(ctlr, b, 2, caloff + 0x12a)) != nil)
goto Err2; goto Err2;
ctlr->eeprom.temp = get16(b); ctlr->eeprom.temp = get16(b);
if ((err = eepromread(ctlr, b, 2, caloff + 0x12b)) != nil) if((err = eepromread(ctlr, b, 2, caloff + 0x12b)) != nil)
goto Err2; goto Err2;
ctlr->eeprom.rawtemp = get16(b); ctlr->eeprom.rawtemp = get16(b);
} }
@ -1183,7 +1183,7 @@ reset(Ctlr *ctlr)
csr32w(ctlr, GpDrv, csr32r(ctlr, GpDrv) | GpDrvCalV6); csr32w(ctlr, GpDrv, csr32r(ctlr, GpDrv) | GpDrvCalV6);
if(ctlr->type == Type6005) if(ctlr->type == Type6005)
csr32w(ctlr, GpDrv, csr32r(ctlr, GpDrv) | GpDrv1X2); csr32w(ctlr, GpDrv, csr32r(ctlr, GpDrv) | GpDrv1X2);
if (ctlr->type == Type2030) if(ctlr->type == Type2030)
csr32w(ctlr, GpDrv, csr32r(ctlr, GpDrv) | GpDrvRadioIqInvert); csr32w(ctlr, GpDrv, csr32r(ctlr, GpDrv) | GpDrvRadioIqInvert);
nicunlock(ctlr); nicunlock(ctlr);
@ -1479,7 +1479,7 @@ postboot(Ctlr *ctlr)
put16(c + 6, 2700); put16(c + 6, 2700);
} }
put16(c + 8, ctlr->eeprom.volt); put16(c + 8, ctlr->eeprom.volt);
if ((err = cmd(ctlr, 176, c, 4+2+2+2+2)) != nil) if((err = cmd(ctlr, 176, c, 4+2+2+2+2)) != nil)
return err; return err;
break; break;
} }
@ -1498,8 +1498,10 @@ postboot(Ctlr *ctlr)
if((err = cmd(ctlr, 152, c, 4)) != nil) if((err = cmd(ctlr, 152, c, 4)) != nil)
return err; return err;
if(ctlr->type == Type2030) if(ctlr->type == Type2030){
sendbtcoexadv(ctlr); if((err = sendbtcoexadv(ctlr)) != nil)
return err;
}
} }
} }
@ -2198,7 +2200,7 @@ iwlattach(Ether *edev)
if(ctlr->wifi == nil){ if(ctlr->wifi == nil){
ctlr->wifi = wifiattach(edev, transmit); ctlr->wifi = wifiattach(edev, transmit);
/* tested with 2230, it has transmit issues using higher bit rates */ /* tested with 2230, it has transmit issues using higher bit rates */
if (ctlr->type != Type2030) if(ctlr->type != Type2030)
ctlr->wifi->rates = iwlrates; ctlr->wifi->rates = iwlrates;
} }