[USBOHCI]
authorJohannes Anderwald <johannes.anderwald@reactos.org>
Wed, 25 Jan 2012 19:56:35 +0000 (19:56 +0000)
committerJohannes Anderwald <johannes.anderwald@reactos.org>
Wed, 25 Jan 2012 19:56:35 +0000 (19:56 +0000)
- Disable GetPortStatus implementation
- Fix build

svn path=/branches/usb-bringup-trunk/; revision=55182

drivers/usb/usbohci/hardware.cpp

index e935c41..0344077 100644 (file)
@@ -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;
 }