Initial input event has not yet arrived in joydev_connect()
where values are set, which means default values of input_absinfo
are used for init event, not the actual values from joystick.
Signed-off-by: Vojtech Bocek <[email protected]>
---
drivers/input/joydev.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 26043cc..11f24b4 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -318,9 +318,14 @@ static int joydev_generate_startup_event(struct joydev_client *client,
event->value = !!test_bit(joydev->keypam[event->number],
input->key);
} else {
+ int evnum = client->startup - joydev->nkey;
+ int val = input_abs_get_val(input, joydev->abspam[evnum]);
+
+ joydev->abs[evnum] = joydev_correct(val, &joydev->corr[evnum]);
+
event->type = JS_EVENT_AXIS | JS_EVENT_INIT;
- event->number = client->startup - joydev->nkey;
- event->value = joydev->abs[event->number];
+ event->number = evnum;
+ event->value = joydev->abs[evnum];
}
client->startup++;
}
--
1.7.10.4
Hi,
sorry for the impatience, but it's been nearly two months since
your last response, and I, trying to send patch to Linux for
the first time, simply don't know if should I just wait more or not.
Is the patch wrong/ugly, or are you simply too busy?
Patch for current linux-next attached.
=====================
>From be5bbc627e5c8ccfea240deef6a68b10f7f1ff40 Mon Sep 17 00:00:00 2001
From: Vojtech Bocek <[email protected]>
Date: Thu, 1 Nov 2012 17:34:34 +0100
Subject: [PATCH 1/1] Input: joydev - fix axes values sent in initial js_event
Initial input ABS events can't reach joydev because it is not
opened yet.
This patch makes joydev reload ABS values on joydev_open_device.
Signed-off-by: Vojtech Bocek <[email protected]>
---
drivers/input/joydev.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index f362883..f53a7b1 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -156,6 +156,18 @@ static void joydev_event(struct input_handle *handle,
wake_up_interruptible(&joydev->wait);
}
+/* joydev must be locked */
+static void joydev_reload_abs(struct joydev *joydev)
+{
+ int i, abs;
+ struct input_dev *input = joydev->handle.dev;
+
+ for (i = 0; i < joydev->nabs; ++i) {
+ abs = input_abs_get_val(input, joydev->abspam[i]);
+ joydev->abs[i] = joydev_correct(abs, &joydev->corr[i]);
+ }
+}
+
static int joydev_fasync(int fd, struct file *file, int on)
{
struct joydev_client *client = file->private_data;
@@ -200,7 +212,9 @@ static int joydev_open_device(struct joydev *joydev)
retval = -ENODEV;
else if (!joydev->open++) {
retval = input_open_device(&joydev->handle);
- if (retval)
+ if (!retval)
+ joydev_reload_abs(joydev);
+ else
joydev->open--;
}
--
1.7.10.4