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

nusb: fix usage inconsitency, shr names

Browse source
This commit is contained in:
cinap_lenrek 2011-08-01 02:36:02 +02:00
parent e5bab1dd9f
commit b43de8eb1f
4 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sys/src/9/boot/nusbrc
View file

@ -17,7 +17,7 @@ if(! nusb/usbd)
} }
} }
fn detach { fn detach {
rm '#σc/usb/'*'-'^$1 rm -f '#σc/usb/'^$1.*
} }
rc < '#σ/usb/usbevent' & rc < '#σ/usb/usbevent' &
} }

4
sys/src/cmd/nusb/disk/disk.c
View file

@ -979,7 +979,7 @@ findendpoints(Ums *ums)
static void static void
usage(void) usage(void)
{ {
fprint(2, "usage: usb/disk [-d] devid"); fprint(2, "usage: %s [-d] devid\n", argv0);
exits("usage"); exits("usage");
} }
@ -1047,7 +1047,7 @@ main(int argc, char **argv)
snprint(lun->name, sizeof(lun->name), "sdU%d.%d", dev->id, i); snprint(lun->name, sizeof(lun->name), "sdU%d.%d", dev->id, i);
makeparts(lun); makeparts(lun);
} }
snprint(buf, sizeof buf, "disk-%s", *argv); snprint(buf, sizeof buf, "%d.disk", dev->id);
postsharesrv(&diskfs, nil, "usb", buf); postsharesrv(&diskfs, nil, "usb", buf);
exits(nil); exits(nil);
} }

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

