ohci0 finally goes in operational mode -- silly confusion with

[ppcskel.git] / ohci.c

diff --git a/ohci.c b/ohci.c
index 1bab91a5b7bac17c06fdfedd6629b875a0f9531f..26aae244b68606c1abcdf8536b5731d7d9189438 100644 (file)
--- a/ohci.c
+++ b/ohci.c
@@ -12,6 +12,7 @@ Copyright (C) 2009     Sebastian Falbesoner <sebastian.falbesoner@gmail.com>
 #include "bootmii_ppc.h"
 #include "ohci.h"
 #include "irq.h"
+#include "string.h"
 
 #define gecko_printf printf
 #define dma_addr(address) virt_to_phys(address)
@@ -39,20 +40,23 @@ static void dbg_op_state() {
 void ohci_init() {
        gecko_printf("ohci-- init\n");
        dbg_op_state();
-       /*
-       u32 i = 0;
-       for(; i <= 0x200; i+=4) {
-               gecko_printf("0x0d050000 + %X: %X\n", i, read32(0x0d050000+i));
-               udelay(10000); //'cause usb gecko is lame
-       }
-       * see output in ohci.default
-       */
+
+       /* disable hc interrupts */
+       set32(OHCI0_HC_INT_DISABLE, OHCI_INTR_MIE);
+
+       /* save fmInterval and calculate FSMPS */
+#define FSMP(fi) (0x7fff & ((6 * ((fi) - 210)) / 7))
+#define FI 0x2edf /* 12000 bits per frame (-1) */
+       u32 fmint = read32(OHCI0_HC_FM_INTERVAL) & 0x3fff;
+       if(fmint != FI)
+              gecko_printf("ohci-- fminterval delta: %d\n", fmint - FI);
+       fmint |= FSMP (fmint) << 16;
 
        /* enable interrupts of both usb host controllers */
        set32(EHCI_CTL, EHCI_CTL_OH0INTE | EHCI_CTL_OH1INTE | 0xe0000);
 
        /* reset HC */
-       set32(OHCI0_HC_COMMAND_STATUS, OHCI_HCR);
+       write32(OHCI0_HC_COMMAND_STATUS, OHCI_HCR);
 
        /* wait max. 30us */
        u32 ts = 30;
@@ -68,7 +72,6 @@ void ohci_init() {
           now we're in the SUSPEND state ... must go OPERATIONAL
           within 2msec else HC enters RESUME */
 
-
           u32 cookie = irq_kill();
 
        /* Tell the controller where the control and bulk lists are
@@ -82,9 +85,9 @@ void ohci_init() {
        /* set periodicstart */
 #define FIT (1<<31)
        u32 fmInterval = read32(OHCI0_HC_FM_INTERVAL) &0x3fff;
-       u32 fit = read32(OHCI0_HC_FM_INTERVAL) & FIT;
+          u32 fit = read32(OHCI0_HC_FM_INTERVAL) & FIT;
 
-       write32(OHCI0_HC_FM_INTERVAL, read32(OHCI0_HC_FM_INTERVAL) | (fit ^ FIT));
+       write32(OHCI0_HC_FM_INTERVAL, fmint | (fit ^ FIT));
        write32(OHCI0_HC_PERIODIC_START, ((9*fmInterval)/10)&0x3fff);
 
        /* testing bla */
@@ -93,7 +96,7 @@ void ohci_init() {
        }
        
        /* start HC operations */
-       set32(OHCI0_HC_CONTROL, OHCI_CONTROL_INIT | OHCI_USB_OPER);
+       write32(OHCI0_HC_CONTROL, OHCI_CONTROL_INIT | OHCI_USB_OPER);
 
        /* wake on ConnectStatusChange, matching external hubs */
        set32(OHCI0_HC_RH_STATUS, RH_HS_DRWE);
@@ -102,9 +105,14 @@ void ohci_init() {
        write32(OHCI0_HC_INT_STATUS, ~0);
        write32(OHCI0_HC_INT_ENABLE, OHCI_INTR_INIT);
 
-
        irq_restore(cookie);
 
        dbg_op_state();
 }
 
+void ohci0_irq() {
+       gecko_printf("ohci_irq\n");
+       write32(OHCI0_HC_INT_STATUS, ~0);
+}
+
+