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

nusb/kb: dont set boot protocol on HidCSP interface when we failed to read report descriptor (thanks aap_)

Browse source 
this fixes wireless keyboard/mouse on raspi.
This commit is contained in:
cinap_lenrek 2014-10-31 20:40:13 +01:00
parent 634c55543a
commit bb33ba6b9a
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sys/src/cmd/nusb/kb/kb.c
View file

@ -304,7 +304,6 @@ setproto(Hiddev *f, int eid)
int id, proto; int id, proto;
Iface *iface; Iface *iface;
proto = Bootproto;
iface = f->dev->usb->ep[eid]->iface; iface = f->dev->usb->ep[eid]->iface;
id = iface->id; id = iface->id;
f->nrep = usbcmd(f->dev, Rd2h|Rstd|Riface, Rgetdesc, Dreport<<8, id, f->nrep = usbcmd(f->dev, Rd2h|Rstd|Riface, Rgetdesc, Dreport<<8, id,
@ -323,13 +322,20 @@ setproto(Hiddev *f, int eid)
} }
proto = Reportproto; proto = Reportproto;
} else { } else {
if(iface->csp == KbdCSP){ switch(iface->csp){
case KbdCSP:
f->nrep = sizeof(kbdbootrep); f->nrep = sizeof(kbdbootrep);
memmove(f->rep, kbdbootrep, f->nrep); memmove(f->rep, kbdbootrep, f->nrep);
} else { break;
case PtrCSP:
f->nrep = sizeof(ptrbootrep); f->nrep = sizeof(ptrbootrep);
memmove(f->rep, ptrbootrep, f->nrep); memmove(f->rep, ptrbootrep, f->nrep);
break;
default:
werrstr("no report descriptor");
return -1;
} }
proto = Bootproto;
} }
return usbcmd(f->dev, Rh2d|Rclass|Riface, Setproto, proto, id, nil, 0); return usbcmd(f->dev, Rh2d|Rclass|Riface, Setproto, proto, id, nil, 0);
} }