Author: janderwald
Date: Thu Feb 2 22:18:58 2012
New Revision: 55385
URL: http://svn.reactos.org/svn/reactos?rev=55385&view=rev
Log:
[USBEHCI]
- Use constants instead of hardcoding register offsets. Taken from Haiku
- Elements in HCSP-PORTROUTE are 4 bit entries instead
Modified:
branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp
branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp?rev=55385&r1=55384&r2=55385&view=diff
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp
[iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp
[iso-8859-1] Thu Feb 2 22:18:58 2012
@@ -304,6 +304,8 @@
PHYSICAL_ADDRESS AsyncPhysicalAddress;
PVOID ResourceBase;
NTSTATUS Status;
+ UCHAR Value;
+ UCHAR PortCount;
DPRINT1("CUSBHardwareDevice::PnpStart\n");
for(Index = 0; Index <
TranslatedResources->List[0].PartialResourceList.Count; Index++)
@@ -361,24 +363,38 @@
//
// Get controllers capabilities
//
- m_Capabilities.Length =
READ_REGISTER_UCHAR((PUCHAR)ResourceBase);
- m_Capabilities.HCIVersion =
READ_REGISTER_USHORT((PUSHORT)((ULONG)ResourceBase + 2));
- m_Capabilities.HCSParamsLong =
READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + 4));
- m_Capabilities.HCCParamsLong =
READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + 8));
+ m_Capabilities.Length =
READ_REGISTER_UCHAR((PUCHAR)ResourceBase + EHCI_CAPLENGTH);
+ m_Capabilities.HCIVersion =
READ_REGISTER_USHORT((PUSHORT)((ULONG)ResourceBase + EHCI_HCIVERSION));
+ m_Capabilities.HCSParamsLong =
READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + EHCI_HCSPARAMS));
+ m_Capabilities.HCCParamsLong =
READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + EHCI_HCCPARAMS));
DPRINT1("Controller has %d Length\n", m_Capabilities.Length);
DPRINT1("Controller has %d Ports\n",
m_Capabilities.HCSParams.PortCount);
DPRINT1("Controller EHCI Version %x\n",
m_Capabilities.HCIVersion);
- DPRINT1("Controler EHCI Caps HCSParamsLong
%x\n", m_Capabilities.HCSParamsLong);
- DPRINT1("Controler EHCI Caps HCCParamsLong
%x\n", m_Capabilities.HCCParamsLong);
-
- DPRINT1("Controler EHCI Caps PowerControl
%x\n", m_Capabilities.HCSParams.PortPowerControl);
+ DPRINT1("Controler EHCI Caps HCSParamsLong %x\n",
m_Capabilities.HCSParamsLong);
+ DPRINT1("Controler EHCI Caps HCCParamsLong %x\n",
m_Capabilities.HCCParamsLong);
+ DPRINT1("Controler EHCI Caps PowerControl %x\n",
m_Capabilities.HCSParams.PortPowerControl);
+
+
+
+
if (m_Capabilities.HCSParams.PortRouteRules)
{
- for (Count = 0; Count <
m_Capabilities.HCSParams.PortCount; Count++)
+ Count = 0;
+ PortCount = max(m_Capabilities.HCSParams.PortCount/2,
(m_Capabilities.HCSParams.PortCount+1)/2);
+ do
{
- m_Capabilities.PortRoute[Count] =
READ_REGISTER_UCHAR((PUCHAR)(ULONG)ResourceBase + 12 + Count);
- }
+ //
+ // each entry is a 4 bit field EHCI 2.2.5
+ //
+ Value =
READ_REGISTER_UCHAR((PUCHAR)(ULONG)ResourceBase + EHCI_HCSP_PORTROUTE + Count);
+ m_Capabilities.PortRoute[Count*2] = (Value & 0xF0);
+
+ if ((Count*2) + 1 < m_Capabilities.HCSParams.PortCount)
+ m_Capabilities.PortRoute[(Count*2)+1] = (Value &
0x0F);
+
+ Count++;
+ }while(Count < PortCount);
}
//
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h?rev=55385&r1=55384&r2=55385&view=diff
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h [iso-8859-1]
Thu Feb 2 22:18:58 2012
@@ -1,6 +1,16 @@
#pragma once
#include <ntddk.h>
+
+
+//
+// Host Controller Capability Registers
+//
+#define EHCI_CAPLENGTH 0x00
+#define EHCI_HCIVERSION 0x02
+#define EHCI_HCSPARAMS 0x04
+#define EHCI_HCCPARAMS 0x08
+#define EHCI_HCSP_PORTROUTE 0x0c
//
// EHCI Operational Registers
