From be2c648596b0332b80c2c1c5fa15f0a4209c4c98 Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Mon, 2 Apr 2018 00:08:40 -0500
Subject: [PATCH] remap-redux part2: after 60 attempsts, new mapper works, N:1
 mapping too

---
 input/input_driver.c          | 21 ++++++++++++---------
 input/input_mapper.c          | 24 +++++++++---------------
 menu/cbs/menu_cbs_get_value.c |  2 +-
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/input/input_driver.c b/input/input_driver.c
index e3032c405c..d307f102a7 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -579,6 +579,8 @@ void input_poll(void)
    if (input_driver_block_libretro_input)
       return;
 
+
+
    for (i = 0; i < max_users; i++)
    {
       if (libretro_input_binds[i][RARCH_TURBO_ENABLE].valid)
@@ -603,6 +605,11 @@ void input_poll(void)
             input_driver_axis_threshold);
 #endif
 
+#ifdef HAVE_KEYMAPPER
+   if (input_driver_mapper)
+      input_mapper_poll(input_driver_mapper);
+#endif
+
 #ifdef HAVE_COMMAND
    if (input_driver_command)
       command_poll(input_driver_command);
@@ -612,11 +619,6 @@ void input_poll(void)
    if (input_driver_remote)
       input_remote_poll(input_driver_remote, max_users);
 #endif
-
-#ifdef HAVE_KEYMAPPER
-   if (input_driver_mapper)
-      input_mapper_poll(input_driver_mapper);
-#endif
 }
 
 /**
@@ -659,9 +661,7 @@ int16_t input_state(unsigned port, unsigned device,
          {
             case RETRO_DEVICE_JOYPAD:
                if (id != settings->uints.input_remap_ids[port][id])
-               {
                   clear = true;
-               }
 
                break;
             case RETRO_DEVICE_ANALOG:
@@ -687,8 +687,11 @@ int16_t input_state(unsigned port, unsigned device,
             joypad_info.joy_idx        = settings->uints.input_joypad_map[port];
             joypad_info.auto_binds     = input_autoconf_binds[joypad_info.joy_idx];
 
-            res = current_input->input_state(
-                  current_input_data, joypad_info, libretro_input_binds, port, device, idx, id);
+            if (!clear)
+               res = current_input->input_state(
+                     current_input_data, joypad_info, libretro_input_binds, port, device, idx, id);
+            else
+               res = 0;
          }
       }
 
diff --git a/input/input_mapper.c b/input/input_mapper.c
index b21d09ac22..6dcd2de98e 100644
--- a/input/input_mapper.c
+++ b/input/input_mapper.c
@@ -58,7 +58,7 @@ struct input_mapper
    /* the whole keyboard state */
    uint32_t keys[RETROK_LAST / 32 + 1];
    /* This is a bitmask of (1 << key_bind_id). */
-   uint64_t buttons;
+   retro_bits_t buttons;
 };
 
 input_mapper_t *input_mapper_new(uint16_t port)
@@ -85,7 +85,7 @@ bool flag = false;
 
 bool input_mapper_button_pressed(input_mapper_t *handle, int id)
 {
-   return (handle->buttons >> id) & 1U;
+   return BIT256_GET(handle->buttons, id);
 }
 
 void input_mapper_poll(input_mapper_t *handle)
@@ -141,23 +141,17 @@ void input_mapper_poll(input_mapper_t *handle)
    }
    if (device == RETRO_DEVICE_JOYPAD)
    {
+      retro_bits_t current_input;
+      input_keys_pressed(settings, &current_input);
+      BIT256_CLEAR_ALL(handle->buttons);
       for (i = 0; i < MAX_USERS; i++)
       {
          for (j = 0; j < RARCH_CUSTOM_BIND_LIST_END; j++)
          {
-            if(input_state(i, RETRO_DEVICE_JOYPAD, i, j))
-            {
-               if (j != settings->uints.input_remap_ids[i][j])
-               {
-                  RARCH_LOG("remapped button pressed: old:%d new: %d\n", j, settings->uints.input_remap_ids[i][j]);
-                  handle->buttons |= 1 << settings->uints.input_remap_ids[i][j];
-               }
-            }
-            if(!input_state(i, RETRO_DEVICE_JOYPAD, i, j))
-            {
-               if (j != settings->uints.input_remap_ids[i][j])
-                  handle->buttons &= ~(1 << settings->uints.input_remap_ids[i][j]);
-            }
+            int aux = BIT256_GET(current_input, j);
+            int remap = settings->uints.input_remap_ids[i][j];
+            if (aux == 1 && j != remap)
+               BIT256_SET(handle->buttons, remap);
          }
       }
    }
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index ed1b625075..e19a4db51f 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -557,7 +557,7 @@ static void menu_action_setting_disp_set_label_input_desc(
    unsigned remap_id = 0;
 
    if (!settings)
-      return 0;
+      return;
 
    offset = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) / (RARCH_FIRST_CUSTOM_BIND + 8);