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

diff --git a/irq.c b/irq.c
index 389ae75..1217ee2 100644
--- a/irq.c
+++ b/irq.c
@@ -2,9 +2,8 @@
 	ppcskel - a Free Software replacement for the Nintendo/BroadOn IOS.
 	IRQ support
 
-Copyright (C) 2008, 2009	Hector Martin "marcan" <marcan@marcansoft.com>
-Copyright (C) 2008, 2009	Sven Peter <svenpeter@gmail.com>
-Copyright (C) 2009			Andre Heider "dhewg" <dhewg@wiibrew.org>
+Copyright (C) 2009		Bernhard Urban <lewurm@gmx.net>
+Copyright (C) 2009		Sebastian Falbesoner <sebastian.falbesoner@gmail.com>
 
 # This code is licensed to you under the terms of the GNU GPL, version 2;
 # see file COPYING or http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
@@ -14,7 +13,10 @@ 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"
+#include "mini_ipc.h"
+
+void show_frame_no(void);
 
 void irq_initialize(void)
 {
@@ -59,8 +61,9 @@ void irq_handler(void)
 
 	if (flags & (1<<BW_PI_IRQ_RESET)) { 
 		write32(BW_PI_IRQFLAG, 1<<BW_PI_IRQ_RESET);
-		printf("IRQ-BW RESET\n");
+		boot2_run(1,2); //sysmenu
 	}
+
 	if (flags & (1<<BW_PI_IRQ_HW)) { //HW-PIC IRQ
 		u32 hw_enabled = read32(HW_PPCIRQMASK);
 		u32 hw_flags = read32(HW_PPCIRQFLAG);
@@ -111,12 +114,12 @@ void irq_handler(void)
 			//sdhc_irq();
 		}
 		if (hw_flags & IRQF_OHCI0) {
-			ohci0_irq();
+			hcdi_irq(OHCI0_REG_BASE);
 			write32(HW_PPCIRQFLAG, IRQF_OHCI0);
 		}
 		if (hw_flags & IRQF_OHCI1) {
+			hcdi_irq(OHCI1_REG_BASE);
 			write32(HW_PPCIRQFLAG, IRQF_OHCI1);
-			//TODO: ohci1_irq();
 		}
 
 		hw_flags &= ~IRQF_ALL;
@@ -157,5 +160,6 @@ u32 irq_kill() {
 
 void irq_restore(u32 cookie) {
 	_CPU_ISR_Restore(cookie);
+	_CPU_ISR_Enable(); //wtf :/
 }