Author: janderwald
Date: Wed Jan 25 19:56:35 2012
New Revision: 55182
URL:
http://svn.reactos.org/svn/reactos?rev=55182&view=rev
Log:
[USBOHCI]
- Disable GetPortStatus implementation
- Fix build
Modified:
branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp
Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Wed Jan 25
19:56:35 2012
@@ -874,10 +874,10 @@
//
// 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 @@
OUT USHORT *PortStatus,
OUT USHORT *PortChange)
{
+#if 0
ULONG Value;
if (PortId > m_NumberOfPorts)
@@ -1146,6 +1147,11 @@
// port reset
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;
}