diff options
| author | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-09-06 05:25:23 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-09-06 05:25:23 +0200 |
| commit | a064a48e6d213acc97c86cd24160847fecc68f6b (patch) | |
| tree | 664aa4de66f26b84a94e096a16f8de42cd3aef26 | |
| parent | 3cdaf6ea5f649e9b89608d7fbd2ddb0e5cb52af4 (diff) | |
nusb: handle 0 csp value on iface, remove unneeded configdev() calls after getdev()
| -rw-r--r-- | sys/src/cmd/nusb/audio/audio.c | 2 | ||||
| -rw-r--r-- | sys/src/cmd/nusb/ether/ether.c | 2 | ||||
| -rw-r--r-- | sys/src/cmd/nusb/lib/parse.c | 2 | ||||
| -rw-r--r-- | sys/src/cmd/nusb/ptp/ptp.c | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/sys/src/cmd/nusb/audio/audio.c b/sys/src/cmd/nusb/audio/audio.c index 1e0bc8158..231216244 100644 --- a/sys/src/cmd/nusb/audio/audio.c +++ b/sys/src/cmd/nusb/audio/audio.c @@ -186,8 +186,6 @@ main(int argc, char *argv[]) if((d = getdev(atoi(*argv))) == nil) sysfatal("getdev: %r"); - if(configdev(d) < 0) - sysfatal("configdev: %r"); audiodev = d; /* parse descriptors, mark valid altc */ diff --git a/sys/src/cmd/nusb/ether/ether.c b/sys/src/cmd/nusb/ether/ether.c index 9eb16bb2a..055668351 100644 --- a/sys/src/cmd/nusb/ether/ether.c +++ b/sys/src/cmd/nusb/ether/ether.c @@ -853,8 +853,6 @@ threadmain(int argc, char **argv) usage(); d = getdev(atoi(*argv)); - if(configdev(d) < 0) - sysfatal("configdev: %r"); if(findendpoints(d, &ei, &eo) < 0) sysfatal("no endpoints found"); if(getmac(d) < 0) diff --git a/sys/src/cmd/nusb/lib/parse.c b/sys/src/cmd/nusb/lib/parse.c index 642c427a2..75904622a 100644 --- a/sys/src/cmd/nusb/lib/parse.c +++ b/sys/src/cmd/nusb/lib/parse.c @@ -71,6 +71,8 @@ parseiface(Usbdev *d, Conf *c, uchar *b, int n, Iface **ipp, Altc **app) subclass = dip->bInterfaceSubClass; proto = dip->bInterfaceProtocol; ip->csp = CSP(class, subclass, proto); + if(ip->csp == 0) + ip->csp = d->csp; if(d->csp == 0) /* use csp from 1st iface */ d->csp = ip->csp; /* if device has none */ if(d->class == 0) diff --git a/sys/src/cmd/nusb/ptp/ptp.c b/sys/src/cmd/nusb/ptp/ptp.c index b4da3cd8f..f420ad381 100644 --- a/sys/src/cmd/nusb/ptp/ptp.c +++ b/sys/src/cmd/nusb/ptp/ptp.c @@ -1017,8 +1017,6 @@ threadmain(int argc, char **argv) usage(); if((d = getdev(atoi(*argv))) == nil) sysfatal("opendev: %r"); - if(configdev(d) < 0) - sysfatal("configdev: %r"); if(findendpoints(d, &epin, &epout, &epint) < 0) sysfatal("findendpoints: %r"); |