X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=main.c;h=d69bb40a1d53dda7f353ae9fb491c4d1fc9f95d2;hb=e3850e3c60ac379edf9d6fad436eeeca5718aa3a;hp=62116920a79401ed597fd10b3727ec5797da5b1d;hpb=0a6cd808a414dab189b1ffac82df6651dfb4ae34;p=ppcskel.git

diff --git a/main.c b/main.c
index 6211692..d69bb40 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
 
@@ -85,20 +85,23 @@ int main(void)
 	dsp_reset();
 
 	irq_initialize();
-	irq_enable(IRQ_OHCI0);
-	
+	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());
 	VISetupEncoder();
 
+	usb_init();
+
 	u32 version = ipc_getvers();
 	u16 mini_version_major = version >> 16 & 0xFFFF;
 	u16 mini_version_minor = version & 0xFFFF;
@@ -112,17 +115,19 @@ int main(void)
 			; // better ideas welcome!
 	}
 
+	/*
     print_str_noscroll(112, 112, "ohai, world!\n");
-
 	testOTP();
-
 	printf("bye, world!\n");
+	*/
+
+	(void) usb_add_device();
 
 	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() // don't know why this is needed...
+		//udelay(100000);
+		//printf("x");
 	}
 
 	return 0;