simple changes to the stack

[ppcskel.git] / main.c

diff --git a/main.c b/main.c
index ca0b2eaedb6a58ac26a7d75a89063cd940f591bf..18cc42220e94461b00249626e61743d4e607d6ea 100644 (file)
--- a/main.c
+++ b/main.c
@@ -24,8 +24,8 @@ Copyright (C) 2009              John Kelley <wiidev@kelley.ca>
 #include "video_low.h"
 #include "input.h"
 #include "console.h"
-#include "ohci.h"
 #include "irq.h"
+#include "usb/core/core.h"
 
 #define MINIMUM_MINI_VERSION 0x00010001
 
@@ -84,8 +84,10 @@ int main(void)
        exception_init();
        dsp_reset();
 
-       // clear interrupt mask
-       write32(BW_PI_IRQMASK, 0);
+       irq_initialize();
+       irq_bw_enable(BW_PI_IRQ_RESET);
+       irq_bw_enable(BW_PI_IRQ_HW); //hollywood pic
+       irq_hw_enable(IRQ_OHCI0);
 
        ipc_initialize();
        ipc_slowping();
@@ -93,7 +95,6 @@ int main(void)
        gecko_init();
     input_init();
        init_fb(vmode);
-       ohci_init();
 
        VIDEO_Init(vmode);
        VIDEO_SetFrameBuffer(get_xfb());
@@ -112,26 +113,13 @@ int main(void)
                        ; // better ideas welcome!
        }
 
-    print_str_noscroll(112, 112, "ohai, world!\n");
+       usb_init();
 
+       /*
+    print_str_noscroll(112, 112, "ohai, world!\n");
        testOTP();
-
        printf("bye, world!\n");
-
-       // enable OHCI0 interrupt on hollywood-pic
-       write32(HW_PPCIRQFLAG, ~0);
-       write32(HW_PPCIRQMASK, 1<<5);
-       // enable RESET and PIC (#14) interrupts on processor interface
-       write32(BW_PI_IRQFLAG, ~0);
-       write32(BW_PI_IRQMASK, (1<<1) | (1<<14));
-       _CPU_ISR_Enable()
-
-       while(1) {
-               // just to get sure we are still in this loop
-               _CPU_ISR_Enable() // don't know why this is needed...
-               udelay(100000);
-               printf("x");
-       }
+       */
 
        return 0;
 }