We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Add driver type check

joy_driver_check.patch (text/plain), 2.21 KB, created by Mathieu Eyraud on 2019-12-21 14:02:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Eyraud

Created: 2019-12-21 14:02:40 UTC

Size: 2.21 KB

patch

obsolete

>diff -r 58440332819a src/haptic/darwin/SDL_syshaptic.c
>--- a/src/haptic/darwin/SDL_syshaptic.c	Fri Dec 20 21:40:28 2019 -0800
>+++ b/src/haptic/darwin/SDL_syshaptic.c	Sat Dec 21 14:41:53 2019 +0100
>@@ -599,6 +599,9 @@
> int
> SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick)
> {
>+    if (joystick->driver != &SDL_DARWIN_JoystickDriver) {
>+        return SDL_FALSE;
>+    }
>     if (joystick->hwdata->ffservice != 0) {
>         return SDL_TRUE;
>     }
>@@ -612,6 +615,9 @@
> int
> SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
> {
>+    if (joystick->driver != &SDL_DARWIN_JoystickDriver) {
>+        return 0;
>+    }
>     if (IOObjectIsEqualTo((io_object_t) ((size_t)haptic->hwdata->device),
>                           joystick->hwdata->ffservice)) {
>         return 1;
>@@ -628,7 +634,10 @@
> {
>     int device_index = 0;
>     SDL_hapticlist_item *item;
>-
>+    
>+    if (joystick->driver != &SDL_DARWIN_JoystickDriver) {
>+        return -1;
>+    }
>     for (item = SDL_hapticlist; item; item = item->next) {
>         if (IOObjectIsEqualTo((io_object_t) item->dev,
>                              joystick->hwdata->ffservice)) {
>diff -r 58440332819a src/haptic/linux/SDL_syshaptic.c
>--- a/src/haptic/linux/SDL_syshaptic.c	Fri Dec 20 21:40:28 2019 -0800
>+++ b/src/haptic/linux/SDL_syshaptic.c	Sat Dec 21 14:41:53 2019 +0100
>@@ -512,6 +512,9 @@
> int
> SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick)
> {
>+    if (joystick->driver != &SDL_LINUX_JoystickDriver) {
>+        return 0;
>+    }
>     return EV_IsHaptic(joystick->hwdata->fd);
> }
> 
>@@ -522,6 +525,9 @@
> int
> SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
> {
>+    if (joystick->driver != &SDL_LINUX_JoystickDriver) {
>+        return 0;
>+    }
>     /* We are assuming Linux is using evdev which should trump the old
>      * joystick methods. */
>     if (SDL_strcmp(joystick->hwdata->fname, haptic->hwdata->fname) == 0) {
>@@ -541,7 +547,10 @@
>     int fd;
>     int ret;
>     SDL_hapticlist_item *item;
>-
>+    
>+    if (joystick->driver != &SDL_LINUX_JoystickDriver) {
>+        return -1;
>+    }
>     /* Find the joystick in the haptic list. */
>     for (item = SDL_hapticlist; item; item = item->next) {
>         if (SDL_strcmp(item->fname, joystick->hwdata->fname) == 0) {

Actions: View | Diff

Attachments on bug 4910: 4130

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.