From: Andrew Duggan <aduggan@synaptics.com> To: <benjamin.tissoires@redhat.com>, <cheiny@synaptics.com>, <linux-input@vger.kernel.org>, <linux-kernel@vger.kernel.org> Cc: Andrew Duggan <aduggan@synaptics.com> Subject: [PATCH] HID: rmi: check for the existence of some optional queries before reading query 12 Date: Thu, 1 May 2014 14:49:17 -0700 [thread overview] Message-ID: <1398980957-10385-1-git-send-email-aduggan@synaptics.com> (raw) The rmi4 spec defines some optional query registers in F11 which appear before query 12. This patch checks for the existence of some of the lesser used queries to compute the location of query12 and all subsequent query registers. Signed-off-by: Andrew Duggan <aduggan@synaptics.com> --- drivers/hid/hid-rmi.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 90ae5eb..912e008 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -546,9 +546,12 @@ static int rmi_populate_f11(struct hid_device *hdev) struct rmi_data *data = hid_get_drvdata(hdev); u8 buf[20]; int ret; + bool has_query9; + bool has_query11; bool has_query12; bool has_physical_props; unsigned x_size, y_size; + u16 query12_offset; if (!data->f11.query_base_addr) { hid_err(hdev, "No 2D sensor found, giving up.\n"); @@ -561,6 +564,8 @@ static int rmi_populate_f11(struct hid_device *hdev) hid_err(hdev, "can not get query 0: %d.\n", ret); return ret; } + has_query9 = !!(buf[0] & BIT(3)); + has_query11 = !!(buf[0] & BIT(4)); has_query12 = !!(buf[0] & BIT(5)); /* query 1 to get the max number of fingers */ @@ -582,11 +587,30 @@ static int rmi_populate_f11(struct hid_device *hdev) } /* - * query 12 to know if the physical properties are reported - * (query 12 is at offset 10 for HID devices) + * At least 8 queries are guaranteed to be present in F11 + * +1 for query12. */ + query12_offset = 9; + + if (has_query9) + ++query12_offset; + + /* query 8 to find out if query 10 exists */ + ret = rmi_read(hdev, data->f11.query_base_addr + 8, buf); + if (ret) { + hid_err(hdev, "can not read gesture information: %d.\n", ret); + return ret; + } + if (!!(buf[0] & BIT(2))) + ++query12_offset; + + if (has_query11) + ++query12_offset; + + /* query 12 to know if the physical properties are reported */ if (has_query12) { - ret = rmi_read(hdev, data->f11.query_base_addr + 10, buf); + ret = rmi_read(hdev, data->f11.query_base_addr + + query12_offset, buf); if (ret) { hid_err(hdev, "can not get query 12: %d.\n", ret); return ret; @@ -595,7 +619,8 @@ static int rmi_populate_f11(struct hid_device *hdev) if (has_physical_props) { ret = rmi_read_block(hdev, - data->f11.query_base_addr + 11, buf, 4); + data->f11.query_base_addr + + query12_offset + 1, buf, 4); if (ret) { hid_err(hdev, "can not read query 15-18: %d.\n", ret); -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Duggan <aduggan@synaptics.com> To: benjamin.tissoires@redhat.com, cheiny@synaptics.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andrew Duggan <aduggan@synaptics.com> Subject: [PATCH] HID: rmi: check for the existence of some optional queries before reading query 12 Date: Thu, 1 May 2014 14:49:17 -0700 [thread overview] Message-ID: <1398980957-10385-1-git-send-email-aduggan@synaptics.com> (raw) The rmi4 spec defines some optional query registers in F11 which appear before query 12. This patch checks for the existence of some of the lesser used queries to compute the location of query12 and all subsequent query registers. Signed-off-by: Andrew Duggan <aduggan@synaptics.com> --- drivers/hid/hid-rmi.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 90ae5eb..912e008 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -546,9 +546,12 @@ static int rmi_populate_f11(struct hid_device *hdev) struct rmi_data *data = hid_get_drvdata(hdev); u8 buf[20]; int ret; + bool has_query9; + bool has_query11; bool has_query12; bool has_physical_props; unsigned x_size, y_size; + u16 query12_offset; if (!data->f11.query_base_addr) { hid_err(hdev, "No 2D sensor found, giving up.\n"); @@ -561,6 +564,8 @@ static int rmi_populate_f11(struct hid_device *hdev) hid_err(hdev, "can not get query 0: %d.\n", ret); return ret; } + has_query9 = !!(buf[0] & BIT(3)); + has_query11 = !!(buf[0] & BIT(4)); has_query12 = !!(buf[0] & BIT(5)); /* query 1 to get the max number of fingers */ @@ -582,11 +587,30 @@ static int rmi_populate_f11(struct hid_device *hdev) } /* - * query 12 to know if the physical properties are reported - * (query 12 is at offset 10 for HID devices) + * At least 8 queries are guaranteed to be present in F11 + * +1 for query12. */ + query12_offset = 9; + + if (has_query9) + ++query12_offset; + + /* query 8 to find out if query 10 exists */ + ret = rmi_read(hdev, data->f11.query_base_addr + 8, buf); + if (ret) { + hid_err(hdev, "can not read gesture information: %d.\n", ret); + return ret; + } + if (!!(buf[0] & BIT(2))) + ++query12_offset; + + if (has_query11) + ++query12_offset; + + /* query 12 to know if the physical properties are reported */ if (has_query12) { - ret = rmi_read(hdev, data->f11.query_base_addr + 10, buf); + ret = rmi_read(hdev, data->f11.query_base_addr + + query12_offset, buf); if (ret) { hid_err(hdev, "can not get query 12: %d.\n", ret); return ret; @@ -595,7 +619,8 @@ static int rmi_populate_f11(struct hid_device *hdev) if (has_physical_props) { ret = rmi_read_block(hdev, - data->f11.query_base_addr + 11, buf, 4); + data->f11.query_base_addr + + query12_offset + 1, buf, 4); if (ret) { hid_err(hdev, "can not read query 15-18: %d.\n", ret); -- 1.9.1
next reply other threads:[~2014-05-01 22:05 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-05-01 21:49 Andrew Duggan [this message] 2014-05-01 21:49 ` [PATCH] HID: rmi: check for the existence of some optional queries before reading query 12 Andrew Duggan 2014-05-02 14:24 ` Benjamin Tissoires
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=1398980957-10385-1-git-send-email-aduggan@synaptics.com \ --to=aduggan@synaptics.com \ --cc=benjamin.tissoires@redhat.com \ --cc=cheiny@synaptics.com \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.