From 6828183b64fb755f5584d3f8f6f517083b127a0b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 16 Nov 2013 15:54:50 +0100
Subject: [PATCH] (OSK) Move runtime state (OSK callbacks) to g_extern

---
 frontend/menu/menu_common.c   | 12 ++++++------
 frontend/menu/menu_settings.c |  4 ++--
 general.h                     | 11 ++++++++---
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index 5542f3e6df..4d307b05cd 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -994,17 +994,17 @@ static int menu_iterate_func(void *data, unsigned action)
 
 #ifdef HAVE_OSK
    // process pending osk init callback
-   if (g_settings.osk.cb_init != NULL)
+   if (g_extern.osk.cb_init != NULL)
    {
-      if (g_settings.osk.cb_init(driver.osk_data))
-         g_settings.osk.cb_init = NULL;
+      if (g_extern.osk.cb_init(driver.osk_data))
+         g_extern.osk.cb_init = NULL;
    }
 
    // process pending osk callback
-   if (g_settings.osk.cb_callback != NULL)
+   if (g_extern.osk.cb_callback != NULL)
    {
-      if (g_settings.osk.cb_callback(driver.osk_data))
-         g_settings.osk.cb_callback = NULL;
+      if (g_extern.osk.cb_callback(driver.osk_data))
+         g_extern.osk.cb_callback = NULL;
    }
 #endif
 
diff --git a/frontend/menu/menu_settings.c b/frontend/menu/menu_settings.c
index b4ee9454a0..6ac6927933 100644
--- a/frontend/menu/menu_settings.c
+++ b/frontend/menu/menu_settings.c
@@ -1344,8 +1344,8 @@ int menu_set_settings(void *data, unsigned setting, unsigned action)
 #if defined(HAVE_RSOUND) && defined(HAVE_OSK)
          if (action == RGUI_ACTION_OK)
          {
-            g_settings.osk.cb_init = osk_callback_enter_rsound_init;
-            g_settings.osk.cb_callback = osk_callback_enter_rsound;
+            g_extern.osk.cb_init     = osk_callback_enter_rsound_init;
+            g_extern.osk.cb_callback = osk_callback_enter_rsound;
          }
 #endif
          break;
diff --git a/general.h b/general.h
index bcddd47f71..7a2825c4ac 100644
--- a/general.h
+++ b/general.h
@@ -194,9 +194,6 @@ struct settings
    struct
    {
       char driver[32];
-      uint64_t state;
-      bool (*cb_init)(void *data);
-      bool (*cb_callback)(void *data);
    } osk;
 #endif
 
@@ -512,6 +509,14 @@ struct global
    } bsv;
 #endif
 
+#ifdef HAVE_OSK
+   struct
+   {
+      bool (*cb_init)(void *data);
+      bool (*cb_callback)(void *data);
+   } osk;
+#endif
+
    bool sram_load_disable;
    bool sram_save_disable;
    bool use_sram;