(PSL1GHT/PS3) Move more header includes/redefinitions to sdk_defines.h

Makefile.psl1ght

@@ -2,9 +2,10 @@
 ##
 # Makefile for RetroArch PSL1GHT.
 ##
+RARCH_VERSION		= "0.9.7"
 
 DEBUG			= 0
-HAVE_LOGGER		= 0
+HAVE_LOGGER		= 1
 HAVE_FILE_LOGGER	= 0
 
 PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
@@ -14,7 +15,11 @@ CC = $(PS3DEV)/ppu/bin/ppu-gcc
 CXX = $(PS3DEV)/ppu/bin/ppu-g++
 LD = $(PS3DEV)/ppu/bin/ppu-ld
 
+CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001
+
 ELF_TARGET := retroarch_psl1ght.elf
+EBOOT_PATH		= ps3/pkg/USRDIR/EBOOT.BIN
+CORE_PATH		= ps3/pkg/USRDIR/cores/CORE.SELF
 
 INCLUDE := -I. -I$(PS3DEV)/ppu/include
 LIBDIRS := -L$(PS3DEV)/ppu/lib -L$(PS3DEV)/portlibs/ppu/lib -L.
@@ -22,13 +27,67 @@ LIBDIRS := -L$(PS3DEV)/ppu/lib -L$(PS3DEV)/portlibs/ppu/lib -L.
 MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__
 CFLAGS += -Wall $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP)
-LIBS := -lretro_psl1ght -laudio -lGL -lEGL -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule  -lm -ljpgdec -lpngdec -llv2
+LIBS := -lretro_psl1ght -laudio -lGL -lEGL -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule  -lm -ljpgdec -lpngdec -llv2 -lnet -lnetctl
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+PKG_SCRIPT		= ps3/ps3py/pkg.py
+ifeq ($(shell uname), Linux)
+PKG_FINALIZE         	= package_finalize
+MAKE_SELF_WC		= make_self_wc
+MAKE_SELF		= make_self_npdrm
+PYTHON2			= python2
+GIT			= git
+else
+PKG_FINALIZE         	= package_finalize.exe
+MAKE_SELF_WC		= make_self_wc.exe
+MAKE_SELF		= make_self_npdrm.exe
+PYTHON2			= python2.exe
+GIT			= git.exe
+endif
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+PKG_SCRIPT		= ps3/ps3py/pkg.py
+ifeq ($(shell uname), Linux)
+PKG_FINALIZE         	= package_finalize
+MAKE_SELF_WC		= make_self_wc
+MAKE_SELF		= make_self_npdrm
+PYTHON2			= python2
+GIT			= git
+else
+PKG_FINALIZE         	= package_finalize.exe
+MAKE_SELF_WC		= make_self_wc.exe
+MAKE_SELF		= make_self_npdrm.exe
+PYTHON2			= python2.exe
+GIT			= git.exe
+endif
+
+MAKE_FSELF_NPDRM = $(CELL_SDK)/host-win32/bin/make_fself_npdrm.exe
+MAKE_PACKAGE_NPDRM = $(CELL_SDK)/host-win32/bin/make_package_npdrm.exe
 
 OBJ = console/griffin/griffin.o console/rzlib/rzlib.o
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
-CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+CFLAGS		+= -Iconsole/logger
 OBJ += console/logger/logger.o
 endif
 
@@ -38,7 +97,7 @@ endif
 
 RSXGL_DEFINES = -D__RSX__ -DGL3_PROTOTYPES
 
-SHARED_FLAGS := -DHAVE_FILEBROWSER $(RSXGL_DEFINES) -DHAVE_OPENGL -DHAVE_EGL -DHAVE_OPENGL_MODERN -DHAVE_GLSL -DHAVE_VID_CONTEXT -DHAVE_FBO -DHAVE_MOUSE -DHAVE_DEFAULT_RETROPAD_INPUT -DRARCH_CONSOLE -DHAVE_CONFIGFILE=1 -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"0.9.7\" -Dmain=rarch_main -Wno-char-subscripts
+SHARED_FLAGS := -DHAVE_FILEBROWSER $(RSXGL_DEFINES) -DHAVE_OPENGL -DHAVE_EGL -DHAVE_OPENGL_MODERN -DHAVE_GLSL -DHAVE_VID_CONTEXT -DHAVE_FBO -DHAVE_MOUSE -DHAVE_DEFAULT_RETROPAD_INPUT -DRARCH_CONSOLE -DHAVE_CONFIGFILE=1 -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_GRIFFIN=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPACKAGE_VERSION=\"0.9.7\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts
 CFLAGS += -std=gnu99 $(SHARED_FLAGS)
 CXXFLAGS += $(SHARED_FLAGS)
 
