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 c75712b16c569ba6bec2987d87471b307f0d8e94..62116920a79401ed597fd10b3727ec5797da5b1d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -25,6 +25,7 @@ Copyright (C) 2009              John Kelley <wiidev@kelley.ca>
 #include "input.h"
 #include "console.h"
 #include "ohci.h"
+#include "irq.h"
 
 #define MINIMUM_MINI_VERSION 0x00010001
 
@@ -83,9 +84,9 @@ int main(void)
        exception_init();
        dsp_reset();
 
-       // clear interrupt mask
-       write32(0x0c003004, 0);
-
+       irq_initialize();
+       irq_enable(IRQ_OHCI0);
+       
        ipc_initialize();
        ipc_slowping();
 
@@ -117,25 +118,12 @@ int main(void)
 
        printf("bye, world!\n");
 
-       // enable OHCI0 interrupt on hollywood-pic
-#define HW_PPCIRQFLAG (0x0d800030)
-#define HW_PPCIRQMASK (0x0d800034)
-       write32(HW_PPCIRQFLAG, ~0);
-       write32(HW_PPCIRQMASK, 1<<5);
-       // enable RESET and PIC (#14) interrupts on processor interface
-       write32(0x0c003004, (1<<1) | (1<<14));
-#define _CPU_ISR_Enable() \
-       { register u32 _val = 0; \
-         __asm__ __volatile__ ( \
-               "mfmsr %0\n" \
-               "ori %0,%0,0x8000\n" \
-               "mtmsr %0" \
-               : "=&r" ((_val)) : "0" ((_val)) \
-         ); \
+       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");
        }
-       _CPU_ISR_Enable()
-
-       while(1) {}
 
        return 0;
 }