added xenon controller code, took another stab at audio

Author: lantus360

Makefile.xenon

@@ -1,6 +1,6 @@
 # Makefile to build the SDL library
 
-INCLUDE = -I./include -I./src/video -I./src/audio
+INCLUDE = -I./include -I./src/video -I./src/audio -I./src/joystick
 CFLAGS  = -g -O2 $(INCLUDE)
 CC = xenon-gcc
 AR	= xenon-ar
@@ -27,7 +27,7 @@ SOURCES = \
 	src/audio/xenon/*.c \
 	src/video/xenon/*.c \
         src/video/xenon/*.s \
-	src/joystick/dummy/*.c \
+	src/joystick/xenon/*.c \
 	src/cdrom/dummy/*.c \
 	src/thread/xenon/*.c \
 	src/loadso/dummy/*.c \	

include/SDL_config_xenon.h

@@ -40,9 +40,8 @@ typedef unsigned int size_t;
 
 #define HAVE_MMAP 0
 
-#define SDL_BYTEORDER	SDL_BIG_ENDIAN 
+#define SDL_BYTEORDER           SDL_BIG_ENDIAN 
 #define SDL_CDROM_DISABLED	1 
-#define SDL_JOYSTICK_DISABLED	1 
 #define SDL_LOADSO_DISABLED	1 
 #define SDL_THREADS_DISABLED	1       //ugh
 #define SDL_AUDIO_DRIVER_XENON	1

src/audio/xenon/SDL_xenonaudio.c

@@ -28,6 +28,9 @@
 #include "SDL_audio.h"
 #include "SDL_audio_c.h"
 #include "SDL_xenonaudio.h"
+
+
+
 
 /* Audio driver functions */
 static int XENON_OpenAudio(_THIS, SDL_AudioSpec *spec);
@@ -113,11 +116,14 @@ static void XENON_WaitAudio_BusyWait(_THIS)
 
 static void XENON_PlayAudio(_THIS)
 {       
-	memcpy(&pAudioBuffers[currentBuffer * mixlen], locked_buf, mixlen);
 
-	while(xenon_sound_get_unplayed()>(4*mixlen)) udelay(50);
 
-	xenon_sound_submit(&pAudioBuffers[currentBuffer * mixlen], mixlen);
+	//while(xenon_sound_get_unplayed()>(4*mixlen)) udelay(50);
+	
+         
+        memcpy(&pAudioBuffers[currentBuffer * mixlen], locked_buf, mixlen);
+        xenon_sound_submit(&pAudioBuffers[currentBuffer * mixlen], mixlen);
+         
 
 	currentBuffer++;
 	currentBuffer %= (NUM_BUFFERS);	       
@@ -163,35 +169,21 @@ static void XENON_CloseAudio(_THIS)
 static int XENON_OpenAudio(_THIS, SDL_AudioSpec *spec)
 {
 
-	/* Determine the audio parameters from the AudioSpec */
-	switch ( spec->format & 0xFF ) {
-		case 8:
-			/* Unsigned 8 bit audio data */
-			spec->format = AUDIO_U8;
-			silence = 0x80;			
-			break;
-		case 16:
-			/* Signed 16 bit audio data */
-			spec->format = AUDIO_S16;
-			silence = 0x00;
-			break;
-		default:
-			SDL_SetError("Unsupported audio format");
-			return(-1);
-	}
-
+	// Set up actual spec.
+        spec->freq      = 48000;
+        spec->format    = AUDIO_S16MSB;
+        spec->channels  = 2;        
+      
 	/* Update the fragment size as size in bytes */
 	SDL_CalculateAudioSpec(spec);
 
-	locked_buf = (unsigned char *)malloc(spec->size);
+	locked_buf = (unsigned char *)malloc(spec->size * 4);
 
 	/* Create the audio buffer to which we write */
-	NUM_BUFFERS = -1;
+	NUM_BUFFERS = 2;
 
-	if ( NUM_BUFFERS < 0 )
-		NUM_BUFFERS = 4;
 
-	pAudioBuffers = (unsigned char *)malloc(spec->size*NUM_BUFFERS);
+	pAudioBuffers = (unsigned char *)malloc(spec->size *NUM_BUFFERS * 4);
  	playing = 0;
 	mixlen = spec->size;