@@ -60,6 +119,18 @@ $(ELF_TARGET): $(OBJ)
 %.o: %.cpp
 	$(CXX) $(CFLAGS) -c -o $@ $<
 
+create-npdrm-core:
+	$(MAKE_FSELF_NPDRM) $(ELF_TARGET) $(CORE_PATH)
+
+create-core:
+	$(MAKE_SELF_WC) $(ELF_TARGET) $(CORE_PATH)
+
+pkg: $(ELF_TARGET) create-npdrm-core
+	$(MAKE_PACKAGE_NPDRM) ps3/pkg/package.conf ps3/pkg
+
+pkg-signed: $(PPU_TARGET) create-core
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+
 clean:
 	rm -f $(ELF_TARGET)
 	rm -f $(OBJ)

console/logger/logger.c

@@ -15,10 +15,13 @@
  */
 
 #ifdef __CELLOS_LV2__
+#include "../../ps3/sdk_defines.h"
+#ifndef __PSL1GHT__
 #include <netex/net.h>
 #include <cell/sysmodule.h>
 #include <netex/libnetctl.h>
 #include <sys/timer.h>
+#endif
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

gfx/context/egl_ctx.c

@@ -150,6 +150,7 @@ void gfx_ctx_set_overscan(void)
 
 // Enforce void (*)(void) as it's not really legal to cast void* to fn-pointer.
 // POSIX allows this, but strict C99 doesn't.
+#ifndef __PSL1GHT__
 gfx_ctx_proc_t gfx_ctx_get_proc_address(const char *symbol)
 {
    rarch_assert(sizeof(void*) == sizeof(void (*)(void)));
@@ -160,3 +161,4 @@ gfx_ctx_proc_t gfx_ctx_get_proc_address(const char *symbol)
 
    return ret;
 }
+#endif

netplay_compat.h

@@ -36,12 +36,14 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#ifndef __PSL1GHT__
 #include <netinet/tcp.h>
+#endif
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <fcntl.h>
 
-#ifdef __CELLOS_LV2__
+#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
 #include <cell/sysmodule.h>
 #include <netex/net.h>
 #else

ps3/frontend/main.c

@@ -19,31 +19,9 @@
 #include <stddef.h>
 #include <string.h>
 
-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
+#include "../sdk_defines.h"
-#include <sdk_version.h>
+
-#endif
 #include <sys/process.h>
-#ifdef HAVE_SYSUTILS
-#include <sysutil/sysutil_screenshot.h>
-#include <sysutil/sysutil_common.h>
-#include <sysutil/sysutil_gamecontent.h>
-#ifdef HAVE_HDD_CACHE_PARTITION
-#include <sysutil/sysutil_syscache.h>
-#endif
-#endif
-
-#if(CELL_SDK_VERSION > 0x340000)
-#include <sysutil/sysutil_bgmplayback.h>
-#endif
-
-#ifdef HAVE_SYSMODULES
-#include <cell/sysmodule.h>
-#endif
-#ifdef HAVE_NETPLAY
-#include <netex/net.h>
-#include <np.h>
-#include <np/drm.h>
-#endif
 
 #include "../../gfx/context/ps3_ctx.h"
 #include "../ps3_input.h"
@@ -257,8 +235,10 @@ int main(int argc, char *argv[])
 #ifdef HAVE_SYSMODULES
    cellSysmoduleLoadModule(CELL_SYSMODULE_IO);
    cellSysmoduleLoadModule(CELL_SYSMODULE_FS);
+#ifndef __PSL1GHT__
    cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_GAME);
    cellSysmoduleLoadModule(CELL_SYSMODULE_AVCONF_EXT);
+#endif
    cellSysmoduleLoadModule(CELL_SYSMODULE_PNGDEC);
    cellSysmoduleLoadModule(CELL_SYSMODULE_JPGDEC);
    cellSysmoduleLoadModule(CELL_SYSMODULE_NET);
@@ -306,7 +286,7 @@ int main(int argc, char *argv[])
 
    input_ps3.post_init();
 
-#if(CELL_SDK_VERSION > 0x340000)
+#if (CELL_SDK_VERSION > 0x340000) && !defined(__PSL1GHT__)
    if (g_console.screenshots_enable)
    {
 #ifdef HAVE_SYSMODULES
@@ -398,14 +378,18 @@ begin_shutdown:
    logger_shutdown();
 #endif
 
-#ifdef HAVE_SYSMODULES
+#if defined(HAVE_SYSMODULES)
+#ifndef __PSL1GHT__
    if(g_console.screenshots_enable)
       cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_SCREENSHOT);
