From 1ad679faaca1c94b041b1f21a7ea68eb24a67d49 Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Sun, 1 Jul 2012 18:22:57 +0200
Subject: [PATCH] (PSL1GHT) ps3_audio.c compiles now

---
 ps3/ps3_audio.c   | 25 +++++++++++++++++++------
 ps3/sdk_defines.h | 18 ++++++++++++++++++
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/ps3/ps3_audio.c b/ps3/ps3_audio.c
index 5939a9ec0d..450b4cc4eb 100644
--- a/ps3/ps3_audio.c
+++ b/ps3/ps3_audio.c
@@ -20,6 +20,7 @@
 
 #ifdef __PSL1GHT__
 #include <audio/audio.h>
+#include <sys/thread.h>
 #else
 #include <cell/audio.h>
 #endif
@@ -56,10 +57,18 @@ typedef struct
    sys_lwcond_t cond;
 } ps3_audio_t;
 
+#ifdef __PSL1GHT__
+static void event_loop(void *data)
+#else
 static void event_loop(uint64_t data)
+#endif
 {
+#ifdef __PSL1GHT__
+   ps3_audio_t *aud = data;
+#else
    void * ptr_data = (void*)(uintptr_t)data;
    ps3_audio_t *aud = ptr_data;
+#endif
    sys_event_queue_t id;
    sys_ipc_key_t key;
    sys_event_t event;
@@ -85,7 +94,7 @@ static void event_loop(uint64_t data)
    }
 
    pAudioRemoveNotifyEventQueue(key);
-   sys_ppu_thread_exit(0);
+   pThreadExit(0);
 }
 
 static void *ps3_audio_init(const char *device, unsigned rate, unsigned latency)
@@ -120,9 +129,9 @@ static void *ps3_audio_init(const char *device, unsigned rate, unsigned latency)
    data->buffer = fifo_new(CELL_AUDIO_BLOCK_SAMPLES * AUDIO_CHANNELS * AUDIO_BLOCKS * sizeof(float));
 
 #ifdef __PSL1GHT__
-   sys_lwmutex_attr_t lock_attr = {SYS_LWMUTEX_ATTR_PROTOCOL, SYS_LWMUTEX_ATTR_RECURSIVE, '\0'};
-   sys_lwmutex_attr_t cond_lock_attr = {SYS_LWMUTEX_ATTR_PROTOCOL, SYS_LWMUTEX_ATTR_RECURSIVE, '\0'};
-   sys_lwcond_attribute_t cond_attr = {'\0'};
+   sys_lwmutex_attr_t lock_attr = {SYS_LWMUTEX_ATTR_PROTOCOL, SYS_LWMUTEX_ATTR_RECURSIVE, "\0"};
+   sys_lwmutex_attr_t cond_lock_attr = {SYS_LWMUTEX_ATTR_PROTOCOL, SYS_LWMUTEX_ATTR_RECURSIVE, "\0"};
+   sys_lwcond_attribute_t cond_attr = {"\0"};
 #else
    sys_lwmutex_attribute_t lock_attr;
    sys_lwmutex_attribute_t cond_lock_attr;
@@ -140,7 +149,11 @@ static void *ps3_audio_init(const char *device, unsigned rate, unsigned latency)
    pLwCondCreate(&data->cond, &data->cond_lock, &cond_attr);
 
    pAudioPortStart(data->audio_port);
-   sys_ppu_thread_create(&data->thread, event_loop, (uint64_t)data, 1500, 0x1000, SYS_PPU_THREAD_CREATE_JOINABLE, (char*)"sound");
+#ifdef __PSL1GHT__
+   pThreadCreate(&data->thread, event_loop, data, 1500, 0x1000, SYS_PPU_THREAD_CREATE_JOINABLE, (char*)"sound");
+#else
+   pThreadCreate(&data->thread, event_loop, (uint64_t)data, 1500, 0x1000, SYS_PPU_THREAD_CREATE_JOINABLE, (char*)"sound");
+#endif
    return data;
 }
 
@@ -192,7 +205,7 @@ static void ps3_audio_free(void *data)
 
    aud->quit_thread = true;
    pAudioPortStart(aud->audio_port);
-   sys_ppu_thread_join(aud->thread, &val);
+   pThreadJoin(aud->thread, &val);
 
    pAudioPortStop(aud->audio_port);
    pAudioPortClose(aud->audio_port);
diff --git a/ps3/sdk_defines.h b/ps3/sdk_defines.h
index 726abd8157..2350205ffc 100644
--- a/ps3/sdk_defines.h
+++ b/ps3/sdk_defines.h
@@ -313,4 +313,22 @@
 
 #endif
 
+/*============================================================
+	THREADING PROTOTYPES
+============================================================ */
+
+#ifdef __PSL1GHT__
+/* define all the thread functions  */
+#define pThreadCreate sysThreadCreate
+#define pThreadJoin sysThreadJoin
+#define pThreadExit sysThreadExit
+
+#define SYS_PPU_THREAD_CREATE_JOINABLE 0 /* FIXME - not sure if this is correct */
+#else
+/* define all the thread functions  */
+#define pThreadCreate sys_ppu_thread_create
+#define pThreadJoin sys_ppu_thread_join
+#define pThreadExit sys_ppu_thread_exit
+#endif
+
 #endif