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

sdide: increase Drq wait timeouts (fixes i/o errors in vbox)

Browse source
This commit is contained in:
cinap_lenrek 2012-04-19 14:50:00 +02:00
parent df1d6ba99d
commit f3609bada2
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sys/src/9/pc/sdide.c
View file

@ -1108,7 +1108,7 @@ atapktio0(Drive *drive, SDreq *r)
outb(cmdport+Command, Cpkt); outb(cmdport+Command, Cpkt);
microdelay(1); microdelay(1);
as = ataready(cmdport, ctlport, 0, Bsy, Drq|Chk, 4*1000); as = ataready(cmdport, ctlport, 0, Bsy, Drq|Chk, 400*1000);
if(as < 0 || (as & (Bsy|Chk))){ if(as < 0 || (as & (Bsy|Chk))){
drive->status = as<0 ? 0 : as; drive->status = as<0 ? 0 : as;
ctlr->curdrive = nil; ctlr->curdrive = nil;
@ -1256,8 +1256,7 @@ atageniostart(Drive* drive, uvlong lba)
case Cws: case Cws:
case Cwsm: case Cwsm:
microdelay(1); microdelay(1);
/* 10*1000 for flash ide drives - maybe detect them? */ as = ataready(cmdport, ctlport, 0, Bsy, Drq|Err, 400*1000);
as = ataready(cmdport, ctlport, 0, Bsy, Drq|Err, 10*1000);
if(as < 0 || (as & Err)){ if(as < 0 || (as & Err)){
iunlock(ctlr); iunlock(ctlr);
return -1; return -1;
@ -1479,8 +1478,7 @@ atagenatastart(Drive* d, SDreq *r)
USED(d); USED(d);
else if(!isdma){ else if(!isdma){
microdelay(1); microdelay(1);
/* 10*1000 for flash ide drives - maybe detect them? */ as = ataready(cmdport, ctlport, 0, Bsy, Drq|Err, 400*1000);
as = ataready(cmdport, ctlport, 0, Bsy, Drq|Err, 10*1000);
if(as < 0 || (as & Err)){ if(as < 0 || (as & Err)){
iunlock(ctlr); iunlock(ctlr);
return -1; return -1;