+#endif
    cellSysmoduleUnloadModule(CELL_SYSMODULE_JPGDEC);
    cellSysmoduleUnloadModule(CELL_SYSMODULE_PNGDEC);
+#ifndef __PSL1GHT__
    cellSysmoduleUnloadModule(CELL_SYSMODULE_AVCONF_EXT);
    cellSysmoduleUnloadModule(CELL_SYSMODULE_SYSUTIL_GAME);
 #endif
+#endif
 
 #ifdef HAVE_HDD_CACHE_PARTITION
    int ret = cellSysCacheClear();

ps3/ps3_audio.c

@@ -18,29 +18,11 @@
 #include "../general.h"
 #include <stdlib.h>
 
-#ifdef __PSL1GHT__
-#include <audio/audio.h>
-#include <sys/thread.h>
-#else
-#include <cell/audio.h>
-#endif
-
 #include <string.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);
-#else
-#include <sys/event.h>
-#include <sys/synchronization.h>
-#endif
-
 #define AUDIO_BLOCKS 8 // 8 or 16. Guess what we choose? :)
 #define AUDIO_CHANNELS 2 // All hail glorious stereo!
 

ps3/ps3_input.c

@@ -21,34 +21,8 @@
 #include <sdk_version.h>
 #endif
 
-#ifdef __PSL1GHT__
-#include <io/pad.h>
-#else
-#include <cell/pad.h>
-#endif
-
-#ifdef HAVE_MOUSE
-#ifdef __PSL1GHT__
-#include <io/mouse.h>
-#else
-#include <cell/mouse.h>
-#endif
-#endif
-
 #include <sys/memory.h>
 
-#ifdef HAVE_OSKUTIL
-#ifdef __PSL1GHT__
-#include <sysutil/osk.h>
-#else
-#include <sysutil/sysutil_oskdialog.h>
-#endif
-#endif
-
-#ifdef HAVE_SYSUTILS
-#include <sysutil/sysutil_common.h>
-#endif
-
 #include "sdk_defines.h"
 
 #include "ps3_input.h"

ps3/ps3_input.h

@@ -20,20 +20,8 @@
 #include <stdbool.h>
 #include <wchar.h>
 
-#ifdef HAVE_OSKUTIL
-#ifdef __PSL1GHT__
-#include <sysutil/osk.h>
-#else
-#include <sysutil/sysutil_oskdialog.h>
-#endif
-#endif
-
 #include "sdk_defines.h"
 
-#ifdef HAVE_SYSUTILS
-#include <sysutil/sysutil_common.h>
-#endif
-
 #ifndef __PSL1GHT__
 #define MAX_PADS 7
 #endif

ps3/sdk_defines.h

@@ -17,11 +17,22 @@
 #ifndef _PS3_SDK_DEFINES_H
 #define _PS3_SDK_DEFINES_H
 
+#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
+#include <sdk_version.h>
+#endif
+
 /*============================================================
 	AUDIO PROTOTYPES
 ============================================================ */
 
 #ifdef __PSL1GHT__
+#include <audio/audio.h>
+#include <sys/thread.h>
+
+#include <sys/event_queue.h>
+#include <lv2/mutex.h>
+#include <lv2/cond.h>
+
 /* define all the audio/audio port functions */
 #define cellAudioQuit audioQuit
 #define cellAudioInit audioInit
@@ -45,6 +56,9 @@
 #define sys_lwmutex_unlock sysLwMutexUnlock
 #define sys_lwmutex_create sysLwMutexCreate
 
+//forward decl. for audioAddData
+extern int audioAddData(uint32_t portNum, float *data, uint32_t frames, float volume);
+
 /* define all the lightweight condition functions */
 #define sys_lwcond_create sysLwCondCreate
 #define sys_lwcond_destroy sysLwCondDestroy
@@ -59,6 +73,10 @@
 #define sys_semaphore_t sys_sem_t
 
 #else
+#include <cell/audio.h>
+#include <sys/event.h>
+#include <sys/synchronization.h>
+
 #define numChannels nChannel
 #define numBlocks nBlock
 #define param_attrib attr
@@ -70,6 +88,7 @@
 ============================================================ */
 
 #ifdef __PSL1GHT__
+#include <io/pad.h>
 /* define all the ps3 pad structs */
 #define CellPadInfo2 padInfo2
 #define CellPadData padData
@@ -81,6 +100,8 @@
 #define cellPadEnd ioPadEnd
 
 #define now_connect connected
