From 40c39de5e3c0fe6c2d7626c25e33b5d92b85070d Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 11 Apr 2021 16:02:47 +0200
Subject: [PATCH] Move old_libretro_device/old_analog_dpad_mode to global
 struct

---
 configuration.c | 18 ++++++++----------
 retroarch.h     |  2 ++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configuration.c b/configuration.c
index d9e820781b..4638d983c7 100644
--- a/configuration.c
+++ b/configuration.c
@@ -661,10 +661,6 @@ static void config_parse_file(global_t *global);
 
 struct defaults g_defaults;
 
-/* TODO/FIXME - static public global variables */
-static unsigned old_analog_dpad_mode[MAX_USERS];
-static unsigned old_libretro_device[MAX_USERS];
-
 /**
  * config_get_default_audio:
  *
@@ -4544,8 +4540,8 @@ bool input_remapping_load_file(void *data, const char *path)
    {
       char s1[32], s2[32], s3[32];
 
-      old_analog_dpad_mode[i] = settings->uints.input_analog_dpad_mode[i];
-      old_libretro_device[i]  = settings->uints.input_libretro_device[i];
+      global->old_analog_dpad_mode[i] = settings->uints.input_analog_dpad_mode[i];
+      global->old_libretro_device[i]  = settings->uints.input_libretro_device[i];
 
       s1[0] = '\0';
       s2[0] = '\0';
@@ -4782,12 +4778,14 @@ void input_remapping_set_defaults(bool deinit)
                   settings->uints.input_remap_ids[i][j], j);
       }
 
-      if (old_analog_dpad_mode[i])
+      if (global->old_analog_dpad_mode[i])
          configuration_set_uint(settings,
-               settings->uints.input_analog_dpad_mode[i], old_analog_dpad_mode[i]);
-      if (old_libretro_device[i])
+               settings->uints.input_analog_dpad_mode[i],
+               global->old_analog_dpad_mode[i]);
+      if (global->old_libretro_device[i])
          configuration_set_uint(settings,
-               settings->uints.input_libretro_device[i], old_libretro_device[i]);
+               settings->uints.input_libretro_device[i],
+               global->old_libretro_device[i]);
    }
 }
 #endif
diff --git a/retroarch.h b/retroarch.h
index 0ecf865334..03e087cc6d 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -288,6 +288,8 @@ typedef struct global
       bool softfilter_enable;
 
    } console;
+   unsigned old_analog_dpad_mode[MAX_USERS];
+   unsigned old_libretro_device[MAX_USERS];
    /* Settings and/or global states specific to menus */
 #ifdef HAVE_MENU
    enum menu_action menu_prev_action;