[Gc-linux-cvs] linux/arch/ppc/platforms gamecube.c,1.4,1.5

[<mi...@pr...>]

Update of /cvsroot/gc-linux/linux/arch/ppc/platforms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18848/arch/ppc/platforms

Modified Files:
	gamecube.c 
Log Message:
RESET works now and interrupts don't crash any longer


Index: gamecube.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gamecube.c	29 Jan 2004 23:08:15 -0000	1.4
+++ gamecube.c	30 Jan 2004 00:40:34 -0000	1.5
@@ -23,13 +23,13 @@
 gamecube_map_io(void)
 {
 	io_block_mapping(0xd0000000, 0, 0x02000000, _PAGE_IO);
-	io_block_mapping(0x0c000000, 0xcc000000, 0x00100000, _PAGE_IO); /* GC IO */
+	io_block_mapping(0xcc000000, 0x0c000000, 0x00100000, _PAGE_IO); /* GC IO */
 }
 
 static void
 gamecube_unmask_irq(unsigned int irq)
 {
-	return;
+	//return;
 	if (irq < GAMECUBE_IRQS) {
 		GAMECUBE_OUT(GAMECUBE_PIIM, GAMECUBE_IN(GAMECUBE_PIIM) | (1 << irq));
 	}
@@ -38,7 +38,7 @@
 static void
 gamecube_mask_irq(unsigned int irq)
 {
-	return;
+	//return;
 	if (irq < GAMECUBE_IRQS) {
 		GAMECUBE_OUT(GAMECUBE_PIIM, GAMECUBE_IN(GAMECUBE_PIIM) & ~(1 << irq)); /* mask */
 	}
@@ -47,7 +47,7 @@
 static void
 gamecube_mask_and_ack_irq(unsigned int irq)
 {
-	return;
+	//return;
 	if (irq < GAMECUBE_IRQS) {
 		GAMECUBE_OUT(GAMECUBE_PIIM, GAMECUBE_IN(GAMECUBE_PIIM) & ~(1 << irq)); /* mask */
 		GAMECUBE_OUT(GAMECUBE_PIIC, 1 << irq); /* ack */
@@ -70,7 +70,7 @@
 {
 	int i;
 
-	return;
+	//return;
 	GAMECUBE_OUT(GAMECUBE_PIIM,0);		/* disable all irqs */
 	GAMECUBE_OUT(GAMECUBE_PIIC,0xffffffff);	/* ack all irqs */
 
@@ -88,7 +88,7 @@
 	int irq = 0;
 	u_int irq_status, irq_test = 1;
 
-	return;
+	//return;
 	irq_status = GAMECUBE_IN(GAMECUBE_PIIC);
 
 	do