summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-12-14 15:09:32 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-12-16 11:45:23 +1000
commit0674bdfdb67e9195af7cb5982ae2eda0fa03ce57 (patch)
tree92ada860abc28bb1b244a0dc86231556ac8e4222
parent39205d76cb45242ee9b47594ec5be7edc509edc7 (diff)
Don't handle history_size in the driver.
This has been handled in the server for quite a while now, just initialize with the defaults and ignore it otherwise. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Trevor Woerner <twoerner@gmail.com>
-rw-r--r--src/jstk.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/jstk.c b/src/jstk.c
index c869537..bb660a6 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -369,7 +369,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk,
}
if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels,
- pInfo->history_size,
+ GetMotionHistorySize(),
Relative) == FALSE) {
ErrorF("unable to allocate Valuator class device\n");
return !Success;
@@ -517,7 +517,6 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pInfo->dev = NULL;
pInfo->private = priv;
pInfo->type_name = XI_JOYSTICK;
- pInfo->history_size = 0;
pInfo->always_core_feedback = NULL;
pInfo->conf_idev = dev;