Plan 9 from Bell Labs 2004-12-19

dist/replica/_plan9.db

@@ -3063,7 +3063,7 @@ rc/bin/psu - 775 sys sys 1019769762 333
 rc/bin/reboot - 775 sys sys 1020011207 36
 rc/bin/replica - 20000000775 sys sys 1018321122 0
 rc/bin/replica/changes - 775 sys sys 1022177304 276
-rc/bin/replica/defs - 664 sys sys 1019058724 782
+rc/bin/replica/defs - 664 sys sys 1103390458 778
 rc/bin/replica/pull - 775 sys sys 1045504036 1445
 rc/bin/replica/push - 775 sys sys 1043865725 361
 rc/bin/replica/scan - 775 sys sys 1089299188 472
@@ -10939,11 +10939,11 @@ sys/src/cmd/usb/audio/usbaudioctl.c - 664 sys sys 1101906325 17266
 sys/src/cmd/usb/audio/usbaudioctl.h - 664 sys sys 1100568597 600
 sys/src/cmd/usb/lib - 20000000775 sys sys 1018369393 0
 sys/src/cmd/usb/lib/device.c - 664 sys sys 1099760882 2968
-sys/src/cmd/usb/lib/dump.c - 664 sys sys 1101906317 12757
+sys/src/cmd/usb/lib/dump.c - 664 sys sys 1103381265 12921
 sys/src/cmd/usb/lib/fmt.c - 664 sys sys 1091204978 291
 sys/src/cmd/usb/lib/mkfile - 664 sys sys 1091204979 204
 sys/src/cmd/usb/lib/setup.c - 664 sys sys 1091204978 1953
-sys/src/cmd/usb/lib/usb.h - 664 sys sys 1099760882 6816
+sys/src/cmd/usb/lib/usb.h - 664 sys sys 1103381265 7036
 sys/src/cmd/usb/lib/util.c - 664 sys sys 1091204978 523
 sys/src/cmd/usb/misc - 20000000775 sys sys 1091205037 0
 sys/src/cmd/usb/misc/mkfile - 664 sys sys 1091205037 274

dist/replica/plan9.db

@@ -3063,7 +3063,7 @@ rc/bin/psu - 775 sys sys 1019769762 333
 rc/bin/reboot - 775 sys sys 1020011207 36
 rc/bin/replica - 20000000775 sys sys 1018321122 0
 rc/bin/replica/changes - 775 sys sys 1022177304 276
-rc/bin/replica/defs - 664 sys sys 1019058724 782
+rc/bin/replica/defs - 664 sys sys 1103390458 778
 rc/bin/replica/pull - 775 sys sys 1045504036 1445
 rc/bin/replica/push - 775 sys sys 1043865725 361
 rc/bin/replica/scan - 775 sys sys 1089299188 472
@@ -10939,11 +10939,11 @@ sys/src/cmd/usb/audio/usbaudioctl.c - 664 sys sys 1101906325 17266
 sys/src/cmd/usb/audio/usbaudioctl.h - 664 sys sys 1100568597 600
 sys/src/cmd/usb/lib - 20000000775 sys sys 1018369393 0
 sys/src/cmd/usb/lib/device.c - 664 sys sys 1099760882 2968
-sys/src/cmd/usb/lib/dump.c - 664 sys sys 1101906317 12757
+sys/src/cmd/usb/lib/dump.c - 664 sys sys 1103381265 12921
 sys/src/cmd/usb/lib/fmt.c - 664 sys sys 1091204978 291
 sys/src/cmd/usb/lib/mkfile - 664 sys sys 1091204979 204
 sys/src/cmd/usb/lib/setup.c - 664 sys sys 1091204978 1953
-sys/src/cmd/usb/lib/usb.h - 664 sys sys 1099760882 6816
+sys/src/cmd/usb/lib/usb.h - 664 sys sys 1103381265 7036
 sys/src/cmd/usb/lib/util.c - 664 sys sys 1091204978 523
 sys/src/cmd/usb/misc - 20000000775 sys sys 1091205037 0
 sys/src/cmd/usb/misc/mkfile - 664 sys sys 1091205037 274

dist/replica/plan9.log

@@ -17611,3 +17611,6 @@
 1103261517 1 c 386/bin/fossil/flchk - 775 sys sys 1103261227 237462
 1103261517 2 c 386/bin/fossil/flfmt - 775 sys sys 1103261228 245611
 1103261517 3 c 386/bin/fossil/fossil - 775 sys sys 1103261228 360277
+1103382020 0 c sys/src/cmd/usb/lib/dump.c - 664 sys sys 1103381265 12921
+1103382020 1 c sys/src/cmd/usb/lib/usb.h - 664 sys sys 1103381265 7036
+1103391021 0 c rc/bin/replica/defs - 664 sys sys 1103390458 778

rc/bin/replica/defs

@@ -1,5 +1,4 @@
 tmp=()
-fn 
 
 fn fatal {
 	if(! ~ $#tmp 0)

sys/src/cmd/usb/lib/dump.c

@@ -498,6 +498,9 @@ pdesc(Device *d, int c, ulong csp, byte *b, int n)
 			if(d->ep[ep]->maxpkt < GET2(de->wMaxPacketSize))
 				d->ep[ep]->maxpkt = GET2(de->wMaxPacketSize);
 			d->ep[ep]->addr = de->bEndpointAddress;
+			d->ep[ep]->dir = (de->bEndpointAddress & 0x80) ? Ein : Eout;
+			d->ep[ep]->type = de->bmAttributes & 0x03;
+			d->ep[ep]->isotype = (de->bmAttributes>>2) & 0x03;
 			d->ep[ep]->csp = csp;
 			d->ep[ep]->conf = d->config[c];
 			d->ep[ep]->iface = d->config[c]->iface[ifc];

sys/src/cmd/usb/lib/usb.h

@@ -164,6 +164,22 @@ enum
 	Noclass = 0,
 	Hubclass,
 	Otherclass,
+
+	/* endpoint direction */
+	Ein = 0,
+	Eout,
+
+	/* endpoint type */
+	Econtrol = 0,
+	Eiso = 1,
+	Ebulk = 2,
+	Eintr = 3,
+
+	/* endpoint isotype */
+	Eunknown = 0,
+	Easync = 1,
+	Eadapt = 2,
+	Esync = 3,
 };
 
 enum
@@ -179,7 +195,7 @@ enum
 
 struct Endpt
 {
-	uchar	addr;		/* endpoint address, 0-15 */
+	uchar	addr;		/* endpoint address, 0-15 (|0x80 if direction==Ein) */
 	uchar	dir;		/* direction, Ein/Eout */
 	uchar	type;		/* Econtrol, Eiso, Ebulk, Eintr */
 	uchar	isotype;	/* Eunknown, Easync, Eadapt, Esync */