[USBEHCI_NEW]

- Define tag for allocations
- Fixes assert hit in ReactOS
- Fix typo in IHubController interface declaration

svn path=/branches/usb-bringup/; revision=51353

diff --git a/drivers/usb/usbehci_new/hcd_controller.cpp b/drivers/usb/usbehci_new/hcd_controller.cpp
index 618c0f1..f0be143 100644 (file)
--- a/drivers/usb/usbehci_new/hcd_controller.cpp
+++ b/drivers/usb/usbehci_new/hcd_controller.cpp
@@ -952,7 +952,7 @@ CreateHCDController(
     //
     // allocate controller
     //
-    This = new(NonPagedPool, 0) CHCDController(0);
+    This = new(NonPagedPool, TAG_USBEHCI) CHCDController(0);
     if (!This)
     {
         //

diff --git a/drivers/usb/usbehci_new/interfaces.h b/drivers/usb/usbehci_new/interfaces.h
index cb90ce3..ba289fd 100644 (file)
--- a/drivers/usb/usbehci_new/interfaces.h
+++ b/drivers/usb/usbehci_new/interfaces.h
@@ -454,7 +454,7 @@ DECLARE_INTERFACE_(IHubController, IUnknown)
     virtual NTSTATUS Initialize(IN PHCDCONTROLLER Controller,
                                 IN PUSBHARDWAREDEVICE Device,
                                 IN BOOLEAN IsRootHubDevice,
-                                IN ULONG DeviceAddress);
+                                IN ULONG DeviceAddress) = 0;
 
 //-----------------------------------------------------------------------------------------
 //

diff --git a/drivers/usb/usbehci_new/usbehci.h b/drivers/usb/usbehci_new/usbehci.h
index fcacb26..bf651e0 100644 (file)
--- a/drivers/usb/usbehci_new/usbehci.h
+++ b/drivers/usb/usbehci_new/usbehci.h
@@ -32,6 +32,10 @@ typedef struct
     };
 }COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION;
 
+//
+// tag for allocations
+//
+#define TAG_USBEHCI 'ICHE'
 
 //
 // assert for c++ - taken from portcls
@@ -55,4 +59,9 @@ NTSTATUS CreateUSBHardware(PUSBHARDWAREDEVICE *OutHardware);
 //
 NTSTATUS NTAPI SyncForwardIrp(PDEVICE_OBJECT DeviceObject, PIRP Irp);
 
+//
+// root_hub_controller.cpp
+//
+NTSTATUS CreateRootHubController(PHUBCONTROLLER * OutHubController);
+
 #endif