From 84e941632bf8e6b4e2d2cc8c7321ccff1e60f4b9 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Wed, 25 Jan 2012 19:56:35 +0000 Subject: [PATCH] [USBOHCI] - Disable GetPortStatus implementation - Fix build svn path=/branches/usb-bringup-trunk/; revision=55182 --- drivers/usb/usbohci/hardware.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/usb/usbohci/hardware.cpp b/drivers/usb/usbohci/hardware.cpp index e935c41a564..03440775de5 100644 --- a/drivers/usb/usbohci/hardware.cpp +++ b/drivers/usb/usbohci/hardware.cpp @@ -874,10 +874,10 @@ CUSBHardwareDevice::StopController(void) // // alignment check // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET, 0xFFFFFFFF); + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET), 0xFFFFFFFF); Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET)); - DPRINT1("HcHCCA Alignment %x\n", Control); - ASSERT((Control & 0xFFFFFFF0) == 0xFFFFFFF0); + //ASSERT((m_HCCAPhysicalAddress.QuadPart & Control) == Control); + // // check context @@ -1099,6 +1099,7 @@ CUSBHardwareDevice::GetPortStatus( OUT USHORT *PortStatus, OUT USHORT *PortChange) { +#if 0 ULONG Value; if (PortId > m_NumberOfPorts) @@ -1147,6 +1148,11 @@ CUSBHardwareDevice::GetPortStatus( if (Value & OHCI_RH_PORTSTATUS_PRSC) *PortChange |= USB_PORT_STATUS_RESET; +#else + *PortStatus = m_PortStatus[PortId].PortStatus; + *PortChange = m_PortStatus[PortId].PortChange; +#endif + return STATUS_SUCCESS; } -- 2.17.1