From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 5 Mar 2010 12:07:35 +0000 (+0000)
Subject: More work on USB related definitions
X-Git-Tag: backups/header-work@57446~248
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=78a63975f802555742095321a4a8ee7f0048ac4c

More work on USB related definitions

svn path=/branches/header-work/; revision=45866
---

diff --git a/include/psdk/usb.h b/include/psdk/usb.h
index 58548b80a69..8edf7a9f552 100644
--- a/include/psdk/usb.h
+++ b/include/psdk/usb.h
@@ -432,13 +432,13 @@ struct _URB_OS_FEATURE_DESCRIPTOR_REQUEST {
   PMDL TransferBufferMDL;
   struct _URB *UrbLink;
   struct _URB_HCD_AREA hca;
-  UCHAR   Recipient:5;
-  UCHAR   Reserved1:3;
-  UCHAR   Reserved2;
-  UCHAR   InterfaceNumber;
-  UCHAR   MS_PageIndex;
-  USHORT  MS_FeatureDescriptorIndex;
-  USHORT  Reserved3;
+  UCHAR Recipient:5;
+  UCHAR Reserved1:3;
+  UCHAR Reserved2;
+  UCHAR InterfaceNumber;
+  UCHAR MS_PageIndex;
+  USHORT MS_FeatureDescriptorIndex;
+  USHORT Reserved3;
 };
 
 #endif
