X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=main.c;h=bbb7d39c9c81b72da7091708cbcdac569cb1a92f;hb=c949f0a1a871099315a20555f8f249edc24f0bcb;hp=ca0b2eaedb6a58ac26a7d75a89063cd940f591bf;hpb=3169c95c4ddd84c74a397760d617e840530c13e0;p=ppcskel.git

diff --git a/main.c b/main.c
index ca0b2ea..bbb7d39 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
 
@@ -84,8 +84,10 @@ int main(void)
 	exception_init();
 	dsp_reset();
 
-	// clear interrupt mask
-	write32(BW_PI_IRQMASK, 0);
+	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();
@@ -93,12 +95,13 @@ int main(void)
 	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,25 +115,17 @@ int main(void)
 			; // better ideas welcome!
 	}
 
+	/*
     print_str_noscroll(112, 112, "ohai, world!\n");
-
 	testOTP();
-
 	printf("bye, world!\n");
-
-	// enable OHCI0 interrupt on hollywood-pic
-	write32(HW_PPCIRQFLAG, ~0);
-	write32(HW_PPCIRQMASK, 1<<5);
-	// enable RESET and PIC (#14) interrupts on processor interface
-	write32(BW_PI_IRQFLAG, ~0);
-	write32(BW_PI_IRQMASK, (1<<1) | (1<<14));
-	_CPU_ISR_Enable()
+	*/
 
 	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");
+		//_CPU_ISR_Enable() // don't know why this is needed...
+		//udelay(100000);
+		//printf("x");
 	}
 
 	return 0;