Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-20 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBOHCI]

Browse source 
- Properly dismiss the enable status changed interrupt to avoid an interrupt storm after a device is disconnected

svn path=/branches/usb-bringup-trunk/; revision=55189
This commit is contained in:
Cameron Gutman 2012-01-26 01:46:06 +00:00
parent 334c9ed261
commit c60ff01cc6
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1125,9 +1125,9 @@ CUSBHardwareDevice::GetPortStatus(
if (Value & OHCI_RH_PORTSTATUS_PES) if (Value & OHCI_RH_PORTSTATUS_PES)
*PortStatus |= USB_PORT_STATUS_ENABLE; *PortStatus |= USB_PORT_STATUS_ENABLE;
// port enabled // port disconnect or hardware error
if (Value & OHCI_RH_PORTSTATUS_PESC) if (Value & OHCI_RH_PORTSTATUS_PESC)
*PortChange |= USB_PORT_STATUS_ENABLE; *PortChange |= USB_PORT_STATUS_CONNECT;
// port suspend // port suspend
if (Value & OHCI_RH_PORTSTATUS_PSS) if (Value & OHCI_RH_PORTSTATUS_PSS)
@ -1211,7 +1211,6 @@ CUSBHardwareDevice::ClearPortStatus(
// //
// sanity checks // sanity checks
// //
ASSERT((Value & OHCI_RH_PORTSTATUS_PRS) == 0);
ASSERT((Value & OHCI_RH_PORTSTATUS_PRSC)); ASSERT((Value & OHCI_RH_PORTSTATUS_PRSC));
// //
@ -1219,28 +1218,25 @@ CUSBHardwareDevice::ClearPortStatus(
// //
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PRSC); WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PRSC);
// //
// sanity check // sanity check
// //
ASSERT((Value & OHCI_RH_PORTSTATUS_PES)); ASSERT((Value & OHCI_RH_PORTSTATUS_PES));
//
// re-enable root hub change
//
Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET));
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), Value | OHCI_ROOT_HUB_STATUS_CHANGE);
} }
if (Status == C_PORT_CONNECTION) if (Status == C_PORT_CONNECTION || Status == C_PORT_ENABLE)
{ {
// //
// clear bit // clear bits
// //
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_CSC); WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_CSC | OHCI_RH_PORTSTATUS_PESC);
} }
//
// re-enable root hub change
//
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_ROOT_HUB_STATUS_CHANGE);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -1474,10 +1470,6 @@ InterruptServiceRoutine(
if (Status & OHCI_ROOT_HUB_STATUS_CHANGE) if (Status & OHCI_ROOT_HUB_STATUS_CHANGE)
{ {
//
// new device has arrived
//
// //
// disable interrupt as it will fire untill the port has been reset // disable interrupt as it will fire untill the port has been reset
// //