linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Simon Wood <simon@mungewell.org>
To: linux-input@vger.kernel.org
Cc: "Jiri Kosina" <jkosina@suse.cz>,
	linux-kernel@vger.kernel.org, simon@mungewell.org,
	"Elias Vanderstuyft" <elias.vds@gmail.com>,
	"Michal Malý" <madcatxster@prifuk.cz>
Subject: [PATCH 5/5] HID:hid-lg4ff: Correct Auto-center strength for wheels other than MOMO and MOMO2
Date: Wed,  6 Nov 2013 12:30:44 -0700	[thread overview]
Message-ID: <1383766244-2336-5-git-send-email-simon@mungewell.org> (raw)
In-Reply-To: <1383766244-2336-1-git-send-email-simon@mungewell.org>

The MOMO and MOMO2 wheels have a slightly different autocenter command,
and accept values in the range 0..F (rather than 0..7 for the other wheels).

This patch uses the product ID to determine how to compute the strength.

Signed-off-by: Simon Wood <simon@mungewell.org>
---
 drivers/hid/hid-lg4ff.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c
index 5492809..befe0e3 100644
--- a/drivers/hid/hid-lg4ff.c
+++ b/drivers/hid/hid-lg4ff.c
@@ -234,6 +234,20 @@ static void hid_lg4ff_set_autocenter_default(struct input_dev *dev, u16 magnitud
 	struct hid_report *report = list_entry(report_list->next, struct hid_report, list);
 	__s32 *value = report->field[0]->value;
 	__u32 expand_a, expand_b;
+	struct lg4ff_device_entry *entry;
+	struct lg_drv_data *drv_data;
+
+	drv_data = hid_get_drvdata(hid);
+	if (!drv_data) {
+		hid_err(hid, "Private driver data not found!\n");
+		return;
+	}
+
+	entry = drv_data->device_props;
+	if (!entry) {
+		hid_err(hid, "Device properties not found!\n");
+		return;
+	}
 
 	/* De-activate Auto-Center */
 	if (magnitude == 0) {
@@ -257,6 +271,16 @@ static void hid_lg4ff_set_autocenter_default(struct input_dev *dev, u16 magnitud
 		expand_b = (0x80 * 0xaaaa) + 0xff * (magnitude - 0xaaaa);
 	}
 
+	/* Adjust for non-MOMO wheels */
+	switch (entry->product_id) {
+	case USB_DEVICE_ID_LOGITECH_MOMO_WHEEL:
+	case USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2:
+		break;
+	default:
+		expand_a = expand_a >> 1;
+		break;
+	}
+
 	value[0] = 0xfe;
 	value[1] = 0x0d;
 	value[2] = expand_a / 0xaaaa;
-- 
1.8.1.2

  parent reply	other threads:[~2013-11-06 19:30 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-06 19:30 [PATCH 1/5] HID:hid-lg4ff: Scale autocentering force properly on Logitech wheel Simon Wood
2013-11-06 19:30 ` [PATCH 2/5] HID:hid-lg4ff: Switch autocentering off when strength is set to zero Simon Wood
2013-11-06 19:30 ` [PATCH 3/5] HID:hid-lg4ff: ensure ConstantForce is disabled when set to 0 Simon Wood
2013-11-06 19:30 ` [PATCH 4/5] HID:hid-lg4ff: Initialize device properties before we touch autocentering Simon Wood
2013-11-06 19:30 ` Simon Wood [this message]
2013-11-08 13:14 ` [PATCH 1/5] HID:hid-lg4ff: Scale autocentering force properly on Logitech wheel Jiri Kosina
2013-11-08 15:54   ` simon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1383766244-2336-5-git-send-email-simon@mungewell.org \
    --to=simon@mungewell.org \
    --cc=elias.vds@gmail.com \
    --cc=jkosina@suse.cz \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=madcatxster@prifuk.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).