mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2019-07-23 13:59:51 +02:00
parent 1db736b13f
commit d4255b0e55
1 changed files with 66 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
input/drivers_joypad/switch_joypad.c
View File

@ -27,6 +27,9 @@ static u32 vibration_handles[DEFAULT_MAX_PADS][2];
static u32 vibration_handleheld[2]; static u32 vibration_handleheld[2];
static HidVibrationValue vibration_values[DEFAULT_MAX_PADS][2]; static HidVibrationValue vibration_values[DEFAULT_MAX_PADS][2];
static HidVibrationValue vibration_stop; static HidVibrationValue vibration_stop;
static int previous_handheld = -1;
/* 1 = handheld, 0 = docked, -1 = first use */
static uint previous_split_joycon_setting[MAX_USERS] = { 0 };
#endif #endif
static const char *switch_joypad_name(unsigned pad) static const char *switch_joypad_name(unsigned pad)
@ -61,11 +64,16 @@ static bool switch_joypad_init(void *data)
for (i = 0; i < DEFAULT_MAX_PADS; i++) for (i = 0; i < DEFAULT_MAX_PADS; i++)
{ {
switch_joypad_autodetect_add(i); switch_joypad_autodetect_add(i);
hidInitializeVibrationDevices(vibration_handles[i], 2, i, TYPE_HANDHELD | TYPE_JOYCON_PAIR); hidInitializeVibrationDevices(
memcpy(&vibration_values[i][0], &vibration_stop, sizeof(HidVibrationValue)); vibration_handles[i], 2, i,
memcpy(&vibration_values[i][1], &vibration_stop, sizeof(HidVibrationValue)); TYPE_HANDHELD | TYPE_JOYCON_PAIR);
memcpy(&vibration_values[i][0],
&vibration_stop, sizeof(HidVibrationValue));
memcpy(&vibration_values[i][1],
&vibration_stop, sizeof(HidVibrationValue));
} }
hidInitializeVibrationDevices(vibration_handleheld, 2, CONTROLLER_HANDHELD, TYPE_HANDHELD | TYPE_JOYCON_PAIR); hidInitializeVibrationDevices(vibration_handleheld,
2, CONTROLLER_HANDHELD, TYPE_HANDHELD | TYPE_JOYCON_PAIR);
#else #else
hid_init(); hid_init();
switch_joypad_autodetect_add(0); switch_joypad_autodetect_add(0);
@ -155,6 +163,12 @@ static void switch_joypad_destroy(void)
{ {
#ifdef HAVE_LIBNX #ifdef HAVE_LIBNX
unsigned i; unsigned i;
previous_handheld = -1;
for (i = 0; i < MAX_USERS; i++)
previous_split_joycon_setting[i] = 0;
for (i = 0; i < DEFAULT_MAX_PADS; i++) for (i = 0; i < DEFAULT_MAX_PADS; i++)
{ {
memcpy(&vibration_values[i][0], memcpy(&vibration_values[i][0],
@ -170,22 +184,20 @@ static void switch_joypad_destroy(void)
} }
#ifdef HAVE_LIBNX #ifdef HAVE_LIBNX
static int previous_handheld = -1; /* 1 = handheld, 0 = docked, -1 = first use */
static uint previous_split_joycon_setting[MAX_USERS] = { 0 };
static void switch_joypad_poll(void) static void switch_joypad_poll(void)
{ {
settings_t *settings; int i, handheld;
int i; settings_t *settings = config_get_ptr();
int handheld;
settings = config_get_ptr();
hidScanInput(); hidScanInput();
handheld = hidGetHandheldMode(); handheld = hidGetHandheldMode();
if (previous_handheld == -1) if (previous_handheld == -1)
{ {
/* first call of this function, apply joycon settings according to prefs, init vars */ /* First call of this function, apply joycon settings
* according to preferences, init variables */
if (!handheld) if (!handheld)
{ {
for (i = 0; i < MAX_USERS; i += 2) for (i = 0; i < MAX_USERS; i += 2)
@ -211,7 +223,8 @@ static void switch_joypad_poll(void)
if (!handheld && previous_handheld) if (!handheld && previous_handheld)
{ {
/* switching out of handheld, so make sure joycons are correctly split */ /* switching out of handheld, so make sure
* joycons are correctly split. */
for (i = 0; i < MAX_USERS; i += 2) for (i = 0; i < MAX_USERS; i += 2)
{ {
/* CONTROLLER_PLAYER_X, X == i++ */ /* CONTROLLER_PLAYER_X, X == i++ */
@ -229,12 +242,11 @@ static void switch_joypad_poll(void)
for (i = 0; i < MAX_USERS; i += 2) for (i = 0; i < MAX_USERS; i += 2)
{ {
/* find all left/right single JoyCon pairs and join them together */ /* find all left/right single JoyCon pairs and join them together */
int id; int id, id_0, id_1;
int id_0;
int id_1;
int last_right_id = MAX_USERS; int last_right_id = MAX_USERS;
for (id = 0; id < MAX_USERS; id++) for (id = 0; id < MAX_USERS; id++)
hidSetNpadJoyAssignmentModeDual(id); hidSetNpadJoyAssignmentModeDual(id);
for (id_0 = 0; id_0 < MAX_USERS; id_0++) for (id_0 = 0; id_0 < MAX_USERS; id_0++)
{ {
if (hidGetControllerType(id_0) & TYPE_JOYCON_LEFT) if (hidGetControllerType(id_0) & TYPE_JOYCON_LEFT)
@ -261,13 +273,15 @@ static void switch_joypad_poll(void)
/* split or join joycons every time the user changes a setting */ /* split or join joycons every time the user changes a setting */
for (i = 0; i < MAX_USERS; i += 2) for (i = 0; i < MAX_USERS; i += 2)
{ {
if (settings->uints.input_split_joycon[i] && !previous_split_joycon_setting[i]) if ( settings->uints.input_split_joycon[i]
&& !previous_split_joycon_setting[i])
{ {
hidSetNpadJoyAssignmentModeSingleByDefault(i); hidSetNpadJoyAssignmentModeSingleByDefault(i);
hidSetNpadJoyAssignmentModeSingleByDefault(i + 1); hidSetNpadJoyAssignmentModeSingleByDefault(i + 1);
hidSetNpadJoyHoldType(HidJoyHoldType_Horizontal); hidSetNpadJoyHoldType(HidJoyHoldType_Horizontal);
} }
else if (!settings->uints.input_split_joycon[i] && previous_split_joycon_setting[i]) else if (!settings->uints.input_split_joycon[i]
&& previous_split_joycon_setting[i])
{ {
hidSetNpadJoyAssignmentModeDual(i); hidSetNpadJoyAssignmentModeDual(i);
hidSetNpadJoyAssignmentModeDual(i + 1); hidSetNpadJoyAssignmentModeDual(i + 1);
@ -280,17 +294,23 @@ static void switch_joypad_poll(void)
previous_split_joycon_setting[i] = settings->uints.input_split_joycon[i]; previous_split_joycon_setting[i] = settings->uints.input_split_joycon[i];
previous_handheld = handheld; previous_handheld = handheld;
for (int i = 0; i < DEFAULT_MAX_PADS; i++) for (i = 0; i < DEFAULT_MAX_PADS; i++)
{ {
JoystickPosition joy_position_left, joy_position_right; JoystickPosition joy_position_left, joy_position_right;
HidControllerID target = (i == 0) ? CONTROLLER_P1_AUTO : i; HidControllerID target = (i == 0) ? CONTROLLER_P1_AUTO : i;
pad_state[i] = hidKeysDown(target) | hidKeysHeld(target); pad_state[i] = hidKeysDown(target) | hidKeysHeld(target);
hidJoystickRead(&joy_position_left, target, JOYSTICK_LEFT); hidJoystickRead(&joy_position_left, target, JOYSTICK_LEFT);
hidJoystickRead(&joy_position_right, target, JOYSTICK_RIGHT); hidJoystickRead(&joy_position_right, target, JOYSTICK_RIGHT);
analog_state[i][RETRO_DEVICE_INDEX_ANALOG_LEFT][RETRO_DEVICE_ID_ANALOG_X] = joy_position_left.dx;
analog_state[i][RETRO_DEVICE_INDEX_ANALOG_LEFT][RETRO_DEVICE_ID_ANALOG_Y] = -joy_position_left.dy; analog_state[i][RETRO_DEVICE_INDEX_ANALOG_LEFT]
analog_state[i][RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_X] = joy_position_right.dx; [RETRO_DEVICE_ID_ANALOG_X] = joy_position_left.dx;
analog_state[i][RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_Y] = -joy_position_right.dy; analog_state[i][RETRO_DEVICE_INDEX_ANALOG_LEFT]
[RETRO_DEVICE_ID_ANALOG_Y] = -joy_position_left.dy;
analog_state[i][RETRO_DEVICE_INDEX_ANALOG_RIGHT]
[RETRO_DEVICE_ID_ANALOG_X] = joy_position_right.dx;
analog_state[i][RETRO_DEVICE_INDEX_ANALOG_RIGHT]
[RETRO_DEVICE_ID_ANALOG_Y] = -joy_position_right.dy;
} }
} }
#else #else
@ -322,10 +342,14 @@ static void switch_joypad_poll(void)
rsy = ent8.right_stick_y; rsy = ent8.right_stick_y;
} }
analog_state[0][RETRO_DEVICE_INDEX_ANALOG_LEFT][RETRO_DEVICE_ID_ANALOG_X] = lsx; analog_state[0][RETRO_DEVICE_INDEX_ANALOG_LEFT]
analog_state[0][RETRO_DEVICE_INDEX_ANALOG_LEFT][RETRO_DEVICE_ID_ANALOG_Y] = -lsy; [RETRO_DEVICE_ID_ANALOG_X] = lsx;
analog_state[0][RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_X] = rsx; analog_state[0][RETRO_DEVICE_INDEX_ANALOG_LEFT]
analog_state[0][RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_Y] = -rsy; [RETRO_DEVICE_ID_ANALOG_Y] = -lsy;
analog_state[0][RETRO_DEVICE_INDEX_ANALOG_RIGHT]
[RETRO_DEVICE_ID_ANALOG_X] = rsx;
analog_state[0][RETRO_DEVICE_INDEX_ANALOG_RIGHT]
[RETRO_DEVICE_ID_ANALOG_Y] = -rsy;
} }
#endif #endif
@ -341,6 +365,7 @@ bool switch_joypad_set_rumble(unsigned pad,
amp = (float)strength / 65535.0f; amp = (float)strength / 65535.0f;
amp *= 0.5f; /* Max strength is too strong */ amp *= 0.5f; /* Max strength is too strong */
if (type == RETRO_RUMBLE_STRONG) if (type == RETRO_RUMBLE_STRONG)
{ {
vibration_values[pad][0].amp_low = amp; vibration_values[pad][0].amp_low = amp;
@ -352,7 +377,8 @@ bool switch_joypad_set_rumble(unsigned pad,
vibration_values[pad][1].amp_high = amp; vibration_values[pad][1].amp_high = amp;
} }
handle = (pad == 0 && hidGetHandheldMode()) ? vibration_handleheld : vibration_handles[pad]; handle = (pad == 0 && hidGetHandheldMode())
? vibration_handleheld : vibration_handles[pad];
return R_SUCCEEDED(hidSendVibrationValues(handle, vibration_values[pad], 2)); return R_SUCCEEDED(hidSendVibrationValues(handle, vibration_values[pad], 2));
} }
#endif #endif