From c4754815b613b14ad883c544e73f80b987cc58b0 Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Sat, 31 Mar 2018 11:35:29 -0500
Subject: [PATCH] remap-redux part 2: fix small issue with keymapper

---
 input/input_defines.h     | 2 +-
 menu/cbs/menu_cbs_left.c  | 4 ++--
 menu/cbs/menu_cbs_right.c | 2 +-
 menu/menu_cbs.c           | 2 +-
 menu/menu_driver.h        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/input/input_defines.h b/input/input_defines.h
index 4f203d4f46..a7be2367d3 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -28,7 +28,7 @@ RETRO_BEGIN_DECLS
 
 #define MAX_INPUT_DEVICES              16
 
-#define MAX_KEYS 136
+#define RARCH_MAX_KEYS 136
 
 #define RARCH_FIRST_CUSTOM_BIND        16
 #define RARCH_FIRST_LIGHTGUN_BIND      RARCH_ANALOG_BIND_LIST_END
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 83b7a5446b..b2980932a5 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -128,7 +128,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label,
    remap_id =
       settings->uints.input_keymapper_ids[offset][id];
 
-   for (key_id = 0; key_id < MENU_SETTINGS_INPUT_DESC_KBD_END - 
+   for (key_id = 0; key_id < RARCH_MAX_KEYS +
       MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id++)
    {
       if(remap_id == key_descriptors[key_id].key)
@@ -138,7 +138,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label,
    if (key_id > 0)
       key_id--;
    else
-      key_id = MENU_SETTINGS_INPUT_DESC_KBD_END - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN;
+      key_id = RARCH_MAX_KEYS + MENU_SETTINGS_INPUT_DESC_KBD_BEGIN;
 
    settings->uints.input_keymapper_ids[offset][id] = key_descriptors[key_id].key;
 
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 132426f9db..c76f7e1dd3 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -129,7 +129,7 @@ int action_right_input_desc_kbd(unsigned type, const char *label,
          break;
    }
 
-   if (key_id < MENU_SETTINGS_INPUT_DESC_KBD_END - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN)
+   if (key_id < RARCH_MAX_KEYS + MENU_SETTINGS_INPUT_DESC_KBD_BEGIN)
       key_id++;
    else
       key_id = 0;
diff --git a/menu/menu_cbs.c b/menu/menu_cbs.c
index 230839574e..33d4b5a01e 100644
--- a/menu/menu_cbs.c
+++ b/menu/menu_cbs.c
@@ -32,7 +32,7 @@ static void menu_cbs_init_log(const char *entry_label, const char *bind_label, c
 #endif
 }
 
-struct key_desc key_descriptors[136] =
+struct key_desc key_descriptors[RARCH_MAX_KEYS] =
 {
    {RETROK_FIRST,         "Unmapped"},
    {RETROK_BACKSPACE,     "Backspace"},
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index c4df110eb8..ebc589b306 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -208,7 +208,7 @@ enum menu_settings_type
    MENU_SETTINGS_INPUT_DESC_BEGIN,
    MENU_SETTINGS_INPUT_DESC_END = MENU_SETTINGS_INPUT_DESC_BEGIN + (MAX_USERS * (RARCH_FIRST_CUSTOM_BIND + 4)),
    MENU_SETTINGS_INPUT_DESC_KBD_BEGIN,
-   MENU_SETTINGS_INPUT_DESC_KBD_END = (MENU_SETTINGS_INPUT_DESC_KBD_BEGIN + 136) * MAX_USERS,
+   MENU_SETTINGS_INPUT_DESC_KBD_END = (MENU_SETTINGS_INPUT_DESC_KBD_BEGIN + RARCH_MAX_KEYS) * MAX_USERS,
 
    MENU_SETTINGS_SUBSYSTEM_LOAD,