USB device not enumerated by iPXE USB stack

[eugenio]

@@ -1176,8 +1176,11 @@ static int uhci_root_enable ( struct usb_hub *hub, struct usb_port *port ) {

/* Check port status */
portsc = inw ( uhci->regs + UHCI_PORTSC ( port->address ) );
- if ( portsc & UHCI_PORTSC_PED )
+ if ( portsc & UHCI_PORTSC_PED && portsc & UHCI_PORTSC_CCS )
+ {
+ port->disconnected = 0;
return 0;
+ }

/* Delay */
mdelay ( 1 );
@@ -1245,7 +1248,7 @@ static int uhci_root_speed ( struct usb_hub *hub, struct usb_port *port ) {
port->speed = speed;

/* Record disconnections and clear changes */
- port->disconnected |= ( portsc & UHCI_PORTSC_CSC );
+ port->disconnected |= ( (portsc & UHCI_PORTSC_CCS) == 0 );
outw ( portsc, uhci->regs + UHCI_PORTSC ( port->address ) );

return 0;
@@ -1288,7 +1291,7 @@ static void uhci_root_poll ( struct usb_hub *hub, struct usb_port *port ) {
return;

/* Record disconnections and clear changes */
- port->disconnected |= ( portsc & UHCI_PORTSC_CSC );
+ port->disconnected |= ( (portsc & UHCI_PORTSC_CCS) == 0 );
outw ( portsc, uhci->regs + UHCI_PORTSC ( port->address ) );

/* Report port status change */