diff options
author | Matthieu Herrb <matthieu@herrb.eu> | 2016-07-31 12:54:14 +0200 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2016-08-16 18:15:03 +1000 |
commit | 60d0e9c451b3f259d524b0ddcc5c1f21a4f82293 (patch) | |
tree | 458165420ee6f5a6f97317eb5bf74d27f422015b | |
parent | baf8bd4441d5dc6cdd687e066bf13cc1c3df1a41 (diff) |
use xf86{Add,Remove}EnabledDevice()
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r-- | src/jstk.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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: */ - |