From 3c02608218197e1ab107eb06c836561dac0bee1b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 23 Sep 2018 12:52:56 +0200
Subject: [PATCH] Cleanups

---
 menu/cbs/menu_cbs_get_value.c | 41 -----------------------------------
 menu/menu_setting.c           | 29 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 8664d6fda2..986691cfb7 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -849,43 +849,6 @@ static void menu_action_setting_disp_set_label_menu_disk_index(
       snprintf(s, len, "%u", current + 1);
 }
 
-static void menu_action_setting_disp_set_label_menu_input_keyboard_gamepad_mapping_type(
-      file_list_t* list,
-      unsigned *w, unsigned type, unsigned i,
-      const char *label,
-      char *s, size_t len,
-      const char *entry_label,
-      const char *path,
-      char *s2, size_t len2)
-{
-   settings_t         *settings = config_get_ptr();
-   unsigned width = 0, height = 0;
-
-   *w = 19;
-   *s = '\0';
-
-   (void)width;
-   (void)height;
-
-   strlcpy(s2, path, len2);
-
-   switch (settings->uints.input_keyboard_gamepad_mapping_type)
-   {
-      case 0:
-         strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NONE), len);
-         break;
-      case 1:
-         strlcpy(s, "iPega PG-9017", len);
-         break;
-      case 2:
-         strlcpy(s, "8-bitty", len);
-         break;
-      case 3:
-         strlcpy(s, "SNES30 8bitdo", len);
-         break;
-   }
-}
-
 static void menu_action_setting_disp_set_label_menu_video_resolution(
       file_list_t* list,
       unsigned *w, unsigned type, unsigned i,
@@ -1496,10 +1459,6 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
             BIND_ACTION_GET_VALUE(cbs,
                   menu_action_setting_disp_set_label_menu_video_resolution);
             break;
-         case MENU_ENUM_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE:
-            BIND_ACTION_GET_VALUE(cbs,
-                  menu_action_setting_disp_set_label_menu_input_keyboard_gamepad_mapping_type);
-            break;
          case MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST:
          case MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY:
          case MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST:
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index ce947aa363..a48f6a1f76 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -190,6 +190,32 @@ static void setting_get_string_representation_cheevos_password(void *data,
 }
 #endif
 
+#if TARGET_OS_IPHONE
+static void setting_get_string_representation_uint_keyboard_gamepad_mapping_type(void *data,
+      char *s, size_t len)
+{
+   rarch_setting_t *setting = (rarch_setting_t*)data;
+   if (!setting)
+      return;
+
+   switch (*setting->value.target.unsigned_integer)
+   {
+      case 0:
+         strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NONE), len);
+         break;
+      case 1:
+         strlcpy(s, "iPega PG-9017", len);
+         break;
+      case 2:
+         strlcpy(s, "8-bitty", len);
+         break;
+      case 3:
+         strlcpy(s, "SNES30 8bitdo", len);
+         break;
+   }
+}
+#endif
+
 static void setting_get_string_representation_uint_menu_thumbnails(void *data,
       char *s, size_t len)
 {
@@ -5607,6 +5633,9 @@ static bool setting_append_list(
                   parent_group,
                   general_write_handler,
                   general_read_handler);
+         (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
+         (*list)[list_info->index - 1].get_string_representation =
+            &setting_get_string_representation_uint_keyboard_gamepad_mapping_type;
             menu_settings_list_current_add_range(list, list_info, 0, 3, 1, true, true);
 
             CONFIG_BOOL(