[PATCH joystick 4/9] Don't handle history_size in the driver.

Peter Hutterer peter.hutterer at who-t.net
Tue Dec 14 18:58:09 PST 2010


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 at who-t.net>
---
 src/jstk.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/jstk.c b/src/jstk.c
index 0be2544..0dbbe63 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;
 
-- 
1.7.3.3



More information about the xorg-devel mailing list