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] Hotplugging non-udev fallback patch

noudevhotplug.patch (text/plain), 6.52 KB, created by Cameron Gutman on 2019-06-25 05:14:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cameron Gutman

Created: 2019-06-25 05:14:04 UTC

Size: 6.52 KB

patch

obsolete

># HG changeset patch
># User Cameron Gutman <cameron.gutman@gmail.com>
># Date 1561435706 25200
>#      Mon Jun 24 21:08:26 2019 -0700
># Node ID ab1e02d6744278361d5d6f763d3c75e0065df38f
># Parent  a08fb896b104e638f45bebd51157886c30d8fc6b
>Allow hotplugging joysticks without udev
>
>diff -r a08fb896b104 -r ab1e02d67442 src/joystick/linux/SDL_sysjoystick.c
>--- a/src/joystick/linux/SDL_sysjoystick.c	Mon Jun 24 23:51:10 2019 +0300
>+++ b/src/joystick/linux/SDL_sysjoystick.c	Mon Jun 24 21:08:26 2019 -0700
>@@ -34,11 +34,13 @@
> #include <limits.h>             /* For the definition of PATH_MAX */
> #include <sys/ioctl.h>
> #include <unistd.h>
>+#include <dirent.h>
> #include <linux/joystick.h>
> 
> #include "SDL_assert.h"
> #include "SDL_joystick.h"
> #include "SDL_endian.h"
>+#include "SDL_timer.h"
> #include "../../events/SDL_events_c.h"
> #include "../SDL_sysjoystick.h"
> #include "../SDL_joystick_c.h"
>@@ -54,6 +56,7 @@
> #include "../../core/linux/SDL_udev.h"
> 
> static int MaybeAddDevice(const char *path);
>+static void HandlePendingRemovals(void);
> #if SDL_USE_LIBUDEV
> static int MaybeRemoveDevice(const char *path);
> static void joystick_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath);
>@@ -79,6 +82,10 @@
> static SDL_joylist_item *SDL_joylist_tail = NULL;
> static int numjoysticks = 0;
> 
>+#if !SDL_USE_LIBUDEV
>+static Uint32 last_joy_detect_time = 0;
>+#endif
>+
> 
> #define test_bit(nr, addr) \
>     (((1UL << ((nr) % (sizeof(long) * 8))) & ((addr)[(nr) / (sizeof(long) * 8)])) != 0)
>@@ -177,8 +184,6 @@
> }
> #endif /* SDL_USE_LIBUDEV */
> 
>-
>-/* !!! FIXME: I would love to dump this code and use libudev instead. */
> static int
> MaybeAddDevice(const char *path)
> {
>@@ -254,7 +259,6 @@
> }
> 
> #if SDL_USE_LIBUDEV
>-/* !!! FIXME: I would love to dump this code and use libudev instead. */
> static int
> MaybeRemoveDevice(const char *path)
> {
>@@ -299,45 +303,38 @@
> }
> #endif
> 
>-#if ! SDL_USE_LIBUDEV
>-static int
>-JoystickInitWithoutUdev(void)
>+static void
>+HandlePendingRemovals(void)
> {
>-    int i;
>-    char path[PATH_MAX];
>+    SDL_joylist_item *item;
>+    SDL_joylist_item *prev = NULL;
> 
>-    /* !!! FIXME: only finds sticks if they're called /dev/input/event[0..31] */
>-    /* !!! FIXME:  we could at least readdir() through /dev/input...? */
>-    /* !!! FIXME:  (or delete this and rely on libudev?) */
>-    for (i = 0; i < 32; i++) {
>-        SDL_snprintf(path, SDL_arraysize(path), "/dev/input/event%d", i);
>-        MaybeAddDevice(path);
>-    }
>-
>-    return 0;
>-}
>-#endif
>+    for (item = SDL_joylist; item != NULL; item = item->next) {
>+        if (item->hwdata && item->hwdata->gone) {
>+            item->hwdata->item = NULL;
> 
>-#if SDL_USE_LIBUDEV
>-static int
>-JoystickInitWithUdev(void)
>-{
>-    if (SDL_UDEV_Init() < 0) {
>-        return SDL_SetError("Could not initialize UDEV");
>-    }
>+            if (prev != NULL) {
>+                prev->next = item->next;
>+            } else {
>+                SDL_assert(SDL_joylist == item);
>+                SDL_joylist = item->next;
>+            }
>+            if (item == SDL_joylist_tail) {
>+                SDL_joylist_tail = prev;
>+            }
> 
>-    /* Set up the udev callback */
>-    if (SDL_UDEV_AddCallback(joystick_udev_callback) < 0) {
>-        SDL_UDEV_Quit();
>-        return SDL_SetError("Could not set up joystick <-> udev callback");
>+            /* Need to decrement the joystick count before we post the event */
>+            --numjoysticks;
>+
>+            SDL_PrivateJoystickRemoved(item->device_instance);
>+
>+            SDL_free(item->path);
>+            SDL_free(item->name);
>+            SDL_free(item);
>+        }
>+        prev = item;
>     }
>-    
>-    /* Force a scan to build the initial device list */
>-    SDL_UDEV_Scan();
>-
>-    return 0;
> }
>-#endif
> 
> static SDL_bool SteamControllerConnectedCallback(const char *name, SDL_JoystickGUID guid, int *device_instance)
> {
>@@ -410,6 +407,42 @@
>     }
> }
> 
>+static void
>+LINUX_JoystickDetect(void)
>+{
>+#if SDL_USE_LIBUDEV
>+    SDL_UDEV_Poll();
>+#else
>+    const Uint32 SDL_JOY_DETECT_INTERVAL_MS = 3000;  /* Update every 3 seconds */
>+    Uint32 now = SDL_GetTicks();
>+
>+    if (!last_joy_detect_time || SDL_TICKS_PASSED(now, last_joy_detect_time + SDL_JOY_DETECT_INTERVAL_MS)) {
>+        DIR *folder;
>+        struct dirent *dent;
>+
>+        folder = opendir("/dev/input");
>+        if (folder) {
>+            while ((dent = readdir(folder))) {
>+                int len = SDL_strlen(dent->d_name);
>+                if (len > 5 && SDL_strncmp(dent->d_name, "event", 5) == 0) {
>+                    char path[PATH_MAX];
>+                    SDL_snprintf(path, SDL_arraysize(path), "/dev/input/%s", dent->d_name);
>+                    MaybeAddDevice(path);
>+                }
>+            }
>+
>+            closedir(folder);
>+        }
>+
>+        last_joy_detect_time = now;
>+    }
>+#endif
>+
>+    HandlePendingRemovals();
>+
>+    SDL_UpdateSteamControllers();
>+}
>+
> static int
> LINUX_JoystickInit(void)
> {
>@@ -433,10 +466,24 @@
>                              SteamControllerDisconnectedCallback);
> 
> #if SDL_USE_LIBUDEV
>-    return JoystickInitWithUdev();
>-#else 
>-    return JoystickInitWithoutUdev();
>+    if (SDL_UDEV_Init() < 0) {
>+        return SDL_SetError("Could not initialize UDEV");
>+    }
>+
>+    /* Set up the udev callback */
>+    if (SDL_UDEV_AddCallback(joystick_udev_callback) < 0) {
>+        SDL_UDEV_Quit();
>+        return SDL_SetError("Could not set up joystick <-> udev callback");
>+    }
>+
>+    /* Force a scan to build the initial device list */
>+    SDL_UDEV_Scan();
>+#else
>+    /* Report all devices currently present */
>+    LINUX_JoystickDetect();
> #endif
>+
>+    return 0;
> }
> 
> static int
>@@ -445,16 +492,6 @@
>     return numjoysticks;
> }
> 
>-static void
>-LINUX_JoystickDetect(void)
>-{
>-#if SDL_USE_LIBUDEV
>-    SDL_UDEV_Poll();
>-#endif
>-
>-    SDL_UpdateSteamControllers();
>-}
>-
> static SDL_joylist_item *
> JoystickByDevIndex(int device_index)
> {
>@@ -915,6 +952,11 @@
>             }
>         }
>     }
>+
>+    if (errno == ENODEV) {
>+        /* We have to wait until the JoystickDetect callback to remove this */
>+        joystick->hwdata->gone = SDL_TRUE;
>+    }
> }
> 
> static void
>diff -r a08fb896b104 -r ab1e02d67442 src/joystick/linux/SDL_sysjoystick_c.h
>--- a/src/joystick/linux/SDL_sysjoystick_c.h	Mon Jun 24 23:51:10 2019 +0300
>+++ b/src/joystick/linux/SDL_sysjoystick_c.h	Mon Jun 24 21:08:26 2019 -0700
>@@ -64,6 +64,9 @@
>     SDL_bool m_bSteamController;
>     /* 4 = (ABS_HAT3X-ABS_HAT0X)/2 (see input-event-codes.h in kernel) */
>     int hats_indices[4];
>+
>+    /* Set when gamepad is pending removal due to ENODEV read error */
>+    SDL_bool gone;
> };
> 
> #endif /* SDL_sysjoystick_c_h_ */

Actions: View | Diff

Attachments on bug 4695: 3844 | 3845

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.