+#else
+#include <cell/pad.h>
 #endif
 
 /*============================================================
@@ -90,6 +111,8 @@
 #ifdef HAVE_MOUSE
 
 #ifdef __PSL1GHT__
+#include <io/mouse.h>
+
 /* define ps3 mouse structs */
 #define CellMouseInfo mouseInfo
 #define CellMouseData mouseData
@@ -110,6 +133,8 @@
 #define CELL_MOUSE_BUTTON_7 (1 << 6) /* Button 7 */
 #define CELL_MOUSE_BUTTON_8 (1 << 7) /* Button 8 */
 
+#else
+#include <cell/mouse.h>
 #endif
 
 #endif
@@ -121,6 +146,7 @@
 #ifdef HAVE_OSKUTIL
 
 #ifdef __PSL1GHT__
+#include <sysutil/osk.h>
 /* define all the OSK functions */
 #define pOskLoadAsync oskLoadAsync
 #define pOskSetLayoutMode oskSetLayoutMode
@@ -162,6 +188,7 @@
 #define CELL_OSKDIALOG_INPUT_FIELD_RESULT_NO_INPUT_TEXT (3)
 #define CELL_OSKDIALOG_STRING_SIZE (512)
 #else
+#include <sysutil/sysutil_oskdialog.h>
 /* define all the OSK functions */
 #define pOskLoadAsync cellOskDialogLoadAsync
 #define pOskSetLayoutMode cellOskDialogSetLayoutMode
@@ -540,6 +567,44 @@
 
 #endif
 
+
+/*============================================================
+	NETWORK PROTOTYPES
+============================================================ */
+
+#ifdef __PSL1GHT__
+#include <net/netctl.h>
+
+#define cellNetCtlInit netCtlInit
+#define cellNetCtlGetState netCtlGetState
+#define cellNetCtlTerm netCtlTerm
+
+#define CELL_NET_CTL_STATE_IPObtained NET_CTL_STATE_IPObtained
+#endif
+
+/*============================================================
+	NET PROTOTYPES
+============================================================ */
+
+#if defined(HAVE_NETPLAY)
+#ifdef __PSL1GHT__
+#include <net/net.h>
+
+#define socketselect select
+#define socketclose close
+
+#define sys_net_initialize_network netInitialize
+#else
+#include <netex/net.h>
+#include <np.h>
+#include <np/drm.h>
+#endif
+#endif
+
+/*============================================================
+	SYSUTIL PROTOTYPES
+============================================================ */
+
 #ifdef __PSL1GHT__
 #include <sysutil/game.h>
 #define CellGameContentSize sysGameContentSize
@@ -556,3 +621,48 @@
 #define CELL_GAME_GAMETYPE_HOME		4
 
 #endif
+
+#if defined(HAVE_SYSUTILS)
+#ifdef __PSL1GHT__
+#include <sysutil/sysutil.h>
+
+#define CELL_SYSUTIL_REQUEST_EXITGAME SYSUTIL_EXIT_GAME
+
+#define cellSysutilRegisterCallback sysUtilRegisterCallback
+#define cellSysutilCheckCallback sysUtilCheckCallback
+#else
+#include <sysutil/sysutil_screenshot.h>
+#include <sysutil/sysutil_common.h>
+#include <sysutil/sysutil_gamecontent.h>
+#ifdef HAVE_HDD_CACHE_PARTITION
+#include <sysutil/sysutil_syscache.h>
+#endif
+#endif
+#endif
+
+#if(CELL_SDK_VERSION > 0x340000)
+#include <sysutil/sysutil_bgmplayback.h>
+#endif
+
+/*============================================================
+	SYSMODULE PROTOTYPES
+============================================================ */
+
+#if defined(HAVE_SYSMODULES)
+#ifdef __PSL1GHT__
+#include <sysmodule/sysmodule.h>
+
+#define CELL_SYSMODULE_IO SYSMODULE_IO
+#define CELL_SYSMODULE_FS SYSMODULE_FS
+#define CELL_SYSMODULE_NET SYSMODULE_NET
+#define CELL_SYSMODULE_SYSUTIL_NP SYSMODULE_SYSUTIL_NP
+#define CELL_SYSMODULE_JPGDEC SYSMODULE_JPGDEC
+#define CELL_SYSMODULE_PNGDEC SYSMODULE_PNGDEC
+
+#define cellSysmoduleLoadModule sysModuleLoad
+#define cellSysmoduleUnloadModule sysModuleUnload
+
+#else
+#include <cell/sysmodule.h>
+#endif
+#endif