Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBEHCI]

Browse source 
- Use constants instead of hardcoding register offsets. Taken from Haiku
- Elements in HCSP-PORTROUTE are 4 bit entries instead

svn path=/branches/usb-bringup-trunk/; revision=55385
This commit is contained in:
Johannes Anderwald 2012-02-02 22:18:58 +00:00
parent afe62bf2cf
commit 7626aedc3b
2 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
drivers/usb/usbehci_new/hardware.cpp
View file

@ -304,6 +304,8 @@ CUSBHardwareDevice::PnpStart(
PHYSICAL_ADDRESS AsyncPhysicalAddress; PHYSICAL_ADDRESS AsyncPhysicalAddress;
PVOID ResourceBase; PVOID ResourceBase;
NTSTATUS Status; NTSTATUS Status;
UCHAR Value;
UCHAR PortCount;
DPRINT1("CUSBHardwareDevice::PnpStart\n"); DPRINT1("CUSBHardwareDevice::PnpStart\n");
for(Index = 0; Index < TranslatedResources->List[0].PartialResourceList.Count; Index++) for(Index = 0; Index < TranslatedResources->List[0].PartialResourceList.Count; Index++)
@ -361,24 +363,38 @@ CUSBHardwareDevice::PnpStart(
// //
// Get controllers capabilities // Get controllers capabilities
// //
m_Capabilities.Length = READ_REGISTER_UCHAR((PUCHAR)ResourceBase); m_Capabilities.Length = READ_REGISTER_UCHAR((PUCHAR)ResourceBase + EHCI_CAPLENGTH);
m_Capabilities.HCIVersion = READ_REGISTER_USHORT((PUSHORT)((ULONG)ResourceBase + 2)); m_Capabilities.HCIVersion = READ_REGISTER_USHORT((PUSHORT)((ULONG)ResourceBase + EHCI_HCIVERSION));
m_Capabilities.HCSParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + 4)); m_Capabilities.HCSParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + EHCI_HCSPARAMS));
m_Capabilities.HCCParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + 8)); m_Capabilities.HCCParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + EHCI_HCCPARAMS));
DPRINT1("Controller has %d Length\n", m_Capabilities.Length); DPRINT1("Controller has %d Length\n", m_Capabilities.Length);
DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount); DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount);
DPRINT1("Controller EHCI Version %x\n", m_Capabilities.HCIVersion); DPRINT1("Controller EHCI Version %x\n", m_Capabilities.HCIVersion);
DPRINT1("Controler EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong); DPRINT1("Controler EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong);
DPRINT1("Controler EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong); 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 PowerControl %x\n", m_Capabilities.HCSParams.PortPowerControl);
if (m_Capabilities.HCSParams.PortRouteRules) 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);
} }
// //

10
drivers/usb/usbehci_new/hardware.h
View file

@ -2,6 +2,16 @@
#include <ntddk.h> #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 // EHCI Operational Registers
// //