* [PATCH] Input: trackpoint: add new trackpoint firmware ID
@ 2017-02-10 3:02 Aaron Ma
2017-02-12 22:38 ` Dmitry Torokhov
0 siblings, 1 reply; 5+ messages in thread
From: Aaron Ma @ 2017-02-10 3:02 UTC (permalink / raw)
To: dmitry.torokhov, linux-input, linux-kernel
Synaptics add new TP firmware ID: 0x2 and 0x3, for now both lower 2 bits
are indicated as TP. Change the constant to bitwise values.
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
Cc: stable@vger.kernel.org
---
drivers/input/mouse/trackpoint.c | 3 ++-
drivers/input/mouse/trackpoint.h | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
index 7331084..9ff0f38 100644
--- a/drivers/input/mouse/trackpoint.c
+++ b/drivers/input/mouse/trackpoint.c
@@ -265,7 +265,8 @@ static int trackpoint_start_protocol(struct psmouse *psmouse, unsigned char *fir
if (ps2_command(&psmouse->ps2dev, param, MAKE_PS2_CMD(0, 2, TP_READ_ID)))
return -1;
- if (param[0] != TP_MAGIC_IDENT)
+ /* add new TP ID. */
+ if (!(param[0] & TP_MAGIC_IDENT))
return -1;
if (firmware_id)
diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h
index 5617ed3..8805575 100644
--- a/drivers/input/mouse/trackpoint.h
+++ b/drivers/input/mouse/trackpoint.h
@@ -21,8 +21,9 @@
#define TP_COMMAND 0xE2 /* Commands start with this */
#define TP_READ_ID 0xE1 /* Sent for device identification */
-#define TP_MAGIC_IDENT 0x01 /* Sent after a TP_READ_ID followed */
+#define TP_MAGIC_IDENT 0x03 /* Sent after a TP_READ_ID followed */
/* by the firmware ID */
+ /* Firmware ID includes 0x1, 0x2, 0x3 */
/*
--
2.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Input: trackpoint: add new trackpoint firmware ID
2017-02-10 3:02 [PATCH] Input: trackpoint: add new trackpoint firmware ID Aaron Ma
@ 2017-02-12 22:38 ` Dmitry Torokhov
2017-02-13 0:21 ` Aaron Ma
2017-02-14 0:30 ` Andrew Duggan
0 siblings, 2 replies; 5+ messages in thread
From: Dmitry Torokhov @ 2017-02-12 22:38 UTC (permalink / raw)
To: Aaron Ma; +Cc: linux-input, linux-kernel, Andrew Duggan, Benjamin Tissoires
On Fri, Feb 10, 2017 at 11:02:21AM +0800, Aaron Ma wrote:
> Synaptics add new TP firmware ID: 0x2 and 0x3, for now both lower 2 bits
> are indicated as TP. Change the constant to bitwise values.
Hmm, I thought IBM/Lenovo owned trackpoint support... Andrew, is it
yours now?
Aaron, what devices have these new trackpoints>?
Thanks.
>
> Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
> Cc: stable@vger.kernel.org
> ---
> drivers/input/mouse/trackpoint.c | 3 ++-
> drivers/input/mouse/trackpoint.h | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
> index 7331084..9ff0f38 100644
> --- a/drivers/input/mouse/trackpoint.c
> +++ b/drivers/input/mouse/trackpoint.c
> @@ -265,7 +265,8 @@ static int trackpoint_start_protocol(struct psmouse *psmouse, unsigned char *fir
> if (ps2_command(&psmouse->ps2dev, param, MAKE_PS2_CMD(0, 2, TP_READ_ID)))
> return -1;
>
> - if (param[0] != TP_MAGIC_IDENT)
> + /* add new TP ID. */
> + if (!(param[0] & TP_MAGIC_IDENT))
> return -1;
>
> if (firmware_id)
> diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h
> index 5617ed3..8805575 100644
> --- a/drivers/input/mouse/trackpoint.h
> +++ b/drivers/input/mouse/trackpoint.h
> @@ -21,8 +21,9 @@
> #define TP_COMMAND 0xE2 /* Commands start with this */
>
> #define TP_READ_ID 0xE1 /* Sent for device identification */
> -#define TP_MAGIC_IDENT 0x01 /* Sent after a TP_READ_ID followed */
> +#define TP_MAGIC_IDENT 0x03 /* Sent after a TP_READ_ID followed */
> /* by the firmware ID */
> + /* Firmware ID includes 0x1, 0x2, 0x3 */
>
>
> /*
> --
> 2.9.3
>
--
Dmitry
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Input: trackpoint: add new trackpoint firmware ID
2017-02-12 22:38 ` Dmitry Torokhov
@ 2017-02-13 0:21 ` Aaron Ma
2017-02-14 0:30 ` Andrew Duggan
1 sibling, 0 replies; 5+ messages in thread
From: Aaron Ma @ 2017-02-13 0:21 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: linux-input, linux-kernel, Andrew Duggan, Benjamin Tissoires
On 02/13/2017 06:38 AM, Dmitry Torokhov wrote:
> On Fri, Feb 10, 2017 at 11:02:21AM +0800, Aaron Ma wrote:
>> Synaptics add new TP firmware ID: 0x2 and 0x3, for now both lower 2 bits
>> are indicated as TP. Change the constant to bitwise values.
>
> Hmm, I thought IBM/Lenovo owned trackpoint support... Andrew, is it
> yours now?
>
> Aaron, what devices have these new trackpoints>?
Lenovo ThinkPad X1 Carbon 5th have this new trackpoint, maybe it is not
on sale yet but soon.
BR,
Aaron
>
> Thanks.
>
>>
>> Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
>> Cc: stable@vger.kernel.org
>> ---
>> drivers/input/mouse/trackpoint.c | 3 ++-
>> drivers/input/mouse/trackpoint.h | 3 ++-
>> 2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
>> index 7331084..9ff0f38 100644
>> --- a/drivers/input/mouse/trackpoint.c
>> +++ b/drivers/input/mouse/trackpoint.c
>> @@ -265,7 +265,8 @@ static int trackpoint_start_protocol(struct psmouse *psmouse, unsigned char *fir
>> if (ps2_command(&psmouse->ps2dev, param, MAKE_PS2_CMD(0, 2, TP_READ_ID)))
>> return -1;
>>
>> - if (param[0] != TP_MAGIC_IDENT)
>> + /* add new TP ID. */
>> + if (!(param[0] & TP_MAGIC_IDENT))
>> return -1;
>>
>> if (firmware_id)
>> diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h
>> index 5617ed3..8805575 100644
>> --- a/drivers/input/mouse/trackpoint.h
>> +++ b/drivers/input/mouse/trackpoint.h
>> @@ -21,8 +21,9 @@
>> #define TP_COMMAND 0xE2 /* Commands start with this */
>>
>> #define TP_READ_ID 0xE1 /* Sent for device identification */
>> -#define TP_MAGIC_IDENT 0x01 /* Sent after a TP_READ_ID followed */
>> +#define TP_MAGIC_IDENT 0x03 /* Sent after a TP_READ_ID followed */
>> /* by the firmware ID */
>> + /* Firmware ID includes 0x1, 0x2, 0x3 */
>>
>>
>> /*
>> --
>> 2.9.3
>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Input: trackpoint: add new trackpoint firmware ID
2017-02-12 22:38 ` Dmitry Torokhov
2017-02-13 0:21 ` Aaron Ma
@ 2017-02-14 0:30 ` Andrew Duggan
2017-02-14 4:24 ` Dmitry Torokhov
1 sibling, 1 reply; 5+ messages in thread
From: Andrew Duggan @ 2017-02-14 0:30 UTC (permalink / raw)
To: Dmitry Torokhov, Aaron Ma; +Cc: linux-input, linux-kernel, Benjamin Tissoires
On 02/12/2017 02:38 PM, Dmitry Torokhov wrote:
> On Fri, Feb 10, 2017 at 11:02:21AM +0800, Aaron Ma wrote:
>> Synaptics add new TP firmware ID: 0x2 and 0x3, for now both lower 2 bits
>> are indicated as TP. Change the constant to bitwise values.
> Hmm, I thought IBM/Lenovo owned trackpoint support... Andrew, is it
> yours now?
No, it should still be Lenovo's trackpoint.
Andrew
> Aaron, what devices have these new trackpoints>?
>
> Thanks.
>
>> Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
>> Cc: stable@vger.kernel.org
>> ---
>> drivers/input/mouse/trackpoint.c | 3 ++-
>> drivers/input/mouse/trackpoint.h | 3 ++-
>> 2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
>> index 7331084..9ff0f38 100644
>> --- a/drivers/input/mouse/trackpoint.c
>> +++ b/drivers/input/mouse/trackpoint.c
>> @@ -265,7 +265,8 @@ static int trackpoint_start_protocol(struct psmouse *psmouse, unsigned char *fir
>> if (ps2_command(&psmouse->ps2dev, param, MAKE_PS2_CMD(0, 2, TP_READ_ID)))
>> return -1;
>>
>> - if (param[0] != TP_MAGIC_IDENT)
>> + /* add new TP ID. */
>> + if (!(param[0] & TP_MAGIC_IDENT))
>> return -1;
>>
>> if (firmware_id)
>> diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h
>> index 5617ed3..8805575 100644
>> --- a/drivers/input/mouse/trackpoint.h
>> +++ b/drivers/input/mouse/trackpoint.h
>> @@ -21,8 +21,9 @@
>> #define TP_COMMAND 0xE2 /* Commands start with this */
>>
>> #define TP_READ_ID 0xE1 /* Sent for device identification */
>> -#define TP_MAGIC_IDENT 0x01 /* Sent after a TP_READ_ID followed */
>> +#define TP_MAGIC_IDENT 0x03 /* Sent after a TP_READ_ID followed */
>> /* by the firmware ID */
>> + /* Firmware ID includes 0x1, 0x2, 0x3 */
>>
>>
>> /*
>> --
>> 2.9.3
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Input: trackpoint: add new trackpoint firmware ID
2017-02-14 0:30 ` Andrew Duggan
@ 2017-02-14 4:24 ` Dmitry Torokhov
0 siblings, 0 replies; 5+ messages in thread
From: Dmitry Torokhov @ 2017-02-14 4:24 UTC (permalink / raw)
To: Andrew Duggan; +Cc: Aaron Ma, linux-input, linux-kernel, Benjamin Tissoires
On Mon, Feb 13, 2017 at 04:30:02PM -0800, Andrew Duggan wrote:
> On 02/12/2017 02:38 PM, Dmitry Torokhov wrote:
> >On Fri, Feb 10, 2017 at 11:02:21AM +0800, Aaron Ma wrote:
> >>Synaptics add new TP firmware ID: 0x2 and 0x3, for now both lower 2 bits
> >>are indicated as TP. Change the constant to bitwise values.
> >Hmm, I thought IBM/Lenovo owned trackpoint support... Andrew, is it
> >yours now?
>
> No, it should still be Lenovo's trackpoint.
OK, I see, but are you aware of new firmware with new IDs? I am hesitant
to extend the list for something that hasn't changed for many years.
>
> Andrew
>
> >Aaron, what devices have these new trackpoints>?
> >
> >Thanks.
> >
> >>Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
> >>Cc: stable@vger.kernel.org
> >>---
> >> drivers/input/mouse/trackpoint.c | 3 ++-
> >> drivers/input/mouse/trackpoint.h | 3 ++-
> >> 2 files changed, 4 insertions(+), 2 deletions(-)
> >>
> >>diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c
> >>index 7331084..9ff0f38 100644
> >>--- a/drivers/input/mouse/trackpoint.c
> >>+++ b/drivers/input/mouse/trackpoint.c
> >>@@ -265,7 +265,8 @@ static int trackpoint_start_protocol(struct psmouse *psmouse, unsigned char *fir
> >> if (ps2_command(&psmouse->ps2dev, param, MAKE_PS2_CMD(0, 2, TP_READ_ID)))
> >> return -1;
> >>- if (param[0] != TP_MAGIC_IDENT)
> >>+ /* add new TP ID. */
> >>+ if (!(param[0] & TP_MAGIC_IDENT))
> >> return -1;
> >> if (firmware_id)
> >>diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h
> >>index 5617ed3..8805575 100644
> >>--- a/drivers/input/mouse/trackpoint.h
> >>+++ b/drivers/input/mouse/trackpoint.h
> >>@@ -21,8 +21,9 @@
> >> #define TP_COMMAND 0xE2 /* Commands start with this */
> >> #define TP_READ_ID 0xE1 /* Sent for device identification */
> >>-#define TP_MAGIC_IDENT 0x01 /* Sent after a TP_READ_ID followed */
> >>+#define TP_MAGIC_IDENT 0x03 /* Sent after a TP_READ_ID followed */
> >> /* by the firmware ID */
> >>+ /* Firmware ID includes 0x1, 0x2, 0x3 */
> >> /*
> >>--
> >>2.9.3
> >>
>
--
Dmitry
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-02-14 4:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-10 3:02 [PATCH] Input: trackpoint: add new trackpoint firmware ID Aaron Ma
2017-02-12 22:38 ` Dmitry Torokhov
2017-02-13 0:21 ` Aaron Ma
2017-02-14 0:30 ` Andrew Duggan
2017-02-14 4:24 ` Dmitry Torokhov
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).