From 593dae2833f45c58d09cf25b98c4a9c2f08382b5 Mon Sep 17 00:00:00 2001 From: Twinaphex <autechre1024@hotmail.com> Date: Sun, 1 Jul 2012 16:13:25 +0200 Subject: [PATCH] (PS3/PSL1GHT) Move define party over to separate file - sdk_defines.h --- ps3/image.c | 137 +---------------------- ps3/ps3_audio.c | 71 +----------- ps3/ps3_input.c | 25 +---- ps3/sdk_defines.h | 278 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 283 insertions(+), 228 deletions(-) create mode 100644 ps3/sdk_defines.h diff --git a/ps3/image.c b/ps3/image.c index 2c1da0931c..f7cddcc7bd 100644 --- a/ps3/image.c +++ b/ps3/image.c @@ -25,150 +25,15 @@ #include <stddef.h> #include "../general.h" -#if defined(__CELLOS_LV2__) +#include "sdk_defines.h" #ifdef __PSL1GHT__ #include <ppu-asm.h> #include <ppu-types.h> #include <jpgdec/jpgdec.h> #include <pngdec/pngdec.h> - -#define pJpgDecCreate jpgDecCreate -#define pJpgDecMainHandle int -#define pPngDecMainHandle int -#define pJpgDecSubHandle int -#define pPngDecSubHandle int -#define pJpgDecThreadInParam jpgDecThreadInParam -#define pPngDecThreadInParam pngDecThreadInParam -#define pJpgDecThreadOutParam jpgDecThreadOutParam -#define pPngDecThreadOutParam pngDecThreadOutParam -#define pJpgDecSrc jpgDecSource -#define pPngDecSrc pngDecSource -#define pJpgDecOpnInfo uint32_t -#define pPngDecOpnInfo uint32_t -#define pJpgDecInfo jpgDecInfo -#define pPngDecInfo pngDecInfo -#define pJpgDecInParam jpgDecInParam -#define pPngDecInParam pngDecInParam -#define pJpgDecOutParam jpgDecOutParam -#define pPngDecOutParam pngDecOutParam -#define pJpgDecDataOutInfo jpgDecDataInfo -#define pPngDecDataOutInfo pngDecDataInfo -#define pJpgDecDataCtrlParam uint64_t -#define pPngDecDataCtrlParam uint64_t - -#define spu_enable enable -#define stream_select stream -#define color_alpha alpha -#define color_space space -#define output_mode mode -#define output_bytes_per_line bytes_per_line -#define output_width width -#define output_height height - -#define pJpgDecOpen jpgDecOpen -#define pJpgDecReadHeader jpgDecReadHeader -#define pJpgDecSetParameter jpgDecSetParameter -#define pJpgDecDecodeData jpgDecDecodeData -#define pJpgDecClose jpgDecClose -#define pJpgDecDestroy jpgDecDestroy - -#define pPngDecCreate pngDecCreate -#define pPngDecOpen pngDecOpen -#define pPngDecReadHeader pngDecReadHeader -#define pPngDecSetParameter pngDecSetParameter -#define pPngDecDecodeData pngDecDecodeData -#define pPngDecClose pngDecClose -#define pPngDecDestroy pngDecDestroy - -#define CELL_PNGDEC_SPU_THREAD_ENABLE 1 -#define CELL_JPGDEC_SPU_THREAD_ENABLE 1 -#define CELL_JPGDEC_FILE JPGDEC_FILE -#define CELL_PNGDEC_FILE PNGDEC_FILE -#define CELL_JPGDEC_SPU_THREAD_ENABLE 1 -#define CELL_JPGDEC_FAST JPGDEC_LOW_QUALITY -#define CELL_JPGDEC_TOP_TO_BOTTOM JPGDEC_TOP_TO_BOTTOM -#define CELL_PNGDEC_TOP_TO_BOTTOM PNGDEC_TOP_TO_BOTTOM -#define CELL_JPG_ARGB JPGDEC_ARGB -#define CELL_PNGDEC_ARGB PNGDEC_ARGB -#define CELL_JPGDEC_DEC_STATUS_FINISH 0 -#define CELL_PNGDEC_DEC_STATUS_FINISH 0 -#define CELL_PNGDEC_1BYTE_PER_1PIXEL 1 -#define CELL_PNGDEC_STREAM_ALPHA 1 -#define CELL_OK 0 -#define PTR_NULL 0 - #else #include <cell/codec.h> - -#define pJpgDecCreate cellJpgDecCreate -#define pJpgDecMainHandle CellJpgDecMainHandle -#define pPngDecMainHandle CellPngDecMainHandle -#define pJpgDecSubHandle CellJpgDecSubHandle -#define pPngDecSubHandle CellPngDecSubHandle -#define pJpgDecThreadInParam CellJpgDecThreadInParam -#define pPngDecThreadInParam CellPngDecThreadInParam -#define pJpgDecThreadOutParam CellJpgDecThreadOutParam -#define pPngDecThreadOutParam CellPngDecThreadOutParam -#define pJpgDecSrc CellJpgDecSrc -#define pPngDecSrc CellPngDecSrc -#define pJpgDecOpnInfo CellJpgDecOpnInfo -#define pPngDecOpnInfo CellPngDecOpnInfo -#define pJpgDecInfo CellJpgDecInfo -#define pPngDecInfo CellPngDecInfo -#define pJpgDecInParam CellJpgDecInParam -#define pPngDecInParam CellPngDecInParam -#define pJpgDecOutParam CellJpgDecOutParam -#define pPngDecOutParam CellPngDecOutParam -#define pJpgDecDataOutInfo CellJpgDecDataOutInfo -#define pPngDecDataOutInfo CellPngDecDataOutInfo -#define pJpgDecDataCtrlParam CellJpgDecDataCtrlParam -#define pPngDecDataCtrlParam CellPngDecDataCtrlParam - -#define spu_enable spuThreadEnable -#define ppu_prio ppuThreadPriority -#define spu_prio spuThreadPriority -#define malloc_func cbCtrlMallocFunc -#define malloc_arg cbCtrlMallocArg -#define free_func cbCtrlFreeFunc -#define free_arg cbCtrlFreeArg -#define stream_select srcSelect -#define file_name fileName -#define file_offset fileOffset -#define file_size fileSize -#define stream_ptr streamPtr -#define stream_size streamSize -#define down_scale downScale -#define color_alpha outputColorAlpha -#define color_space outputColorSpace -#define cmd_ptr commandPtr -#define quality method -#define output_mode outputMode -#define output_bytes_per_line outputBytesPerLine -#define output_width outputWidth -#define output_height outputHeight -#define bit_depth outputBitDepth -#define pack_flag outputPackFlag -#define alpha_select outputAlphaSelect - -#define pJpgDecOpen cellJpgDecOpen -#define pJpgDecReadHeader cellJpgDecReadHeader -#define pJpgDecSetParameter cellJpgDecSetParameter -#define pJpgDecDecodeData cellJpgDecDecodeData -#define pJpgDecClose cellJpgDecClose -#define pJpgDecDestroy cellJpgDecDestroy - -#define pPngDecCreate cellPngDecCreate -#define pPngDecOpen cellPngDecOpen -#define pPngDecReadHeader cellPngDecReadHeader -#define pPngDecSetParameter cellPngDecSetParameter -#define pPngDecDecodeData cellPngDecDecodeData -#define pPngDecClose cellPngDecClose -#define pPngDecDestroy cellPngDecDestroy - -#define PTR_NULL NULL -#endif - #endif /******************************************************************************* diff --git a/ps3/ps3_audio.c b/ps3/ps3_audio.c index 471eb486c2..ec0c1a8fbf 100644 --- a/ps3/ps3_audio.c +++ b/ps3/ps3_audio.c @@ -28,84 +28,17 @@ #include <pthread.h> #include "../fifo_buffer.h" +#include "sdk_defines.h" + #ifdef __PSL1GHT__ #include <sys/event_queue.h> #include <lv2/mutex.h> #include <lv2/cond.h> - //forward decl. for audioAddData extern int audioAddData(uint32_t portNum, float *data, uint32_t frames, float volume); - -/* define all the audio/audio port functions */ -#define pAudioQuit audioQuit -#define pAudioInit audioInit -#define pAudioPortStart audioPortStart -#define pAudioPortOpen audioPortOpen -#define pAudioPortClose audioPortClose -#define pAudioPortStop audioPortStop -#define pAudioPortParam audioPortParam -#define pAudioPortOpen audioPortOpen -#define pAudioAddData audioAddData - -/* define all the event queue functions */ -#define pSysEventQueueReceive sysEventQueueReceive -#define pAudioSetNotifyEventQueue audioSetNotifyEventQueue -#define pAudioRemoveNotifyEventQueue audioRemoveNotifyEventQueue -#define pAudioCreateNotifyEventQueue audioCreateNotifyEventQueue - -/* define all the lightweight mutex functions */ -#define pLwMutexDestroy sysLwMutexDestroy -#define pLwMutexLock sysLwMutexLock -#define pLwMutexUnlock sysLwMutexUnlock -#define pLwMutexCreate sysLwMutexCreate - -/* define all the lightweight condition functions */ -#define pLwCondCreate sysLwCondCreate -#define pLwCondDestroy sysLwCondDestroy -#define pLwCondWait sysLwCondWait -#define pLwCondSignal sysLwCondSignal - -#define CELL_AUDIO_BLOCK_SAMPLES AUDIO_BLOCK_SAMPLES -#define SYS_NO_TIMEOUT 0 -#define param_attrib attrib -#define sys_lwmutex_attribute_t sys_lwmutex_attr_t -#define sys_lwcond_attribute_t sys_lwcond_attr_t #else #include <sys/event.h> #include <sys/synchronization.h> - -/* define all the audio/audio port functions */ -#define pAudioQuit cellAudioQuit -#define pAudioInit cellAudioInit -#define pAudioPortStart cellAudioPortStart -#define pAudioPortOpen cellAudioPortOpen -#define pAudioPortClose cellAudioPortClose -#define pAudioPortStop cellAudioPortStop -#define pAudioPortParam CellAudioPortParam -#define pAudioAddData cellAudioAddData - -/* define all the event queue functions */ -#define pSysEventQueueReceive sys_event_queue_receive -#define pAudioSetNotifyEventQueue cellAudioSetNotifyEventQueue -#define pAudioRemoveNotifyEventQueue cellAudioRemoveNotifyEventQueue -#define pAudioCreateNotifyEventQueue cellAudioCreateNotifyEventQueue - -/* define all the lightweight mutex functions */ -#define pLwMutexDestroy sys_lwmutex_destroy -#define pLwMutexUnlock sys_lwmutex_unlock -#define pLwMutexLock sys_lwmutex_lock -#define pLwMutexCreate sys_lwmutex_create -#define pLwMutexAttributeInitialize sys_lwmutex_attribute_initialize - -/* define all the lightweight condition functions */ -#define pLwCondCreate sys_lwcond_create -#define pLwCondDestroy sys_lwcond_destroy -#define pLwCondWait sys_lwcond_wait -#define pLwCondSignal sys_lwcond_signal - -#define numChannels nChannel -#define numBlocks nBlock -#define param_attrib attr #endif #define AUDIO_BLOCKS 8 // 8 or 16. Guess what we choose? :) diff --git a/ps3/ps3_input.c b/ps3/ps3_input.c index 3eb89ce3f6..a6c83f7716 100644 --- a/ps3/ps3_input.c +++ b/ps3/ps3_input.c @@ -41,6 +41,8 @@ #include <sysutil/sysutil_common.h> #endif +#include "sdk_defines.h" + #include "ps3_input.h" #include "../driver.h" #include "../console/retroarch_console.h" @@ -83,29 +85,6 @@ CellMouseData ps3_mouse_input_poll_device(uint32_t id) PS3 PAD ============================================================ */ -#ifdef __PSL1GHT__ -#define pPadInfo padInfo2 -#define pPadData padData -#define pPadGetInfo ioPadGetInfo2 -#define pPadGetData ioPadGetData -#define pPadInit ioPadInit -#define now_connect connected -#else -#define pPadData CellPadData -#define pPadInit cellPadInit -#define pPadGetData cellPadGetData -#define pPadInfo CellPadInfo -#define pPadGetInfo cellPadGetInfo -#endif - -#if(CELL_SDK_VERSION > 0x340000) -#undef pPadInfo -#undef pPadGetInfo -#define pPadInfo CellPadInfo2 -#define pPadGetInfo cellPadGetInfo2 -#endif - - #define MAP(x) (x & 0xFF) static uint64_t state[MAX_PADS]; diff --git a/ps3/sdk_defines.h b/ps3/sdk_defines.h new file mode 100644 index 0000000000..bdf736f47c --- /dev/null +++ b/ps3/sdk_defines.h @@ -0,0 +1,278 @@ +/* RetroArch - A frontend for libretro. + * Copyright (C) 2010-2012 - Hans-Kristian Arntzen + * Copyright (C) 2011-2012 - Daniel De Matteis + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef _PS3_SDK_DEFINES_H +#define _PS3_SDK_DEFINES_H + +/*============================================================ + AUDIO PROTOTYPES +============================================================ */ + +#ifdef __PSL1GHT__ +/* define all the audio/audio port functions */ +#define pAudioQuit audioQuit +#define pAudioInit audioInit +#define pAudioPortStart audioPortStart +#define pAudioPortOpen audioPortOpen +#define pAudioPortClose audioPortClose +#define pAudioPortStop audioPortStop +#define pAudioPortParam audioPortParam +#define pAudioPortOpen audioPortOpen +#define pAudioAddData audioAddData + +/* define all the event queue functions */ +#define pSysEventQueueReceive sysEventQueueReceive +#define pAudioSetNotifyEventQueue audioSetNotifyEventQueue +#define pAudioRemoveNotifyEventQueue audioRemoveNotifyEventQueue +#define pAudioCreateNotifyEventQueue audioCreateNotifyEventQueue + +/* define all the lightweight mutex functions */ +#define pLwMutexDestroy sysLwMutexDestroy +#define pLwMutexLock sysLwMutexLock +#define pLwMutexUnlock sysLwMutexUnlock +#define pLwMutexCreate sysLwMutexCreate + +/* define all the lightweight condition functions */ +#define pLwCondCreate sysLwCondCreate +#define pLwCondDestroy sysLwCondDestroy +#define pLwCondWait sysLwCondWait +#define pLwCondSignal sysLwCondSignal + +#define CELL_AUDIO_BLOCK_SAMPLES AUDIO_BLOCK_SAMPLES +#define SYS_NO_TIMEOUT 0 +#define param_attrib attrib +#define sys_lwmutex_attribute_t sys_lwmutex_attr_t +#define sys_lwcond_attribute_t sys_lwcond_attr_t + +#else + +/* define all the audio/audio port functions */ +#define pAudioQuit cellAudioQuit +#define pAudioInit cellAudioInit +#define pAudioPortStart cellAudioPortStart +#define pAudioPortOpen cellAudioPortOpen +#define pAudioPortClose cellAudioPortClose +#define pAudioPortStop cellAudioPortStop +#define pAudioPortParam CellAudioPortParam +#define pAudioAddData cellAudioAddData + +/* define all the event queue functions */ +#define pSysEventQueueReceive sys_event_queue_receive +#define pAudioSetNotifyEventQueue cellAudioSetNotifyEventQueue +#define pAudioRemoveNotifyEventQueue cellAudioRemoveNotifyEventQueue +#define pAudioCreateNotifyEventQueue cellAudioCreateNotifyEventQueue + +/* define all the lightweight mutex functions */ +#define pLwMutexDestroy sys_lwmutex_destroy +#define pLwMutexUnlock sys_lwmutex_unlock +#define pLwMutexLock sys_lwmutex_lock +#define pLwMutexCreate sys_lwmutex_create +#define pLwMutexAttributeInitialize sys_lwmutex_attribute_initialize + +/* define all the lightweight condition functions */ +#define pLwCondCreate sys_lwcond_create +#define pLwCondDestroy sys_lwcond_destroy +#define pLwCondWait sys_lwcond_wait +#define pLwCondSignal sys_lwcond_signal + +#define numChannels nChannel +#define numBlocks nBlock +#define param_attrib attr + +#endif + +/*============================================================ + INPUT PROTOTYPES +============================================================ */ + +#ifdef __PSL1GHT__ +/* define all the ps3 pad structs */ +#define pPadInfo padInfo2 +#define pPadData padData + +/* define all the ps3 pad functions */ +#define pPadGetInfo ioPadGetInfo2 +#define pPadGetData ioPadGetData +#define pPadInit ioPadInit + +#define now_connect connected + +#else +/* define all the ps3 pad structs */ +#define pPadInfo CellPadInfo +#define pPadData CellPadData + +/* define all the ps3 pad functions */ +#define pPadInit cellPadInit +#define pPadGetData cellPadGetData +#define pPadGetInfo cellPadGetInfo + +#if(CELL_SDK_VERSION > 0x340000) +#undef pPadInfo +#undef pPadGetInfo +#define pPadInfo CellPadInfo2 +#define pPadGetInfo cellPadGetInfo2 +#endif + +#endif + +/*============================================================ + JPEG/PNG DECODING/ENCODING PROTOTYPES +============================================================ */ + +#ifdef __PSL1GHT__ +/* define all of the JPEG/PNG structs */ +#define pJpgDecMainHandle int +#define pPngDecMainHandle int +#define pJpgDecSubHandle int +#define pPngDecSubHandle int +#define pJpgDecThreadInParam jpgDecThreadInParam +#define pPngDecThreadInParam pngDecThreadInParam +#define pJpgDecThreadOutParam jpgDecThreadOutParam +#define pPngDecThreadOutParam pngDecThreadOutParam +#define pJpgDecSrc jpgDecSource +#define pPngDecSrc pngDecSource +#define pJpgDecOpnInfo uint32_t +#define pPngDecOpnInfo uint32_t +#define pJpgDecInfo jpgDecInfo +#define pPngDecInfo pngDecInfo +#define pJpgDecInParam jpgDecInParam +#define pPngDecInParam pngDecInParam +#define pJpgDecOutParam jpgDecOutParam +#define pPngDecOutParam pngDecOutParam +#define pJpgDecDataOutInfo jpgDecDataInfo +#define pPngDecDataOutInfo pngDecDataInfo +#define pJpgDecDataCtrlParam uint64_t +#define pPngDecDataCtrlParam uint64_t + +#define spu_enable enable +#define stream_select stream +#define color_alpha alpha +#define color_space space +#define output_mode mode +#define output_bytes_per_line bytes_per_line +#define output_width width +#define output_height height + +/* define all of the JPEG/PNG functions */ +#define pJpgDecCreate jpgDecCreate +#define pJpgDecOpen jpgDecOpen +#define pJpgDecReadHeader jpgDecReadHeader +#define pJpgDecSetParameter jpgDecSetParameter +#define pJpgDecDecodeData jpgDecDecodeData +#define pJpgDecClose jpgDecClose +#define pJpgDecDestroy jpgDecDestroy + +#define pPngDecCreate pngDecCreate +#define pPngDecOpen pngDecOpen +#define pPngDecReadHeader pngDecReadHeader +#define pPngDecSetParameter pngDecSetParameter +#define pPngDecDecodeData pngDecDecodeData +#define pPngDecClose pngDecClose +#define pPngDecDestroy pngDecDestroy + +/* define all of the JPEG/PNG defines */ +#define CELL_PNGDEC_SPU_THREAD_ENABLE 1 +#define CELL_JPGDEC_SPU_THREAD_ENABLE 1 +#define CELL_JPGDEC_FILE JPGDEC_FILE +#define CELL_PNGDEC_FILE PNGDEC_FILE +#define CELL_JPGDEC_SPU_THREAD_ENABLE 1 +#define CELL_JPGDEC_FAST JPGDEC_LOW_QUALITY +#define CELL_JPGDEC_TOP_TO_BOTTOM JPGDEC_TOP_TO_BOTTOM +#define CELL_PNGDEC_TOP_TO_BOTTOM PNGDEC_TOP_TO_BOTTOM +#define CELL_JPG_ARGB JPGDEC_ARGB +#define CELL_PNGDEC_ARGB PNGDEC_ARGB +#define CELL_JPGDEC_DEC_STATUS_FINISH 0 +#define CELL_PNGDEC_DEC_STATUS_FINISH 0 +#define CELL_PNGDEC_1BYTE_PER_1PIXEL 1 +#define CELL_PNGDEC_STREAM_ALPHA 1 +#define CELL_OK 0 +#define PTR_NULL 0 + +#else +/* define all of the JPEG/PNG structs */ +#define pJpgDecMainHandle CellJpgDecMainHandle +#define pPngDecMainHandle CellPngDecMainHandle +#define pJpgDecSubHandle CellJpgDecSubHandle +#define pPngDecSubHandle CellPngDecSubHandle +#define pJpgDecThreadInParam CellJpgDecThreadInParam +#define pPngDecThreadInParam CellPngDecThreadInParam +#define pJpgDecThreadOutParam CellJpgDecThreadOutParam +#define pPngDecThreadOutParam CellPngDecThreadOutParam +#define pJpgDecSrc CellJpgDecSrc +#define pPngDecSrc CellPngDecSrc +#define pJpgDecOpnInfo CellJpgDecOpnInfo +#define pPngDecOpnInfo CellPngDecOpnInfo +#define pJpgDecInfo CellJpgDecInfo +#define pPngDecInfo CellPngDecInfo +#define pJpgDecInParam CellJpgDecInParam +#define pPngDecInParam CellPngDecInParam +#define pJpgDecOutParam CellJpgDecOutParam +#define pPngDecOutParam CellPngDecOutParam +#define pJpgDecDataOutInfo CellJpgDecDataOutInfo +#define pPngDecDataOutInfo CellPngDecDataOutInfo +#define pJpgDecDataCtrlParam CellJpgDecDataCtrlParam +#define pPngDecDataCtrlParam CellPngDecDataCtrlParam + +/* define the JPEG/PNG struct member names */ +#define spu_enable spuThreadEnable +#define ppu_prio ppuThreadPriority +#define spu_prio spuThreadPriority +#define malloc_func cbCtrlMallocFunc +#define malloc_arg cbCtrlMallocArg +#define free_func cbCtrlFreeFunc +#define free_arg cbCtrlFreeArg +#define stream_select srcSelect +#define file_name fileName +#define file_offset fileOffset +#define file_size fileSize +#define stream_ptr streamPtr +#define stream_size streamSize +#define down_scale downScale +#define color_alpha outputColorAlpha +#define color_space outputColorSpace +#define cmd_ptr commandPtr +#define quality method +#define output_mode outputMode +#define output_bytes_per_line outputBytesPerLine +#define output_width outputWidth +#define output_height outputHeight +#define bit_depth outputBitDepth +#define pack_flag outputPackFlag +#define alpha_select outputAlphaSelect + +/* define all the JPEG/PNG functions */ +#define pJpgDecCreate cellJpgDecCreate +#define pJpgDecOpen cellJpgDecOpen +#define pJpgDecReadHeader cellJpgDecReadHeader +#define pJpgDecSetParameter cellJpgDecSetParameter +#define pJpgDecDecodeData cellJpgDecDecodeData +#define pJpgDecClose cellJpgDecClose +#define pJpgDecDestroy cellJpgDecDestroy + +#define pPngDecCreate cellPngDecCreate +#define pPngDecOpen cellPngDecOpen +#define pPngDecReadHeader cellPngDecReadHeader +#define pPngDecSetParameter cellPngDecSetParameter +#define pPngDecDecodeData cellPngDecDecodeData +#define pPngDecClose cellPngDecClose +#define pPngDecDestroy cellPngDecDestroy + +#define PTR_NULL NULL + +#endif + +#endif