Sync with trunk (r48545)

[reactos.git] / include / ddk / usbbusif.h

diff --git a/include/ddk/usbbusif.h b/include/ddk/usbbusif.h
index 0483738..04297e9 100644 (file)
--- a/include/ddk/usbbusif.h
+++ b/include/ddk/usbbusif.h
@@ -1,12 +1,16 @@
 #pragma once
 
+#define _USBBUSIF_
+
 #ifndef USB_BUSIFFN
 #define USB_BUSIFFN __stdcall
 #endif
 
 #if (NTDDI_VERSION >= NTDDI_WINXP)
 
+#if !defined(_HUBBUSIF_)
 typedef PVOID PUSB_DEVICE_HANDLE;
+#endif
 
 typedef NTSTATUS
 (USB_BUSIFFN *PUSB_BUSIFFN_SUBMIT_ISO_OUT_URB) (
@@ -63,8 +67,8 @@ typedef BOOLEAN
 #define USB_BUSIF_USBDI_VERSION_2         0x0002
 #define USB_BUSIF_USBDI_VERSION_3         0x0003
 
-DEFINE_GUID(USB_BUS_INTERFACE_USBDI_GUID, 
-0xb1a96a13, 0x3de0, 0x4574, 0x9b, 0x1, 0xc0, 0x8f, 0xea, 0xb3, 0x18, 0xd6);
+DEFINE_GUID(USB_BUS_INTERFACE_USBDI_GUID,
+  0xb1a96a13, 0x3de0, 0x4574, 0x9b, 0x1, 0xc0, 0x8f, 0xea, 0xb3, 0x18, 0xd6);
 
 typedef struct _USB_BUS_INTERFACE_USBDI_V0 {
   USHORT Size;
@@ -105,7 +109,7 @@ typedef struct _USB_BUS_INTERFACE_USBDI_V2 {
   PUSB_BUSIFFN_ENUM_LOG_ENTRY EnumLogEntry;
 } USB_BUS_INTERFACE_USBDI_V2, *PUSB_BUS_INTERFACE_USBDI_V2;
 
-#endif
+#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */
 
 #if (NTDDI_VERSION >= NTDDI_VISTA)
 
@@ -141,8 +145,8 @@ typedef struct _USB_BUS_INTERFACE_USBDI_V3 {
   PUSB_BUSIFFN_QUERY_CONTROLLER_TYPE QueryControllerType;
 } USB_BUS_INTERFACE_USBDI_V3, *PUSB_BUS_INTERFACE_USBDI_V3;
 
-DEFINE_GUID(USB_BUS_INTERFACE_USBC_CONFIGURATION_GUID, 
-0x893b6a96, 0xb7f, 0x4d4d, 0xbd, 0xb4, 0xbb, 0xd4, 0xce, 0xeb, 0xb3, 0x1c);
+DEFINE_GUID(USB_BUS_INTERFACE_USBC_CONFIGURATION_GUID,
+  0x893b6a96, 0xb7f, 0x4d4d, 0xbd, 0xb4, 0xbb, 0xd4, 0xce, 0xeb, 0xb3, 0x1c);
 
 #define USBC_FUNCTION_FLAG_APPEND_ID 0x1
 
@@ -190,4 +194,5 @@ typedef struct _USBC_DEVICE_CONFIGURATION_INTERFACE_V1 {
   PVOID Reserved[7];
 } USBC_DEVICE_CONFIGURATION_INTERFACE_V1, *PUSBC_DEVICE_CONFIGURATION_INTERFACE_V1;
 
-#endif
+#endif /* (NTDDI_VERSION >= NTDDI_VISTA) */
+