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

[USBHUB]

Browse source 
- Handle errors returned from the HCD correctly
[USBEHCI]
- Discard any changes on ports that were given to the companion controller

svn path=/trunk/; revision=55851
This commit is contained in:
Cameron Gutman 2012-02-25 04:45:30 +00:00
parent 7991e67594
commit c14c8d7ef4
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/drivers/usb/usbehci/hardware.cpp
View file

@ -1446,6 +1446,15 @@ EhciDefferedRoutine(
for (i = 0; i < PortCount; i++)
{
PortStatus = This->EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * i));
// Check if we actually own the port
if (PortStatus & EHCI_PRT_RELEASEOWNERSHIP)
{
//Discard anything on this port but ack any status changes
This->EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * i), PortStatus);
continue;
}
//
// Device connected or removed
//

6
reactos/drivers/usb/usbhub/fdo.c
View file

@ -300,6 +300,7 @@ DeviceStatusChangeThread(
if (!NT_SUCCESS(Status))
{
DPRINT1("Failed to clear connection change for port %d\n", PortId);
continue;
}
//
@ -313,6 +314,7 @@ DeviceStatusChangeThread(
if (!NT_SUCCESS(Status))
{
DPRINT1("Failed to delete child device object after disconnect\n");
continue;
}
}
else
@ -328,6 +330,7 @@ DeviceStatusChangeThread(
if (!NT_SUCCESS(Status))
{
DPRINT1("Failed to reset port %d\n", PortId);
continue;
}
}
}
@ -340,6 +343,7 @@ DeviceStatusChangeThread(
if (!NT_SUCCESS(Status))
{
DPRINT1("Failed to clear enable change on port %d\n", PortId);
continue;
}
}
else if (PortStatus.Change & USB_PORT_STATUS_RESET)
@ -351,6 +355,7 @@ DeviceStatusChangeThread(
if (!NT_SUCCESS(Status))
{
DPRINT1("Failed to clear reset change on port %d\n", PortId);
continue;
}
//
@ -373,6 +378,7 @@ DeviceStatusChangeThread(
if(PortStatus.Change & USB_PORT_STATUS_RESET)
{
DPRINT1("Port did not clear reset! Possible Hardware problem!\n");
continue;
}
//