From 523d7d6ee8d0157d2da5986aa7515af563f060b2 Mon Sep 17 00:00:00 2001
From: "Mark W. Kidd" <mark@stardart.net>
Date: Mon, 5 Jul 2021 15:18:17 -0400
Subject: [PATCH] consolidate input defines

---
 input/input_defines.h | 46 +++++++++++++++++++++++++++++++++++++++++++
 input/input_driver.h  | 46 -------------------------------------------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/input/input_defines.h b/input/input_defines.h
index 036af0716a..07a0caac0d 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -135,6 +135,52 @@ enum analog_dpad_mode
    ANALOG_DPAD_LAST
 };
 
+enum input_toggle_type
+{
+   INPUT_TOGGLE_NONE = 0,
+   INPUT_TOGGLE_DOWN_Y_L_R,
+   INPUT_TOGGLE_L3_R3,
+   INPUT_TOGGLE_L1_R1_START_SELECT,
+   INPUT_TOGGLE_START_SELECT,
+   INPUT_TOGGLE_L3_R,
+   INPUT_TOGGLE_L_R,
+   INPUT_TOGGLE_HOLD_START,
+   INPUT_TOGGLE_HOLD_SELECT,
+   INPUT_TOGGLE_DOWN_SELECT,
+   INPUT_TOGGLE_L2_R2,
+   INPUT_TOGGLE_LAST
+};
+
+enum input_turbo_mode
+{
+   INPUT_TURBO_MODE_CLASSIC = 0,
+   INPUT_TURBO_MODE_SINGLEBUTTON,
+   INPUT_TURBO_MODE_SINGLEBUTTON_HOLD,
+   INPUT_TURBO_MODE_LAST
+};
+
+enum input_turbo_default_button
+{
+   INPUT_TURBO_DEFAULT_BUTTON_B = 0,
+   INPUT_TURBO_DEFAULT_BUTTON_Y,
+   INPUT_TURBO_DEFAULT_BUTTON_A,
+   INPUT_TURBO_DEFAULT_BUTTON_X,
+   INPUT_TURBO_DEFAULT_BUTTON_L,
+   INPUT_TURBO_DEFAULT_BUTTON_R,
+   INPUT_TURBO_DEFAULT_BUTTON_L2,
+   INPUT_TURBO_DEFAULT_BUTTON_R2,
+   INPUT_TURBO_DEFAULT_BUTTON_L3,
+   INPUT_TURBO_DEFAULT_BUTTON_R3,
+   INPUT_TURBO_DEFAULT_BUTTON_LAST
+};
+
+enum input_action
+{
+   INPUT_ACTION_NONE = 0,
+   INPUT_ACTION_AXIS_THRESHOLD,
+   INPUT_ACTION_MAX_USERS
+};
+
 /* Specialized _MOUSE that targets the full screen regardless of viewport.
  */
 #define RARCH_DEVICE_MOUSE_SCREEN      (RETRO_DEVICE_MOUSE | 0x10000)
diff --git a/input/input_driver.h b/input/input_driver.h
index 10e32b1a30..3fd2f3dcc2 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -43,52 +43,6 @@
 
 RETRO_BEGIN_DECLS
 
-enum input_toggle_type
-{
-   INPUT_TOGGLE_NONE = 0,
-   INPUT_TOGGLE_DOWN_Y_L_R,
-   INPUT_TOGGLE_L3_R3,
-   INPUT_TOGGLE_L1_R1_START_SELECT,
-   INPUT_TOGGLE_START_SELECT,
-   INPUT_TOGGLE_L3_R,
-   INPUT_TOGGLE_L_R,
-   INPUT_TOGGLE_HOLD_START,
-   INPUT_TOGGLE_HOLD_SELECT,
-   INPUT_TOGGLE_DOWN_SELECT,
-   INPUT_TOGGLE_L2_R2,
-   INPUT_TOGGLE_LAST
-};
-
-enum input_turbo_mode
-{
-   INPUT_TURBO_MODE_CLASSIC = 0,
-   INPUT_TURBO_MODE_SINGLEBUTTON,
-   INPUT_TURBO_MODE_SINGLEBUTTON_HOLD,
-   INPUT_TURBO_MODE_LAST
-};
-
-enum input_turbo_default_button
-{
-   INPUT_TURBO_DEFAULT_BUTTON_B = 0,
-   INPUT_TURBO_DEFAULT_BUTTON_Y,
-   INPUT_TURBO_DEFAULT_BUTTON_A,
-   INPUT_TURBO_DEFAULT_BUTTON_X,
-   INPUT_TURBO_DEFAULT_BUTTON_L,
-   INPUT_TURBO_DEFAULT_BUTTON_R,
-   INPUT_TURBO_DEFAULT_BUTTON_L2,
-   INPUT_TURBO_DEFAULT_BUTTON_R2,
-   INPUT_TURBO_DEFAULT_BUTTON_L3,
-   INPUT_TURBO_DEFAULT_BUTTON_R3,
-   INPUT_TURBO_DEFAULT_BUTTON_LAST
-};
-
-enum input_action
-{
-   INPUT_ACTION_NONE = 0,
-   INPUT_ACTION_AXIS_THRESHOLD,
-   INPUT_ACTION_MAX_USERS
-};
-
 struct retro_keybind
 {
    char     *joykey_label;