mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-07 03:40:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Free up g_extern.lifecycle_state - start with getting rid of

Browse Source 
MODE_EXTLAUNCH_MULTIMAN/MODE_EXITSPAWN_MULTIMAN
This commit is contained in:
twinaphex 2014-10-02 21:17:32 +02:00
parent 54bfe360c6
commit a0e3404422
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/platform/platform_ps3.c
View File

@ -38,8 +38,10 @@ SYS_PROCESS_PARAM(1001, 0x200000)
#ifdef HAVE_MULTIMAN #ifdef HAVE_MULTIMAN
#define MULTIMAN_SELF_FILE "/dev_hdd0/game/BLES80608/USRDIR/RELOAD.SELF" #define MULTIMAN_SELF_FILE "/dev_hdd0/game/BLES80608/USRDIR/RELOAD.SELF"
static bool multiman_detected = false;
#endif #endif
#ifdef IS_SALAMANDER #ifdef IS_SALAMANDER
#include <netex/net.h> #include <netex/net.h>
#include <np.h> #include <np.h>
@ -104,7 +106,7 @@ static void frontend_ps3_get_environment_settings(int *argc, char *argv[],
if(path_file_exists(argv[2]) && *argc > 1 if(path_file_exists(argv[2]) && *argc > 1
&& (strcmp(argv[2], EMULATOR_CONTENT_DIR) == 0)) && (strcmp(argv[2], EMULATOR_CONTENT_DIR) == 0))
{ {
g_extern.lifecycle_state |= (1ULL << MODE_EXTLAUNCH_MULTIMAN); multiman_detected = true;
RARCH_LOG("Started from multiMAN, auto-game start enabled.\n"); RARCH_LOG("Started from multiMAN, auto-game start enabled.\n");
} }
else else
@ -171,7 +173,7 @@ static void frontend_ps3_get_environment_settings(int *argc, char *argv[],
ret = cellGameContentPermit(contentInfoPath, g_defaults.port_dir); ret = cellGameContentPermit(contentInfoPath, g_defaults.port_dir);
#ifdef HAVE_MULTIMAN #ifdef HAVE_MULTIMAN
if (g_extern.lifecycle_state & (1ULL << MODE_EXTLAUNCH_MULTIMAN)) if (multiman_detected)
{ {
fill_pathname_join(contentInfoPath, "/dev_hdd0/game/", fill_pathname_join(contentInfoPath, "/dev_hdd0/game/",
EMULATOR_CONTENT_DIR, sizeof(contentInfoPath)); EMULATOR_CONTENT_DIR, sizeof(contentInfoPath));
@ -313,14 +315,6 @@ static void frontend_ps3_exitspawn(char *core_path, size_t core_path_size)
bool original_verbose = g_extern.verbosity; bool original_verbose = g_extern.verbosity;
g_extern.verbosity = true; g_extern.verbosity = true;
#ifdef HAVE_MULTIMAN
if (g_extern.lifecycle_state & (1ULL << MODE_EXITSPAWN_MULTIMAN))
{
RARCH_LOG("Boot Multiman: %s.\n", MULTIMAN_SELF_FILE);
strlcpy(core_path, MULTIMAN_SELF_FILE, core_path_size);
}
else
#endif
if (g_extern.lifecycle_state & (1ULL << MODE_EXITSPAWN_START_GAME)) if (g_extern.lifecycle_state & (1ULL << MODE_EXITSPAWN_START_GAME))
should_load_game = true; should_load_game = true;
#endif #endif

2
general.h
View File

@ -147,10 +147,8 @@ enum menu_enums
MODE_NONE = 0, MODE_NONE = 0,
MODE_MENU_WIDESCREEN, MODE_MENU_WIDESCREEN,
MODE_MENU_HD, MODE_MENU_HD,
MODE_EXTLAUNCH_MULTIMAN,
MODE_EXITSPAWN, MODE_EXITSPAWN,
MODE_EXITSPAWN_START_GAME, MODE_EXITSPAWN_START_GAME,
MODE_EXITSPAWN_MULTIMAN,
MODE_OSK_ENTRY_SUCCESS, MODE_OSK_ENTRY_SUCCESS,
MODE_OSK_ENTRY_FAIL, MODE_OSK_ENTRY_FAIL,
}; };