From bd53c330699862c500fc0830724caf88a85af0c9 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 1 Dec 2016 03:43:51 +0100
Subject: [PATCH] Move input_get_auto_bind to input_config.c

---
 input/input_autodetect.c      | 13 -------------
 input/input_autodetect.h      |  3 ---
 input/input_config.c          | 13 +++++++++++++
 input/input_config.h          |  2 ++
 menu/cbs/menu_cbs_get_value.c |  2 +-
 menu/widgets/menu_dialog.c    |  2 +-
 setting_list.c                |  2 +-
 7 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/input/input_autodetect.c b/input/input_autodetect.c
index 85a3bfa6b1..43cede3528 100644
--- a/input/input_autodetect.c
+++ b/input/input_autodetect.c
@@ -322,19 +322,6 @@ error:
    return false;
 }
 
-const struct retro_keybind *input_get_auto_bind(unsigned port, unsigned id)
-{
-   settings_t *settings = config_get_ptr();
-   unsigned joy_idx     = 0;
-
-   if (settings)
-      joy_idx = settings->input.joypad_map[port];
-
-   if (joy_idx < MAX_USERS)
-      return &settings->input.autoconf_binds[joy_idx][id];
-   return NULL;
-}
-
 void input_config_autoconfigure_disconnect(unsigned i, const char *ident)
 {
    char msg[255];
diff --git a/input/input_autodetect.h b/input/input_autodetect.h
index 542e525219..6e6bb9b912 100644
--- a/input/input_autodetect.h
+++ b/input/input_autodetect.h
@@ -32,9 +32,6 @@ typedef struct autoconfig_params
    int32_t pid;
 } autoconfig_params_t;
 
-const struct retro_keybind *input_get_auto_bind(unsigned port,
-      unsigned id);
-
 bool input_config_autoconfigure_joypad(autoconfig_params_t *params);
 
 void input_config_autoconfigure_disconnect(unsigned i, const char *ident);
diff --git a/input/input_config.c b/input/input_config.c
index b8f713422e..1f7f6531fd 100644
--- a/input/input_config.c
+++ b/input/input_config.c
@@ -470,3 +470,16 @@ void input_config_get_bind_string(char *buf, const struct retro_keybind *bind,
    strlcat(buf, keybuf, size);
 #endif
 }
+
+const struct retro_keybind *input_config_get_bind_auto(unsigned port, unsigned id)
+{
+   settings_t *settings = config_get_ptr();
+   unsigned joy_idx     = 0;
+
+   if (settings)
+      joy_idx = settings->input.joypad_map[port];
+
+   if (joy_idx < MAX_USERS)
+      return &settings->input.autoconf_binds[joy_idx][id];
+   return NULL;
+}
diff --git a/input/input_config.h b/input/input_config.h
index 8822f30d5a..79dd7f8acb 100644
--- a/input/input_config.h
+++ b/input/input_config.h
@@ -69,4 +69,6 @@ void input_config_parse_joy_button(config_file_t *conf, const char *prefix,
 void input_config_parse_joy_axis(config_file_t *conf, const char *prefix,
       const char *axis, struct retro_keybind *bind);
 
+const struct retro_keybind *input_config_get_bind_auto(unsigned port, unsigned id);
+
 #endif
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index c1a11ce419..271a5977fb 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -475,7 +475,7 @@ static void menu_action_setting_disp_set_label_input_desc(
    keybind = (const struct retro_keybind*)
       &settings->input.binds[inp_desc_user][remap_id];
    auto_bind = (const struct retro_keybind*)
-      input_get_auto_bind(inp_desc_user, remap_id);
+      input_config_get_bind_auto(inp_desc_user, remap_id);
 
    input_config_get_bind_string(descriptor,
       keybind, auto_bind, sizeof(descriptor));
diff --git a/menu/widgets/menu_dialog.c b/menu/widgets/menu_dialog.c
index f272685156..19205dcbfb 100644
--- a/menu/widgets/menu_dialog.c
+++ b/menu/widgets/menu_dialog.c
@@ -111,7 +111,7 @@ int menu_dialog_iterate(char *s, size_t len, const char *label)
                   &settings->input.binds[0][binds[i]];
                const struct retro_keybind *auto_bind =
                   (const struct retro_keybind*)
-                  input_get_auto_bind(0, binds[i]);
+                  input_config_get_bind_auto(0, binds[i]);
 
                input_config_get_bind_string(desc[i],
                      keybind, auto_bind, sizeof(desc[i]));
diff --git a/setting_list.c b/setting_list.c
index 9949da39c1..97fcfca679 100644
--- a/setting_list.c
+++ b/setting_list.c
@@ -610,7 +610,7 @@ static void setting_get_string_representation_st_bind(void *data,
    index_offset = setting->index_offset;
    keybind      = (const struct retro_keybind*)setting->value.target.keybind;
    auto_bind    = (const struct retro_keybind*)
-      input_get_auto_bind(index_offset, keybind->id);
+      input_config_get_bind_auto(index_offset, keybind->id);
 
    input_config_get_bind_string(s, keybind, auto_bind, len);
 }