From d70b8a0f1548c6e2357405e40b2939e96da2e1e3 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 28 May 2014 22:09:42 +0200
Subject: [PATCH] Get rid of global driver init/uninit bullshit - we're going
 to do console initing/deiniting properly once and for all

---
 driver.c            | 16 ----------------
 driver.h            |  3 ---
 frontend/frontend.c |  8 --------
 3 files changed, 27 deletions(-)

diff --git a/driver.c b/driver.c
index c1048a569c..f027d3224c 100644
--- a/driver.c
+++ b/driver.c
@@ -501,22 +501,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)
-{
-   init_drivers_pre();
-   init_drivers();
-}
-
-void global_uninit_drivers(void)
-{
-   uninit_drivers();
-}
-
 void init_drivers(void)
 {
    driver.video_data_own = !driver.video_data;
diff --git a/driver.h b/driver.h
index 4a5578895a..7f744049bb 100644
--- a/driver.h
+++ b/driver.h
@@ -546,9 +546,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);
 void uninit_video_input(void);
 void init_audio(void);
diff --git a/frontend/frontend.c b/frontend/frontend.c
index 6862a151ea..06a88931a9 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -44,13 +44,6 @@ static void rarch_get_environment_console(void)
    path_mkdir(default_paths.savestate_dir);
    path_mkdir(default_paths.sram_dir);
 #endif
-
-   config_load();
-
-   init_libretro_sym(false);
-   rarch_init_system_info();
-
-   global_init_drivers();
 }
 #endif
 
@@ -307,7 +300,6 @@ void main_exit(args_type() args)
    if (g_extern.main_is_init)
       rarch_main_deinit();
    rarch_deinit_msg_queue();
-   global_uninit_drivers();
 
 #ifdef PERF_TEST
    rarch_perf_log();