diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-12-14 15:14:47 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-12-16 12:41:39 +1000 |
commit | 29a486ba56bc6279297a716b018ba24880680e82 (patch) | |
tree | 9d4a44af3e3d74a9328140f43f30e5a4e2b4b127 | |
parent | 0674bdfdb67e9195af7cb5982ae2eda0fa03ce57 (diff) |
Drop close_proc, conversion_proc, reverse_conversion_proc
All three aren't called by the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Trevor Woerner <twoerner@gmail.com>
-rw-r--r-- | src/jstk.c | 36 | ||||
-rw-r--r-- | src/jstk_key.c | 2 |
2 files changed, 0 insertions, 38 deletions
@@ -62,40 +62,6 @@ char debug_level = 0; #endif - -/* - *************************************************************************** - * - * jstkConvertProc -- - * - * Convert valuators to X and Y. - * - *************************************************************************** - */ - -static Bool -jstkConvertProc(InputInfoPtr pInfo, - int first, - int num, - int v0, - int v1, - int v2, - int v3, - int v4, - int v5, - int* x, - int* y) -{ - if (first != 0 || num != 2) - return FALSE; - - *x = v0; - *y = v1; - - return TRUE; -} - - /* *************************************************************************** * @@ -509,10 +475,8 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags) pInfo->flags = XI86_SEND_DRAG_EVENTS; pInfo->device_control = jstkDeviceControlProc; pInfo->read_input = jstkReadProc; - pInfo->close_proc = NULL; pInfo->control_proc = NULL; pInfo->switch_mode = NULL; - pInfo->conversion_proc = jstkConvertProc; pInfo->fd = -1; pInfo->dev = NULL; pInfo->private = priv; diff --git a/src/jstk_key.c b/src/jstk_key.c index ad9198c..c3636b6 100644 --- a/src/jstk_key.c +++ b/src/jstk_key.c @@ -207,10 +207,8 @@ jstkKeyboardPreInit(InputDriverPtr drv, IDevPtr _dev, int flags) pInfo->flags = XI86_KEYBOARD_CAPABLE; pInfo->device_control = jstkKeyboardDeviceControlProc; pInfo->read_input = NULL; - pInfo->close_proc = NULL; pInfo->control_proc = NULL; pInfo->switch_mode = NULL; - pInfo->conversion_proc = NULL; pInfo->fd = -1; pInfo->dev = NULL; pInfo->private = NULL; |