diff --git a/Makefile.common b/Makefile.common
index 439e7f9daa..e5b789d619 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -302,7 +302,6 @@ OBJ += \
$(LIBRETRO_COMM_DIR)/file/file_path_io.o \
file_path_special.o \
$(LIBRETRO_COMM_DIR)/hash/lrc_hash.o \
- input/input_driver.o \
input/common/input_hid_common.o \
led/led_driver.o \
gfx/video_coord_array.o \
diff --git a/cheat_manager.c b/cheat_manager.c
index 23b48b21cd..96b2b148c6 100644
--- a/cheat_manager.c
+++ b/cheat_manager.c
@@ -1341,8 +1341,8 @@ void cheat_manager_apply_rumble(struct item_cheat *cheat, unsigned int curr_valu
{
cheat->rumble_primary_end_time = current_time + (cheat->rumble_primary_duration * 1000);
cheat->rumble_secondary_end_time = current_time + (cheat->rumble_secondary_duration * 1000);
- input_set_rumble_state(cheat->rumble_port, RETRO_RUMBLE_STRONG, cheat->rumble_primary_strength);
- input_set_rumble_state(cheat->rumble_port, RETRO_RUMBLE_WEAK, cheat->rumble_secondary_strength);
+ input_driver_set_rumble_state(cheat->rumble_port, RETRO_RUMBLE_STRONG, cheat->rumble_primary_strength);
+ input_driver_set_rumble_state(cheat->rumble_port, RETRO_RUMBLE_WEAK, cheat->rumble_secondary_strength);
}
}
else
@@ -1354,24 +1354,24 @@ void cheat_manager_apply_rumble(struct item_cheat *cheat, unsigned int curr_valu
if (cheat->rumble_primary_end_time <= current_time)
{
if (cheat->rumble_primary_end_time != 0)
- input_set_rumble_state(cheat->rumble_port,
+ input_driver_set_rumble_state(cheat->rumble_port,
RETRO_RUMBLE_STRONG, 0);
cheat->rumble_primary_end_time = 0;
}
else
{
- input_set_rumble_state(cheat->rumble_port,
+ input_driver_set_rumble_state(cheat->rumble_port,
RETRO_RUMBLE_STRONG, cheat->rumble_primary_strength);
}
if (cheat->rumble_secondary_end_time <= current_time)
{
if (cheat->rumble_secondary_end_time != 0)
- input_set_rumble_state(cheat->rumble_port, RETRO_RUMBLE_WEAK, 0);
+ input_driver_set_rumble_state(cheat->rumble_port, RETRO_RUMBLE_WEAK, 0);
cheat->rumble_secondary_end_time = 0;
}
else
- input_set_rumble_state(cheat->rumble_port, RETRO_RUMBLE_WEAK, cheat->rumble_secondary_strength);
+ input_driver_set_rumble_state(cheat->rumble_port, RETRO_RUMBLE_WEAK, cheat->rumble_secondary_strength);
}
void cheat_manager_apply_retro_cheats(void)
diff --git a/configuration.c b/configuration.c
index e5ed25c0a0..ac2276083d 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1946,7 +1946,7 @@ static struct config_float_setting *populate_settings_float(
SETTING_FLOAT("video_font_size", &settings->floats.video_font_size, true, DEFAULT_FONT_SIZE, false);
SETTING_FLOAT("fastforward_ratio", &settings->floats.fastforward_ratio, true, DEFAULT_FASTFORWARD_RATIO, false);
SETTING_FLOAT("slowmotion_ratio", &settings->floats.slowmotion_ratio, true, DEFAULT_SLOWMOTION_RATIO, false);
- SETTING_FLOAT("input_axis_threshold", &settings->floats.input_axis_threshold, true, DEFAULT_AXIS_THRESHOLD, false);
+ SETTING_FLOAT("input_axis_threshold", input_driver_get_float(INPUT_ACTION_AXIS_THRESHOLD), true, DEFAULT_AXIS_THRESHOLD, false);
SETTING_FLOAT("input_analog_deadzone", &settings->floats.input_analog_deadzone, true, DEFAULT_ANALOG_DEADZONE, false);
SETTING_FLOAT("input_analog_sensitivity", &settings->floats.input_analog_sensitivity, true, DEFAULT_ANALOG_SENSITIVITY, false);
SETTING_FLOAT("video_msg_bgcolor_opacity", &settings->floats.video_msg_bgcolor_opacity, true, message_bgcolor_opacity, false);
@@ -1977,7 +1977,7 @@ static struct config_uint_setting *populate_settings_uint(
SETTING_UINT("input_duty_cycle", &settings->uints.input_turbo_duty_cycle, true, turbo_duty_cycle, false);
SETTING_UINT("input_turbo_mode", &settings->uints.input_turbo_mode, true, turbo_mode, false);
SETTING_UINT("input_turbo_default_button", &settings->uints.input_turbo_default_button, true, turbo_default_btn, false);
- SETTING_UINT("input_max_users", &settings->uints.input_max_users, true, input_max_users, false);
+ SETTING_UINT("input_max_users", input_driver_get_uint(INPUT_ACTION_MAX_USERS), true, input_max_users, false);
SETTING_UINT("fps_update_interval", &settings->uints.fps_update_interval, true, DEFAULT_FPS_UPDATE_INTERVAL, false);
SETTING_UINT("memory_update_interval", &settings->uints.memory_update_interval, true, DEFAULT_MEMORY_UPDATE_INTERVAL, false);
SETTING_UINT("input_menu_toggle_gamepad_combo", &settings->uints.input_menu_toggle_gamepad_combo, true, DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO, false);
@@ -4787,8 +4787,8 @@ bool input_remapping_save_file(const char *path)
"a", "x", "l", "r", "l2", "r2",
"l3", "r3", "l_x+", "l_x-", "l_y+", "l_y-", "r_x+", "r_x-", "r_y+", "r_y-" };
config_file_t *conf = NULL;
+ unsigned max_users = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
settings_t *settings = config_get_ptr();
- unsigned max_users = settings->uints.input_max_users;
const char *dir_input_remapping = settings->paths.directory_input_remapping;
remap_file[0] = '\0';
diff --git a/configuration.h b/configuration.h
index 431a8cdd6c..1de7b5bd17 100644
--- a/configuration.h
+++ b/configuration.h
@@ -165,7 +165,6 @@ typedef struct settings
unsigned input_poll_type_behavior;
unsigned input_dingux_rumble_gain;
unsigned input_auto_game_focus;
- unsigned input_max_users;
unsigned netplay_port;
unsigned netplay_input_latency_frames_min;
@@ -353,7 +352,6 @@ typedef struct settings
float slowmotion_ratio;
float fastforward_ratio;
float input_analog_deadzone;
- float input_axis_threshold;
float input_analog_sensitivity;
} floats;
diff --git a/griffin/griffin.c b/griffin/griffin.c
index fdbb58eb44..98b5ea2c12 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -664,18 +664,14 @@ FONTS
/*============================================================
INPUT
============================================================ */
-
-#include "../input/input_driver.c"
-#include "../input/input_keymaps.c"
#include "../tasks/task_autodetect.c"
-
#ifdef HAVE_BLISSBOX
#include "../tasks/task_autodetect_blissbox.c"
#endif
-
#ifdef HAVE_AUDIOMIXER
#include "../tasks/task_audio_mixer.c"
#endif
+#include "../input/input_keymaps.c"
#ifdef HAVE_OVERLAY
#include "../led/drivers/led_overlay.c"
@@ -693,6 +689,8 @@ INPUT
#endif
#endif
+#include "../input/input_autodetect_builtin.c"
+
#if defined(SN_TARGET_PSP2) || defined(PSP) || defined(VITA)
#include "../input/drivers/psp_input.c"
#include "../input/drivers_joypad/psp_joypad.c"
diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c
index c2fd6ef832..70b5bdfb51 100644
--- a/input/drivers/android_input.c
+++ b/input/drivers/android_input.c
@@ -385,12 +385,12 @@ static void android_input_poll_main_cmd(void)
video_driver_unset_stub_frame();
if (enable_accelerometer)
- input_set_sensor_state(0,
+ input_sensor_set_state(0,
RETRO_SENSOR_ACCELEROMETER_ENABLE,
android_app->accelerometer_event_rate);
if (enable_gyroscope)
- input_set_sensor_state(0,
+ input_sensor_set_state(0,
RETRO_SENSOR_GYROSCOPE_ENABLE,
android_app->gyroscope_event_rate);
}
@@ -415,12 +415,12 @@ static void android_input_poll_main_cmd(void)
/* Avoid draining battery while app is not being used. */
if (disable_accelerometer)
- input_set_sensor_state(0,
+ input_sensor_set_state(0,
RETRO_SENSOR_ACCELEROMETER_DISABLE,
android_app->accelerometer_event_rate);
if (disable_gyroscope)
- input_set_sensor_state(0,
+ input_sensor_set_state(0,
RETRO_SENSOR_GYROSCOPE_DISABLE,
android_app->gyroscope_event_rate);
}
diff --git a/input/input_defines.h b/input/input_defines.h
index 55c751bd47..07a0caac0d 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -174,6 +174,13 @@ enum input_turbo_default_button
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.c b/input/input_driver.c
deleted file mode 100644
index 42434b157e..0000000000
--- a/input/input_driver.c
+++ /dev/null
@@ -1,444 +0,0 @@
-/**
- * RetroArch - A frontend for libretro.
- * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- * Copyright (C) 2011-2017 - Daniel De Matteis
- *
- * RetroArch is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
- *
- * RetroArch is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with RetroArch. If not, see .
- **/
-
-#include
-
-#include "input_driver.h"
-
-#include "retroarch.h"
-#include "verbosity.h"
-#include "configuration.h"
-#include "../list_special.h"
-
-/**************************************/
-
-static void *input_null_init(const char *joypad_driver) { return (void*)-1; }
-static void input_null_poll(void *data) { }
-static int16_t input_null_input_state(
- void *data,
- const input_device_driver_t *joypad,
- const input_device_driver_t *sec_joypad,
- rarch_joypad_info_t *joypad_info,
- const struct retro_keybind **retro_keybinds,
- bool keyboard_mapping_blocked,
- unsigned port, unsigned device, unsigned index, unsigned id) { return 0; }
-static void input_null_free(void *data) { }
-static bool input_null_set_sensor_state(void *data, unsigned port,
- enum retro_sensor_action action, unsigned rate) { return false; }
-static float input_null_get_sensor_input(void *data, unsigned port, unsigned id) { return 0.0; }
-static uint64_t input_null_get_capabilities(void *data) { return 0; }
-static void input_null_grab_mouse(void *data, bool state) { }
-static bool input_null_grab_stdin(void *data) { return false; }
-
-static input_driver_t input_null = {
- input_null_init,
- input_null_poll,
- input_null_input_state,
- input_null_free,
- input_null_set_sensor_state,
- input_null_get_sensor_input,
- input_null_get_capabilities,
- "null",
- input_null_grab_mouse,
- input_null_grab_stdin
-};
-
-static input_device_driver_t null_joypad = {
- NULL, /* init */
- NULL, /* query_pad */
- NULL, /* destroy */
- NULL, /* button */
- NULL, /* state */
- NULL, /* get_buttons */
- NULL, /* axis */
- NULL, /* poll */
- NULL,
- NULL, /* name */
- "null",
-};
-
-
-#ifdef HAVE_HID
-static bool null_hid_joypad_query(void *data, unsigned pad) {
- return pad < MAX_USERS; }
-static const char *null_hid_joypad_name(
- void *data, unsigned pad) { return NULL; }
-static void null_hid_joypad_get_buttons(void *data,
- unsigned port, input_bits_t *state) { BIT256_CLEAR_ALL_PTR(state); }
-static int16_t null_hid_joypad_button(
- void *data, unsigned port, uint16_t joykey) { return 0; }
-static bool null_hid_joypad_rumble(void *data, unsigned pad,
- enum retro_rumble_effect effect, uint16_t strength) { return false; }
-static int16_t null_hid_joypad_axis(
- void *data, unsigned port, uint32_t joyaxis) { return 0; }
-static void *null_hid_init(void) { return (void*)-1; }
-static void null_hid_free(const void *data) { }
-static void null_hid_poll(void *data) { }
-static int16_t null_hid_joypad_state(
- void *data,
- rarch_joypad_info_t *joypad_info,
- const void *binds_data,
- unsigned port) { return 0; }
-
-static hid_driver_t null_hid = {
- null_hid_init, /* init */
- null_hid_joypad_query, /* joypad_query */
- null_hid_free, /* free */
- null_hid_joypad_button, /* button */
- null_hid_joypad_state, /* state */
- null_hid_joypad_get_buttons, /* get_buttons */
- null_hid_joypad_axis, /* axis */
- null_hid_poll, /* poll */
- null_hid_joypad_rumble, /* rumble */
- null_hid_joypad_name, /* joypad_name */
- "null",
-};
-#endif
-
-input_device_driver_t *joypad_drivers[] = {
-#ifdef HAVE_XINPUT
- &xinput_joypad,
-#endif
-#ifdef GEKKO
- &gx_joypad,
-#endif
-#ifdef WIIU
- &wiiu_joypad,
-#endif
-#ifdef _XBOX1
- &xdk_joypad,
-#endif
-#if defined(ORBIS)
- &ps4_joypad,
-#endif
-#if defined(__PSL1GHT__) || defined(__PS3__)
- &ps3_joypad,
-#endif
-#if defined(PSP) || defined(VITA)
- &psp_joypad,
-#endif
-#if defined(PS2)
- &ps2_joypad,
-#endif
-#ifdef _3DS
- &ctr_joypad,
-#endif
-#ifdef SWITCH
- &switch_joypad,
-#endif
-#ifdef HAVE_DINPUT
- &dinput_joypad,
-#endif
-#ifdef HAVE_UDEV
- &udev_joypad,
-#endif
-#if defined(__linux) && !defined(ANDROID)
- &linuxraw_joypad,
-#endif
-#ifdef HAVE_PARPORT
- &parport_joypad,
-#endif
-#ifdef ANDROID
- &android_joypad,
-#endif
-#if defined(HAVE_SDL) || defined(HAVE_SDL2)
- &sdl_joypad,
-#endif
-#if defined(DINGUX) && defined(HAVE_SDL_DINGUX)
- &sdl_dingux_joypad,
-#endif
-#ifdef __QNX__
- &qnx_joypad,
-#endif
-#ifdef HAVE_MFI
- &mfi_joypad,
-#endif
-#ifdef DJGPP
- &dos_joypad,
-#endif
-/* Selecting the HID gamepad driver disables the Wii U gamepad. So while
- * we want the HID code to be compiled & linked, we don't want the driver
- * to be selectable in the UI. */
-#if defined(HAVE_HID) && !defined(WIIU)
- &hid_joypad,
-#endif
-#ifdef EMSCRIPTEN
- &rwebpad_joypad,
-#endif
- &null_joypad,
- NULL,
-};
-
-input_driver_t *input_drivers[] = {
-#ifdef ORBIS
- &input_ps4,
-#endif
-#if defined(__PSL1GHT__) || defined(__PS3__)
- &input_ps3,
-#endif
-#if defined(SN_TARGET_PSP2) || defined(PSP) || defined(VITA)
- &input_psp,
-#endif
-#if defined(PS2)
- &input_ps2,
-#endif
-#if defined(_3DS)
- &input_ctr,
-#endif
-#if defined(SWITCH)
- &input_switch,
-#endif
-#if defined(HAVE_SDL) || defined(HAVE_SDL2)
- &input_sdl,
-#endif
-#if defined(DINGUX) && defined(HAVE_SDL_DINGUX)
- &input_sdl_dingux,
-#endif
-#ifdef HAVE_DINPUT
- &input_dinput,
-#endif
-#ifdef HAVE_X11
- &input_x,
-#endif
-#ifdef __WINRT__
- &input_uwp,
-#endif
-#ifdef XENON
- &input_xenon360,
-#endif
-#if defined(HAVE_XINPUT2) || defined(HAVE_XINPUT_XBOX1) || defined(__WINRT__)
- &input_xinput,
-#endif
-#ifdef GEKKO
- &input_gx,
-#endif
-#ifdef WIIU
- &input_wiiu,
-#endif
-#ifdef ANDROID
- &input_android,
-#endif
-#ifdef HAVE_UDEV
- &input_udev,
-#endif
-#if defined(__linux__) && !defined(ANDROID)
- &input_linuxraw,
-#endif
-#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL)
- &input_cocoa,
-#endif
-#ifdef __QNX__
- &input_qnx,
-#endif
-#ifdef EMSCRIPTEN
- &input_rwebinput,
-#endif
-#ifdef DJGPP
- &input_dos,
-#endif
-#if defined(_WIN32) && !defined(_XBOX) && _WIN32_WINNT >= 0x0501 && !defined(__WINRT__)
-#ifdef HAVE_WINRAWINPUT
- /* winraw only available since XP */
- &input_winraw,
-#endif
-#endif
- &input_null,
- NULL,
-};
-
-#ifdef HAVE_HID
-hid_driver_t *hid_drivers[] = {
-#if defined(HAVE_BTSTACK)
- &btstack_hid,
-#endif
-#if defined(__APPLE__) && defined(HAVE_IOHIDMANAGER)
- &iohidmanager_hid,
-#endif
-#if defined(HAVE_LIBUSB) && defined(HAVE_THREADS)
- &libusb_hid,
-#endif
-#ifdef HW_RVL
- &wiiusb_hid,
-#endif
- &null_hid,
- NULL,
-};
-#endif
-
-/**************************************/
-
-/* private function prototypes */
-
-static const input_device_driver_t *input_joypad_init_first(void *data);
-
-
-/**************************************/
-
-bool input_driver_set_rumble(
- input_driver_state_t *driver_state, unsigned port, unsigned joy_idx,
- enum retro_rumble_effect effect, uint16_t strength)
-{
- const input_device_driver_t *primary_joypad;
- const input_device_driver_t *sec_joypad;
- bool rumble_state = false;
-
- if (!driver_state || (joy_idx >= MAX_USERS))
- return false;
-
- primary_joypad = driver_state->primary_joypad;
- sec_joypad = driver_state->secondary_joypad;
-
- if (primary_joypad && primary_joypad->set_rumble)
- rumble_state = primary_joypad->set_rumble(joy_idx, effect, strength);
-
- /* if sec_joypad exists, this set_rumble() return value will replace primary_joypad's return */
- if (sec_joypad && sec_joypad->set_rumble)
- rumble_state = sec_joypad->set_rumble(joy_idx, effect, strength);
-
- return rumble_state;
-}
-
-/**************************************/
-
-bool input_driver_set_sensor(
- input_driver_state_t *driver_state, unsigned port, bool sensors_enable,
- enum retro_sensor_action action, unsigned rate)
-{
- const input_driver_t *current_driver;
- void *current_data;
-
- if (!driver_state || !driver_state->current_data)
- return false;
-
- current_driver = driver_state->current_driver;
- current_data = driver_state->current_data;
-
- /* If sensors are disabled, inhibit any enable
- * actions (but always allow disable actions) */
- if (!sensors_enable &&
- ((action == RETRO_SENSOR_ACCELEROMETER_ENABLE) ||
- (action == RETRO_SENSOR_GYROSCOPE_ENABLE) ||
- (action == RETRO_SENSOR_ILLUMINANCE_ENABLE)))
- return false;
-
- if (current_driver && current_driver->set_sensor_state)
- return current_driver->set_sensor_state(current_data,
- port, action, rate);
-
- return false;
-}
-
-/**************************************/
-
-float input_driver_get_sensor(
- input_driver_state_t *driver_state,
- unsigned port, bool sensors_enable, unsigned id)
-{
- const input_driver_t *current_driver;
- void *current_data;
-
- if (!driver_state || !driver_state->current_data)
- return 0.0f;
-
- current_driver = driver_state->current_driver;
- current_data = driver_state->current_data;
-
- if (sensors_enable && current_driver->get_sensor_input)
- return current_driver->get_sensor_input(current_data, port, id);
-
- return 0.0f;
-}
-
-/**************************************/
-
-bool input_driver_get_nonblocking(input_driver_state_t *driver_state)
-{
- if (!driver_state)
- return false;
-
- return driver_state->nonblocking_flag;
-}
-
-void input_driver_set_nonblocking(input_driver_state_t *driver_state,
- bool new_value)
-{
- if (!driver_state)
- return;
-
- driver_state->nonblocking_flag = new_value;
-}
-
-/**************************************/
-
-const input_device_driver_t *input_joypad_init_driver(
- const char *ident, void *data)
-{
- unsigned i;
-
- if (ident && *ident)
- {
- for (i = 0; joypad_drivers[i]; i++)
- {
- if (string_is_equal(ident, joypad_drivers[i]->ident)
- && joypad_drivers[i]->init)
- {
- void *ptr = joypad_drivers[i]->init(data);
- if (ptr)
- {
- RARCH_LOG("[Joypad]: Found joypad driver: \"%s\".\n",
- joypad_drivers[i]->ident);
- return joypad_drivers[i];
- }
- }
- }
- }
-
- return input_joypad_init_first(data); /* fall back to first available driver */
-}
-
-/**
- * Finds first suitable joypad driver and initializes. Used as a fallback by
- * input_joypad_init_driver when no matching driver is found.
- *
- * @param data joypad state data pointer, which can be NULL and will be
- * initialized by the new joypad driver, if one is found.
- *
- * @return joypad driver if found and initialized, otherwise NULL.
- **/
-static const input_device_driver_t *input_joypad_init_first(void *data)
-{
- unsigned i;
-
- for (i = 0; joypad_drivers[i]; i++)
- {
- if ( joypad_drivers[i]
- && joypad_drivers[i]->init)
- {
- void *ptr = joypad_drivers[i]->init(data);
- if (ptr)
- {
- RARCH_LOG("[Joypad]: Found joypad driver: \"%s\".\n",
- joypad_drivers[i]->ident);
- return joypad_drivers[i];
- }
- }
- }
-
- return NULL;
-}
diff --git a/input/input_driver.h b/input/input_driver.h
index 00269d4aad..ec2761a7b3 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -22,6 +22,8 @@
#include
#include
+#include "input_types.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif /* HAVE_CONFIG_H */
@@ -33,13 +35,11 @@
#include
#include "input_defines.h"
-#include "input_types.h"
#include "../msg_hash.h"
#include "include/hid_types.h"
#include "include/hid_driver.h"
#include "include/gamepad.h"
-#include "configuration.h"
RETRO_BEGIN_DECLS
@@ -279,21 +279,6 @@ struct rarch_joypad_driver
const char *ident;
};
-typedef struct
-{
- /* pointers */
- input_driver_t *current_driver;
- void *current_data;
- const input_device_driver_t *primary_joypad; /* ptr alignment */
- const input_device_driver_t *secondary_joypad; /* ptr alignment */
-
- /* primitives */
- bool nonblocking_flag;
-} input_driver_state_t;
-
-
-void input_driver_init_joypads(void);
-
/**
* Get an enumerated list of all input driver names
*
@@ -302,54 +287,73 @@ void input_driver_init_joypads(void);
const char* config_get_input_driver_options(void);
/**
- * Sets the rumble state.
+ * Sets the rumble state. Used by RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE.
*
- * @param driver_state
- * @param port User number.
- * @param joy_idx
- * @param effect Rumble effect.
- * @param strength Strength of rumble effect.
+ * @param port User number.
+ * @param effect Rumble effect.
+ * @param strength Strength of rumble effect.
*
* @return true if the rumble state has been successfully set
**/
-bool input_driver_set_rumble(
- input_driver_state_t *driver_state, unsigned port, unsigned joy_idx,
- enum retro_rumble_effect effect, uint16_t strength);
+bool input_driver_set_rumble_state(unsigned port,
+ enum retro_rumble_effect effect, uint16_t strength);
/**
- * Sets the sensor state.
+ * Sets the sensor state. Used by RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE.
*
- * @param driver_state
* @param port
- * @param sensors_enable
- * @param effect Sensor action
- * @param rate Sensor rate update
+ * @param effect Sensor action
+ * @param rate Sensor rate update
*
* @return true if the sensor state has been successfully set
**/
-bool input_driver_set_sensor(
- input_driver_state_t *driver_state, unsigned port, bool sensors_enable,
- enum retro_sensor_action action, unsigned rate);
+bool input_sensor_set_state(unsigned port,
+ enum retro_sensor_action action, unsigned rate);
/**
* Retrieves the sensor state associated with the provided port and ID.
*
- * @param driver_state
* @param port
- * @param sensors_enable
- * @param id Sensor ID
+ * @param id Sensor ID
*
* @return The current state associated with the port and ID as a float
**/
-float input_driver_get_sensor(
- input_driver_state_t *driver_state,
- unsigned port, bool sensors_enable, unsigned id);
+float input_sensor_get_input(unsigned port, unsigned id);
+/**
+ * Retrieves the input driver state struct
+ *
+ * @return The input state struct
+ **/
+void *input_driver_get_data(void);
-bool input_driver_get_nonblocking(input_driver_state_t *driver_state);
+/**
+ * Sets the input_driver_nonblock_state flag to true
+ **/
+void input_driver_set_nonblock_state(void);
-void input_driver_set_nonblocking(input_driver_state_t *driver_state,
- bool new_value);
+/**
+ * Sets the input_driver_nonblock_state flag to false
+ **/
+void input_driver_unset_nonblock_state(void);
+
+/**
+ * If the action is INPUT_ACTION_AXIS_THRESHOLD, return the current
+ * input_driver_axis_threshold.
+ *
+ * @return value of input_driver_axis_threshold or NULL for actions other than
+ * INPUT_ACTION_AXIS_THRESHOLD
+**/
+float *input_driver_get_float(enum input_action action);
+
+/**
+ * If the action is INPUT_ACTION_MAX_USERS, return the current
+ * input_driver_max_users.
+ *
+ * @return value of input_driver_axis_threshold or NULL for actions other than
+ * INPUT_ACTION_AXIS_THRESHOLD
+**/
+unsigned *input_driver_get_uint(enum input_action action);
/**
* Get an enumerated list of all joypad driver names
@@ -363,8 +367,6 @@ const char* config_get_joypad_driver_options(void);
* zero-length string, equivalent to calling input_joypad_init_first().
*
* @param ident identifier of driver to initialize.
- * @param data joypad state data pointer, which can be NULL and will be
- * initialized by the new joypad driver, if one is found.
*
* @return The joypad driver if found, otherwise NULL.
**/
@@ -726,11 +728,28 @@ void input_config_reset(void);
#define DEFAULT_MAX_PADS 16
#endif /* defined(ANDROID) */
-extern input_device_driver_t *joypad_drivers[];
-extern input_driver_t *input_drivers[];
-#ifdef HAVE_HID
-extern hid_driver_t *hid_drivers[];
-#endif
+extern input_device_driver_t dinput_joypad;
+extern input_device_driver_t linuxraw_joypad;
+extern input_device_driver_t parport_joypad;
+extern input_device_driver_t udev_joypad;
+extern input_device_driver_t xinput_joypad;
+extern input_device_driver_t sdl_joypad;
+extern input_device_driver_t sdl_dingux_joypad;
+extern input_device_driver_t ps4_joypad;
+extern input_device_driver_t ps3_joypad;
+extern input_device_driver_t psp_joypad;
+extern input_device_driver_t ps2_joypad;
+extern input_device_driver_t ctr_joypad;
+extern input_device_driver_t switch_joypad;
+extern input_device_driver_t xdk_joypad;
+extern input_device_driver_t gx_joypad;
+extern input_device_driver_t wiiu_joypad;
+extern input_device_driver_t hid_joypad;
+extern input_device_driver_t android_joypad;
+extern input_device_driver_t qnx_joypad;
+extern input_device_driver_t mfi_joypad;
+extern input_device_driver_t dos_joypad;
+extern input_device_driver_t rwebpad_joypad;
extern input_driver_t input_android;
extern input_driver_t input_sdl;
@@ -757,29 +776,6 @@ extern input_driver_t input_dos;
extern input_driver_t input_winraw;
extern input_driver_t input_wayland;
-extern input_device_driver_t dinput_joypad;
-extern input_device_driver_t linuxraw_joypad;
-extern input_device_driver_t parport_joypad;
-extern input_device_driver_t udev_joypad;
-extern input_device_driver_t xinput_joypad;
-extern input_device_driver_t sdl_joypad;
-extern input_device_driver_t sdl_dingux_joypad;
-extern input_device_driver_t ps4_joypad;
-extern input_device_driver_t ps3_joypad;
-extern input_device_driver_t psp_joypad;
-extern input_device_driver_t ps2_joypad;
-extern input_device_driver_t ctr_joypad;
-extern input_device_driver_t switch_joypad;
-extern input_device_driver_t xdk_joypad;
-extern input_device_driver_t gx_joypad;
-extern input_device_driver_t wiiu_joypad;
-extern input_device_driver_t hid_joypad;
-extern input_device_driver_t android_joypad;
-extern input_device_driver_t qnx_joypad;
-extern input_device_driver_t mfi_joypad;
-extern input_device_driver_t dos_joypad;
-extern input_device_driver_t rwebpad_joypad;
-
#ifdef HAVE_HID
extern hid_driver_t iohidmanager_hid;
extern hid_driver_t btstack_hid;
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 8acb2cab2b..235e32f87a 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -6152,7 +6152,7 @@ unsigned menu_displaylist_build_list(
case DISPLAYLIST_OPTIONS_REMAPPINGS:
{
unsigned p;
- unsigned max_users = settings->uints.input_max_users;
+ unsigned max_users = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
#ifdef HAVE_CONFIGFILE
if (menu_entries_append_enum(list,
@@ -6488,7 +6488,7 @@ unsigned menu_displaylist_build_list(
{
unsigned user;
- unsigned max_users = settings->uints.input_max_users;
+ unsigned max_users = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
for (user = 0; user < max_users; user++)
{
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
@@ -7245,7 +7245,7 @@ unsigned menu_displaylist_build_list(
{
unsigned user;
- unsigned max_users = settings->uints.input_max_users;
+ unsigned max_users = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
for (user = 0; user < max_users; user++)
{
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
@@ -9740,7 +9740,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
break;
case DISPLAYLIST_OPTIONS_REMAPPINGS_PORT:
{
- unsigned max_users = settings->uints.input_max_users;
+ unsigned max_users = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
const char *menu_driver = menu_driver_ident();
bool is_rgui = string_is_equal(menu_driver, "rgui");
file_list_t *list = info->list;
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 421e367c6b..1c60afb5ca 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -7986,11 +7986,11 @@ static void general_write_handler(rarch_setting_t *setting)
{
/* Event rate does not matter when disabling
* sensors - set to zero */
- input_set_sensor_state(i,
+ input_sensor_set_state(i,
RETRO_SENSOR_ACCELEROMETER_DISABLE, 0);
- input_set_sensor_state(i,
+ input_sensor_set_state(i,
RETRO_SENSOR_GYROSCOPE_DISABLE, 0);
- input_set_sensor_state(i,
+ input_sensor_set_state(i,
RETRO_SENSOR_ILLUMINANCE_DISABLE, 0);
}
}
@@ -12579,7 +12579,7 @@ static bool setting_append_list(
CONFIG_UINT(
list, list_info,
- &settings->uints.input_max_users,
+ input_driver_get_uint(INPUT_ACTION_MAX_USERS),
MENU_ENUM_LABEL_INPUT_MAX_USERS,
MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS,
input_max_users,
@@ -13005,7 +13005,7 @@ static bool setting_append_list(
CONFIG_FLOAT(
list, list_info,
- &settings->floats.input_axis_threshold,
+ input_driver_get_float(INPUT_ACTION_AXIS_THRESHOLD),
MENU_ENUM_LABEL_INPUT_BUTTON_AXIS_THRESHOLD,
MENU_ENUM_LABEL_VALUE_INPUT_BUTTON_AXIS_THRESHOLD,
DEFAULT_AXIS_THRESHOLD,
@@ -18973,7 +18973,7 @@ static bool setting_append_list(
/* TODO/FIXME - add enum_idx */
{
- unsigned max_users = settings->uints.input_max_users;
+ unsigned max_users = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
for (user = 0; user < max_users; user++)
{
char s1[64], s2[64];
diff --git a/network/netplay/netplay_io.c b/network/netplay/netplay_io.c
index a819fe37ed..460451a4b9 100644
--- a/network/netplay/netplay_io.c
+++ b/network/netplay/netplay_io.c
@@ -1452,7 +1452,7 @@ void netplay_sync_post_frame(netplay_t *netplay, bool stalled)
if (netplay->catch_up)
{
netplay->catch_up = false;
- input_unset_nonblock_state();
+ input_driver_unset_nonblock_state();
driver_set_nonblock_state();
}
return;
@@ -1645,7 +1645,7 @@ void netplay_sync_post_frame(netplay_t *netplay, bool stalled)
if (netplay->self_frame_count + 1 >= lo_frame_count)
{
netplay->catch_up = false;
- input_unset_nonblock_state();
+ input_driver_unset_nonblock_state();
driver_set_nonblock_state();
}
@@ -1674,7 +1674,7 @@ void netplay_sync_post_frame(netplay_t *netplay, bool stalled)
/* We're definitely falling behind! */
netplay->catch_up = true;
netplay->catch_up_time = 0;
- input_set_nonblock_state();
+ input_driver_set_nonblock_state();
driver_set_nonblock_state();
}
else
diff --git a/retroarch.c b/retroarch.c
index 30ac5cc7b4..bb37271452 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1069,13 +1069,12 @@ static void menu_input_key_bind_poll_bind_state(
{
unsigned b;
rarch_joypad_info_t joypad_info;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
- input_driver_t *current_input = input_driver_st->current_driver;
- void *input_data = input_driver_st->current_data;
+ input_driver_t *current_input = p_rarch->current_input;
+ void *input_data = p_rarch->current_input_data;
unsigned port = state->port;
- const input_device_driver_t *joypad = input_driver_st->primary_joypad;
+ const input_device_driver_t *joypad = p_rarch->joypad;
#ifdef HAVE_MFI
- const input_device_driver_t *sec_joypad = input_driver_st->secondary_joypad;
+ const input_device_driver_t *sec_joypad = p_rarch->sec_joypad;
#else
const input_device_driver_t *sec_joypad = NULL;
#endif
@@ -1358,9 +1357,8 @@ bool menu_input_key_bind_set_mode(
{
uint64_t current_usec;
unsigned index_offset;
- rarch_setting_t *setting = (rarch_setting_t*)data;
- struct rarch_state *p_rarch = &rarch_st;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
+ rarch_setting_t *setting = (rarch_setting_t*)data;
+ struct rarch_state *p_rarch = &rarch_st;
menu_handle_t *menu = p_rarch->menu_driver_data;
menu_input_t *menu_input = &p_rarch->menu_input_state;
settings_t *settings = p_rarch->configuration_settings;
@@ -1380,9 +1378,9 @@ bool menu_input_key_bind_set_mode(
binds->port = settings->uints.input_joypad_index[index_offset];
menu_input_key_bind_poll_bind_get_rested_axes(
- input_driver_st->primary_joypad,
+ p_rarch->joypad,
#ifdef HAVE_MFI
- input_driver_st->secondary_joypad,
+ p_rarch->sec_joypad,
#else
NULL,
#endif
@@ -1509,7 +1507,7 @@ static bool menu_input_key_bind_iterate(
new_binds.buffer = *(new_binds.output);
if (menu_input_key_bind_poll_find_hold(
- settings->uints.input_max_users,
+ p_rarch->input_driver_max_users,
&new_binds, &new_binds.buffer))
{
uint64_t current_usec = cpu_features_get_time_usec();
@@ -1543,7 +1541,7 @@ static bool menu_input_key_bind_iterate(
#else
if ((new_binds.skip && !_binds->skip) ||
menu_input_key_bind_poll_find_trigger(
- settings->uints.input_max_users,
+ p_rarch->input_driver_max_users,
_binds, &new_binds, &(new_binds.buffer)))
complete = true;
#endif
@@ -13367,20 +13365,20 @@ void input_remapping_set_defaults(bool clear_cache)
static bool input_driver_grab_mouse(struct rarch_state *p_rarch)
{
- if (!p_rarch->input_driver_state.current_driver || !p_rarch->input_driver_state.current_driver->grab_mouse)
+ if (!p_rarch->current_input || !p_rarch->current_input->grab_mouse)
return false;
- p_rarch->input_driver_state.current_driver->grab_mouse(p_rarch->input_driver_state.current_data, true);
+ p_rarch->current_input->grab_mouse(p_rarch->current_input_data, true);
p_rarch->input_driver_grab_mouse_state = true;
return true;
}
static bool input_driver_ungrab_mouse(struct rarch_state *p_rarch)
{
- if (!p_rarch->input_driver_state.current_driver || !p_rarch->input_driver_state.current_driver->grab_mouse)
+ if (!p_rarch->current_input || !p_rarch->current_input->grab_mouse)
return false;
- p_rarch->input_driver_state.current_driver->grab_mouse(p_rarch->input_driver_state.current_data, false);
+ p_rarch->current_input->grab_mouse(p_rarch->current_input_data, false);
p_rarch->input_driver_grab_mouse_state = false;
return true;
}
@@ -13388,9 +13386,7 @@ static bool input_driver_ungrab_mouse(struct rarch_state *p_rarch)
static void command_event_reinit(struct rarch_state *p_rarch,
const int flags)
{
- settings_t *settings = p_rarch->configuration_settings;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
-
+ settings_t *settings = p_rarch->configuration_settings;
#ifdef HAVE_MENU
bool video_fullscreen = settings->bools.video_fullscreen;
bool adaptive_vsync = settings->bools.video_adaptive_vsync;
@@ -13400,17 +13396,17 @@ static void command_event_reinit(struct rarch_state *p_rarch,
video_driver_reinit(flags);
/* Poll input to avoid possibly stale data to corrupt things. */
- if ( input_driver_st->primary_joypad &&
- input_driver_st->primary_joypad->poll)
- input_driver_st->primary_joypad->poll();
+ if ( p_rarch->joypad &&
+ p_rarch->joypad->poll)
+ p_rarch->joypad->poll();
#ifdef HAVE_MFI
- if ( input_driver_st->secondary_joypad &&
- input_driver_st->secondary_joypad->poll)
- input_driver_st->secondary_joypad->poll();
+ if ( p_rarch->sec_joypad &&
+ p_rarch->sec_joypad->poll)
+ p_rarch->sec_joypad->poll();
#endif
- if ( p_rarch->input_driver_state.current_driver &&
- p_rarch->input_driver_state.current_driver->poll)
- p_rarch->input_driver_state.current_driver->poll(p_rarch->input_driver_state.current_data);
+ if ( p_rarch->current_input &&
+ p_rarch->current_input->poll)
+ p_rarch->current_input->poll(p_rarch->current_input_data);
command_event(CMD_EVENT_GAME_FOCUS_TOGGLE, &game_focus_cmd);
#ifdef HAVE_MENU
@@ -15051,13 +15047,11 @@ bool command_event(enum event_command cmd, void *data)
break;
case CMD_EVENT_RUMBLE_STOP:
{
- input_driver_state_t *input_driver_st = &(p_rarch->input_driver_state);
unsigned i;
for (i = 0; i < MAX_USERS; i++)
{
- unsigned joy_idx = settings->uints.input_joypad_index[i];
- input_driver_set_rumble(input_driver_st, i, joy_idx, RETRO_RUMBLE_STRONG, 0);
- input_driver_set_rumble(input_driver_st, i, joy_idx, RETRO_RUMBLE_WEAK, 0);
+ input_driver_set_rumble_state(i, RETRO_RUMBLE_STRONG, 0);
+ input_driver_set_rumble_state(i, RETRO_RUMBLE_WEAK, 0);
}
}
break;
@@ -15308,7 +15302,7 @@ bool command_event(enum event_command cmd, void *data)
rarch_system_info_t *info = &runloop_state.system;
if (info)
command_event_init_controllers(info, settings,
- settings->uints.input_max_users);
+ p_rarch->input_driver_max_users);
}
break;
case CMD_EVENT_NONE:
@@ -15764,9 +15758,8 @@ void emscripten_mainloop(void)
static unsigned emscripten_frame_count = 0;
struct rarch_state *p_rarch = &rarch_st;
settings_t *settings = p_rarch->configuration_settings;
- input_driver_state_t *input_driver_st = &(p_rarch->input_driver_state);
bool black_frame_insertion = settings->uints.video_black_frame_insertion;
- bool input_driver_nonblock_state = input_driver_get_nonblocking(input_driver_st);
+ bool input_driver_nonblock_state = p_rarch->input_driver_nonblock_state;
bool runloop_is_slowmotion = runloop_state.slowmotion;
bool runloop_is_paused = runloop_state.paused;
@@ -16464,11 +16457,10 @@ static const char *hw_render_context_name(enum retro_hw_context_type type, int m
static bool rarch_environment_cb(unsigned cmd, void *data)
{
unsigned p;
- struct rarch_state *p_rarch = &rarch_st;
- settings_t *settings = p_rarch->configuration_settings;
- input_driver_state_t *input_driver_st = &(p_rarch->input_driver_state);
- rarch_system_info_t *system = &runloop_state.system;
- bool ignore_environment_cb = p_rarch->ignore_environment_cb;
+ struct rarch_state *p_rarch = &rarch_st;
+ settings_t *settings = p_rarch->configuration_settings;
+ rarch_system_info_t *system = &runloop_state.system;
+ bool ignore_environment_cb = p_rarch->ignore_environment_cb;
if (ignore_environment_cb)
return false;
@@ -17063,7 +17055,7 @@ static bool rarch_environment_cb(unsigned cmd, void *data)
if (log_level == RETRO_LOG_DEBUG)
{
unsigned input_driver_max_users =
- settings->uints.input_max_users;
+ p_rarch->input_driver_max_users;
for (p = 0; p < input_driver_max_users; p++)
{
unsigned mapped_port = settings->uints.input_remap_ports[p];
@@ -17396,7 +17388,7 @@ static bool rarch_environment_cb(unsigned cmd, void *data)
(struct retro_rumble_interface*)data;
RARCH_LOG("[Environ]: GET_RUMBLE_INTERFACE.\n");
- iface->set_rumble_state = input_set_rumble_state;
+ iface->set_rumble_state = input_driver_set_rumble_state;
break;
}
@@ -17405,7 +17397,7 @@ static bool rarch_environment_cb(unsigned cmd, void *data)
uint64_t *mask = (uint64_t*)data;
RARCH_LOG("[Environ]: GET_INPUT_DEVICE_CAPABILITIES.\n");
- if (!p_rarch->input_driver_state.current_driver->get_capabilities || !p_rarch->input_driver_state.current_data)
+ if (!p_rarch->current_input->get_capabilities || !p_rarch->current_input_data)
return false;
*mask = input_driver_get_capabilities();
break;
@@ -17422,8 +17414,8 @@ static bool rarch_environment_cb(unsigned cmd, void *data)
if (!input_sensors_enable)
return false;
- iface->set_sensor_state = input_set_sensor_state;
- iface->get_sensor_input = input_get_sensor_state;
+ iface->set_sensor_state = input_sensor_set_state;
+ iface->get_sensor_input = input_sensor_get_input;
break;
}
case RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE:
@@ -17962,11 +17954,11 @@ static bool rarch_environment_cb(unsigned cmd, void *data)
p_runloop->fastmotion_override.fastforward;
if (p_runloop->fastmotion)
- input_driver_set_nonblocking(input_driver_st, true);
+ p_rarch->input_driver_nonblock_state = true;
else
{
- input_driver_set_nonblocking(input_driver_st, false);
- p_rarch->fastforward_after_frames = 1;
+ p_rarch->input_driver_nonblock_state = false;
+ p_rarch->fastforward_after_frames = 1;
}
driver_set_nonblock_state();
@@ -18025,7 +18017,7 @@ static bool rarch_environment_cb(unsigned cmd, void *data)
}
case RETRO_ENVIRONMENT_GET_INPUT_MAX_USERS:
- *(unsigned *)data = settings->uints.input_max_users;
+ *(unsigned *)data = p_rarch->input_driver_max_users;
break;
/* Private environment callbacks.
@@ -18905,7 +18897,7 @@ static bool secondary_core_create(struct rarch_state *p_rarch,
const enum rarch_core_type
last_core_type = p_rarch->last_core_type;
rarch_system_info_t *info = &runloop_state.system;
- unsigned num_active_users = settings->uints.input_max_users;
+ unsigned num_active_users = p_rarch->input_driver_max_users;
if ( last_core_type != CORE_TYPE_PLAIN ||
!p_rarch->load_content_info ||
@@ -21442,10 +21434,9 @@ static void input_poll_overlay(
uint16_t key_mod = 0;
bool polled = false;
bool button_pressed = false;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
- void *input_data = input_driver_st->current_data;
+ void *input_data = p_rarch->current_input_data;
input_overlay_state_t *ol_state = &ol->overlay_state;
- input_driver_t *current_input = input_driver_st->current_driver;
+ input_driver_t *current_input = p_rarch->current_input;
enum overlay_show_input_type
input_overlay_show_inputs = (enum overlay_show_input_type)
settings->uints.input_overlay_show_inputs;
@@ -21467,7 +21458,7 @@ static void input_poll_overlay(
: RETRO_DEVICE_POINTER;
#ifdef HAVE_MFI
const input_device_driver_t
- *sec_joypad = input_driver_st->secondary_joypad;
+ *sec_joypad = p_rarch->sec_joypad;
#else
const input_device_driver_t
*sec_joypad = NULL;
@@ -21480,7 +21471,7 @@ static void input_poll_overlay(
for (i = 0;
current_input->input_state(
input_data,
- input_driver_st->primary_joypad,
+ p_rarch->joypad,
sec_joypad,
&joypad_info,
NULL,
@@ -21494,7 +21485,7 @@ static void input_poll_overlay(
input_overlay_state_t polled_data;
int16_t x = current_input->input_state(
input_data,
- input_driver_st->primary_joypad,
+ p_rarch->joypad,
sec_joypad,
&joypad_info,
NULL,
@@ -21505,7 +21496,7 @@ static void input_poll_overlay(
RETRO_DEVICE_ID_POINTER_X);
int16_t y = current_input->input_state(
input_data,
- input_driver_st->primary_joypad,
+ p_rarch->joypad,
sec_joypad,
&joypad_info,
NULL,
@@ -21828,134 +21819,119 @@ const char* config_get_input_driver_options(void)
return char_list_new_special(STRING_LIST_INPUT_DRIVERS, NULL);
}
-/******************************************************************************
- * BEGIN helper functions for input_driver refactoring
- *
- * These functions have similar names and signatures to functions that now require
- * an input_driver_state_t pointer to be passed to them. They essentially wrap
- * the newer functions by grabbing pointer to the driver state struct and the
- * settings struct.
- ******************************************************************************/
-
/**
- * Retrieves the sensor state associated with the provided port and ID.
- *
- * @param port
- * @param id Sensor ID
+ * input_driver_set_rumble_state:
+ * @port : User number.
+ * @effect : Rumble effect.
+ * @strength : Strength of rumble effect.
*
- * @return The current state associated with the port and ID as a float
+ * Sets the rumble state.
+ * Used by RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE.
**/
-float input_get_sensor_state(unsigned port, unsigned id)
-{
- struct rarch_state *p_rarch = &rarch_st;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
- settings_t *settings = p_rarch->configuration_settings;
- bool input_sensors_enable = settings->bools.input_sensors_enable;
-
- return input_driver_get_sensor(input_driver_st, port, input_sensors_enable, id);
-}
-
-/**
- * Sets the rumble state. Used by RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE.
- *
- * @param port User number.
- * @param effect Rumble effect.
- * @param strength Strength of rumble effect.
- *
- * @return true if the rumble state has been successfully set
- **/
-bool input_set_rumble_state(unsigned port,
+bool input_driver_set_rumble_state(unsigned port,
enum retro_rumble_effect effect, uint16_t strength)
{
- struct rarch_state *p_rarch = &rarch_st;
- input_driver_state_t *input_driver_st = &(p_rarch->input_driver_state);
- settings_t *settings = p_rarch->configuration_settings;
- unsigned joy_idx = settings->uints.input_joypad_index[port];
+ struct rarch_state *p_rarch = &rarch_st;
+ settings_t *settings = p_rarch->configuration_settings;
+#ifdef HAVE_MFI
+ const input_device_driver_t *sec_joypad = p_rarch->sec_joypad;
+#else
+ const input_device_driver_t *sec_joypad = NULL;
+#endif
+ bool rumble_state = false;
+ unsigned joy_idx = settings->uints.input_joypad_index[port];
- return input_driver_set_rumble(
- input_driver_st,
- port, joy_idx, effect, strength);
+ if (joy_idx >= MAX_USERS)
+ return false;
+ if (p_rarch->joypad && p_rarch->joypad->set_rumble)
+ rumble_state = p_rarch->joypad->set_rumble(
+ joy_idx, effect, strength);
+ if (sec_joypad && sec_joypad->set_rumble)
+ rumble_state = sec_joypad->set_rumble(
+ joy_idx, effect, strength);
+ return rumble_state;
}
-/**
- * Sets the sensor state. Used by RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE.
- *
- * @param port
- * @param action
- * @param rate
- *
- * @return true if the sensor state has been successfully set
- **/
-bool input_set_sensor_state(unsigned port,
- enum retro_sensor_action action, unsigned rate)
-{
- struct rarch_state *p_rarch = &rarch_st;
- settings_t *settings = p_rarch->configuration_settings;
- bool input_sensors_enable = settings->bools.input_sensors_enable;
- return input_driver_set_sensor(
- &p_rarch->input_driver_state,
- port, input_sensors_enable, action, rate);
-}
-
-void input_set_nonblock_state(void)
-{
- struct rarch_state *p_rarch = &rarch_st;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
-
- input_driver_set_nonblocking(input_driver_st, true);
-}
-
-void input_unset_nonblock_state(void)
-{
- struct rarch_state *p_rarch = &rarch_st;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
-
- input_driver_set_nonblocking(input_driver_st, false);
-}
-
-/******************************************************************************
- * END helper functions for input_driver refactoring
- ******************************************************************************/
-
const char *joypad_driver_name(unsigned i)
{
- struct rarch_state *p_rarch = &rarch_st;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
- if (!p_rarch || !input_driver_st->primary_joypad || !input_driver_st->primary_joypad->name)
+ struct rarch_state *p_rarch = &rarch_st;
+ if (!p_rarch || !p_rarch->joypad || !p_rarch->joypad->name)
return NULL;
- return input_driver_st->primary_joypad->name(i);
+ return p_rarch->joypad->name(i);
}
void joypad_driver_reinit(void *data, const char *joypad_driver_name)
{
- struct rarch_state *p_rarch = &rarch_st;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
-
+ struct rarch_state *p_rarch = &rarch_st;
if (!p_rarch)
return;
- if (input_driver_st->primary_joypad)
- input_driver_st->primary_joypad->destroy();
- input_driver_st->primary_joypad = NULL;
+ if (p_rarch->joypad)
+ p_rarch->joypad->destroy();
+ p_rarch->joypad = NULL;
#ifdef HAVE_MFI
- if (input_driver_st->secondary_joypad)
- input_driver_st->secondary_joypad->destroy();
- input_driver_st->secondary_joypad = NULL;
+ if (p_rarch->sec_joypad)
+ p_rarch->sec_joypad->destroy();
+ p_rarch->sec_joypad = NULL;
#endif
- input_driver_st->primary_joypad = input_joypad_init_driver(joypad_driver_name, data);
+ p_rarch->joypad = input_joypad_init_driver(joypad_driver_name, data);
#ifdef HAVE_MFI
- input_driver_st->secondary_joypad = input_joypad_init_driver("mfi", data);
+ p_rarch->sec_joypad = input_joypad_init_driver("mfi", data);
#endif
}
static uint64_t input_driver_get_capabilities(void)
{
struct rarch_state *p_rarch = &rarch_st;
- if (!p_rarch->input_driver_state.current_driver || !p_rarch->input_driver_state.current_driver->get_capabilities)
+ if (!p_rarch->current_input || !p_rarch->current_input->get_capabilities)
return 0;
- return p_rarch->input_driver_state.current_driver->get_capabilities(p_rarch->input_driver_state.current_data);
+ return p_rarch->current_input->get_capabilities(p_rarch->current_input_data);
}
+/**
+ * input_sensor_set_state:
+ * @port : User number.
+ * @effect : Sensor action.
+ * @rate : Sensor rate update.
+ *
+ * Sets the sensor state.
+ * Used by RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE.
+ **/
+bool input_sensor_set_state(unsigned port,
+ enum retro_sensor_action action, unsigned rate)
+{
+ struct rarch_state *p_rarch = &rarch_st;
+ settings_t *settings = p_rarch->configuration_settings;
+ bool input_sensors_enable = settings->bools.input_sensors_enable;
+
+ /* If sensors are disabled, inhibit any enable
+ * actions (but always allow disable actions) */
+ if (!input_sensors_enable &&
+ ((action == RETRO_SENSOR_ACCELEROMETER_ENABLE) ||
+ (action == RETRO_SENSOR_GYROSCOPE_ENABLE) ||
+ (action == RETRO_SENSOR_ILLUMINANCE_ENABLE)))
+ return false;
+
+ if (p_rarch->current_input_data &&
+ p_rarch->current_input->set_sensor_state)
+ return p_rarch->current_input->set_sensor_state(p_rarch->current_input_data,
+ port, action, rate);
+ return false;
+}
+
+float input_sensor_get_input(unsigned port, unsigned id)
+{
+ struct rarch_state *p_rarch = &rarch_st;
+ settings_t *settings = p_rarch->configuration_settings;
+ bool input_sensors_enable = settings->bools.input_sensors_enable;
+
+ if (input_sensors_enable &&
+ p_rarch->current_input_data &&
+ p_rarch->current_input->get_sensor_input)
+ return p_rarch->current_input->get_sensor_input(p_rarch->current_input_data,
+ port, id);
+ return 0.0f;
+}
/**
* input_poll:
@@ -21967,11 +21943,10 @@ static void input_driver_poll(void)
size_t i, j;
rarch_joypad_info_t joypad_info[MAX_USERS];
struct rarch_state *p_rarch = &rarch_st;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
settings_t *settings = p_rarch->configuration_settings;
#ifdef HAVE_MFI
const input_device_driver_t
- *sec_joypad = input_driver_st->secondary_joypad;
+ *sec_joypad = p_rarch->sec_joypad;
#else
const input_device_driver_t
*sec_joypad = NULL;
@@ -21980,19 +21955,19 @@ static void input_driver_poll(void)
float input_overlay_opacity = settings->floats.input_overlay_opacity;
#endif
bool input_remap_binds_enable = settings->bools.input_remap_binds_enable;
- uint8_t max_users = (uint8_t)settings->uints.input_max_users;
+ uint8_t max_users = (uint8_t)p_rarch->input_driver_max_users;
- if ( input_driver_st->primary_joypad
- && input_driver_st->primary_joypad->poll)
- input_driver_st->primary_joypad->poll();
+ if ( p_rarch->joypad
+ && p_rarch->joypad->poll)
+ p_rarch->joypad->poll();
#ifdef HAVE_MFI
- if ( input_driver_st->secondary_joypad
- && input_driver_st->secondary_joypad->poll)
- input_driver_st->secondary_joypad->poll();
+ if ( p_rarch->sec_joypad
+ && p_rarch->sec_joypad->poll)
+ p_rarch->sec_joypad->poll();
#endif
- if ( p_rarch->input_driver_state.current_driver
- && p_rarch->input_driver_state.current_driver->poll)
- p_rarch->input_driver_state.current_driver->poll(p_rarch->input_driver_state.current_data);
+ if ( p_rarch->current_input
+ && p_rarch->current_input->poll)
+ p_rarch->current_input->poll(p_rarch->current_input_data);
p_rarch->input_driver_turbo_btns.count++;
@@ -22008,15 +21983,15 @@ static void input_driver_poll(void)
* when mapping analog stick to dpad input. */
for (i = 0; i < max_users; i++)
{
- joypad_info[i].axis_threshold = settings->floats.input_axis_threshold;
+ joypad_info[i].axis_threshold = p_rarch->input_driver_axis_threshold;
joypad_info[i].joy_idx = settings->uints.input_joypad_index[i];
joypad_info[i].auto_binds = input_autoconf_binds[joypad_info[i].joy_idx];
p_rarch->input_driver_turbo_btns.frame_enable[i] = p_rarch->libretro_input_binds[i][RARCH_TURBO_ENABLE].valid ?
input_state_wrap(
- p_rarch->input_driver_state.current_driver,
- p_rarch->input_driver_state.current_data,
- input_driver_st->primary_joypad,
+ p_rarch->current_input,
+ p_rarch->current_input_data,
+ p_rarch->joypad,
sec_joypad,
&joypad_info[i],
p_rarch->libretro_input_binds,
@@ -22058,7 +22033,7 @@ static void input_driver_poll(void)
p_rarch->overlay_ptr,
input_overlay_opacity,
input_analog_dpad_mode,
- settings->floats.input_analog_deadzone);
+ p_rarch->input_driver_axis_threshold);
}
#endif
@@ -22073,7 +22048,7 @@ static void input_driver_poll(void)
#endif
input_mapper_t *handle = &p_rarch->input_driver_mapper;
const input_device_driver_t *joypad_driver
- = input_driver_st->primary_joypad;
+ = p_rarch->joypad;
float input_analog_deadzone = settings->floats.input_analog_deadzone;
float input_analog_sensitivity = settings->floats.input_analog_sensitivity;
@@ -22113,9 +22088,9 @@ static void input_driver_poll(void)
{
unsigned k, j;
int16_t ret = input_state_wrap(
- p_rarch->input_driver_state.current_driver,
- p_rarch->input_driver_state.current_data,
- input_driver_st->primary_joypad,
+ p_rarch->current_input,
+ p_rarch->current_input_data,
+ p_rarch->joypad,
sec_joypad,
&joypad_info[i],
p_rarch->libretro_input_binds,
@@ -22196,7 +22171,7 @@ static void input_driver_poll(void)
{
int16_t current_axis_value = p_new_state->analogs[j - RARCH_FIRST_CUSTOM_BIND];
current_button_value = abs(current_axis_value) >
- settings->floats.input_axis_threshold
+ p_rarch->input_driver_axis_threshold
* 32767;
}
else
@@ -22326,7 +22301,7 @@ static void input_driver_poll(void)
{
if (remap_axis < RARCH_FIRST_CUSTOM_BIND &&
abs(current_axis_value) >
- settings->floats.input_axis_threshold
+ p_rarch->input_driver_axis_threshold
* 32767)
{
BIT256_SET(handle->buttons[i], remap_axis);
@@ -22768,28 +22743,27 @@ static int16_t input_state_internal(unsigned port, unsigned device,
rarch_joypad_info_t joypad_info;
unsigned mapped_port;
struct rarch_state *p_rarch = &rarch_st;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
settings_t *settings = p_rarch->configuration_settings;
float input_analog_deadzone = settings->floats.input_analog_deadzone;
float input_analog_sensitivity = settings->floats.input_analog_sensitivity;
unsigned *input_remap_port_map = settings->uints.input_remap_port_map[port];
bool input_driver_analog_requested = p_rarch->input_driver_analog_requested[port];
- const input_device_driver_t *joypad = input_driver_st->primary_joypad;
+ const input_device_driver_t *joypad = p_rarch->joypad;
#ifdef HAVE_MFI
- const input_device_driver_t *sec_joypad = input_driver_st->secondary_joypad;
+ const input_device_driver_t *sec_joypad = p_rarch->sec_joypad;
#else
const input_device_driver_t *sec_joypad = NULL;
#endif
bool input_blocked = (p_rarch->input_driver_flushing_input > 0) ||
p_rarch->input_driver_block_libretro_input;
bool bitmask_enabled = false;
- unsigned max_users = settings->uints.input_max_users;
+ unsigned max_users = p_rarch->input_driver_max_users;
int16_t result = 0;
device &= RETRO_DEVICE_MASK;
bitmask_enabled = (device == RETRO_DEVICE_JOYPAD) &&
(id == RETRO_DEVICE_ID_JOYPAD_MASK);
- joypad_info.axis_threshold = settings->floats.input_axis_threshold;
+ joypad_info.axis_threshold = p_rarch->input_driver_axis_threshold;
/* Loop over all 'physical' ports mapped to specified
* 'virtual' port index */
@@ -22830,8 +22804,8 @@ static int16_t input_state_internal(unsigned port, unsigned device,
* thing needs to be rewritten from scratch... */
ret = input_state_wrap(
- p_rarch->input_driver_state.current_driver,
- p_rarch->input_driver_state.current_data,
+ p_rarch->current_input,
+ p_rarch->current_input_data,
joypad,
sec_joypad,
&joypad_info,
@@ -23094,13 +23068,12 @@ static int16_t menu_input_read_mouse_hw(
enum menu_input_mouse_hw_id id)
{
rarch_joypad_info_t joypad_info;
- unsigned type = 0;
- unsigned device = RETRO_DEVICE_MOUSE;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
- input_driver_t *current_input = input_driver_st->current_driver;
+ unsigned type = 0;
+ unsigned device = RETRO_DEVICE_MOUSE;
+ input_driver_t *current_input = p_rarch->current_input;
#ifdef HAVE_MFI
const input_device_driver_t
- *sec_joypad = input_driver_st->secondary_joypad;
+ *sec_joypad = p_rarch->sec_joypad;
#else
const input_device_driver_t
*sec_joypad = NULL;
@@ -23143,8 +23116,8 @@ static int16_t menu_input_read_mouse_hw(
if (!current_input->input_state)
return 0;
return current_input->input_state(
- input_driver_st->current_data,
- input_driver_st->primary_joypad,
+ p_rarch->current_input_data,
+ p_rarch->joypad,
sec_joypad,
&joypad_info,
NULL,
@@ -23282,9 +23255,8 @@ static void menu_input_get_touchscreen_hw_state(
int pointer_y = 0;
settings_t *settings =
p_rarch->configuration_settings;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
const struct retro_keybind *binds[MAX_USERS] = {NULL};
- input_driver_t *current_input = p_rarch->input_driver_state.current_driver;
+ input_driver_t *current_input = p_rarch->current_input;
menu_handle_t *menu = p_rarch->menu_driver_data;
/* Is a background texture set for the current menu driver?
* Checks if the menu framebuffer is set.
@@ -23302,7 +23274,7 @@ static void menu_input_get_touchscreen_hw_state(
unsigned input_touch_scale = settings->uints.input_touch_scale;
#ifdef HAVE_MFI
const input_device_driver_t
- *sec_joypad = input_driver_st->secondary_joypad;
+ *sec_joypad = p_rarch->sec_joypad;
#else
const input_device_driver_t
*sec_joypad = NULL;
@@ -23352,8 +23324,8 @@ static void menu_input_get_touchscreen_hw_state(
/* X pos */
if (current_input->input_state)
pointer_x = current_input->input_state(
- p_rarch->input_driver_state.current_data,
- input_driver_st->primary_joypad,
+ p_rarch->current_input_data,
+ p_rarch->joypad,
sec_joypad,
&joypad_info, binds,
p_rarch->keyboard_mapping_blocked,
@@ -23383,8 +23355,8 @@ static void menu_input_get_touchscreen_hw_state(
/* Y pos */
if (current_input->input_state)
pointer_y = current_input->input_state(
- p_rarch->input_driver_state.current_data,
- input_driver_st->primary_joypad,
+ p_rarch->current_input_data,
+ p_rarch->joypad,
sec_joypad,
&joypad_info, binds,
p_rarch->keyboard_mapping_blocked,
@@ -23410,8 +23382,8 @@ static void menu_input_get_touchscreen_hw_state(
* Note that releasing select also counts as activity */
if (current_input->input_state)
hw_state->select_pressed = (bool)current_input->input_state(
- p_rarch->input_driver_state.current_data,
- input_driver_st->primary_joypad,
+ p_rarch->current_input_data,
+ p_rarch->joypad,
sec_joypad,
&joypad_info, binds,
p_rarch->keyboard_mapping_blocked,
@@ -23425,8 +23397,8 @@ static void menu_input_get_touchscreen_hw_state(
* Note that releasing cancel also counts as activity */
if (current_input->input_state)
hw_state->cancel_pressed = (bool)current_input->input_state(
- p_rarch->input_driver_state.current_data,
- input_driver_st->primary_joypad,
+ p_rarch->current_input_data,
+ p_rarch->joypad,
sec_joypad,
&joypad_info, binds,
p_rarch->keyboard_mapping_blocked,
@@ -24723,10 +24695,9 @@ static void input_keys_pressed(
rarch_joypad_info_t *joypad_info)
{
unsigned i;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
#ifdef HAVE_MFI
const input_device_driver_t
- *sec_joypad = input_driver_st->secondary_joypad;
+ *sec_joypad = p_rarch->sec_joypad;
#else
const input_device_driver_t
*sec_joypad = NULL;
@@ -24735,9 +24706,9 @@ static void input_keys_pressed(
if (CHECK_INPUT_DRIVER_BLOCK_HOTKEY(binds_norm, binds_auto))
{
if ( input_state_wrap(
- input_driver_st->current_driver,
- input_driver_st->current_data,
- input_driver_st->primary_joypad,
+ p_rarch->current_input,
+ p_rarch->current_input_data,
+ p_rarch->joypad,
sec_joypad,
joypad_info,
&binds[port],
@@ -24771,9 +24742,9 @@ static void input_keys_pressed(
focus_normal, focus_binds_auto))
{
if (input_state_wrap(
- p_rarch->input_driver_state.current_driver,
- p_rarch->input_driver_state.current_data,
- input_driver_st->primary_joypad,
+ p_rarch->current_input,
+ p_rarch->current_input_data,
+ p_rarch->joypad,
sec_joypad,
joypad_info,
&binds[port],
@@ -24790,9 +24761,9 @@ static void input_keys_pressed(
/* Check the libretro input first */
if (!p_rarch->input_driver_block_libretro_input)
ret = input_state_wrap(
- p_rarch->input_driver_state.current_driver,
- p_rarch->input_driver_state.current_data,
- input_driver_st->primary_joypad,
+ p_rarch->current_input,
+ p_rarch->current_input_data,
+ p_rarch->joypad,
sec_joypad,
joypad_info, &binds[port],
p_rarch->keyboard_mapping_blocked,
@@ -24830,9 +24801,9 @@ static void input_keys_pressed(
{
bool bit_pressed = binds[port][i].valid
&& input_state_wrap(
- p_rarch->input_driver_state.current_driver,
- p_rarch->input_driver_state.current_data,
- input_driver_st->primary_joypad,
+ p_rarch->current_input,
+ p_rarch->current_input_data,
+ p_rarch->joypad,
sec_joypad,
joypad_info,
&binds[port],
@@ -24848,18 +24819,23 @@ static void input_keys_pressed(
}
}
+void *input_driver_get_data(void)
+{
+ struct rarch_state *p_rarch = &rarch_st;
+ return p_rarch->current_input_data;
+}
+
void input_driver_init_joypads(void)
{
- struct rarch_state *p_rarch = &rarch_st;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
- settings_t *settings = p_rarch->configuration_settings;
- input_driver_st->primary_joypad = input_joypad_init_driver(
+ struct rarch_state *p_rarch = &rarch_st;
+ settings_t *settings = p_rarch->configuration_settings;
+ p_rarch->joypad = input_joypad_init_driver(
settings->arrays.input_joypad_driver,
- input_driver_st->current_data);
+ p_rarch->current_input_data);
#ifdef HAVE_MFI
- input_driver_st->secondary_joypad = input_joypad_init_driver(
+ p_rarch->sec_joypad = input_joypad_init_driver(
"mfi",
- input_driver_st->current_data);
+ p_rarch->current_input_data);
#endif
}
@@ -24879,11 +24855,11 @@ void *input_driver_init_wrap(input_driver_t *input, const char *name)
static bool input_driver_init(struct rarch_state *p_rarch,
settings_t *settings)
{
- if (p_rarch->input_driver_state.current_driver)
- p_rarch->input_driver_state.current_data = input_driver_init_wrap(
- p_rarch->input_driver_state.current_driver, settings->arrays.input_joypad_driver);
+ if (p_rarch->current_input)
+ p_rarch->current_input_data = input_driver_init_wrap(
+ p_rarch->current_input, settings->arrays.input_joypad_driver);
- return (p_rarch->input_driver_state.current_data != NULL);
+ return (p_rarch->current_input_data != NULL);
}
static bool input_driver_find_driver(
@@ -24898,9 +24874,9 @@ static bool input_driver_find_driver(
if (i >= 0)
{
- p_rarch->input_driver_state.current_driver = (input_driver_t*)input_drivers[i];
+ p_rarch->current_input = (input_driver_t*)input_drivers[i];
RARCH_LOG("[Input]: Found %s: \"%s\".\n", prefix,
- p_rarch->input_driver_state.current_driver->ident);
+ p_rarch->current_input->ident);
}
else
{
@@ -24915,9 +24891,9 @@ static bool input_driver_find_driver(
RARCH_WARN("Going to default to first %s...\n", prefix);
}
- p_rarch->input_driver_state.current_driver = (input_driver_t*)input_drivers[0];
+ p_rarch->current_input = (input_driver_t*)input_drivers[0];
- if (!p_rarch->input_driver_state.current_driver)
+ if (!p_rarch->current_input)
{
retroarch_fail(p_rarch, 1, "find_input_driver()");
return false;
@@ -24927,6 +24903,18 @@ static bool input_driver_find_driver(
return true;
}
+void input_driver_set_nonblock_state(void)
+{
+ struct rarch_state *p_rarch = &rarch_st;
+ p_rarch->input_driver_nonblock_state = true;
+}
+
+void input_driver_unset_nonblock_state(void)
+{
+ struct rarch_state *p_rarch = &rarch_st;
+ p_rarch->input_driver_nonblock_state = false;
+}
+
#ifdef HAVE_COMMAND
static void input_driver_init_command(struct rarch_state *p_rarch,
settings_t *settings)
@@ -24938,8 +24926,8 @@ static void input_driver_init_command(struct rarch_state *p_rarch,
if (input_stdin_cmd_enable)
{
- bool grab_stdin = p_rarch->input_driver_state.current_driver->grab_stdin &&
- p_rarch->input_driver_state.current_driver->grab_stdin(p_rarch->input_driver_state.current_data);
+ bool grab_stdin = p_rarch->current_input->grab_stdin &&
+ p_rarch->current_input->grab_stdin(p_rarch->current_input_data);
if (grab_stdin)
{
RARCH_WARN("stdin command interface is desired, "
@@ -24998,6 +24986,38 @@ static input_remote_t *input_driver_init_remote(
}
#endif
+float *input_driver_get_float(enum input_action action)
+{
+ struct rarch_state *p_rarch = &rarch_st;
+
+ switch (action)
+ {
+ case INPUT_ACTION_AXIS_THRESHOLD:
+ return &p_rarch->input_driver_axis_threshold;
+ default:
+ case INPUT_ACTION_NONE:
+ break;
+ }
+
+ return NULL;
+}
+
+unsigned *input_driver_get_uint(enum input_action action)
+{
+ struct rarch_state *p_rarch = &rarch_st;
+
+ switch (action)
+ {
+ case INPUT_ACTION_MAX_USERS:
+ return &p_rarch->input_driver_max_users;
+ default:
+ case INPUT_ACTION_NONE:
+ break;
+ }
+
+ return NULL;
+}
+
/**
* config_get_joypad_driver_options:
*
@@ -25010,6 +25030,70 @@ const char* config_get_joypad_driver_options(void)
return char_list_new_special(STRING_LIST_INPUT_JOYPAD_DRIVERS, NULL);
}
+/**
+ * input_joypad_init_first:
+ *
+ * Finds first suitable joypad driver and initializes.
+ *
+ * Returns: joypad driver if found, otherwise NULL.
+ **/
+static const input_device_driver_t *input_joypad_init_first(void *data)
+{
+ unsigned i;
+
+ for (i = 0; joypad_drivers[i]; i++)
+ {
+ if ( joypad_drivers[i]
+ && joypad_drivers[i]->init)
+ {
+ void *ptr = joypad_drivers[i]->init(data);
+ if (ptr)
+ {
+ RARCH_LOG("[Joypad]: Found joypad driver: \"%s\".\n",
+ joypad_drivers[i]->ident);
+ return joypad_drivers[i];
+ }
+ }
+ }
+
+ return NULL;
+}
+
+/**
+ * input_joypad_init_driver:
+ * @ident : identifier of driver to initialize.
+ *
+ * Initialize a joypad driver of name @ident.
+ *
+ * If ident points to NULL or a zero-length string,
+ * equivalent to calling input_joypad_init_first().
+ *
+ * Returns: joypad driver if found, otherwise NULL.
+ **/
+const input_device_driver_t *input_joypad_init_driver(
+ const char *ident, void *data)
+{
+ unsigned i;
+ if (ident && *ident)
+ {
+ for (i = 0; joypad_drivers[i]; i++)
+ {
+ if (string_is_equal(ident, joypad_drivers[i]->ident)
+ && joypad_drivers[i]->init)
+ {
+ void *ptr = joypad_drivers[i]->init(data);
+ if (ptr)
+ {
+ RARCH_LOG("[Joypad]: Found joypad driver: \"%s\".\n",
+ joypad_drivers[i]->ident);
+ return joypad_drivers[i];
+ }
+ }
+ }
+ }
+
+ return input_joypad_init_first(data);
+}
bool input_key_pressed(int key, bool keyboard_pressed)
{
@@ -25022,18 +25106,16 @@ bool input_key_pressed(int key, bool keyboard_pressed)
)
)
{
- struct rarch_state *p_rarch = &rarch_st;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
- settings_t *settings = p_rarch->configuration_settings;
+ struct rarch_state *p_rarch = &rarch_st;
const input_device_driver_t
*joypad = (const input_device_driver_t*)
- input_driver_st->primary_joypad;
+ p_rarch->joypad;
const uint64_t bind_joykey = input_config_binds[0][key].joykey;
const uint64_t bind_joyaxis = input_config_binds[0][key].joyaxis;
const uint64_t autobind_joykey = input_autoconf_binds[0][key].joykey;
const uint64_t autobind_joyaxis= input_autoconf_binds[0][key].joyaxis;
uint16_t port = 0;
- float axis_threshold = settings->floats.input_axis_threshold;
+ float axis_threshold = p_rarch->input_driver_axis_threshold;
const uint64_t joykey = (bind_joykey != NO_BTN)
? bind_joykey : autobind_joykey;
const uint32_t joyaxis = (bind_joyaxis != AXIS_NONE)
@@ -25280,11 +25362,9 @@ static bool input_mouse_button_raw(
unsigned port, unsigned id)
{
rarch_joypad_info_t joypad_info;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
- settings_t *settings = p_rarch->configuration_settings;
#ifdef HAVE_MFI
const input_device_driver_t
- *sec_joypad = input_driver_st->secondary_joypad;
+ *sec_joypad = p_rarch->sec_joypad;
#else
const input_device_driver_t
*sec_joypad = NULL;
@@ -25294,14 +25374,14 @@ static bool input_mouse_button_raw(
if (id == RETRO_DEVICE_ID_MOUSE_X || id == RETRO_DEVICE_ID_MOUSE_Y)
return false;
- joypad_info.axis_threshold = settings->floats.input_axis_threshold;
+ joypad_info.axis_threshold = p_rarch->input_driver_axis_threshold;
joypad_info.joy_idx = joy_idx;
joypad_info.auto_binds = input_autoconf_binds[joy_idx];
if (current_input->input_state)
return current_input->input_state(
- p_rarch->input_driver_state.current_data,
- input_driver_st->primary_joypad,
+ p_rarch->current_input_data,
+ p_rarch->joypad,
sec_joypad,
&joypad_info,
p_rarch->libretro_input_binds,
@@ -29728,7 +29808,7 @@ static void video_driver_init_input(
bool verbosity_enabled)
{
struct rarch_state *p_rarch = &rarch_st;
- input_driver_t **input = &p_rarch->input_driver_state.current_driver;
+ input_driver_t **input = &p_rarch->current_input;
if (*input)
return;
@@ -29746,7 +29826,7 @@ static void video_driver_init_input(
/* This should never really happen as tmp (driver.input) is always
* found before this in find_driver_input(), or we have aborted
* in a similar fashion anyways. */
- if (!p_rarch->input_driver_state.current_driver || !input_driver_init(p_rarch, settings))
+ if (!p_rarch->current_input || !input_driver_init(p_rarch, settings))
{
RARCH_ERR("[Video]: Cannot initialize input driver. Exiting ...\n");
retroarch_fail(p_rarch, 1, "video_driver_init_input()");
@@ -29818,8 +29898,6 @@ static void video_driver_free_hw_context(struct rarch_state *p_rarch)
static void video_driver_free_internal(struct rarch_state *p_rarch)
{
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
-
#ifdef HAVE_THREADS
bool is_threaded = VIDEO_DRIVER_IS_THREADED_INTERNAL();
#endif
@@ -29833,21 +29911,21 @@ static void video_driver_free_internal(struct rarch_state *p_rarch)
if (!video_driver_is_video_cache_context())
video_driver_free_hw_context(p_rarch);
- if (!(input_driver_st->current_data == p_rarch->video_driver_data))
+ if (!(p_rarch->current_input_data == p_rarch->video_driver_data))
{
- if (input_driver_st->current_driver)
- if (input_driver_st->current_driver->free)
- input_driver_st->current_driver->free(input_driver_st->current_data);
- if (input_driver_st->primary_joypad)
- input_driver_st->primary_joypad->destroy();
- input_driver_st->primary_joypad = NULL;
+ if (p_rarch->current_input)
+ if (p_rarch->current_input->free)
+ p_rarch->current_input->free(p_rarch->current_input_data);
+ if (p_rarch->joypad)
+ p_rarch->joypad->destroy();
+ p_rarch->joypad = NULL;
#ifdef HAVE_MFI
- if (input_driver_st->secondary_joypad)
- input_driver_st->secondary_joypad->destroy();
- input_driver_st->secondary_joypad = NULL;
+ if (p_rarch->sec_joypad)
+ p_rarch->sec_joypad->destroy();
+ p_rarch->sec_joypad = NULL;
#endif
p_rarch->keyboard_mapping_blocked = false;
- p_rarch->input_driver_state.current_data = NULL;
+ p_rarch->current_input_data = NULL;
}
if (p_rarch->video_driver_data
@@ -30205,7 +30283,7 @@ static bool video_driver_init_internal(
/* Reset video frame count */
p_rarch->video_driver_frame_count = 0;
- tmp = p_rarch->input_driver_state.current_driver;
+ tmp = p_rarch->current_input;
/* Need to grab the "real" video driver interface on a reinit. */
video_driver_find_driver(p_rarch, settings,
"video driver", verbosity_enabled);
@@ -30222,8 +30300,8 @@ static bool video_driver_init_internal(
ret = video_init_thread((const video_driver_t**)&p_rarch->current_video,
&p_rarch->video_driver_data,
- &p_rarch->input_driver_state.current_driver,
- (void**)&p_rarch->input_driver_state.current_data,
+ &p_rarch->current_input,
+ (void**)&p_rarch->current_input_data,
p_rarch->current_video,
video);
if (!ret)
@@ -30236,8 +30314,8 @@ static bool video_driver_init_internal(
#endif
p_rarch->video_driver_data = p_rarch->current_video->init(
&video,
- &p_rarch->input_driver_state.current_driver,
- (void**)&p_rarch->input_driver_state.current_data);
+ &p_rarch->current_input,
+ (void**)&p_rarch->current_input_data);
if (!p_rarch->video_driver_data)
{
@@ -31836,7 +31914,6 @@ void video_driver_build_info(video_frame_info_t *video_info)
video_viewport_t *custom_vp = NULL;
struct rarch_state *p_rarch = &rarch_st;
settings_t *settings = p_rarch->configuration_settings;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
#ifdef HAVE_THREADS
bool is_threaded =
VIDEO_DRIVER_IS_THREADED_INTERNAL();
@@ -31952,9 +32029,9 @@ void video_driver_build_info(video_frame_info_t *video_info)
video_info->runloop_is_paused = runloop_state.paused;
video_info->runloop_is_slowmotion = runloop_state.slowmotion;
- video_info->input_driver_nonblock_state = input_driver_get_nonblocking(input_driver_st);
+ video_info->input_driver_nonblock_state = p_rarch->input_driver_nonblock_state;
video_info->input_driver_grab_mouse_state = p_rarch->input_driver_grab_mouse_state;
- video_info->disp_userdata = &p_rarch->dispgfx;
+ video_info->disp_userdata = &p_rarch->dispgfx;
video_info->userdata = VIDEO_DRIVER_GET_PTR_INTERNAL(p_rarch);
@@ -32895,9 +32972,8 @@ static void driver_adjust_system_rates(
**/
void driver_set_nonblock_state(void)
{
- struct rarch_state *p_rarch = &rarch_st;
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
- bool enable = input_driver_get_nonblocking(input_driver_st);
+ struct rarch_state *p_rarch = &rarch_st;
+ bool enable = p_rarch->input_driver_nonblock_state;
settings_t *settings = p_rarch->configuration_settings;
bool audio_sync = settings->bools.audio_sync;
bool video_vsync = settings->bools.video_vsync;
@@ -32944,7 +33020,6 @@ static void drivers_init(struct rarch_state *p_rarch,
int flags,
bool verbosity_enabled)
{
- input_driver_state_t *input_driver_st = &p_rarch->input_driver_state;
#ifdef HAVE_MENU
struct menu_state *menu_st = &p_rarch->menu_driver_state;
#endif
@@ -33126,7 +33201,7 @@ static void drivers_init(struct rarch_state *p_rarch,
if (flags & (DRIVER_VIDEO_MASK | DRIVER_AUDIO_MASK))
{
/* Keep non-throttled state as good as possible. */
- if (input_driver_get_nonblocking(input_driver_st))
+ if (p_rarch->input_driver_nonblock_state)
driver_set_nonblock_state();
}
@@ -33226,7 +33301,7 @@ static void driver_uninit(struct rarch_state *p_rarch, int flags)
p_rarch->video_driver_data = NULL;
if ((flags & DRIVER_INPUT_MASK))
- p_rarch->input_driver_state.current_data = NULL;
+ p_rarch->current_input_data = NULL;
if ((flags & DRIVER_AUDIO_MASK))
p_rarch->audio_driver_context_audio_data = NULL;
@@ -33242,8 +33317,6 @@ static void driver_uninit(struct rarch_state *p_rarch, int flags)
static void retroarch_deinit_drivers(
struct rarch_state *p_rarch, struct retro_callbacks *cbs)
{
- input_driver_state_t *input_driver_st = &(p_rarch->input_driver_state);
-
#if defined(HAVE_GFX_WIDGETS)
/* Tear down display widgets no matter what
* in case the handle is lost in the threaded
@@ -33288,13 +33361,12 @@ static void retroarch_deinit_drivers(
p_rarch->input_driver_keyboard_linefeed_enable = false;
p_rarch->input_driver_block_hotkey = false;
p_rarch->input_driver_block_libretro_input = false;
- input_driver_set_nonblocking(input_driver_st, false);
-
+ p_rarch->input_driver_nonblock_state = false;
p_rarch->input_driver_flushing_input = 0;
memset(&p_rarch->input_driver_turbo_btns, 0, sizeof(turbo_buttons_t));
memset(&p_rarch->input_driver_analog_requested, 0,
sizeof(p_rarch->input_driver_analog_requested));
- p_rarch->input_driver_state.current_driver = NULL;
+ p_rarch->current_input = NULL;
#ifdef HAVE_MENU
menu_driver_destroy(p_rarch,
@@ -35499,12 +35571,12 @@ bool retroarch_main_init(int argc, char *argv[])
#ifdef HAVE_NETWORKGAMEPAD
if (p_rarch->input_driver_remote)
input_remote_free(p_rarch->input_driver_remote,
- settings->uints.input_max_users);
+ p_rarch->input_driver_max_users);
p_rarch->input_driver_remote = NULL;
if (settings->bools.network_remote_enable)
p_rarch->input_driver_remote = input_driver_init_remote(
settings,
- settings->uints.input_max_users);
+ p_rarch->input_driver_max_users);
#endif
input_mapper_reset(&p_rarch->input_driver_mapper);
#ifdef HAVE_REWIND
@@ -36089,7 +36161,6 @@ void retroarch_init_task_queue(void)
bool rarch_ctl(enum rarch_ctl_state state, void *data)
{
struct rarch_state *p_rarch = &rarch_st;
- settings_t *settings = p_rarch->configuration_settings;
switch(state)
{
@@ -36153,7 +36224,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
#ifdef HAVE_NETWORKGAMEPAD
if (p_rarch->input_driver_remote)
input_remote_free(p_rarch->input_driver_remote,
- settings->uints.input_max_users);
+ p_rarch->input_driver_max_users);
p_rarch->input_driver_remote = NULL;
#endif
input_mapper_reset(&p_rarch->input_driver_mapper);
@@ -37151,8 +37222,6 @@ static enum runloop_state runloop_check_state(
#ifdef HAVE_MENU
static input_bits_t last_input = {{0}};
#endif
- input_driver_state_t *input_driver_st = &(p_rarch->input_driver_state);
-
static bool old_focus = true;
struct retro_callbacks *cbs = &p_rarch->retro_ctx;
bool is_focused = false;
@@ -37209,7 +37278,7 @@ static enum runloop_state runloop_check_state(
rarch_joypad_info_t joypad_info;
unsigned port = 0;
int input_hotkey_block_delay = settings->uints.input_hotkey_block_delay;
- input_driver_t *current_input = p_rarch->input_driver_state.current_driver;
+ input_driver_t *current_input = p_rarch->current_input;
const struct retro_keybind *binds_norm = &input_config_binds[port][RARCH_ENABLE_HOTKEY];
const struct retro_keybind *binds_auto = &input_autoconf_binds[port][RARCH_ENABLE_HOTKEY];
const struct retro_keybind *binds = input_config_binds[port];
@@ -37222,7 +37291,7 @@ static enum runloop_state runloop_check_state(
#endif
#ifdef HAVE_MFI
const input_device_driver_t
- *sec_joypad = input_driver_st->secondary_joypad;
+ *sec_joypad = p_rarch->sec_joypad;
#else
const input_device_driver_t
*sec_joypad = NULL;
@@ -37230,7 +37299,7 @@ static enum runloop_state runloop_check_state(
joypad_info.joy_idx = settings->uints.input_joypad_index[port];
joypad_info.auto_binds = input_autoconf_binds[joypad_info.joy_idx];
- joypad_info.axis_threshold = settings->floats.input_axis_threshold;
+ joypad_info.axis_threshold = p_rarch->input_driver_axis_threshold;
#ifdef HAVE_MENU
if (menu_input_active)
@@ -37327,8 +37396,8 @@ static enum runloop_state runloop_check_state(
for (i = 0; i < ARRAY_SIZE(ids); i++)
{
if (current_input->input_state(
- p_rarch->input_driver_state.current_data,
- input_driver_st->primary_joypad,
+ p_rarch->current_input_data,
+ p_rarch->joypad,
sec_joypad,
&joypad_info, &binds,
p_rarch->keyboard_mapping_blocked,
@@ -38081,9 +38150,9 @@ static enum runloop_state runloop_check_state(
if (check2)
{
- bool check1 = input_driver_get_nonblocking(input_driver_st);
- input_driver_set_nonblocking(input_driver_st, !check1);
- runloop_state.fastmotion = !check1;
+ bool check1 = p_rarch->input_driver_nonblock_state;
+ p_rarch->input_driver_nonblock_state = !check1;
+ runloop_state.fastmotion = !check1;
if (check1)
p_rarch->fastforward_after_frames = 1;
driver_set_nonblock_state();
@@ -38361,11 +38430,10 @@ int runloop_iterate(void)
unsigned i;
enum analog_dpad_mode dpad_mode[MAX_USERS];
struct rarch_state *p_rarch = &rarch_st;
- input_driver_state_t *input_driver_st = &(p_rarch->input_driver_state);
settings_t *settings = p_rarch->configuration_settings;
unsigned video_frame_delay = settings->uints.video_frame_delay;
bool vrr_runloop_enable = settings->bools.vrr_runloop_enable;
- unsigned max_users = settings->uints.input_max_users;
+ unsigned max_users = p_rarch->input_driver_max_users;
retro_time_t current_time = cpu_features_get_time_usec();
#ifdef HAVE_MENU
bool menu_pause_libretro = settings->bools.menu_pause_libretro;
@@ -38399,7 +38467,7 @@ int runloop_iterate(void)
retro_usec_t runloop_last_frame_time = runloop_state.frame_time_last;
retro_time_t current = current_time;
bool is_locked_fps = (runloop_state.paused
- || input_driver_st->nonblocking_flag)
+ || p_rarch->input_driver_nonblock_state)
| !!p_rarch->recording_data;
retro_time_t delta = (!runloop_last_frame_time || is_locked_fps)
? runloop_state.frame_time.reference
@@ -38590,7 +38658,7 @@ int runloop_iterate(void)
}
}
- if ((video_frame_delay > 0) && !input_driver_get_nonblocking(input_driver_st))
+ if ((video_frame_delay > 0) && !p_rarch->input_driver_nonblock_state)
retro_sleep(video_frame_delay);
{
@@ -39983,4 +40051,3 @@ enum retro_language frontend_driver_get_user_language(void)
return RETRO_LANGUAGE_ENGLISH;
return frontend->get_user_language();
}
-
diff --git a/retroarch.h b/retroarch.h
index 4195cb8b27..658a7aacfc 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -44,9 +44,6 @@
#include "core_type.h"
#include "core.h"
-#include "input/input_driver.h"
-#include "input/input_types.h"
-
#ifdef HAVE_MENU
#include "menu/menu_defines.h"
#endif
@@ -790,6 +787,9 @@ void recording_driver_update_streaming_url(void);
#include "gfx/video_defines.h"
#include "gfx/video_coord_array.h"
+#include "input/input_driver.h"
+#include "input/input_types.h"
+
#define RARCH_SCALE_BASE 256
#define VIDEO_SHADER_STOCK_BLEND (GFX_MAX_SHADERS - 1)
@@ -2011,31 +2011,6 @@ unsigned int retroarch_get_rotation(void);
void retroarch_init_task_queue(void);
-/******************************************************************************
- * BEGIN helper functions for input_driver refactoring
- *
- * These functions have similar names and signatures to functions that now require
- * an input_driver_state_t pointer to be passed to them. They essentially wrap
- * the newer functions by grabbing pointer to the driver state struct and the
- * settings struct.
- ******************************************************************************/
-bool input_set_rumble_state(unsigned port,
- enum retro_rumble_effect effect, uint16_t strength);
-
-float input_get_sensor_state(unsigned port, unsigned id);
-
-bool input_set_sensor_state(unsigned port,
- enum retro_sensor_action action, unsigned rate);
-
-void input_set_nonblock_state(void);
-
-void input_unset_nonblock_state(void);
-
-/******************************************************************************
- * END helper functions for input_driver refactoring
- ******************************************************************************/
-
-
bool input_key_pressed(int key, bool keyboard_pressed);
bool input_mouse_grabbed(void);
@@ -2043,6 +2018,8 @@ bool input_mouse_grabbed(void);
const char *joypad_driver_name(unsigned i);
void joypad_driver_reinit(void *data, const char *joypad_driver_name);
+void input_driver_init_joypads(void);
+
void *input_driver_init_wrap(input_driver_t *input, const char *name);
/* Human readable order of input binds */
diff --git a/retroarch_data.h b/retroarch_data.h
index 266577a12e..e700f59768 100644
--- a/retroarch_data.h
+++ b/retroarch_data.h
@@ -802,6 +802,256 @@ static const gfx_ctx_driver_t *gfx_ctx_gl_drivers[] = {
NULL
};
+static void *input_null_init(const char *joypad_driver) { return (void*)-1; }
+static void input_null_poll(void *data) { }
+static int16_t input_null_input_state(
+ void *data,
+ const input_device_driver_t *joypad,
+ const input_device_driver_t *sec_joypad,
+ rarch_joypad_info_t *joypad_info,
+ const struct retro_keybind **retro_keybinds,
+ bool keyboard_mapping_blocked,
+ unsigned port, unsigned device, unsigned index, unsigned id) { return 0; }
+static void input_null_free(void *data) { }
+static bool input_null_set_sensor_state(void *data, unsigned port,
+ enum retro_sensor_action action, unsigned rate) { return false; }
+static float input_null_get_sensor_input(void *data, unsigned port, unsigned id) { return 0.0; }
+static uint64_t input_null_get_capabilities(void *data) { return 0; }
+static void input_null_grab_mouse(void *data, bool state) { }
+static bool input_null_grab_stdin(void *data) { return false; }
+
+static input_driver_t input_null = {
+ input_null_init,
+ input_null_poll,
+ input_null_input_state,
+ input_null_free,
+ input_null_set_sensor_state,
+ input_null_get_sensor_input,
+ input_null_get_capabilities,
+ "null",
+ input_null_grab_mouse,
+ input_null_grab_stdin
+};
+
+static input_driver_t *input_drivers[] = {
+#ifdef ORBIS
+ &input_ps4,
+#endif
+#if defined(__PSL1GHT__) || defined(__PS3__)
+ &input_ps3,
+#endif
+#if defined(SN_TARGET_PSP2) || defined(PSP) || defined(VITA)
+ &input_psp,
+#endif
+#if defined(PS2)
+ &input_ps2,
+#endif
+#if defined(_3DS)
+ &input_ctr,
+#endif
+#if defined(SWITCH)
+ &input_switch,
+#endif
+#if defined(HAVE_SDL) || defined(HAVE_SDL2)
+ &input_sdl,
+#endif
+#if defined(DINGUX) && defined(HAVE_SDL_DINGUX)
+ &input_sdl_dingux,
+#endif
+#ifdef HAVE_DINPUT
+ &input_dinput,
+#endif
+#ifdef HAVE_X11
+ &input_x,
+#endif
+#ifdef __WINRT__
+ &input_uwp,
+#endif
+#ifdef XENON
+ &input_xenon360,
+#endif
+#if defined(HAVE_XINPUT2) || defined(HAVE_XINPUT_XBOX1) || defined(__WINRT__)
+ &input_xinput,
+#endif
+#ifdef GEKKO
+ &input_gx,
+#endif
+#ifdef WIIU
+ &input_wiiu,
+#endif
+#ifdef ANDROID
+ &input_android,
+#endif
+#ifdef HAVE_UDEV
+ &input_udev,
+#endif
+#if defined(__linux__) && !defined(ANDROID)
+ &input_linuxraw,
+#endif
+#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL)
+ &input_cocoa,
+#endif
+#ifdef __QNX__
+ &input_qnx,
+#endif
+#ifdef EMSCRIPTEN
+ &input_rwebinput,
+#endif
+#ifdef DJGPP
+ &input_dos,
+#endif
+#if defined(_WIN32) && !defined(_XBOX) && _WIN32_WINNT >= 0x0501 && !defined(__WINRT__)
+#ifdef HAVE_WINRAWINPUT
+ /* winraw only available since XP */
+ &input_winraw,
+#endif
+#endif
+ &input_null,
+ NULL,
+};
+
+static input_device_driver_t null_joypad = {
+ NULL, /* init */
+ NULL, /* query_pad */
+ NULL, /* destroy */
+ NULL, /* button */
+ NULL, /* state */
+ NULL, /* get_buttons */
+ NULL, /* axis */
+ NULL, /* poll */
+ NULL,
+ NULL, /* name */
+ "null",
+};
+
+static input_device_driver_t *joypad_drivers[] = {
+#ifdef HAVE_XINPUT
+ &xinput_joypad,
+#endif
+#ifdef GEKKO
+ &gx_joypad,
+#endif
+#ifdef WIIU
+ &wiiu_joypad,
+#endif
+#ifdef _XBOX1
+ &xdk_joypad,
+#endif
+#if defined(ORBIS)
+ &ps4_joypad,
+#endif
+#if defined(__PSL1GHT__) || defined(__PS3__)
+ &ps3_joypad,
+#endif
+#if defined(PSP) || defined(VITA)
+ &psp_joypad,
+#endif
+#if defined(PS2)
+ &ps2_joypad,
+#endif
+#ifdef _3DS
+ &ctr_joypad,
+#endif
+#ifdef SWITCH
+ &switch_joypad,
+#endif
+#ifdef HAVE_DINPUT
+ &dinput_joypad,
+#endif
+#ifdef HAVE_UDEV
+ &udev_joypad,
+#endif
+#if defined(__linux) && !defined(ANDROID)
+ &linuxraw_joypad,
+#endif
+#ifdef HAVE_PARPORT
+ &parport_joypad,
+#endif
+#ifdef ANDROID
+ &android_joypad,
+#endif
+#if defined(HAVE_SDL) || defined(HAVE_SDL2)
+ &sdl_joypad,
+#endif
+#if defined(DINGUX) && defined(HAVE_SDL_DINGUX)
+ &sdl_dingux_joypad,
+#endif
+#ifdef __QNX__
+ &qnx_joypad,
+#endif
+#ifdef HAVE_MFI
+ &mfi_joypad,
+#endif
+#ifdef DJGPP
+ &dos_joypad,
+#endif
+/* Selecting the HID gamepad driver disables the Wii U gamepad. So while
+ * we want the HID code to be compiled & linked, we don't want the driver
+ * to be selectable in the UI. */
+#if defined(HAVE_HID) && !defined(WIIU)
+ &hid_joypad,
+#endif
+#ifdef EMSCRIPTEN
+ &rwebpad_joypad,
+#endif
+ &null_joypad,
+ NULL,
+};
+
+#ifdef HAVE_HID
+static bool null_hid_joypad_query(void *data, unsigned pad) {
+ return pad < MAX_USERS; }
+static const char *null_hid_joypad_name(
+ void *data, unsigned pad) { return NULL; }
+static void null_hid_joypad_get_buttons(void *data,
+ unsigned port, input_bits_t *state) { BIT256_CLEAR_ALL_PTR(state); }
+static int16_t null_hid_joypad_button(
+ void *data, unsigned port, uint16_t joykey) { return 0; }
+static bool null_hid_joypad_rumble(void *data, unsigned pad,
+ enum retro_rumble_effect effect, uint16_t strength) { return false; }
+static int16_t null_hid_joypad_axis(
+ void *data, unsigned port, uint32_t joyaxis) { return 0; }
+static void *null_hid_init(void) { return (void*)-1; }
+static void null_hid_free(const void *data) { }
+static void null_hid_poll(void *data) { }
+static int16_t null_hid_joypad_state(
+ void *data,
+ rarch_joypad_info_t *joypad_info,
+ const void *binds_data,
+ unsigned port) { return 0; }
+
+static hid_driver_t null_hid = {
+ null_hid_init, /* init */
+ null_hid_joypad_query, /* joypad_query */
+ null_hid_free, /* free */
+ null_hid_joypad_button, /* button */
+ null_hid_joypad_state, /* state */
+ null_hid_joypad_get_buttons, /* get_buttons */
+ null_hid_joypad_axis, /* axis */
+ null_hid_poll, /* poll */
+ null_hid_joypad_rumble, /* rumble */
+ null_hid_joypad_name, /* joypad_name */
+ "null",
+};
+
+static hid_driver_t *hid_drivers[] = {
+#if defined(HAVE_BTSTACK)
+ &btstack_hid,
+#endif
+#if defined(__APPLE__) && defined(HAVE_IOHIDMANAGER)
+ &iohidmanager_hid,
+#endif
+#if defined(HAVE_LIBUSB) && defined(HAVE_THREADS)
+ &libusb_hid,
+#endif
+#ifdef HW_RVL
+ &wiiusb_hid,
+#endif
+ &null_hid,
+ NULL,
+};
+#endif
+
static bluetooth_driver_t bluetooth_null = {
NULL, /* init */
NULL, /* free */
@@ -1487,8 +1737,6 @@ typedef struct runloop runloop_state_t;
struct rarch_state
{
- input_driver_state_t input_driver_state;
-
double audio_source_ratio_original;
double audio_source_ratio_current;
struct retro_system_av_info video_driver_av_info; /* double alignment */
@@ -1647,6 +1895,8 @@ struct rarch_state
#ifdef HAVE_NETWORKGAMEPAD
input_remote_t *input_driver_remote;
#endif
+ input_driver_t *current_input;
+ void *current_input_data;
#ifdef HAVE_HID
const void *hid_data;
@@ -1689,6 +1939,10 @@ struct rarch_state
midi_event_t midi_drv_output_event; /* ptr alignment */
core_info_state_t core_info_st; /* ptr alignment */
struct retro_hw_render_callback hw_render; /* ptr alignment */
+ const input_device_driver_t *joypad; /* ptr alignment */
+#ifdef HAVE_MFI
+ const input_device_driver_t *sec_joypad; /* ptr alignment */
+#endif
#ifdef HAVE_BSV_MOVIE
bsv_movie_t *bsv_movie_state_handle; /* ptr alignment */
#endif
@@ -1814,6 +2068,7 @@ struct rarch_state
unsigned osk_last_codepoint;
unsigned osk_last_codepoint_len;
unsigned input_driver_flushing_input;
+ unsigned input_driver_max_users;
unsigned input_hotkey_block_counter;
#ifdef HAVE_ACCESSIBILITY
unsigned gamepad_input_override;
@@ -1839,6 +2094,8 @@ struct rarch_state
float audio_driver_input;
float audio_driver_volume_gain;
+ float input_driver_axis_threshold;
+
enum osk_type osk_idx;
enum rarch_core_type current_core_type;
enum rarch_core_type explicit_current_core_type;
@@ -2050,6 +2307,7 @@ struct rarch_state
bool input_driver_block_hotkey;
bool input_driver_block_libretro_input;
+ bool input_driver_nonblock_state;
bool input_driver_grab_mouse_state;
bool input_driver_analog_requested[MAX_USERS];
diff --git a/ui/drivers/qt/qt_options.cpp b/ui/drivers/qt/qt_options.cpp
index 70fea39601..31a27aeb63 100644
--- a/ui/drivers/qt/qt_options.cpp
+++ b/ui/drivers/qt/qt_options.cpp
@@ -264,8 +264,7 @@ UserBindsPage::UserBindsPage(QObject *parent) :
QWidget *UserBindsPage::widget()
{
unsigned p, retro_id;
- settings_t *settings = config_get_ptr();
- unsigned max_users = settings->uints.input_max_users;
+ unsigned max_users = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
QWidget *widget = new QWidget;
QGridLayout *layout = new QGridLayout;
QComboBox *userCombo = new QComboBox;