Combine rarch_input_set_controls_default and post_init

console/rarch_console_input.c

@@ -144,19 +144,6 @@ void rarch_input_set_default_keybinds(unsigned player)
    g_settings.input.dpad_emulation[player] = DPAD_EMULATION_LSTICK;
 }
 
-#define STUB_DEVICE 0
-
-void rarch_input_set_controls_default (const void *data)
-{
-   const input_driver_t *input = (const input_driver_t*)data;
-
-   for(uint32_t x = 0; x < MAX_PLAYERS; x++)
-   {
-      input->set_default_keybind_lut(STUB_DEVICE, x);
-      rarch_input_set_default_keybinds(x);
-   }
-}
-
 const char *rarch_input_get_default_keybind_name(unsigned id)
 {
    return rarch_default_libretro_keybind_name_lut[id];

console/rarch_console_input.h

@@ -31,12 +31,8 @@ extern char rarch_default_libretro_keybind_name_lut[RARCH_FIRST_META_KEY][32];
 extern char rarch_dpad_emulation_name_lut[KEYBIND_DEFAULT][32];
 
 const char *rarch_input_find_platform_key_label(uint64_t joykey);
-
 void rarch_input_set_default_keybinds(unsigned player);
-
 void rarch_input_set_keybind(unsigned player, unsigned keybind_action, uint64_t default_retro_joypad_id);
-
-void rarch_input_set_controls_default (const void *data);
 const char *rarch_input_get_default_keybind_name (unsigned id);
 
 #endif

frontend/frontend_console.c

@@ -199,7 +199,6 @@ static void init_console_drivers(void)
    init_drivers_pre(); // Set driver.* function callbacks.
    driver.video->start(); // Statically starts video driver. Sets driver.video_data.
    driver.input_data = driver.input->init();
-   rarch_input_set_controls_default(driver.input);
    driver.input->post_init();
 
    // Core handles audio.

gx/gx_input.c

@@ -257,6 +257,12 @@ static void *gx_input_init(void)
 
 static void gx_input_post_init(void)
 {
+   for(unsigned i = 0; i < MAX_PLAYERS; i++)
+   {
+      gx_set_default_keybind_lut(0, i):
+      rarch_input_set_default_keybinds(i);
+   }
+
    for(unsigned i = 0; i < MAX_PADS; i++)
       gx_input_set_analog_dpad_mapping(g_settings.input.device[i], g_settings.input.dpad_emulation[i], i);
 }

ps3/ps3_input.c

@@ -436,19 +436,6 @@ static void* ps3_input_init(void)
    return (void*)-1;
 }
 
-#define STUB_DEVICE 0
-
-static void ps3_input_post_init(void)
-{
-   for (unsigned i = 0; i < MAX_PADS; i++)
-      ps3_input_set_analog_dpad_mapping(STUB_DEVICE, g_settings.input.dpad_emulation[i], i);
-}
-
-static bool ps3_input_key_pressed(void *data, int key)
-{
-   return (g_extern.lifecycle_state & (1ULL << key));
-}
-
 static void ps3_set_default_keybind_lut(unsigned device, unsigned port)
 {
    (void)device;
@@ -458,6 +445,23 @@ static void ps3_set_default_keybind_lut(unsigned device, unsigned port)
       g_settings.input.default_binds[i] = platform_keys[i].joykey;
 }
 
+static void ps3_input_post_init(void)
+{
+   for(unsigned i = 0; i < MAX_PLAYERS; i++)
+   {
+      ps3_set_default_keybind_lut(0, i);
+      rarch_input_set_default_keybinds(i);
+   }
+
+   for (unsigned i = 0; i < MAX_PADS; i++)
+      ps3_input_set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[i], i);
+}
+
+static bool ps3_input_key_pressed(void *data, int key)
+{
+   return (g_extern.lifecycle_state & (1ULL << key));
+}
+
 const input_driver_t input_ps3 = {
    .init = ps3_input_init,
    .poll = ps3_input_poll,

psp/psp_input.c

@@ -162,6 +162,11 @@ static void* psp_input_initialize(void)
 
 static void psp_input_post_init(void)
 {
+   for(unsigned i = 0; i < MAX_PLAYERS; i++)
+   {
+      psp_set_default_keybind_lut(0, i);
+      rarch_input_set_default_keybinds(i);
+   }
 }
 
 static bool psp_key_pressed(void *data, int key)

xdk/xdk_xinput_input.c

@@ -332,12 +332,16 @@ static void *xdk_input_init(void)
    return (void*)-1;
 }
 
-#define STUB_DEVICE 0
-
 static void xdk_input_post_init(void)
 {
+   for(unsigned i = 0; i < MAX_PLAYERS; i++)
+   {
+      xdk_set_default_keybind_lut(0, i);
+      rarch_input_set_default_keybinds(i);
+   }
+
    for(unsigned i = 0; i < MAX_PADS; i++)
-      xdk_input_set_analog_dpad_mapping(STUB_DEVICE, g_settings.input.dpad_emulation[i], i);
+      xdk_input_set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[i], i);
 }
 
 static bool xdk_input_key_pressed(void *data, int key)

xenon/xenon360_input.c

@@ -107,6 +107,12 @@ static void xenon360_input_set_analog_dpad_mapping(unsigned device, unsigned map
 
 static void xenon360_input_post_init(void)
 {
+   for(unsigned i = 0; i < MAX_PLAYERS; i++)
+   {
+      xenon360_input_set_default_keybind_lut(0, i);
+      rarch_input_set_default_keybinds(i);
+   }
+
    for(unsigned i = 0; i < MAX_PADS; i++)
       xenon360_input_set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[i], i);
 }