X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=main.c;h=e2a51e95566d2ea00c33aec6983a22dc6f82102c;hb=3b9dfcf21e6f8aa9efd701ac38a3a594ac2fd94f;hp=62116920a79401ed597fd10b3727ec5797da5b1d;hpb=e256c484ff2f56a6a58547c88b3763e8f2ae2c13;p=ppcskel.git

diff --git a/main.c b/main.c
index 6211692..e2a51e9 100644
--- a/main.c
+++ b/main.c
@@ -24,8 +24,9 @@ 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"
+#include "hollywood.h"
 
 #define MINIMUM_MINI_VERSION 0x00010001
 
@@ -85,15 +86,19 @@ 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
+	/* external ohci */
+	irq_hw_enable(IRQ_OHCI0);
+	/* internal ohci */
+	//irq_hw_enable(IRQ_OHCI1);
+
 	ipc_initialize();
 	ipc_slowping();
 
 	gecko_init();
     input_init();
 	init_fb(vmode);
-	ohci_init();
 
 	VIDEO_Init(vmode);
 	VIDEO_SetFrameBuffer(get_xfb());
@@ -112,18 +117,16 @@ int main(void)
 			; // better ideas welcome!
 	}
 
-    print_str_noscroll(112, 112, "ohai, world!\n");
+	/* external ohci */
+	usb_init(OHCI0_REG_BASE);
+	/* internal ohci */
+	//usb_init(OHCI1_REG_BASE);
 
+	/*
+    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
-		//wtf? _CPU_ISR_Enable() // don't know why this is needed...
-		udelay(100000);
-		printf("x");
-	}
+	*/
 
 	return 0;
 }