X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=irq.c;h=31daa980e5ac3d7d6547d38d3b97aa56f7ae96dd;hb=d2d9dbe02102801e2f52380fb5bd11d8cbcf786c;hp=389ae75fc81358e79f6a5528c2e26799d573173b;hpb=bf20e0275f40af8a6c7db3bcbfbb20d930ff40a5;p=ppcskel.git

diff --git a/irq.c b/irq.c
index 389ae75..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)
 {
@@ -59,6 +61,7 @@ void irq_handler(void)
 
 	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
@@ -111,12 +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) {
-			write32(HW_PPCIRQFLAG, IRQF_OHCI1);
 			//TODO: ohci1_irq();
+			write32(HW_PPCIRQFLAG, IRQF_OHCI1);
 		}
 
 		hw_flags &= ~IRQF_ALL;
@@ -157,5 +160,6 @@ u32 irq_kill() {
 
 void irq_restore(u32 cookie) {
 	_CPU_ISR_Restore(cookie);
+	_CPU_ISR_Enable(); //wtf :/
 }