[Gc-linux-cvs] linux/arch/ppc/platforms Makefile,1.1.1.1,1.2 gamecube.c,1.2,1.3

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

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

Modified Files:
	Makefile gamecube.c 
Log Message:
framebuffer code now functional. thanks to tmbinc and PhREAksTe.
still greenish though. tmbinc's console driver is now a compile time
option. better don't compile both the console driver and the framebuffer
driver in, or else both will continuously scroll the screen...


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile	23 Jan 2004 03:26:19 -0000	1.1.1.1
+++ Makefile	29 Jan 2004 01:02:46 -0000	1.2
@@ -45,7 +45,8 @@
 obj-$(CONFIG_PRPMC800)		+= prpmc800_setup.o prpmc800_pci.o
 obj-$(CONFIG_SANDPOINT)		+= sandpoint.o
 obj-$(CONFIG_SPRUCE)		+= spruce_setup.o spruce_pci.o
-obj-$(CONFIG_GAMECUBE)		+= gamecube.o console.o
+obj-$(CONFIG_GAMECUBE)		+= gamecube.o
+obj-$(CONFIG_GAMECUBE_CONSOLE)	+= console.o
 
 ifeq ($(CONFIG_SMP),y)
 obj-$(CONFIG_PPC_PMAC)		+= pmac_smp.o

Index: gamecube.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gamecube.c	25 Jan 2004 16:10:44 -0000	1.2
+++ gamecube.c	29 Jan 2004 01:02:48 -0000	1.3
@@ -2,6 +2,7 @@
 #include <linux/init.h>
 #include <linux/pagemap.h>
 #include <linux/irq.h>
+#include <linux/console.h>
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
@@ -21,12 +22,13 @@
 gamecube_map_io(void)
 {
 	io_block_mapping(0xd0000000, 0, 0x02000000, _PAGE_IO);
-	io_block_mapping(0xcc000000, 0xcc000000, 0x00100000, _PAGE_IO); /* GC IO */
+	io_block_mapping(0x0c000000, 0xcc000000, 0x00100000, _PAGE_IO); /* GC IO */
 }
 
 static void
 gamecube_unmask_irq(unsigned int irq)
 {
+	return;
 	if (irq < GAMECUBE_IRQS) {
 		GAMECUBE_OUT(GAMECUBE_PIIM, GAMECUBE_IN(GAMECUBE_PIIM) | (1 << irq));
 	}
@@ -35,6 +37,7 @@
 static void
 gamecube_mask_irq(unsigned int irq)
 {
+	return;
 	if (irq < GAMECUBE_IRQS) {
 		GAMECUBE_OUT(GAMECUBE_PIIM, GAMECUBE_IN(GAMECUBE_PIIM) & ~(1 << irq)); /* mask */
 	}
@@ -43,6 +46,7 @@
 static void
 gamecube_mask_and_ack_irq(unsigned int irq)
 {
+	return;
 	if (irq < GAMECUBE_IRQS) {
 		GAMECUBE_OUT(GAMECUBE_PIIM, GAMECUBE_IN(GAMECUBE_PIIM) & ~(1 << irq)); /* mask */
 		GAMECUBE_OUT(GAMECUBE_PIIC, 1 << irq); /* ack */
@@ -65,6 +69,7 @@
 {
 	int i;
 
+	return;
 	GAMECUBE_OUT(GAMECUBE_PIIM,0);		/* disable all irqs */
 	GAMECUBE_OUT(GAMECUBE_PIIC,0xffffffff);	/* ack all irqs */
 
@@ -82,6 +87,7 @@
 	int irq = 0;
 	u_int irq_status, irq_test = 1;
 
+	return;
 	irq_status = GAMECUBE_IN(GAMECUBE_PIIC);
 
 	do
@@ -98,6 +104,7 @@
 static void
 gamecube_restart(char *cmd)
 {
+	printk("gamecube_restart()\n");
 	GAMECUBE_OUT(GAMECUBE_RESET, 0);
 }
 
@@ -139,5 +146,7 @@
 
 	ppc_md.calibrate_decr = gamecube_calibrate_decr;
 
-//	console_do_init();
+#ifdef CONFIG_DUMMY_CONSOLE
+	conswitchp = &dummy_con;
+#endif
 }