(RARCH_CONSOLE) Can finally get rid of global_driver_init

This commit is contained in:
twinaphex 2014-05-09 06:45:03 +02:00
parent beb0a80692
commit 540fad51a6
3 changed files with 15 additions and 35 deletions

View File

@ -713,18 +713,6 @@ bool driver_update_system_av_info(const struct retro_system_av_info *info)
return true;
}
// Only called once on init and deinit.
// Video and input drivers need to be active (owned)
// before retroarch core starts.
// Core handles audio.
void global_init_drivers(void)
{
find_audio_driver();
find_input_driver();
init_video_input();
}
void global_uninit_drivers(void)
{
if (driver.video && driver.video_data)

View File

@ -539,7 +539,6 @@ void init_drivers(void);
void init_drivers_pre(void);
void uninit_drivers(void);
void global_init_drivers(void);
void global_uninit_drivers(void);
void init_video_input(void);

View File

@ -32,23 +32,7 @@ frontend_ctx_driver_t *frontend_ctx;
#ifdef RARCH_CONSOLE
#include "../config.def.h"
default_paths_t default_paths;
static void rarch_get_environment_console(void)
{
path_mkdir(default_paths.port_dir);
path_mkdir(default_paths.system_dir);
path_mkdir(default_paths.savestate_dir);
path_mkdir(default_paths.sram_dir);
config_load();
init_libretro_sym(false);
rarch_init_system_info();
global_init_drivers();
}
#endif
#if defined(ANDROID)
@ -89,27 +73,24 @@ static void rarch_get_environment_console(void)
#define ra_preinited false
#endif
#if defined(HAVE_BB10) || defined(RARCH_CONSOLE)
#if defined(HAVE_BB10)
#define attempt_load_game false
#else
#define attempt_load_game true
#endif
#if defined(RARCH_CONSOLE) || defined(HAVE_BB10) || defined(ANDROID)
#if defined(HAVE_BB10) || defined(ANDROID)
#define initial_menu_lifecycle_state (1ULL << MODE_LOAD_GAME)
#else
#define initial_menu_lifecycle_state (1ULL << MODE_GAME)
#endif
#if !defined(RARCH_CONSOLE) && !defined(HAVE_BB10) && !defined(ANDROID)
#if !defined(HAVE_BB10) && !defined(ANDROID)
#define attempt_load_game_push_history true
#else
#define attempt_load_game_push_history false
#endif
#ifndef RARCH_CONSOLE
#define rarch_get_environment_console() (void)0
#endif
#if defined(RARCH_CONSOLE) || defined(__QNX__) || defined(ANDROID)
#define attempt_load_game_fails (1ULL << MODE_MENU_PREINIT)
@ -119,6 +100,18 @@ static void rarch_get_environment_console(void)
static retro_keyboard_event_t key_event;
static void rarch_get_environment_console(void)
{
#ifdef RARCH_CONSOLE
path_mkdir(default_paths.port_dir);
path_mkdir(default_paths.system_dir);
path_mkdir(default_paths.savestate_dir);
path_mkdir(default_paths.sram_dir);
config_load();
#endif
}
#ifdef HAVE_MENU
static int main_entry_iterate_clear_input(args_type() args)
{