encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed whitespace

This commit is contained in:
Sam Lantinga 2020-12-03 18:17:01 -08:00
parent f487d63a6b
commit 59f28b7f4b
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hidapi/SDL_hidapi.c
View File

@ -130,7 +130,7 @@ static const SDL_UDEV_Symbols *udev_ctx = NULL;
#undef make_path #undef make_path
#undef read_thread #undef read_thread
#ifdef HAVE_HIDAPI_NVAGIPMAN #ifdef SDL_JOYSTICK_HIDAPI_STEAMXBOX
#define HAVE_DRIVER_BACKEND 1 #define HAVE_DRIVER_BACKEND 1
#endif #endif
@ -160,9 +160,9 @@ static const SDL_UDEV_Symbols *udev_ctx = NULL;
#define hid_get_indexed_string DRIVER_hid_get_indexed_string #define hid_get_indexed_string DRIVER_hid_get_indexed_string
#define hid_error DRIVER_hid_error #define hid_error DRIVER_hid_error
#ifdef HAVE_HIDAPI_NVAGIPMAN #ifdef SDL_JOYSTICK_HIDAPI_STEAMXBOX
#undef HIDAPI_H__ #undef HIDAPI_H__
#include "nvagipman/hid.c" #include "steamxbox/hid.c"
#else #else
#error Need a driver hid.c for this platform! #error Need a driver hid.c for this platform!
#endif #endif

16
src/joystick/hidapi/SDL_hidapi_ps4.c
View File

@ -652,14 +652,14 @@ HIDAPI_DriverPS4_HandleStatePacket(SDL_Joystick *joystick, hid_device *dev, SDL_
SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_RIGHTSTICK, (data & 0x80) ? SDL_PRESSED : SDL_RELEASED); SDL_PrivateJoystickButton(joystick, SDL_CONTROLLER_BUTTON_RIGHTSTICK, (data & 0x80) ? SDL_PRESSED : SDL_RELEASED);
} }
/* Some fightsticks, ex: Victrix FS Pro will only this these digital trigger bits and not the analog values so this needs to run whenever the /* Some fightsticks, ex: Victrix FS Pro will only this these digital trigger bits and not the analog values so this needs to run whenever the
trigger is evaluated trigger is evaluated
*/ */
if ((packet->rgucButtonsHatAndCounter[1] & 0x0C) != 0) { if ((packet->rgucButtonsHatAndCounter[1] & 0x0C) != 0) {
Uint8 data = packet->rgucButtonsHatAndCounter[1]; Uint8 data = packet->rgucButtonsHatAndCounter[1];
packet->ucTriggerLeft = (data & 0x04) && packet->ucTriggerLeft == 0 ? 255 : packet->ucTriggerLeft; packet->ucTriggerLeft = (data & 0x04) && packet->ucTriggerLeft == 0 ? 255 : packet->ucTriggerLeft;
packet->ucTriggerRight = (data & 0x08) && packet->ucTriggerRight == 0 ? 255 : packet->ucTriggerRight; packet->ucTriggerRight = (data & 0x08) && packet->ucTriggerRight == 0 ? 255 : packet->ucTriggerRight;
} }
if (ctx->last_state.rgucButtonsHatAndCounter[2] != packet->rgucButtonsHatAndCounter[2]) { if (ctx->last_state.rgucButtonsHatAndCounter[2] != packet->rgucButtonsHatAndCounter[2]) {
Uint8 data = (packet->rgucButtonsHatAndCounter[2] & 0x03); Uint8 data = (packet->rgucButtonsHatAndCounter[2] & 0x03);

6
src/joystick/iphoneos/SDL_mfijoystick.m
View File

@ -479,9 +479,9 @@ static int
IOS_JoystickInit(void) IOS_JoystickInit(void)
{ {
#if defined(__MACOSX__) #if defined(__MACOSX__)
if (!is_macos11()) { if (!is_macos11()) {
return 0; return 0;
} }
#endif #endif
@autoreleasepool { @autoreleasepool {

2
src/joystick/iphoneos/SDL_mfijoystick_c.h
View File

@ -34,7 +34,7 @@ typedef struct joystick_hwdata
SDL_bool remote; SDL_bool remote;
GCController __unsafe_unretained *controller; GCController __unsafe_unretained *controller;
void *rumble; void *rumble;
SDL_bool uses_pause_handler; SDL_bool uses_pause_handler;
int num_pause_presses; int num_pause_presses;
Uint32 pause_button_down_time; Uint32 pause_button_down_time;

2
src/joystick/linux/SDL_sysjoystick.c
View File

@ -625,7 +625,7 @@ LINUX_JoystickDetect(void)
} }
else else
#endif #endif
{ {
LINUX_FallbackJoystickDetect(); LINUX_FallbackJoystickDetect();
} }