diff --git a/include/psdk/usb100.h b/include/psdk/usb100.h
index 1201ac16795..7e43d302268 100644
--- a/include/psdk/usb100.h
+++ b/include/psdk/usb100.h
@@ -28,39 +28,6 @@ extern "C" {
 
 #include <pshpack1.h>
 
-#define MAXIMUM_USB_STRING_LENGTH         255
-
-#define USB_DEVICE_CLASS_RESERVED           0x00
-#define USB_DEVICE_CLASS_AUDIO              0x01
-#define USB_DEVICE_CLASS_COMMUNICATIONS     0x02
-#define USB_DEVICE_CLASS_HUMAN_INTERFACE    0x03
-#define USB_DEVICE_CLASS_MONITOR            0x04
-#define USB_DEVICE_CLASS_PHYSICAL_INTERFACE 0x05
-#define USB_DEVICE_CLASS_POWER              0x06
-#define USB_DEVICE_CLASS_PRINTER            0x07
-#define USB_DEVICE_CLASS_STORAGE            0x08
-#define USB_DEVICE_CLASS_HUB                0x09
-#define USB_DEVICE_CLASS_VENDOR_SPECIFIC    0xFF
-
-#define USB_RESERVED_DESCRIPTOR_TYPE        0x06
-#define USB_CONFIG_POWER_DESCRIPTOR_TYPE    0x07
-#define USB_INTERFACE_POWER_DESCRIPTOR_TYPE 0x08
-
-#define USB_REQUEST_GET_STATUS            0x00
-#define USB_REQUEST_CLEAR_FEATURE         0x01
-#define USB_REQUEST_SET_FEATURE           0x03
-#define USB_REQUEST_SET_ADDRESS           0x05
-#define USB_REQUEST_GET_DESCRIPTOR        0x06
-#define USB_REQUEST_SET_DESCRIPTOR        0x07
-#define USB_REQUEST_GET_CONFIGURATION     0x08
-#define USB_REQUEST_SET_CONFIGURATION     0x09
-#define USB_REQUEST_GET_INTERFACE         0x0A
-#define USB_REQUEST_SET_INTERFACE         0x0B
-#define USB_REQUEST_SYNC_FRAME            0x0C
-
-#define USB_GETSTATUS_SELF_POWERED            0x01
-#define USB_GETSTATUS_REMOTE_WAKEUP_ENABLED   0x02
-
 #define BMREQUEST_HOST_TO_DEVICE          0
 #define BMREQUEST_DEVICE_TO_HOST          1
 
@@ -73,36 +40,72 @@ extern "C" {
 #define BMREQUEST_TO_ENDPOINT             2
 #define BMREQUEST_TO_OTHER                3
 
+#define MAXIMUM_USB_STRING_LENGTH         255
+
+#define USB_GETSTATUS_SELF_POWERED            0x01
+#define USB_GETSTATUS_REMOTE_WAKEUP_ENABLED   0x02
+
 /* USB_COMMON_DESCRIPTOR.bDescriptorType constants */
 #define USB_DEVICE_DESCRIPTOR_TYPE        0x01
 #define USB_CONFIGURATION_DESCRIPTOR_TYPE 0x02
 #define USB_STRING_DESCRIPTOR_TYPE        0x03
 #define USB_INTERFACE_DESCRIPTOR_TYPE     0x04
 #define USB_ENDPOINT_DESCRIPTOR_TYPE      0x05
-
-typedef struct _USB_COMMON_DESCRIPTOR {
-  UCHAR bLength;
-  UCHAR bDescriptorType;
-} USB_COMMON_DESCRIPTOR, *PUSB_COMMON_DESCRIPTOR;
+#define USB_RESERVED_DESCRIPTOR_TYPE        0x06
+#define USB_CONFIG_POWER_DESCRIPTOR_TYPE    0x07
+#define USB_INTERFACE_POWER_DESCRIPTOR_TYPE 0x08
 
 #define USB_DESCRIPTOR_MAKE_TYPE_AND_INDEX(d, i) ((USHORT)((USHORT)d << 8 | i))
 
+/* USB_ENDPOINT_DESCRIPTOR.bmAttributes constants */
+#define USB_ENDPOINT_TYPE_MASK            0x03
+#define USB_ENDPOINT_TYPE_CONTROL         0x00
+#define USB_ENDPOINT_TYPE_ISOCHRONOUS     0x01
+#define USB_ENDPOINT_TYPE_BULK            0x02
+#define USB_ENDPOINT_TYPE_INTERRUPT       0x03
+
 /* USB_CONFIGURATION_DESCRIPTOR.bmAttributes constants */
 #define USB_CONFIG_POWERED_MASK           0xc0
 #define USB_CONFIG_BUS_POWERED            0x80
 #define USB_CONFIG_SELF_POWERED           0x40
 #define USB_CONFIG_REMOTE_WAKEUP          0x20
 
-typedef struct _USB_CONFIGURATION_DESCRIPTOR {
-  UCHAR bLength;
-  UCHAR bDescriptorType;
-  USHORT wTotalLength;
-  UCHAR bNumInterfaces;
-  UCHAR bConfigurationValue;
-  UCHAR iConfiguration;
-  UCHAR bmAttributes;
-  UCHAR MaxPower;
-} USB_CONFIGURATION_DESCRIPTOR, *PUSB_CONFIGURATION_DESCRIPTOR;
+#define USB_ENDPOINT_DIRECTION_MASK       0x80
+
+#define USB_ENDPOINT_DIRECTION_OUT(x) (!((x) & USB_ENDPOINT_DIRECTION_MASK))
+#define USB_ENDPOINT_DIRECTION_IN(x) ((x) & USB_ENDPOINT_DIRECTION_MASK)
+
+#define USB_REQUEST_GET_STATUS            0x00
+#define USB_REQUEST_CLEAR_FEATURE         0x01
+#define USB_REQUEST_SET_FEATURE           0x03
+#define USB_REQUEST_SET_ADDRESS           0x05
+#define USB_REQUEST_GET_DESCRIPTOR        0x06
+#define USB_REQUEST_SET_DESCRIPTOR        0x07
+#define USB_REQUEST_GET_CONFIGURATION     0x08
+#define USB_REQUEST_SET_CONFIGURATION     0x09
+#define USB_REQUEST_GET_INTERFACE         0x0A
+#define USB_REQUEST_SET_INTERFACE         0x0B
+#define USB_REQUEST_SYNC_FRAME            0x0C
+
+#define USB_DEVICE_CLASS_RESERVED           0x00
+#define USB_DEVICE_CLASS_AUDIO              0x01
+#define USB_DEVICE_CLASS_COMMUNICATIONS     0x02
+#define USB_DEVICE_CLASS_HUMAN_INTERFACE    0x03
+#define USB_DEVICE_CLASS_MONITOR            0x04
+#define USB_DEVICE_CLASS_PHYSICAL_INTERFACE 0x05
+#define USB_DEVICE_CLASS_POWER              0x06
+#define USB_DEVICE_CLASS_PRINTER            0x07
+#define USB_DEVICE_CLASS_STORAGE            0x08
+#define USB_DEVICE_CLASS_HUB                0x09
+#define USB_DEVICE_CLASS_VENDOR_SPECIFIC    0xFF
+
+#define USB_FEATURE_ENDPOINT_STALL        0x0000
+#define USB_FEATURE_REMOTE_WAKEUP         0x0001
+
+#define USB_FEATURE_INTERFACE_POWER_D0    0x0002
+#define USB_FEATURE_INTERFACE_POWER_D1    0x0003
+#define USB_FEATURE_INTERFACE_POWER_D2    0x0004
+#define USB_FEATURE_INTERFACE_POWER_D3    0x0005
 
 typedef struct _USB_DEVICE_DESCRIPTOR {
   UCHAR bLength;
@@ -121,18 +124,6 @@ typedef struct _USB_DEVICE_DESCRIPTOR {
   UCHAR bNumConfigurations;
 } USB_DEVICE_DESCRIPTOR, *PUSB_DEVICE_DESCRIPTOR;
 
-#define USB_ENDPOINT_DIRECTION_MASK       0x80
-
-#define USB_ENDPOINT_DIRECTION_OUT(x) (!((x) & USB_ENDPOINT_DIRECTION_MASK))
-#define USB_ENDPOINT_DIRECTION_IN(x) ((x) & USB_ENDPOINT_DIRECTION_MASK)
-
-/* USB_ENDPOINT_DESCRIPTOR.bmAttributes constants */
-#define USB_ENDPOINT_TYPE_MASK            0x03
-#define USB_ENDPOINT_TYPE_CONTROL         0x00
-#define USB_ENDPOINT_TYPE_ISOCHRONOUS     0x01
-#define USB_ENDPOINT_TYPE_BULK            0x02
-#define USB_ENDPOINT_TYPE_INTERRUPT       0x03
-
 typedef struct _USB_ENDPOINT_DESCRIPTOR {
   UCHAR bLength;
   UCHAR bDescriptorType;
@@ -142,8 +133,16 @@ typedef struct _USB_ENDPOINT_DESCRIPTOR {
   UCHAR bInterval;
 } USB_ENDPOINT_DESCRIPTOR, *PUSB_ENDPOINT_DESCRIPTOR;
 
-#define USB_FEATURE_ENDPOINT_STALL        0x0000
-#define USB_FEATURE_REMOTE_WAKEUP         0x0001
+typedef struct _USB_CONFIGURATION_DESCRIPTOR {
+  UCHAR bLength;
+  UCHAR bDescriptorType;
+  USHORT wTotalLength;
+  UCHAR bNumInterfaces;
+  UCHAR bConfigurationValue;
+  UCHAR iConfiguration;
+  UCHAR bmAttributes;
+  UCHAR MaxPower;
+} USB_CONFIGURATION_DESCRIPTOR, *PUSB_CONFIGURATION_DESCRIPTOR;
 
 typedef struct _USB_INTERFACE_DESCRIPTOR {
   UCHAR bLength;
@@ -163,6 +162,11 @@ typedef struct _USB_STRING_DESCRIPTOR {
   WCHAR bString[1];
 } USB_STRING_DESCRIPTOR, *PUSB_STRING_DESCRIPTOR;
 
+typedef struct _USB_COMMON_DESCRIPTOR {
+  UCHAR bLength;
+  UCHAR bDescriptorType;
+} USB_COMMON_DESCRIPTOR, *PUSB_COMMON_DESCRIPTOR;
+
 typedef struct _USB_HUB_DESCRIPTOR {
   UCHAR bDescriptorLength;
   UCHAR bDescriptorType;
@@ -197,24 +201,19 @@ typedef struct _USB_CONFIGURATION_POWER_DESCRIPTOR {
   USHORT TransitionTimeFromD3;
 } USB_CONFIGURATION_POWER_DESCRIPTOR, *PUSB_CONFIGURATION_POWER_DESCRIPTOR;
 
-#define USB_FEATURE_INTERFACE_POWER_D0    0x0002
-#define USB_FEATURE_INTERFACE_POWER_D1    0x0003
-#define USB_FEATURE_INTERFACE_POWER_D2    0x0004
-#define USB_FEATURE_INTERFACE_POWER_D3    0x0005
-
 typedef struct _USB_INTERFACE_POWER_DESCRIPTOR {
-  UCHAR  bLength;
-  UCHAR  bDescriptorType;
-  UCHAR  bmCapabilitiesFlags;
-  UCHAR  bBusPowerSavingD1;
-  UCHAR  bSelfPowerSavingD1;
-  UCHAR  bBusPowerSavingD2;
-  UCHAR  bSelfPowerSavingD2;
-  UCHAR  bBusPowerSavingD3;
-  UCHAR  bSelfPowerSavingD3;
-  USHORT  TransitionTimeFromD1;
-  USHORT  TransitionTimeFromD2;
-  USHORT  TransitionTimeFromD3;
+  UCHAR bLength;
+  UCHAR bDescriptorType;
+  UCHAR bmCapabilitiesFlags;
+  UCHAR bBusPowerSavingD1;
+  UCHAR bSelfPowerSavingD1;
+  UCHAR bBusPowerSavingD2;
+  UCHAR bSelfPowerSavingD2;
+  UCHAR bBusPowerSavingD3;
+  UCHAR bSelfPowerSavingD3;
+  USHORT TransitionTimeFromD1;
+  USHORT TransitionTimeFromD2;
+  USHORT TransitionTimeFromD3;
 } USB_INTERFACE_POWER_DESCRIPTOR, *PUSB_INTERFACE_POWER_DESCRIPTOR;
 
 #include <poppack.h>