X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=main.c;h=18cc42220e94461b00249626e61743d4e607d6ea;hb=6dfbb32b3c0be5f9a47fb094f378d76f53b0b4b2;hp=51f43269c5302ff585aa05ca887a75c1b8668b91;hpb=cbb2f30692a3d5cb7817aaa95dc14f8db24f5adb;p=ppcskel.git

diff --git a/main.c b/main.c
index 51f4326..18cc422 100644
--- 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
 
@@ -88,14 +88,13 @@ int main(void)
 	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();
 
 	gecko_init();
     input_init();
 	init_fb(vmode);
-	ohci_init();
 
 	VIDEO_Init(vmode);
 	VIDEO_SetFrameBuffer(get_xfb());
@@ -114,19 +113,14 @@ int main(void)
 			; // better ideas welcome!
 	}
 
+	usb_init();
+
 	/*
     print_str_noscroll(112, 112, "ohai, world!\n");
 	testOTP();
 	printf("bye, world!\n");
 	*/
 
-	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;
 }