some roothub stuff added. TD transfer without errors, w00t!

diff --git a/main.c b/main.c
index d69bb40a1d53dda7f353ae9fb491c4d1fc9f95d2..bbb7d39c9c81b72da7091708cbcdac569cb1a92f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -121,8 +121,6 @@ int main(void)
        printf("bye, world!\n");
        */
 
-       (void) usb_add_device();
-
        while(1) {
                // just to get sure we are still in this loop
                //_CPU_ISR_Enable() // don't know why this is needed...

diff --git a/usb/host/ohci.c b/usb/host/ohci.c
index 5e41bb6565c3546ad4970740a09dd7a33794e7a6..801720db5ed946c574fe662be36eb6965195ed3b 100644 (file)
--- a/usb/host/ohci.c
+++ b/usb/host/ohci.c
@@ -393,11 +393,45 @@ void hcdi_irq()
        if (flags & OHCI_INTR_RHSC) {
                printf("RootHubStatusChange\n");
                /* TODO: set some next_statechange variable... */
+               u32 port1 = read32(OHCI0_HC_RH_PORT_STATUS_1);
+               u32 port2 = read32(OHCI0_HC_RH_PORT_STATUS_2);
                printf("OHCI0_HC_RH_DESCRIPTOR_A:\t0x%08X\n", read32(OHCI0_HC_RH_DESCRIPTOR_A));
                printf("OHCI0_HC_RH_DESCRIPTOR_B:\t0x%08X\n", read32(OHCI0_HC_RH_DESCRIPTOR_B));
                printf("OHCI0_HC_RH_STATUS:\t\t0x%08X\n", read32(OHCI0_HC_RH_STATUS));
-               printf("OHCI0_HC_RH_PORT_STATUS_1:\t0x%08X\n", read32(OHCI0_HC_RH_PORT_STATUS_1));
-               printf("OHCI0_HC_RH_PORT_STATUS_2:\t0x%08X\n", read32(OHCI0_HC_RH_PORT_STATUS_2));
+               printf("OHCI0_HC_RH_PORT_STATUS_1:\t0x%08X\n", port1);
+               printf("OHCI0_HC_RH_PORT_STATUS_2:\t0x%08X\n", port2);
+
+               if((port1 & RH_PS_CCS) && (port1 & RH_PS_CSC)) {
+                       wait_ms(100);
+
+                       /* clear CSC flag, set PES and start port reset (PRS) */
+                       write32(OHCI0_HC_RH_PORT_STATUS_1, port1 | RH_PS_CSC | RH_PS_PES | RH_PS_PRS); 
+
+                       /* spin until port reset is complete */
+                       port1 = read32(OHCI0_HC_RH_PORT_STATUS_1);
+                       while(!(port1 & RH_PS_PRSC)) {
+                               udelay(2);
+                               port1 = read32(OHCI0_HC_RH_PORT_STATUS_1);
+                       }
+
+                       (void) usb_add_device();
+               }
+               if((port2 & RH_PS_CCS) && (port2 & RH_PS_CSC)) {
+                       wait_ms(100);
+
+                       /* clear CSC flag, set PES and start port reset (PRS) */
+                       write32(OHCI0_HC_RH_PORT_STATUS_2, port2 | RH_PS_CSC | RH_PS_PES | RH_PS_PRS); 
+
+                       /* spin until port reset is complete */
+                       port2 = read32(OHCI0_HC_RH_PORT_STATUS_2);
+                       while(!(port2 & RH_PS_PRSC)) {
+                               udelay(2);
+                               port2 = read32(OHCI0_HC_RH_PORT_STATUS_2);
+                       }
+
+                       (void) usb_add_device();
+               }
+
                write32(OHCI0_HC_INT_STATUS, OHCI_INTR_RD | OHCI_INTR_RHSC);
        }
        /* ResumeDetected */