[Gc-linux-cvs] linux/arch/ppc/platforms gamecube.c,1.26,1.27 gamecube.h,1.10,1.11

[<aot...@us...>]

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

Modified Files:
	gamecube.c gamecube.h 
Log Message:
Isolate majority of register definitions and function declarations back
into arch/ppc/platforms/gamecube.h


Index: gamecube.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- gamecube.c	4 Jan 2005 22:42:25 -0000	1.26
+++ gamecube.c	4 Jan 2005 23:30:44 -0000	1.27
@@ -27,44 +27,13 @@
 #include "gamecube.h"
 
 /*
- * There are 14 IRQs in total. Each has a corresponding bit in both
- * the Interrupt Cause (ICR) and Interrupt Mask (IMR) registers.
- *
- * Enabling/disabling an interrupt line involves asserting/clearing
- * the corresponding bit in IMR. ACK'ing a request simply involves
- * asserting the corresponding bit in ICR.
- */
-#define FLIPPER_NR_IRQS		14
-#define FLIPPER_ICR		((volatile ulong *)0xcc003000)
-#define FLIPPER_IMR		((volatile ulong *)0xcc003004)
-
-/*
- * Anything written here automagically puts us through reset.
- */
-#define GCN_PI_RESET		0xcc003024
-
-/*
- * These registers control where the visible framebuffer is located.
- */
-#define GCN_VI_TFBL		0xcc00201c
-#define GCN_VI_BFBL		0xcc002024
-
-/*
- * We happen to be ISA/PCI-free, hence the !CONFIG_PCI. These
- * are here only to avoid the accompanying compile breakage.
+ * We happen to be ISA/PCI-free, hence !CONFIG_PCI. These
+ * are only here to avoid the accompanying compile breakage.
  */
 unsigned long isa_io_base = 0;
 unsigned long isa_mem_base = 0;
 unsigned long pci_dram_offset = 0;
 
-/* from arch/ppc/platforms/gcn-time.c */
-extern long gcn_time_init(void) __init;
-extern unsigned long gcn_get_rtc_time(void);
-extern int gcn_set_rtc_time(unsigned long nowtime);
-
-/* from arch/ppc/platforms/gcn-con.c */
-extern void gcn_con_init(void);
-
 
 static unsigned long gamecube_find_end_of_memory(void)
 {
@@ -83,7 +52,7 @@
 static void gamecube_restart(char *cmd)
 {
 	local_irq_disable();
-	writeb(0x00, GCN_PI_RESET);
+	writeb(0x00, FLIPPER_RESET);
 }
 
 static void gamecube_power_off(void)

Index: gamecube.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gamecube.h	22 Oct 2004 19:42:03 -0000	1.10
+++ gamecube.h	4 Jan 2005 23:30:44 -0000	1.11
@@ -17,6 +17,23 @@
 #include <asm/ppcboot.h>
 
 /*
+ * There are 14 IRQs in total. Each has a corresponding bit in both
+ * the Interrupt Cause (ICR) and Interrupt Mask (IMR) registers.
+ *
+ * Enabling/disabling an interrupt line involves asserting/clearing
+ * the corresponding bit in IMR. ACK'ing a request simply involves
+ * asserting the corresponding bit in ICR.
+ */
+#define FLIPPER_NR_IRQS		(14)
+#define FLIPPER_ICR		((volatile ulong *)0xcc003000)
+#define FLIPPER_IMR		((volatile ulong *)0xcc003004)
+
+/*
+ * Anything written here automagically puts us through reset.
+ */
+#define FLIPPER_RESET		((volatile ulong *)0xcc003024)
+
+/*
  * This is the current memory layout for the GameCube Linux port.
  *
  *   +------------------------------+ 
@@ -82,5 +99,19 @@
 #define GCN_PRESERVE_TO         (GCN_KXC_START)
 #define GCN_PRESERVE_SIZE       (GCN_PRESERVE_END+1)
 
-#endif /* !__MACH_GAMECUBE_H */
+/*
+ * These registers control where the visible framebuffer is located.
+ */
+#define GCN_VI_TFBL		0xcc00201c
+#define GCN_VI_BFBL		0xcc002024
+
+
+/* arch/ppc/platforms/gcn-time.c */
+extern long gcn_time_init(void);
+extern unsigned long gcn_get_rtc_time(void);
+extern int gcn_set_rtc_time(unsigned long nowtime);
 
+/* arch/ppc/platforms/gcn-con.c */
+extern void gcn_con_init(void);
+
+#endif /* !__MACH_GAMECUBE_H */