Revert the sync.

[reactos.git] / drivers / usb / usbehci / usbiffn.h

diff --git a/drivers/usb/usbehci/usbiffn.h b/drivers/usb/usbehci/usbiffn.h
index eff48f0..e9c2de4 100644 (file)
--- a/drivers/usb/usbehci/usbiffn.h
+++ b/drivers/usb/usbehci/usbiffn.h
@@ -1,12 +1,77 @@
 #pragma once
 
+#define USB_BUSIFFN __stdcall
 #include <ntifs.h>
 #include <ntddk.h>
 #include <usb.h>
-#include <usbbusif.h>
 
-PVOID
-InternalCreateUsbDevice(UCHAR DeviceNumber, ULONG Port, PUSB_DEVICE Parent, BOOLEAN Hub);
+/* usbbusif.h and hubbusif.h need to be imported */
+typedef PVOID PUSB_DEVICE_HANDLE;
+
+typedef
+VOID
+USB_BUSIFFN
+RH_INIT_CALLBACK (PVOID CallBackContext);
+
+typedef RH_INIT_CALLBACK *PRH_INIT_CALLBACK;
+
+typedef struct _USB_EXTPORT_INFORMATION_0
+{
+    ULONG PhysicalPortNumber;
+    ULONG PortLabelNumber;
+    USHORT VidOverride;
+    USHORT PidOverride;
+    ULONG PortAttributes;
+} USB_EXTPORT_INFORMATION_0, *PUSB_EXTPORT_INFORMATION;
+
+typedef struct _USB_EXTHUB_INFORMATION_0
+{
+    ULONG InformationLevel;
+    ULONG NumberOfPorts;
+    USB_EXTPORT_INFORMATION_0 Port[255];
+} USB_EXTHUB_INFORMATION_0, *PUSB_EXTHUB_INFORMATION_0;
+
+typedef struct _USB_BUS_INTERFACE_USBDI_V2
+{
+    USHORT Size;
+    USHORT Version;
+    PVOID BusContext;
+    PINTERFACE_REFERENCE InterfaceReference;
+    PINTERFACE_DEREFERENCE InterfaceDereference;
+
+    PVOID GetUSBDIVersion;
+    PVOID QueryBusTime;
+    PVOID SubmitIsoOutUrb;
+    PVOID QueryBusInformation;
+    PVOID IsDeviceHighSpeed;
+    PVOID EnumLogEntry;
+} USB_BUS_INTERFACE_USBDI_V2, *PUSB_BUS_INTERFACE_USBDI_V2;
+
+typedef struct _USB_BUS_INTERFACE_HUB_V5
+{
+    USHORT Size;
+    USHORT Version;
+    PVOID BusContext;
+    PINTERFACE_REFERENCE InterfaceReference;
+    PINTERFACE_DEREFERENCE InterfaceDereference;
+
+    PVOID CreateUsbDevice;
+    PVOID InitializeUsbDevice;
+    PVOID GetUsbDescriptors;
+    PVOID RemoveUsbDevice;
+    PVOID RestoreUsbDevice;
+    PVOID GetPortHackFlags;
+    PVOID QueryDeviceInformation;
+    PVOID GetControllerInformation;
+    PVOID ControllerSelectiveSuspend;
+    PVOID GetExtendedHubInformation;
+    PVOID GetRootHubSymbolicName;
+    PVOID GetDeviceBusContext;
+    PVOID Initialize20Hub;
+    PVOID RootHubInitNotification;
+    PVOID FlushTransfers;
+    PVOID SetDeviceHandleData;
+} USB_BUS_INTERFACE_HUB_V5, *PUSB_BUS_INTERFACE_HUB_V5;
 
 VOID
 USB_BUSIFFN
@@ -33,7 +98,7 @@ GetUsbDescriptors(PVOID BusContext,
     PUSB_DEVICE_HANDLE DeviceHandle,
     PUCHAR DeviceDescriptorBuffer,
     PULONG DeviceDescriptorBufferLength,
-    PUCHAR ConfigDescriptorBuffer,
+    PUCHAR ConfigurationBuffer,
     PULONG ConfigDescriptorBufferLength);
 
 NTSTATUS
@@ -102,7 +167,7 @@ VOID
 USB_BUSIFFN
 SetDeviceHandleData(PVOID BusContext, PVOID DeviceHandle, PDEVICE_OBJECT UsbDevicePdo);
 
-VOID
+NTSTATUS
 USB_BUSIFFN
 GetUSBDIVersion(PVOID BusContext, PUSBD_VERSION_INFORMATION VersionInformation, PULONG HcdCapabilites);