JehanneOS/jehanne
JehanneOS
/
jehanne
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

kernel: fix usb after changing OREAD/OWRITE values 

OREAD and OWRITE are used as array indexes assuming that OREAD was zero
and OWRITE was one. Thus each related allocation reserved just 2 slot and
even Ep struct in usb.h reserved just 2 int for toggles.

Since OREAD is now 1 and OWRITE is 2 we have to allocate/reserve 3 slot
as long as we use them as array indexes (which we could change in the future).

Unfortunately this means we waste the index zero in those arrays that will
always be unused. This also means that, to loop in such arrays we must begin
with OREAD as index zero is always empty.

PRO-MEMORIA: if/when we introduce the walk() syscall, OSTAT might turn useless.
In that case we might remove it and thus consider to move back OREAD/OWRITE
to 0/1 respectively (which might or might not be a good idea, to be analyzed).
This commit is contained in:
Giacomo Tesio 2017-01-03 00:42:37 +01:00
parent c1eb65b35e
commit 890f126abc
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/src/kern/amd64/usbohci.c
View File

@ -2059,7 +2059,7 @@ epopen(Ep *ep)
ep->pollival = 1; /* assume this; doesn't really matter */ ep->pollival = 1; /* assume this; doesn't really matter */
/* and fall... */ /* and fall... */
case Tintr: case Tintr:
io = ep->aux = smalloc(sizeof(Qio)*2); io = ep->aux = smalloc(sizeof(Qio)*3);
io[OREAD].debug = io[OWRITE].debug = ep->debug; io[OREAD].debug = io[OWRITE].debug = ep->debug;
usbid = (ep->nb&Epmax)<<7 | (ep->dev->nb&Devmax); usbid = (ep->nb&Epmax)<<7 | (ep->dev->nb&Devmax);
if(ep->mode != OREAD){ if(ep->mode != OREAD){

2
sys/src/kern/amd64/usbuhci.c
View File

@ -1785,7 +1785,7 @@ epopen(Ep *ep)
break; break;
case Tbulk: case Tbulk:
case Tintr: case Tintr:
io = ep->aux = smalloc(sizeof(Qio)*2); io = ep->aux = smalloc(sizeof(Qio)*3); // allocate 3 Qio because OREAD == 1 and OWRITE == 2; index 0 is wasted; TODO: fix this
io[OREAD].debug = io[OWRITE].debug = ep->debug; io[OREAD].debug = io[OWRITE].debug = ep->debug;
usbid = ((ep->nb&Epmax)<<7)|(ep->dev->nb&Devmax); usbid = ((ep->nb&Epmax)<<7)|(ep->dev->nb&Devmax);
if(ep->mode != OREAD){ if(ep->mode != OREAD){

8
sys/src/kern/port/devusb.c
View File

@ -144,9 +144,9 @@ static Dirtab usbdir[] =
char *usbmodename[] = char *usbmodename[] =
{ {
[OREAD] "r", [OREAD] "r",
[OWRITE] "w", [OWRITE] "w",
[ORDWR] "rw", [ORDWR] "rw",
}; };
static char *ttname[] = static char *ttname[] =
@ -223,7 +223,7 @@ name2mode(char *mode)
{ {
int i; int i;
for(i = 0; i < nelem(usbmodename); i++) for(i = OREAD; i < nelem(usbmodename); i++)
if(strcmp(mode, usbmodename[i]) == 0) if(strcmp(mode, usbmodename[i]) == 0)
return i; return i;
return -1; return -1;
@ -821,7 +821,7 @@ usbopen(Chan *c, unsigned long omode)
{ {
int q; int q;
Ep *ep; Ep *ep;
int mode; unsigned long mode;
mode = openmode(omode); mode = openmode(omode);
q = QID(c->qid); q = QID(c->qid);

5
sys/src/kern/port/usb.h
View File

@ -163,8 +163,9 @@ struct Ep
uint32_t load; /* in microseconds, for a fransfer of maxpkt bytes */ uint32_t load; /* in microseconds, for a fransfer of maxpkt bytes */
void* aux; /* for controller specific info */ void* aux; /* for controller specific info */
int rhrepl; /* fake root hub replies */ int rhrepl; /* fake root hub replies */
int toggle[2]; /* saved toggles (while ep is not in use) */ int toggle[3]; /* saved toggles (while ep is not in use)
int32_t pollival; /* poll interval ([µ]frames; intr/iso) */ NOTE: 3 because OREAD == 1 and OWRITE == 2; index 0 is wasted; TODO fix this */
int32_t pollival; /* poll interval ([µ]frames; intr/iso) */
int32_t hz; /* poll frequency (iso) */ int32_t hz; /* poll frequency (iso) */
int32_t samplesz; /* sample size (iso) */ int32_t samplesz; /* sample size (iso) */
int ntds; /* nb. of Tds per µframe */ int ntds; /* nb. of Tds per µframe */

2
sys/src/kern/port/usbehci.c
View File

@ -2923,7 +2923,7 @@ epopen(Ep *ep)
ep->pollival = 1; /* assume this; doesn't really matter */ ep->pollival = 1; /* assume this; doesn't really matter */
/* and fall... */ /* and fall... */
case Tintr: case Tintr:
io = ep->aux = smalloc(sizeof(Qio)*2); io = ep->aux = smalloc(sizeof(Qio)*3);
io[OREAD].debug = io[OWRITE].debug = ep->debug; io[OREAD].debug = io[OWRITE].debug = ep->debug;
usbid = (ep->nb&Epmax) << 7 | ep->dev->nb &Devmax; usbid = (ep->nb&Epmax) << 7 | ep->dev->nb &Devmax;
assert(ep->pollival != 0); assert(ep->pollival != 0);