small usblib cleanup Reference: /n/atom/patch/applied/usblibbits Date: Fri Mar 28 03:22:20 CET 2014 Signed-off-by: quanstro@quanstro.net --- /sys/src/cmd/usb/lib/dev.c Fri Mar 28 03:22:05 2014 +++ /sys/src/cmd/usb/lib/dev.c Fri Mar 28 03:22:06 2014 @@ -375,11 +375,11 @@ ndata = count; wp = emallocz(8+ndata, 0); } - wp[0] = type; - wp[1] = req; - PUT2(wp+2, value); - PUT2(wp+4, index); - PUT2(wp+6, count); + wp[0] = type; /* bmRequestType */ + wp[1] = req; /* bRequest */ + PUT2(wp+2, value); /* wValue */ + PUT2(wp+4, index); /* wIndex */ + PUT2(wp+6, count); /* wLength */ if(data != nil) memmove(wp+8, data, ndata); if(usbdebug>2){ --- /sys/src/cmd/usb/lib/dump.c Fri Mar 28 03:22:08 2014 +++ /sys/src/cmd/usb/lib/dump.c Fri Mar 28 03:22:09 2014 @@ -6,24 +6,24 @@ int usbdebug; -static char *edir[] = {"in", "out", "inout"}; -static char *etype[] = {"ctl", "iso", "bulk", "intr"}; +static char *edir[] = {"in", "out", "inout", }; +static char *etype[] = {"ctl", "iso", "bulk", "intr", }; static char* cnames[] = { "none", "audio", "comms", "hid", "", - "", "", "printer", "storage", "hub", "data" + "", "", "printer", "storage", "hub", "data", }; static char* devstates[] = { - "detached", "attached", "enabled", "assigned", "configured" + "detached", "attached", "enabled", "assigned", "configured", }; char* -classname(int c) +classname(uint c) { static char buf[12]; - if(c >= 0 && c < nelem(cnames)) + if(c < nelem(cnames)) return cnames[c]; else{ snprint(buf, sizeof(buf), "%d", c); --- /sys/src/cmd/usb/lib/usb.h Fri Mar 28 03:22:10 2014 +++ /sys/src/cmd/usb/lib/usb.h Fri Mar 28 03:22:11 2014 @@ -333,7 +333,7 @@ #pragma varargck argpos devctl 2 int Ufmt(Fmt *f); -char* classname(int c); +char* classname(uint c); void closedev(Dev *d); int configdev(Dev *d); int devctl(Dev *dev, char *fmt, ...);