mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 11:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build

Browse Source
This commit is contained in:
Sam Lantinga
2023-06-26 07:43:44 -07:00
parent 6cc21af900
commit fd062657dd
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,14 +213,13 @@ static SDL_bool IsVirtualJoystick(Uint16 vendor, Uint16 product, Uint16 version,
} }
#endif /* SDL_JOYSTICK_HIDAPI */ #endif /* SDL_JOYSTICK_HIDAPI */
static int GuessIsJoystick(int fd) static int GuessDeviceClass(int fd)
{ {
unsigned long propbit[NBITS(INPUT_PROP_MAX)] = { 0 }; unsigned long propbit[NBITS(INPUT_PROP_MAX)] = { 0 };
unsigned long evbit[NBITS(EV_MAX)] = { 0 }; unsigned long evbit[NBITS(EV_MAX)] = { 0 };
unsigned long keybit[NBITS(KEY_MAX)] = { 0 }; unsigned long keybit[NBITS(KEY_MAX)] = { 0 };
unsigned long absbit[NBITS(ABS_MAX)] = { 0 }; unsigned long absbit[NBITS(ABS_MAX)] = { 0 };
unsigned long relbit[NBITS(REL_MAX)] = { 0 }; unsigned long relbit[NBITS(REL_MAX)] = { 0 };
int devclass;
if ((ioctl(fd, EVIOCGBIT(0, sizeof(evbit)), evbit) < 0) || if ((ioctl(fd, EVIOCGBIT(0, sizeof(evbit)), evbit) < 0) ||
(ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) < 0) || (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) < 0) ||
@@ -233,9 +232,12 @@ static int GuessIsJoystick(int fd)
* device just doesn't have any properties. */ * device just doesn't have any properties. */
(void) ioctl(fd, EVIOCGPROP(sizeof(propbit)), propbit); (void) ioctl(fd, EVIOCGPROP(sizeof(propbit)), propbit);
devclass = SDL_EVDEV_GuessDeviceClass(propbit, evbit, absbit, keybit, relbit); return SDL_EVDEV_GuessDeviceClass(propbit, evbit, absbit, keybit, relbit);
}
if (devclass & SDL_UDEV_DEVICE_JOYSTICK) { static int GuessIsJoystick(int fd)
{
if (GuessDeviceClass(fd) & SDL_UDEV_DEVICE_JOYSTICK) {
return 1; return 1;
} }
@@ -244,22 +246,7 @@ static int GuessIsJoystick(int fd)
static int GuessIsSensor(int fd) static int GuessIsSensor(int fd)
{ {
unsigned long evbit[NBITS(EV_MAX)] = { 0 }; if (GuessDeviceClass(fd) & SDL_UDEV_DEVICE_ACCELEROMETER) {
unsigned long keybit[NBITS(KEY_MAX)] = { 0 };
unsigned long absbit[NBITS(ABS_MAX)] = { 0 };
unsigned long relbit[NBITS(REL_MAX)] = { 0 };
int devclass;
if ((ioctl(fd, EVIOCGBIT(0, sizeof(evbit)), evbit) < 0) ||
(ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) < 0) ||
(ioctl(fd, EVIOCGBIT(EV_REL, sizeof(relbit)), relbit) < 0) ||
(ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) < 0)) {
return 0;
}
devclass = SDL_EVDEV_GuessDeviceClass(evbit, absbit, keybit, relbit);
if (devclass & SDL_UDEV_DEVICE_ACCELEROMETER) {
return 1; return 1;
} }