Skip to content

Commit

Permalink
missed declaration + comment fix for testinput cfg files
Browse files Browse the repository at this point in the history
  • Loading branch information
zoltanvb committed Jun 25, 2024
1 parent 0684531 commit ff31ce3
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
7 changes: 4 additions & 3 deletions cores/libretro-net-retropad/net_retropad_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,7 @@ void NETRETROPAD_CORE_PREFIX(retro_set_environment)(retro_environment_t cb)
};
enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
struct retro_keyboard_callback kcb = { NETRETROPAD_CORE_PREFIX(update_keyboard_cb) };
struct retro_sensor_interface sensor_interface = {0};

cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars);

Expand All @@ -654,12 +655,12 @@ void NETRETROPAD_CORE_PREFIX(retro_set_environment)(retro_environment_t cb)

NETRETROPAD_CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK, &kcb);

if (cb(RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE, &sensorInterface)) {
if (cb(RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE, &sensor_interface)) {

NETRETROPAD_CORE_PREFIX(log_cb)(RETRO_LOG_DEBUG,"[Remote RetroPad]: Sensor interface supported, enabling.\n");

NETRETROPAD_CORE_PREFIX(sensor_get_input_cb) = sensorInterface.get_sensor_input;
NETRETROPAD_CORE_PREFIX(sensor_set_state_cb) = sensorInterface.set_sensor_state;
NETRETROPAD_CORE_PREFIX(sensor_get_input_cb) = sensor_interface.get_sensor_input;
NETRETROPAD_CORE_PREFIX(sensor_set_state_cb) = sensor_interface.set_sensor_state;


if (NETRETROPAD_CORE_PREFIX(sensor_set_state_cb) && NETRETROPAD_CORE_PREFIX(sensor_get_input_cb)) {
Expand Down
2 changes: 1 addition & 1 deletion tests-other/testinput.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Sets up joypad driver, test input file for the joypad driver,
# logging and autoconfig dir, and prevents saving.
# Usage: retroarch --appendconfig tests-other/testinput.cfg\|tests_other/all_binds_empty.cfg
# Usage with retropad test counterpart: retroarch --appendconfig tests_other/testinput.cfg\|tests_other/all_binds_empty.cfg -L netretropad tests_other/netretropad_all_inputs.ratst
# Usage with retropad test counterpart: retroarch --appendconfig tests-other/testinput.cfg\|tests-other/all_binds_empty.cfg -L netretropad tests-other/netretropad_all_inputs.ratst

input_joypad_driver = "test"
test_input_file_joypad = "tests-other/test_input_joypad.ratst"
Expand Down
2 changes: 1 addition & 1 deletion tests-other/testinput_device_reservation_test.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Sets up joypad driver, test input file for the joypad driver,
# logging and autoconfig dir, and prevents saving.
# Usage:
# retroarch --appendconfig tests_other/testinput_device_reservation_test.cfg\|tests_other/all_binds_empty.cfg
# retroarch --appendconfig tests-other/testinput_device_reservation_test.cfg\|tests-other/all_binds_empty.cfg

# Test scenario:
# - Player 1 has preferred device C, Player 4 has reserved device B
Expand Down
4 changes: 2 additions & 2 deletions tests-other/testinput_device_reservation_test2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Sets up joypad driver, test input file for the joypad driver,
# logging and autoconfig dir, and prevents saving.
# Usage:
# retroarch --appendconfig tests_other/testinput_device_reservation_test.cfg\|tests_other/all_binds_empty.cfg
# retroarch --appendconfig tests-other/testinput_device_reservation_test.cfg\|tests-other/all_binds_empty.cfg

# Test scenario:
# - Player 1 through 4 has preferred device C
Expand All @@ -26,4 +26,4 @@ input_player3_reserved_device = "0005:0006 Test joypad device C"
input_player3_device_reservation_type = "2"
input_player4_reserved_device = "0005:0006 "
input_player4_device_reservation_type = "2"
# input_max_users = "3"
# input_max_users = "3"

0 comments on commit ff31ce3

Please sign in to comment.