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

Make the check work.

Browse source 
Embarrassing.
This commit is contained in:
Ori Bernstein 2018-12-23 23:10:42 -08:00
parent c80f22f74a
commit ee9b29550f
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
sys/src/cmd/nusb/disk/disk.c
View file

@ -361,15 +361,6 @@ umsinit(void)
return 0; return 0;
} }
static int
needunstall(void)
{
char buf[ERRMAX];
rerrstr(buf, sizeof(buf));
return strstr(buf, "medium not present") == nil;
}
/* /*
* called by SR*() commands provided by scuzz's scsireq * called by SR*() commands provided by scuzz's scsireq
@ -377,11 +368,15 @@ needunstall(void)
long long
umsrequest(Umsc *umsc, ScsiPtr *cmd, ScsiPtr *data, int *status) umsrequest(Umsc *umsc, ScsiPtr *cmd, ScsiPtr *data, int *status)
{ {
char buf[ERRMAX];
Cbw cbw; Cbw cbw;
Csw csw; Csw csw;
int n, nio; int n, nio, present;
Ums *ums; Ums *ums;
rerrstr(buf, sizeof(buf));
present = strstr(buf, "medium not present") == nil;
ums = umsc->ums; ums = umsc->ums;
memcpy(cbw.signature, "USBC", 4); memcpy(cbw.signature, "USBC", 4);
@ -427,7 +422,7 @@ umsrequest(Umsc *umsc, ScsiPtr *cmd, ScsiPtr *data, int *status)
else else
fprint(2, "disk: data: %d bytes (nio: %d)\n", n, nio); fprint(2, "disk: data: %d bytes (nio: %d)\n", n, nio);
nio = n; nio = n;
if(n < 0 && needunstall() || (n <= 9 || data->write == 0)) if((n == 0 && present) || (n < 0 && data->write == 0))
unstall(dev, ums->epin, Ein); unstall(dev, ums->epin, Ein);
} }