Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 07:05:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USBOHCI]

Browse source 
- Implement per-port power control

svn path=/trunk/; revision=55848
This commit is contained in:
Cameron Gutman 2012-02-25 02:20:15 +00:00
parent 494fa29ffa
commit b4d2570c4b
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
reactos/drivers/usb/usbohci/hardware.cpp
View file

@ -517,7 +517,7 @@ CUSBHardwareDevice::GetUSBQueue(
NTSTATUS NTSTATUS
CUSBHardwareDevice::StartController(void) CUSBHardwareDevice::StartController(void)
{ {
ULONG Control, Descriptor, FrameInterval, Periodic; ULONG Control, Descriptor, FrameInterval, Periodic, Port;
// //
// lets write physical address of dummy control endpoint descriptor // lets write physical address of dummy control endpoint descriptor
@ -530,7 +530,7 @@ CUSBHardwareDevice::StartController(void)
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_BULK_HEAD_ED_OFFSET), m_BulkEndpointDescriptor->PhysicalAddress.LowPart); WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_BULK_HEAD_ED_OFFSET), m_BulkEndpointDescriptor->PhysicalAddress.LowPart);
// //
// read descriptor // read descriptor A
// //
Descriptor = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET)); Descriptor = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET));
@ -552,19 +552,35 @@ CUSBHardwareDevice::StartController(void)
Descriptor &= ~OHCI_RH_NO_POWER_SWITCHING; Descriptor &= ~OHCI_RH_NO_POWER_SWITCHING;
// //
// control each port power independently (disabled until it's supported correctly) // control each port power independently
// //
#if 0
Descriptor |= OHCI_RH_POWER_SWITCHING_MODE; Descriptor |= OHCI_RH_POWER_SWITCHING_MODE;
#else
Descriptor &= ~OHCI_RH_POWER_SWITCHING_MODE;
#endif
// //
// write the configuration back // write the configuration back
// //
DPRINT1("Descriptor A: %x\n", Descriptor);
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET), Descriptor); WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET), Descriptor);
//
// read descriptor B
//
Descriptor = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_B_OFFSET));
//
// set power power control for each port to use PPS
//
for (Port = 1; Port <= m_NumberOfPorts; Port++)
{
Descriptor |= (1 << (16 + Port));
}
//
// write the configuration back
//
DPRINT1("Descriptor B: %x\n", Descriptor);
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_B_OFFSET), Descriptor);
// //
// get frame interval // get frame interval
// //
@ -635,11 +651,6 @@ CUSBHardwareDevice::StartController(void)
ASSERT((Control & OHCI_ENABLE_LIST) == OHCI_ENABLE_LIST); ASSERT((Control & OHCI_ENABLE_LIST) == OHCI_ENABLE_LIST);
DPRINT1("Control %x\n", Control); DPRINT1("Control %x\n", Control);
//
// enable power on all ports
//
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_STATUS_OFFSET), OHCI_RH_LOCAL_POWER_STATUS_CHANGE);
// //
// done // done
// //

2
reactos/drivers/usb/usbohci/hardware.h
View file

@ -113,7 +113,7 @@
// Root Hub Descriptor B register (section 7.4.2) // Root Hub Descriptor B register (section 7.4.2)
// //
#define OHCI_RH_DESCRIPTOR_B 0x4c #define OHCI_RH_DESCRIPTOR_B_OFFSET 0x4c
// //
// Root Hub status register (section 7.4.3) // Root Hub status register (section 7.4.3)