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 
- Fix and enable the proper GetPortStatus implementation
- Remove the old hacked cached port status mess

svn path=/branches/usb-bringup-trunk/; revision=55185
This commit is contained in:
Cameron Gutman 2012-01-25 23:56:29 +00:00
parent 84e941632b
commit 23f71216c4
1 changed files with 9 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -120,7 +120,6 @@ protected:
POHCI_ENDPOINT_DESCRIPTOR m_IsoEndpointDescriptor; // iso endpoint descriptor POHCI_ENDPOINT_DESCRIPTOR m_IsoEndpointDescriptor; // iso endpoint descriptor
POHCI_ENDPOINT_DESCRIPTOR m_InterruptEndpoints[OHCI_STATIC_ENDPOINT_COUNT]; // endpoints for interrupt / iso transfers POHCI_ENDPOINT_DESCRIPTOR m_InterruptEndpoints[OHCI_STATIC_ENDPOINT_COUNT]; // endpoints for interrupt / iso transfers
ULONG m_NumberOfPorts; // number of ports ULONG m_NumberOfPorts; // number of ports
OHCI_PORT_STATUS m_PortStatus[OHCI_MAX_PORT_COUNT]; // port change status
PDMAMEMORYMANAGER m_MemoryManager; // memory manager PDMAMEMORYMANAGER m_MemoryManager; // memory manager
HD_INIT_CALLBACK* m_SCECallBack; // status change callback routine HD_INIT_CALLBACK* m_SCECallBack; // status change callback routine
PVOID m_SCEContext; // status change callback routine context PVOID m_SCEContext; // status change callback routine context
@ -1099,7 +1098,6 @@ CUSBHardwareDevice::GetPortStatus(
OUT USHORT *PortStatus, OUT USHORT *PortStatus,
OUT USHORT *PortChange) OUT USHORT *PortChange)
{ {
#if 0
ULONG Value; ULONG Value;
if (PortId > m_NumberOfPorts) if (PortId > m_NumberOfPorts)
@ -1115,7 +1113,6 @@ CUSBHardwareDevice::GetPortStatus(
Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId))); Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)));
DPRINT("GetPortStatus PortId %x Value %x\n", PortId, Value); DPRINT("GetPortStatus PortId %x Value %x\n", PortId, Value);
// connected // connected
if (Value & OHCI_RH_PORTSTATUS_CCS) if (Value & OHCI_RH_PORTSTATUS_CCS)
*PortStatus |= USB_PORT_STATUS_CONNECT; *PortStatus |= USB_PORT_STATUS_CONNECT;
@ -1140,18 +1137,20 @@ CUSBHardwareDevice::GetPortStatus(
if (Value & OHCI_RH_PORTSTATUS_PSSC) if (Value & OHCI_RH_PORTSTATUS_PSSC)
*PortChange |= USB_PORT_STATUS_ENABLE; *PortChange |= USB_PORT_STATUS_ENABLE;
// port reset // port reset started (change bit only set at completion)
if (Value & OHCI_RH_PORTSTATUS_PSS) if (Value & OHCI_RH_PORTSTATUS_PRS)
{
*PortStatus |= USB_PORT_STATUS_RESET; *PortStatus |= USB_PORT_STATUS_RESET;
*PortChange |= USB_PORT_STATUS_RESET;
}
// port reset // port reset ended (change bit only set at completion)
if (Value & OHCI_RH_PORTSTATUS_PRSC) if (Value & OHCI_RH_PORTSTATUS_PRSC)
*PortChange |= USB_PORT_STATUS_RESET; *PortChange |= USB_PORT_STATUS_RESET;
#else // low speed device
*PortStatus = m_PortStatus[PortId].PortStatus; if (Value & OHCI_RH_PORTSTATUS_LSDA)
*PortChange = m_PortStatus[PortId].PortChange; *PortStatus |= USB_PORT_STATUS_LOW_SPEED;
#endif
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -1220,31 +1219,12 @@ 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);
//
// read status register
//
Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)));
//
// reset complete bit should be cleared
//
ASSERT((Value & OHCI_RH_PORTSTATUS_PRSC) == 0);
//
// update port status
//
m_PortStatus[PortId].PortChange &= ~USB_PORT_STATUS_RESET;
// //
// sanity check // sanity check
// //
ASSERT((Value & OHCI_RH_PORTSTATUS_PES)); ASSERT((Value & OHCI_RH_PORTSTATUS_PES));
//
// port is enabled
//
m_PortStatus[PortId].PortStatus |= USB_PORT_STATUS_ENABLE;
// //
// re-enable root hub change // re-enable root hub change
// //
@ -1259,11 +1239,8 @@ CUSBHardwareDevice::ClearPortStatus(
// clear bit // clear bit
// //
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);
m_PortStatus[PortId].PortChange &= ~USB_PORT_STATUS_CONNECT;
} }
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -1324,12 +1301,6 @@ CUSBHardwareDevice::SetPortFeature(
// //
KeStallExecutionProcessor(100); KeStallExecutionProcessor(100);
//
// update cached settings
//
m_PortStatus[PortId].PortChange |= USB_PORT_STATUS_RESET;
m_PortStatus[PortId].PortStatus &= ~USB_PORT_STATUS_ENABLE;
// //
// is there a status change callback // is there a status change callback
// //
@ -1596,21 +1567,6 @@ OhciDefferedRoutine(
// enable port // enable port
// //
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_RH_PORT_STATUS(Index)), OHCI_RH_PORTSTATUS_PES); WRITE_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_RH_PORT_STATUS(Index)), OHCI_RH_PORTSTATUS_PES);
//
// store change
//
This->m_PortStatus[Index].PortStatus |= USB_PORT_STATUS_CONNECT;
This->m_PortStatus[Index].PortChange |= USB_PORT_STATUS_CONNECT;
if ((PortStatus & OHCI_RH_PORTSTATUS_LSDA))
{
//
// low speed device connected
//
This->m_PortStatus[Index].PortStatus |= USB_PORT_STATUS_LOW_SPEED;
}
} }
else else
{ {
@ -1618,13 +1574,6 @@ OhciDefferedRoutine(
// device disconnected // device disconnected
// //
DPRINT1("Device disconnected at Port %x\n", Index); DPRINT1("Device disconnected at Port %x\n", Index);
//
// update port status flags
//
This->m_PortStatus[Index].PortStatus &= ~USB_PORT_STATUS_LOW_SPEED;
This->m_PortStatus[Index].PortStatus &= ~USB_PORT_STATUS_CONNECT;
This->m_PortStatus[Index].PortChange |= USB_PORT_STATUS_CONNECT;
} }
// //