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

ether82557: timeout for ifstats DumpSC command

Browse source
This commit is contained in:
cinap_lenrek 2012-09-30 16:16:20 +02:00
parent 5d64e428eb
commit 2204bb7321
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sys/src/9/pc/ether82557.c
View file

@ -409,6 +409,10 @@ ifstat(Ether* ether, void* a, long n, ulong offset)
ctlr = ether->ctlr; ctlr = ether->ctlr;
lock(&ctlr->dlock); lock(&ctlr->dlock);
if(waserror()){
unlock(&ctlr->dlock);
nexterror();
}
/* /*
* Start the command then * Start the command then
@ -417,23 +421,25 @@ ifstat(Ether* ether, void* a, long n, ulong offset)
*/ */
ctlr->dump[16] = 0; ctlr->dump[16] = 0;
command(ctlr, DumpSC, 0); command(ctlr, DumpSC, 0);
while(ctlr->dump[16] == 0) for(i = 0; i < 1000 && ctlr->dump[16] == 0; i++)
; microdelay(100);
if(i == 1000)
ether->oerrs = ctlr->dump[1]+ctlr->dump[2]+ctlr->dump[3]; error("command timeout");
ether->crcs = ctlr->dump[10];
ether->frames = ctlr->dump[11];
ether->buffs = ctlr->dump[12]+ctlr->dump[15];
ether->overflows = ctlr->dump[13];
if(n == 0){
unlock(&ctlr->dlock);
return 0;
}
memmove(dump, ctlr->dump, sizeof(dump)); memmove(dump, ctlr->dump, sizeof(dump));
ether->oerrs = dump[1]+dump[2]+dump[3];
ether->crcs = dump[10];
ether->frames = dump[11];
ether->buffs = dump[12]+dump[15];
ether->overflows = dump[13];
poperror();
unlock(&ctlr->dlock); unlock(&ctlr->dlock);
if(n == 0)
return 0;
p = smalloc(READSTR); p = smalloc(READSTR);
len = snprint(p, READSTR, "transmit good frames: %lud\n", dump[0]); len = snprint(p, READSTR, "transmit good frames: %lud\n", dump[0]);
len += snprint(p+len, READSTR-len, "transmit maximum collisions errors: %lud\n", dump[1]); len += snprint(p+len, READSTR-len, "transmit maximum collisions errors: %lud\n", dump[1]);