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

[ppcskel.git] / main.c

diff --git a/main.c b/main.c
index acd97174cd0e328a07f8d60d821cfb1022430db7..62116920a79401ed597fd10b3727ec5797da5b1d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -24,6 +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"
 
 #define MINIMUM_MINI_VERSION 0x00010001
 
@@ -82,15 +84,16 @@ int main(void)
        exception_init();
        dsp_reset();
 
-       // clear interrupt mask
-       write32(0x0c003004, 0);
-
+       irq_initialize();
+       irq_enable(IRQ_OHCI0);
+       
        ipc_initialize();
        ipc_slowping();
 
        gecko_init();
     input_init();
        init_fb(vmode);
+       ohci_init();
 
        VIDEO_Init(vmode);
        VIDEO_SetFrameBuffer(get_xfb());
@@ -115,6 +118,13 @@ int main(void)
 
        printf("bye, world!\n");
 
+       while(1) {
+               // just to get sure we are still in this loop
+               //wtf? _CPU_ISR_Enable() // don't know why this is needed...
+               udelay(100000);
+               printf("x");
+       }
+
        return 0;
 }