From a0e3404422bf72ad7e496a106bae74423736a026 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 2 Oct 2014 21:17:32 +0200
Subject: [PATCH] Free up g_extern.lifecycle_state - start with getting rid of
 MODE_EXTLAUNCH_MULTIMAN/MODE_EXITSPAWN_MULTIMAN

---
 frontend/platform/platform_ps3.c | 14 ++++----------
 general.h                        |  2 --
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c
index 23eae56aa9..0706c6905a 100644
--- a/frontend/platform/platform_ps3.c
+++ b/frontend/platform/platform_ps3.c
@@ -38,8 +38,10 @@ SYS_PROCESS_PARAM(1001, 0x200000)
    
 #ifdef HAVE_MULTIMAN
 #define MULTIMAN_SELF_FILE "/dev_hdd0/game/BLES80608/USRDIR/RELOAD.SELF"
+static bool multiman_detected  = false;
 #endif
 
+
 #ifdef IS_SALAMANDER
 #include <netex/net.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
          && (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");
    }
    else
@@ -171,7 +173,7 @@ static void frontend_ps3_get_environment_settings(int *argc, char *argv[],
       ret = cellGameContentPermit(contentInfoPath, g_defaults.port_dir);
 
 #ifdef HAVE_MULTIMAN
-      if (g_extern.lifecycle_state & (1ULL << MODE_EXTLAUNCH_MULTIMAN))
+      if (multiman_detected)
       {
          fill_pathname_join(contentInfoPath, "/dev_hdd0/game/",
                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;
    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))
       should_load_game = true;
 #endif
diff --git a/general.h b/general.h
index 713ea1d852..0571810f6e 100644
--- a/general.h
+++ b/general.h
@@ -147,10 +147,8 @@ enum menu_enums
    MODE_NONE = 0,
    MODE_MENU_WIDESCREEN,
    MODE_MENU_HD,
-   MODE_EXTLAUNCH_MULTIMAN,
    MODE_EXITSPAWN,
    MODE_EXITSPAWN_START_GAME,
-   MODE_EXITSPAWN_MULTIMAN,
    MODE_OSK_ENTRY_SUCCESS,
    MODE_OSK_ENTRY_FAIL,
 };