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

[USBOHCI]

Browse source 
- No need to turn off interrupts 
- Check if bios is active
- Check for timeouts when resetting host controller

svn path=/branches/usb-bringup-trunk/; revision=55171
This commit is contained in:
Johannes Anderwald 2012-01-25 09:50:04 +00:00
parent 6c55f96de8
commit 58dab5a63b
1 changed files with 90 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

107
drivers/usb/usbohci/hardware.cpp
View file

@ -888,7 +888,6 @@ CUSBHardwareDevice::StopController(void)
//
Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET));
if ((Control & OHCI_INTERRUPT_ROUTING))
{
//
@ -932,26 +931,100 @@ CUSBHardwareDevice::StopController(void)
DPRINT1("SMM has given up ownership\n");
}
}
else
{
//
// read contents of control register
//
Control = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)) & OHCI_HC_FUNCTIONAL_STATE_MASK);
DPRINT1("Controller State %x\n", Control);
//
// turn off interrupts
//
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_DISABLE_OFFSET), OHCI_ALL_INTERRUPTS);
if (Control != OHCI_HC_FUNCTIONAL_STATE_RESET)
{
//
// OHCI 5.1.1.3.4, no SMM, BIOS active
//
if (Control != OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL)
{
//
// lets resume
//
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_HC_FUNCTIONAL_STATE_RESUME);
Index = 0;
do
{
//
// wait untill its resumed
//
KeStallExecutionProcessor(10);
//
// have a break
//
KeStallExecutionProcessor(100);
//
// check control register
//
Control = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)) & OHCI_HC_FUNCTIONAL_STATE_MASK);
if (Control & OHCI_HC_FUNCTIONAL_STATE_RESUME)
{
//
// it has resumed
//
break;
}
//
// some controllers also depend on this
//
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_HC_FUNCTIONAL_STATE_RESET);
//
// check for time outs
//
Index++;
if(Index > 100)
{
DPRINT1("Failed to resume controller\n");
break;
}
}while(TRUE);
}
}
else
{
//
// 5.1.1.3.5 OHCI, no SMM, no BIOS
//
Index = 0;
//
// wait a bit
//
KeStallExecutionProcessor(100);
//
// some controllers also depend on this
//
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET), OHCI_HC_FUNCTIONAL_STATE_RESET);
do
{
//
// wait untill its reset
//
KeStallExecutionProcessor(10);
//
// check control register
//
Control = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)) & OHCI_HC_FUNCTIONAL_STATE_MASK);
if (Control == OHCI_HC_FUNCTIONAL_STATE_RESET)
{
//
// it has reset
//
break;
}
//
// check for time outs
//
Index++;
if(Index > 100)
{
DPRINT1("Failed to reset controller\n");
break;
}
}while(TRUE);
}
}
//
// read from interval