Author: janderwald Date: Fri Feb 3 13:02:45 2012 New Revision: 55393
URL: http://svn.reactos.org/svn/reactos?rev=55393&view=rev Log: [USBOHCI] - Fix build
Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp
Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/us... ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Fri Feb 3 13:02:45 2012 @@ -2282,7 +2282,7 @@ CHubController * Controller; NTSTATUS Status;
- DPRINT1("USBHI_CreateUsbDevice\n"); + DPRINT1("USBHI_CreateUsbDevice PortStatus %x\n", PortStatus);
// // first get hub controller
Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/us... ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] Fri Feb 3 13:02:45 2012 @@ -80,6 +80,8 @@ PUSBQUEUE m_Queue; PDMAMEMORYMANAGER m_DmaManager; PUSB_CONFIGURATION_DESCRIPTOR *m_ConfigurationDescriptors; + LIST_ENTRY m_IrpListHead; + };
//---------------------------------------------------------------------------------------- @@ -118,6 +120,11 @@ KeInitializeSpinLock(&m_Lock);
// + // initialize irp list + // + InitializeListHead(&m_IrpListHead); + + // // no device address has been set yet // m_DeviceAddress = 0; @@ -268,7 +275,6 @@
DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB); PC_ASSERT(FALSE); - return Usb11Device; }
@@ -462,7 +468,7 @@ // // initialize request // - Status = Request->InitializeWithIrp(m_DmaManager, Irp); + Status = Request->InitializeWithIrp(m_DmaManager, Irp, GetSpeed());
// // mark irp as pending @@ -550,7 +556,7 @@ // // initialize request // - Status = Request->InitializeWithSetupPacket(m_DmaManager, Packet, m_DeviceAddress, EndpointDescriptor, BufferLength, Mdl); + Status = Request->InitializeWithSetupPacket(m_DmaManager, Packet, m_DeviceAddress, EndpointDescriptor, GetSpeed(), BufferLength, Mdl); if (!NT_SUCCESS(Status)) { //