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] Proposed patch

0001-Expose-Linux-device-path-for-Joysticks.patch (text/plain), 4.79 KB, created by Sjoerd Simons on 2020-05-06 08:52:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sjoerd Simons

Created: 2020-05-06 08:52:26 UTC

Size: 4.79 KB

patch

obsolete

>From 5956bfe36f1142c9af8c759957f71b19792f28cf Mon Sep 17 00:00:00 2001
>From: Sjoerd Simons <sjoerd@collabora.com>
>Date: Wed, 6 May 2020 09:23:00 +0200
>Subject: [PATCH] Expose Linux device path for Joysticks
>
>It's currently impossible to correlate an SDL Joystick to a device on
>Linux. Add a linux-only function to get the device path used for a given
>Joystick which uniquely identifies the device. This allows a more system
>type HMI to work out information about the joystick not support by SDL
>(e.g. usb port it's connected to, firmware version, bt mac address).
>
>Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
>---
> include/SDL_joystick.h               |  9 +++++++++
> src/dynapi/SDL_dynapi_overrides.h    |  1 +
> src/dynapi/SDL_dynapi_procs.h        |  3 +++
> src/joystick/SDL_joystick.c          |  6 ++++++
> src/joystick/SDL_sysjoystick.h       |  4 ++++
> src/joystick/linux/SDL_sysjoystick.c | 10 ++++++++++
> test/testjoystick.c                  |  3 +++
> 7 files changed, 36 insertions(+)
>
>diff --git a/include/SDL_joystick.h b/include/SDL_joystick.h
>index b638d1cbd..10a37015b 100644
>--- a/include/SDL_joystick.h
>+++ b/include/SDL_joystick.h
>@@ -442,6 +442,15 @@ extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick * joystick);
>  */
> extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL_Joystick * joystick);
> 
>+#ifdef __LINUX__
>+/**
>+ *  Return the device path this currently opened joystick.
>+ *  If no path can be found, this function returns NULL.
>+ */
>+extern DECLSPEC const char *SDLCALL SDL_JoystickLinuxDevicePath(SDL_Joystick * joystick);
>+
>+#endif
>+
> /* Ends C function definitions when using C++ */
> #ifdef __cplusplus
> }
>diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h
>index 4474a519c..682872346 100644
>--- a/src/dynapi/SDL_dynapi_overrides.h
>+++ b/src/dynapi/SDL_dynapi_overrides.h
>@@ -763,3 +763,4 @@
> #define SDL_Metal_GetDrawableSize SDL_Metal_GetDrawableSize_REAL
> #define SDL_trunc SDL_trunc_REAL
> #define SDL_truncf SDL_truncf_REAL
>+#define SDL_JoystickLinuxDevicePath SDL_JoystickLinuxDevicePath_REAL
>diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
>index c4822a6c8..372c537ce 100644
>--- a/src/dynapi/SDL_dynapi_procs.h
>+++ b/src/dynapi/SDL_dynapi_procs.h
>@@ -822,3 +822,6 @@ SDL_DYNAPI_PROC(void*,SDL_Metal_GetLayer,(SDL_MetalView a),(a),return)
> SDL_DYNAPI_PROC(void,SDL_Metal_GetDrawableSize,(SDL_Window *a, int *b, int *c),(a,b,c),)
> SDL_DYNAPI_PROC(double,SDL_trunc,(double a),(a),return)
> SDL_DYNAPI_PROC(float,SDL_truncf,(float a),(a),return)
>+#ifdef __LINUX__
>+SDL_DYNAPI_PROC(const char*,SDL_JoystickLinuxDevicePath,(SDL_Joystick *a),(a),return)
>+#endif
>diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
>index e2bce51cf..a45f34299 100644
>--- a/src/joystick/SDL_joystick.c
>+++ b/src/joystick/SDL_joystick.c
>@@ -2263,4 +2263,10 @@ SDL_JoystickPowerLevel SDL_JoystickCurrentPowerLevel(SDL_Joystick * joystick)
>     return joystick->epowerlevel;
> }
> 
>+#ifdef __LINUX__
>+const char *SDL_JoystickLinuxDevicePath(SDL_Joystick * joystick)
>+{
>+  return LINUX_Joystick_get_devpath (joystick);
>+}
>+#endif
> /* vi: set ts=4 sw=4 expandtab: */
>diff --git a/src/joystick/SDL_sysjoystick.h b/src/joystick/SDL_sysjoystick.h
>index e0ac96726..c3e306f2a 100644
>--- a/src/joystick/SDL_sysjoystick.h
>+++ b/src/joystick/SDL_sysjoystick.h
>@@ -156,6 +156,10 @@ extern SDL_JoystickDriver SDL_VIRTUAL_JoystickDriver;
> extern SDL_JoystickDriver SDL_WGI_JoystickDriver;
> extern SDL_JoystickDriver SDL_WINDOWS_JoystickDriver;
> 
>+#ifdef __LINUX__
>+extern const char * LINUX_Joystick_get_devpath (SDL_Joystick *joystick);
>+#endif
>+
> #endif /* SDL_sysjoystick_h_ */
> 
> /* vi: set ts=4 sw=4 expandtab: */
>diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
>index 28bccd8ea..cfa1ec86f 100644
>--- a/src/joystick/linux/SDL_sysjoystick.c
>+++ b/src/joystick/linux/SDL_sysjoystick.c
>@@ -1100,6 +1100,16 @@ LINUX_JoystickQuit(void)
>     SDL_QuitSteamControllers();
> }
> 
>+const char *
>+LINUX_Joystick_get_devpath (SDL_Joystick *joystick)
>+{
>+    if (joystick->driver == &SDL_LINUX_JoystickDriver && joystick->hwdata) {
>+        return joystick->hwdata->fname;
>+    }
>+
>+    return NULL;
>+}
>+
> SDL_JoystickDriver SDL_LINUX_JoystickDriver =
> {
>     LINUX_JoystickInit,
>diff --git a/test/testjoystick.c b/test/testjoystick.c
>index 2d8d2e1bc..5bb19d685 100644
>--- a/test/testjoystick.c
>+++ b/test/testjoystick.c
>@@ -79,6 +79,9 @@ PrintJoystick(SDL_Joystick *joystick)
>     }
>     SDL_Log("Joystick\n");
>     SDL_Log("       name: %s\n", SDL_JoystickName(joystick));
>+#ifdef __LINUX__
>+    SDL_Log("    devpath: %s\n", SDL_JoystickLinuxDevicePath(joystick));
>+#endif
>     SDL_Log("       type: %s\n", type);
>     SDL_Log("       axes: %d\n", SDL_JoystickNumAxes(joystick));
>     SDL_Log("      balls: %d\n", SDL_JoystickNumBalls(joystick));
>-- 
>2.26.2
>

Actions: View | Diff

Attachments on bug 5125: 4333

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.