patch-2.4.10 linux/drivers/usb/hub.h

• Lines: 114
• Date: Sun Sep 23 10:34:28 2001
• Orig file: v2.4.9/linux/drivers/usb/hub.h
• Orig date: Tue Apr 17 17:23:06 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/usb/hub.h linux/drivers/usb/hub.h
@@ -26,37 +26,61 @@
 #define USB_PORT_FEAT_RESET		4
 #define USB_PORT_FEAT_POWER		8
 #define USB_PORT_FEAT_LOWSPEED		9
+#define USB_PORT_FEAT_HIGHSPEED		10
 #define USB_PORT_FEAT_C_CONNECTION	16
 #define USB_PORT_FEAT_C_ENABLE		17
 #define USB_PORT_FEAT_C_SUSPEND		18
 #define USB_PORT_FEAT_C_OVER_CURRENT	19
 #define USB_PORT_FEAT_C_RESET		20
+#define USB_PORT_FEAT_TEST              21
+#define USB_PORT_FEAT_INDICATOR         22
 
+/* 
+ * Hub Status and Hub Change results
+ * See USB 2.0 spec Table 11-19 and Table 11-20
+ */
 struct usb_port_status {
 	__u16 wPortStatus;
 	__u16 wPortChange;	
 } __attribute__ ((packed));
 
-/* wPortStatus bits */
+/* 
+ * wPortStatus bit field
+ * See USB 2.0 spec Table 11-21
+ */
 #define USB_PORT_STAT_CONNECTION	0x0001
 #define USB_PORT_STAT_ENABLE		0x0002
 #define USB_PORT_STAT_SUSPEND		0x0004
 #define USB_PORT_STAT_OVERCURRENT	0x0008
 #define USB_PORT_STAT_RESET		0x0010
+/* bits 5 for 7 are reserved */
 #define USB_PORT_STAT_POWER		0x0100
 #define USB_PORT_STAT_LOW_SPEED		0x0200
-
-/* wPortChange bits */
+#define USB_PORT_STAT_HIGH_SPEED        0x0400
+#define USB_PORT_STAT_TEST              0x0800
+#define USB_PORT_STAT_INDICATOR         0x1000
+/* bits 13 to 15 are reserved */
+
+/* 
+ * wPortChange bit field
+ * See USB 2.0 spec Table 11-22
+ * Bits 0 to 4 shown, bits 5 to 15 are reserved
+ */
 #define USB_PORT_STAT_C_CONNECTION	0x0001
 #define USB_PORT_STAT_C_ENABLE		0x0002
 #define USB_PORT_STAT_C_SUSPEND		0x0004
 #define USB_PORT_STAT_C_OVERCURRENT	0x0008
 #define USB_PORT_STAT_C_RESET		0x0010
 
-/* wHubCharacteristics (masks) */
-#define HUB_CHAR_LPSM		0x0003
-#define HUB_CHAR_COMPOUND	0x0004
-#define HUB_CHAR_OCPM		0x0018
+/*
+ * wHubCharacteristics (masks) 
+ * See USB 2.0 spec Table 11-13, offset 3
+ */
+#define HUB_CHAR_LPSM		0x0003 /* D1 .. D0 */
+#define HUB_CHAR_COMPOUND	0x0004 /* D2       */
+#define HUB_CHAR_OCPM		0x0018 /* D4 .. D3 */
+#define HUB_CHAR_TTTT           0x0060 /* D6 .. D5 */
+#define HUB_CHAR_PORTIND        0x0080 /* D7       */
 
 struct usb_hub_status {
 	__u16 wHubStatus;
@@ -64,28 +88,28 @@
 } __attribute__ ((packed));
 
 /*
- *Hub Status & Hub Change bit masks
+ * Hub Status & Hub Change bit masks
+ * See USB 2.0 spec Table 11-19 and Table 11-20
+ * Bits 0 and 1 for wHubStatus and wHubChange
+ * Bits 2 to 15 are reserved for both
  */
 #define HUB_STATUS_LOCAL_POWER	0x0001
 #define HUB_STATUS_OVERCURRENT	0x0002
-
 #define HUB_CHANGE_LOCAL_POWER	0x0001
 #define HUB_CHANGE_OVERCURRENT	0x0002
 
-#define HUB_DESCRIPTOR_MAX_SIZE	39	/* enough for 127 ports on a hub */
 
 /* Hub descriptor */
 struct usb_hub_descriptor {
-	__u8  bLength;
+	__u8  bDescLength;
 	__u8  bDescriptorType;
 	__u8  bNbrPorts;
 	__u16 wHubCharacteristics;
 	__u8  bPwrOn2PwrGood;
 	__u8  bHubContrCurrent;
-
 	/* DeviceRemovable and PortPwrCtrlMask want to be variable-length 
 	   bitmaps that hold max 256 entries, but for now they're ignored */
-	__u8  bitmap[0];
+	__u8  bitmap[2 * ((USB_MAXCHILDREN + 1 + 7) / 8)];
 } __attribute__ ((packed));
 
 struct usb_device;
@@ -103,9 +127,6 @@
 	struct list_head hub_list;
 
 	struct list_head event_list;
-
-	/* Number of ports on the hub */
-	int nports;
 
 	struct usb_hub_descriptor *descriptor;