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

nusb/lib: make usbcmd() return value symmetic; returning size of data phase (if any) (thanks aiju)

Browse source 
usbcmd() with Rh2d used to return the command size (8+ndata) wile returning
only ndata for Rd2h. this changes it to always return ndata for Rh2d. it
mostly doesnt matter as Rh2d callers only check r < 0 for error, but this
makes the interface symmetic.
This commit is contained in:
cinap_lenrek 2017-04-01 22:19:58 +02:00
parent 25725eb0ad
commit e0087b2a78
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sys/src/cmd/nusb/lib/dev.c
View file

@ -396,14 +396,13 @@ cmdreq(Dev *d, int type, int req, int value, int index, uchar *data, int count)
}else{ }else{
ndata = count; ndata = count;
wp = emallocz(8+ndata, 0); wp = emallocz(8+ndata, 0);
memmove(wp+8, data, ndata);
} }
wp[0] = type; wp[0] = type;
wp[1] = req; wp[1] = req;
PUT2(wp+2, value); PUT2(wp+2, value);
PUT2(wp+4, index); PUT2(wp+4, index);
PUT2(wp+6, count); PUT2(wp+6, count);
if(data != nil)
memmove(wp+8, data, ndata);
if(usbdebug>2){ if(usbdebug>2){
hd = hexstr(wp, ndata+8); hd = hexstr(wp, ndata+8);
rs = reqstr(type, req); rs = reqstr(type, req);
@ -421,7 +420,7 @@ cmdreq(Dev *d, int type, int req, int value, int index, uchar *data, int count)
dprint(2, "%s: cmd: short write: %d\n", argv0, n); dprint(2, "%s: cmd: short write: %d\n", argv0, n);
return -1; return -1;
} }
return n; return ndata;
} }
static int static int
@ -430,7 +429,7 @@ cmdrep(Dev *d, void *buf, int nb)
char *hd; char *hd;
nb = read(d->dfd, buf, nb); nb = read(d->dfd, buf, nb);
if(nb >0 && usbdebug > 2){ if(nb > 0 && usbdebug > 2){
hd = hexstr(buf, nb); hd = hexstr(buf, nb);
fprint(2, "%s: in[%d] %s\n", d->dir, nb, hd); fprint(2, "%s: in[%d] %s\n", d->dir, nb, hd);
free(hd); free(hd);
@ -455,7 +454,7 @@ usbcmd(Dev *d, int type, int req, int value, int index, uchar *data, int count)
r = cmdreq(d, type, req, value, index, nil, count); r = cmdreq(d, type, req, value, index, nil, count);
else else
r = cmdreq(d, type, req, value, index, data, count); r = cmdreq(d, type, req, value, index, data, count);
if(r > 0){ if(r >= 0){
if((type & Rd2h) == 0) if((type & Rd2h) == 0)
break; break;
r = cmdrep(d, data, count); r = cmdrep(d, data, count);
@ -469,7 +468,7 @@ usbcmd(Dev *d, int type, int req, int value, int index, uchar *data, int count)
rerrstr(err, sizeof(err)); rerrstr(err, sizeof(err));
sleep(Ucdelay); sleep(Ucdelay);
} }
if(r > 0 && i >= 2) if(r >= 0 && i >= 2)
/* let the user know the device is not in good shape */ /* let the user know the device is not in good shape */
fprint(2, "%s: usbcmd: %s: required %d attempts (%s)\n", fprint(2, "%s: usbcmd: %s: required %d attempts (%s)\n",
argv0, d->dir, i, err); argv0, d->dir, i, err);

2
sys/src/cmd/nusb/serial/ftdi.c
View file

@ -858,7 +858,7 @@ ftdiread(Serialport *p, int index, int req, uchar *buf, int len)
index |= p->interfc + 1; index |= p->interfc + 1;
dsprint(2, "serial: ftdiread %#p [%d] req: %#x val: %#x idx:%d buf:%p len:%d\n", dsprint(2, "serial: ftdiread %#p [%d] req: %#x val: %#x idx:%d buf:%p len:%d\n",
p, p->interfc, req, 0, index, buf, len); p, p->interfc, req, 0, index, buf, len);
res = usbcmd(ser->dev, Rd2h | Rftdireq | Rdev, req, 0, index, buf, len); res = usbcmd(ser->dev, Rd2h | Rftdireq | Rdev, req, 0, index, buf, len);
dsprint(2, "serial: ftdiread res:%d\n", res); dsprint(2, "serial: ftdiread res:%d\n", res);
return res; return res;
} }