removed decrementer exception message

[ppcskel.git] / main.c

diff --git a/main.c b/main.c
index 2c1e41ff71a0b63938465d7207815259af95d491..d69bb40a1d53dda7f353ae9fb491c4d1fc9f95d2 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,6 +84,11 @@ int main(void)
        exception_init();
        dsp_reset();
 
+       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();
 
@@ -95,12 +100,7 @@ int main(void)
        VIDEO_SetFrameBuffer(get_xfb());
        VISetupEncoder();
 
-       irq_initialize();
-       irq_bw_enable(BW_PI_IRQ_RESET);
-       irq_bw_enable(BW_PI_IRQ_HW); //hollywood pic
-       irq_hw_enable(IRQ_OHCI0);
-
-       ohci_init();
+       usb_init();
 
        u32 version = ipc_getvers();
        u16 mini_version_major = version >> 16 & 0xFFFF;
@@ -121,6 +121,8 @@ int main(void)
        printf("bye, world!\n");
        */
 
+       (void) usb_add_device();
+
        while(1) {
                // just to get sure we are still in this loop
                //_CPU_ISR_Enable() // don't know why this is needed...