Sync with trunk (r48545)

[reactos.git] / include / psdk / usb200.h

diff --git a/include/psdk/usb200.h b/include/psdk/usb200.h
index 6d86cb2..5d6fd65 100644 (file)
--- a/include/psdk/usb200.h
+++ b/include/psdk/usb200.h
@@ -1,6 +1,26 @@
+/*
+ * usb200.h
+ *
+ * This file is part of the ReactOS PSDK package.
+ *
+ * Contributors:
+ *   Magnus Olsen.
+ *
+ * THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ * This source code is offered for use in the public domain. You may
+ * use, modify or distribute it freely.
+ *
+ * This code is distributed in the hope that it will be useful but
+ * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ * DISCLAIMED. This includes but is not limited to warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+
 #pragma once
 
-/* Helper macro to enable gcc's extension.  */
+/* Helper macro to enable gcc's extension. */
 #ifndef __GNU_EXTENSION
 #ifdef __GNUC__
 #define __GNU_EXTENSION __extension__
@@ -24,6 +44,16 @@ typedef enum _USB_DEVICE_SPEED {
   UsbHighSpeed
 } USB_DEVICE_SPEED;
 
+#define USB_PORT_STATUS_CONNECT                       0x0001
+#define USB_PORT_STATUS_ENABLE                        0x0002
+#define USB_PORT_STATUS_SUSPEND                       0x0004
+#define USB_PORT_STATUS_OVER_CURRENT                  0x0008
+#define USB_PORT_STATUS_RESET                         0x0010
+#define USB_PORT_STATUS_POWER                         0x0100
+#define USB_PORT_STATUS_LOW_SPEED                     0x0200
+#define USB_PORT_STATUS_HIGH_SPEED                    0x0400
+
+
 typedef union _BM_REQUEST_TYPE {
   struct _BM {
     UCHAR Recipient:2;
@@ -56,6 +86,9 @@ typedef struct _USB_DEFAULT_PIPE_SETUP_PACKET {
 
 C_ASSERT(sizeof(USB_DEFAULT_PIPE_SETUP_PACKET) == 8);
 
+#define USB_DEVICE_QUALIFIER_DESCRIPTOR_TYPE          0x06
+#define USB_OTHER_SPEED_CONFIGURATION_DESCRIPTOR_TYPE 0x07
+
 typedef struct _USB_DEVICE_QUALIFIER_DESCRIPTOR {
   UCHAR bLength;
   UCHAR bDescriptorType;
@@ -77,6 +110,8 @@ typedef union _USB_HIGH_SPEED_MAXPACKET {
   USHORT us;
 } USB_HIGH_SPEED_MAXPACKET, *PUSB_HIGH_SPEED_MAXPACKET;
 
+#define USB_INTERFACE_ASSOCIATION_DESCRIPTOR_TYPE     0x0B
+
 typedef struct _USB_INTERFACE_ASSOCIATION_DESCRIPTOR {
   UCHAR bLength;
   UCHAR bDescriptorType;
@@ -88,16 +123,4 @@ typedef struct _USB_INTERFACE_ASSOCIATION_DESCRIPTOR {
   UCHAR iFunction;
 } USB_INTERFACE_ASSOCIATION_DESCRIPTOR, *PUSB_INTERFACE_ASSOCIATION_DESCRIPTOR;
 
-#define USB_PORT_STATUS_CONNECT                       0x0001
-#define USB_PORT_STATUS_ENABLE                        0x0002
-#define USB_PORT_STATUS_SUSPEND                       0x0004
-#define USB_PORT_STATUS_OVER_CURRENT                  0x0008
-#define USB_PORT_STATUS_RESET                         0x0010
-#define USB_PORT_STATUS_POWER                         0x0100
-#define USB_PORT_STATUS_LOW_SPEED                     0x0200
-#define USB_PORT_STATUS_HIGH_SPEED                    0x0400
-#define USB_DEVICE_QUALIFIER_DESCRIPTOR_TYPE          0x06
-#define USB_OTHER_SPEED_CONFIGURATION_DESCRIPTOR_TYPE 0x07
-#define USB_INTERFACE_ASSOCIATION_DESCRIPTOR_TYPE     0x0B
-
 #include <poppack.h>