[Gc-linux-cvs] linux/sound/ppc gcn-ai.c,1.9,1.10

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/sound/ppc
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7117/sound/ppc

Modified Files:
	gcn-ai.c 
Log Message:
Added powerpc arch.
Tweaked some driver for wii compatibility.


Index: gcn-ai.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/gcn-ai.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gcn-ai.c	14 Nov 2007 23:08:58 -0000	1.9
+++ gcn-ai.c	4 Mar 2008 06:20:56 -0000	1.10
@@ -28,6 +28,12 @@
 #define SNDRV_GET_ID
 #include <sound/initval.h>
 
+#ifdef CONFIG_PPC_MERGE
+#include <platforms/embedded6xx/gamecube.h>
+#else
+#include <platforms/gamecube.h>
+#endif
+
 #ifdef AI_DEBUG
 #  define DPRINTK(fmt, args...) \
           printk(KERN_ERR "%s: " fmt, __FUNCTION__ , ## args)
@@ -47,6 +53,8 @@
 #define ai_printk(level, format, arg...) \
         printk(level PFX format , ## arg)
 
+#define DSP_BASE		(GCN_IO1_BASE + 0x5000)
+#define AI_BASE			(GCN_IO2_BASE + 0x6c00)
 
 #define DSP_IRQ 6
 
@@ -71,7 +79,8 @@
 #define  AI_DCL_PLAY        (1<<15)
 
 #define AUDIO_DMA_LEFT      *(volatile u_int16_t *)(0xCC00503A)
-#define AUDIO_STREAM_STATUS *(volatile u_int32_t *)(0xCC006C00)
+
+#define AUDIO_STREAM_STATUS *(volatile u_int32_t *)(GCN_IO2_BASE+0x6C00)
 #define  AI_AICR_RATE       (1<<6)
 
 #define LoadSample(addr, len) \