Merge branch 'isr_test' of git://github.com/theStack/ppcskel into isr_test

[ppcskel.git] / ohci.c

diff --git a/ohci.c b/ohci.c
index 04550f903bfeec385746e216e2b8678476fb3357..1bab91a5b7bac17c06fdfedd6629b875a0f9531f 100644 (file)
--- a/ohci.c
+++ b/ohci.c
@@ -14,7 +14,6 @@ Copyright (C) 2009     Sebastian Falbesoner <sebastian.falbesoner@gmail.com>
 #include "irq.h"
 
 #define gecko_printf printf
-#define set32(address, flags) write32(address, read32(address) | flags)
 #define dma_addr(address) virt_to_phys(address)
 
 
@@ -70,10 +69,7 @@ void ohci_init() {
           within 2msec else HC enters RESUME */
 
 
-       //u32 cookie = irq_kill();
-       u32 cookie;
-       _CPU_ISR_Disable(cookie);
-
+          u32 cookie = irq_kill();
 
        /* Tell the controller where the control and bulk lists are
         * The lists are empty now. */
@@ -107,11 +103,8 @@ void ohci_init() {
        write32(OHCI0_HC_INT_ENABLE, OHCI_INTR_INIT);
 
 
-       //irq_restore(cookie);
-       _CPU_ISR_Restore(cookie);
-
+       irq_restore(cookie);
 
        dbg_op_state();
-
 }