Author: janderwald Date: Fri Apr 15 15:45:09 2011 New Revision: 51353
URL: http://svn.reactos.org/svn/reactos?rev=51353&view=rev Log: [USBEHCI_NEW] - Define tag for allocations - Fixes assert hit in ReactOS - Fix typo in IHubController interface declaration
Modified: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h
Modified: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci_... ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] Fri Apr 15 15:45:09 2011 @@ -952,7 +952,7 @@ // // allocate controller // - This = new(NonPagedPool, 0) CHCDController(0); + This = new(NonPagedPool, TAG_USBEHCI) CHCDController(0); if (!This) { //
Modified: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci_... ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Fri Apr 15 15:45:09 2011 @@ -454,7 +454,7 @@ virtual NTSTATUS Initialize(IN PHCDCONTROLLER Controller, IN PUSBHARDWAREDEVICE Device, IN BOOLEAN IsRootHubDevice, - IN ULONG DeviceAddress); + IN ULONG DeviceAddress) = 0;
//----------------------------------------------------------------------------------------- //
Modified: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci_... ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Fri Apr 15 15:45:09 2011 @@ -32,6 +32,10 @@ }; }COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION;
+// +// tag for allocations +// +#define TAG_USBEHCI 'ICHE'
// // assert for c++ - taken from portcls @@ -55,4 +59,9 @@ // NTSTATUS NTAPI SyncForwardIrp(PDEVICE_OBJECT DeviceObject, PIRP Irp);
+// +// root_hub_controller.cpp +// +NTSTATUS CreateRootHubController(PHUBCONTROLLER * OutHubController); + #endif