[PATCH xf86-input-joystick] use xf86{Add,Remove}EnabledDevice()

Matthieu Herrb matthieu at herrb.eu
Sun Jul 31 10:54:14 UTC 2016


Signed-off-by: Matthieu Herrb <matthieu at herrb.eu>
---
 src/jstk.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/jstk.c b/src/jstk.c
index 6cf0ef9..158d77a 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -147,7 +147,7 @@ jstkReadProc(InputInfoPtr pInfo)
             xf86Msg(X_WARNING, "JOYSTICK: Read failed. Deactivating device.\n");
 
             if (pInfo->fd >= 0)
-                RemoveEnabledDevice(pInfo->fd);
+                xf86RemoveEnabledDevice(pInfo);
             return;
         }
 
@@ -414,7 +414,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
         if (jstkOpenDevice(priv, FALSE) != -1) {
             pJstk->public.on = TRUE;
             pInfo->fd = priv->fd;
-            AddEnabledDevice(pInfo->fd);
+            xf86AddEnabledDevice(pInfo);
         } else return !Success;
         break;
 
@@ -437,7 +437,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
         }
 
         if (pInfo->fd >= 0)
-            RemoveEnabledDevice(pInfo->fd);
+            xf86RemoveEnabledDevice(pInfo);
         if (!(pInfo->flags & XI86_SERVER_FD))
             pInfo->fd = -1;
         if (priv->close_proc)
@@ -772,4 +772,3 @@ _X_EXPORT XF86ModuleData joystickModuleData = {
 };
 
 /* vim: set filetype=c.doxygen ts=4 et: */
-
-- 
2.1.4



More information about the xorg-devel mailing list