X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=main.c;h=e2a51e95566d2ea00c33aec6983a22dc6f82102c;hb=68091cca4f474d6385f0cb3387c8d731b0f308f5;hp=2c1e41ff71a0b63938465d7207815259af95d491;hpb=3a17a5742283d2510b6bdcf42dcb76cdb66d3770;p=ppcskel.git

diff --git a/main.c b/main.c
index 2c1e41f..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
 
@@ -84,6 +85,14 @@ 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
+	/* external ohci */
+	irq_hw_enable(IRQ_OHCI0);
+	/* internal ohci */
+	//irq_hw_enable(IRQ_OHCI1);
+
 	ipc_initialize();
 	ipc_slowping();
 
@@ -95,13 +104,6 @@ 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();
-
 	u32 version = ipc_getvers();
 	u16 mini_version_major = version >> 16 & 0xFFFF;
 	u16 mini_version_minor = version & 0xFFFF;
@@ -115,19 +117,17 @@ int main(void)
 			; // better ideas welcome!
 	}
 
+	/* 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
-		//_CPU_ISR_Enable() // don't know why this is needed...
-		//udelay(100000);
-		//printf("x");
-	}
-
 	return 0;
 }