X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=irq.c;h=31daa980e5ac3d7d6547d38d3b97aa56f7ae96dd;hb=a160aa2f4d9d2df95e051e49de2a0235efa62c3b;hp=449a85c34a1e43f861f82f7ab7c90ee03a07294c;hpb=364f2c37f1b3a971f60bf67a7030c56b550b1407;p=ppcskel.git

diff --git a/irq.c b/irq.c
index 449a85c..31daa98 100644
--- a/irq.c
+++ b/irq.c
@@ -14,7 +14,9 @@ Copyright (C) 2009			Andre Heider "dhewg" <dhewg@wiibrew.org>
 #include "hollywood.h"
 #include "ipc.h"
 #include "bootmii_ppc.h"
-#include "ohci.h"
+#include "usb/host/host.h"
+
+void show_frame_no(void);
 
 void irq_initialize(void)
 {
@@ -54,20 +56,19 @@ void irq_handler(void)
 {
 	u32 enabled = read32(BW_PI_IRQMASK);
 	u32 flags = read32(BW_PI_IRQFLAG);
-	printf( "========================\n"
-			"flags1: 0x%08X\n", flags);
 
 	flags = flags & enabled;
 
 	if (flags & (1<<BW_PI_IRQ_RESET)) { 
 		write32(BW_PI_IRQFLAG, 1<<BW_PI_IRQ_RESET);
+		show_frame_no();
 		printf("IRQ-BW RESET\n");
 	}
 	if (flags & (1<<BW_PI_IRQ_HW)) { //HW-PIC IRQ
 		u32 hw_enabled = read32(HW_PPCIRQMASK);
 		u32 hw_flags = read32(HW_PPCIRQFLAG);
 
-		printf("In IRQ handler: 0x%08x 0x%08x 0x%08x\n", hw_enabled, hw_flags, hw_flags & hw_enabled);
+		//printf("In IRQ handler: 0x%08x 0x%08x 0x%08x\n", hw_enabled, hw_flags, hw_flags & hw_enabled);
 
 		hw_flags = hw_flags & hw_enabled;
 
@@ -113,13 +114,12 @@ void irq_handler(void)
 			//sdhc_irq();
 		}
 		if (hw_flags & IRQF_OHCI0) {
-			ohci0_irq();
+			hcdi_irq();
 			write32(HW_PPCIRQFLAG, IRQF_OHCI0);
 		}
 		if (hw_flags & IRQF_OHCI1) {
-			printf("IRQ: OHCI1\n");
-			write32(HW_PPCIRQFLAG, IRQF_OHCI1);
 			//TODO: ohci1_irq();
+			write32(HW_PPCIRQFLAG, IRQF_OHCI1);
 		}
 
 		hw_flags &= ~IRQF_ALL;
@@ -128,12 +128,9 @@ void irq_handler(void)
 			write32(HW_PPCIRQFLAG, hw_flags);
 		}
 
-		printf("hw_flags1: 0x%08x\n", read32(HW_PPCIRQFLAG));
-
 		// not necessary here, but "cleaner"?
 		write32(BW_PI_IRQFLAG, 1<<BW_PI_IRQ_HW);
 	}
-	printf("flags2: 0x%08X\n", read32(BW_PI_IRQFLAG));
 }
 
 void irq_bw_enable(u32 irq)
@@ -163,5 +160,6 @@ u32 irq_kill() {
 
 void irq_restore(u32 cookie) {
 	_CPU_ISR_Restore(cookie);
+	_CPU_ISR_Enable(); //wtf :/
 }