@ -157,9 +157,9 @@ kbfatal(KDev *kd, char *sts)
Dev *dev; Dev *dev;
if(sts != nil) if(sts != nil)
fprint(2, "kb: fatal: %s\n", sts); fprint(2, "%s: fatal: %s\n", argv0, sts);
else else
fprint(2, "kb: exiting\n"); fprint(2, "%s: exiting\n", argv0);
if(kd->repeatc != nil) if(kd->repeatc != nil)
nbsendul(kd->repeatc, Diemsg); nbsendul(kd->repeatc, Diemsg);
dev = kd->dev; dev = kd->dev;
@ -269,7 +269,7 @@ ptrwork(void* a)
if(c > 3 && buf[3] == -1) /* down */ if(c > 3 && buf[3] == -1) /* down */
b |= 0x10; b |= 0x10;
if(kbdebug > 1) if(kbdebug > 1)
fprint(2, "kb: m%11d %11d %11d\n", x, y, b); fprint(2, "%s: m%11d %11d %11d\n", argv0, x, y, b);
seprint(mbuf, mbuf+sizeof(mbuf), "m%11d %11d %11d", x, y,b); seprint(mbuf, mbuf+sizeof(mbuf), "m%11d %11d %11d", x, y,b);
if(write(mfd, mbuf, strlen(mbuf)) < 0) if(write(mfd, mbuf, strlen(mbuf)) < 0)
kbfatal(f, "mousein i/o"); kbfatal(f, "mousein i/o");
@ -468,7 +468,7 @@ kbdwork(void *a)
assert(f->ep != nil); assert(f->ep != nil);
if(c < 0){ if(c < 0){
rerrstr(err, sizeof(err)); rerrstr(err, sizeof(err));
fprint(2, "kb: %s: read: %s\n", f->ep->dir, err); fprint(2, "%s: %s: read: %s\n", argv0, f->ep->dir, err);
if(strstr(err, "babble") != 0 && ++nerrs < 3){ if(strstr(err, "babble") != 0 && ++nerrs < 3){
recoverkb(f); recoverkb(f);
continue; continue;
@ -506,7 +506,6 @@ freekdev(void *a)
} }
qunlock(&inlck); qunlock(&inlck);
} }
dprint(2, "freekdev\n");
free(kd); free(kd);
} }
@ -519,7 +518,7 @@ kbstart(Dev *d, Ep *ep, Kin *in, void (*f)(void*), int accel)
if(in->fd < 0){ if(in->fd < 0){
in->fd = open(in->name, OWRITE); in->fd = open(in->name, OWRITE);
if(in->fd < 0){ if(in->fd < 0){
fprint(2, "kb: %s: %r\n", in->name); fprint(2, "%s: %s: %r\n", argv0, in->name);
qunlock(&inlck); qunlock(&inlck);
return; return;
} }
@ -531,17 +530,17 @@ kbstart(Dev *d, Ep *ep, Kin *in, void (*f)(void*), int accel)
kd->in = in; kd->in = in;
kd->dev = d; kd->dev = d;
if(setbootproto(kd, ep->id) < 0){ if(setbootproto(kd, ep->id) < 0){
fprint(2, "kb: %s: bootproto: %r\n", d->dir); fprint(2, "%s: %s: bootproto: %r\n", argv0, d->dir);
return; return;
} }
kd->accel = accel; kd->accel = accel;
kd->ep = openep(d, ep->id); kd->ep = openep(d, ep->id);
if(kd->ep == nil){ if(kd->ep == nil){
fprint(2, "kb: %s: openep %d: %r\n", d->dir, ep->id); fprint(2, "%s: %s: openep %d: %r\n", argv0, d->dir, ep->id);
return; return;
} }
if(opendevdata(kd->ep, OREAD) < 0){ if(opendevdata(kd->ep, OREAD) < 0){
fprint(2, "kb: %s: opendevdata: %r\n", kd->ep->dir); fprint(2, "%s: %s: opendevdata: %r\n", argv0, kd->ep->dir);
closedev(kd->ep); closedev(kd->ep);
kd->ep = nil; kd->ep = nil;
return; return;
@ -553,7 +552,7 @@ kbstart(Dev *d, Ep *ep, Kin *in, void (*f)(void*), int accel)
static void static void
usage(void) usage(void)
{ {
werrstr("usage: usb/kb [-dkm] [-a n] [-N nb]"); fprint(2, "usage: %s [-d] [-a n] devid\n", argv0);
threadexits("usage"); threadexits("usage");
} }

15
sys/src/cmd/nusb/serial/serial.c
View file

@ -729,7 +729,7 @@ findendpoints(Serial *ser, int ifc)
static void static void
usage(void) usage(void)
{ {
fprint(2, "usage: usb/serial [-dD] [-m mtpt] [-s srv] devid\n"); fprint(2, "usage: %s [-d] devid\n", argv0);
threadexitsall("usage"); threadexitsall("usage");
} }
@ -789,8 +789,8 @@ threadmain(int argc, char* argv[])
Serial *ser; Serial *ser;
Dev *dev; Dev *dev;
char buf[50]; char buf[50];
int i, devid;
Serialport *p; Serialport *p;
int i;
ARGBEGIN{ ARGBEGIN{
case 'd': case 'd':
@ -801,8 +801,7 @@ threadmain(int argc, char* argv[])
}ARGEND }ARGEND
if(argc != 1) if(argc != 1)
usage(); usage();
devid = atoi(*argv); dev = getdev(atoi(*argv));
dev = getdev(devid);
if(dev == nil) if(dev == nil)
sysfatal("getdev: %r"); sysfatal("getdev: %r");
@ -852,13 +851,13 @@ threadmain(int argc, char* argv[])
if(p->isjtag){ if(p->isjtag){
snprint(p->name, sizeof p->name, "jtag"); snprint(p->name, sizeof p->name, "jtag");
dsprint(2, "serial: JTAG interface %d %p\n", i, p); dsprint(2, "serial: JTAG interface %d %p\n", i, p);
snprint(p->name, sizeof p->name, "jtag%d.%d", devid, i); snprint(p->name, sizeof p->name, "jtag%d.%d", dev->id, i);
} else { } else {
snprint(p->name, sizeof p->name, "eiaU"); snprint(p->name, sizeof p->name, "eiaU");
if(i == 0) if(i == 0)
snprint(p->name, sizeof p->name, "eiaU%d", devid); snprint(p->name, sizeof p->name, "eiaU%d", dev->id);
else else
snprint(p->name, sizeof p->name, "eiaU%d.%d", devid, i); snprint(p->name, sizeof p->name, "eiaU%d.%d", dev->id, i);
} }
fprint(2, "%s...", p->name); fprint(2, "%s...", p->name);
incref(dev); incref(dev);
@ -870,7 +869,7 @@ threadmain(int argc, char* argv[])
qunlock(ser); qunlock(ser);
if(nports > 0){ if(nports > 0){
snprint(buf, sizeof buf, "serial-%d", devid); snprint(buf, sizeof buf, "%d.serial", dev->id);
threadpostsharesrv(&serialfs, nil, "usb", buf); threadpostsharesrv(&serialfs, nil, "usb", buf);
} }
} }