Re: [Linuxwacom-devel] [PATCH input-wacom 1/2] backport: report width and height for Intuos Pro 2 on 3.7 and 2.6.38

2017-04-14 Thread Ping Cheng 
On Thu, Apr 13, 2017 at 12:22 PM, Aaron Armstrong Skomra
 wrote:
> Also remove extra spaces.
>
> Signed-off-by: Aaron Armstrong Skomra 

Reviewed-by: Ping Cheng  for the set.

Thank you, Aaron, for the cleanup.

Ping

> ---
>  2.6.30/wacom_wac.c |8 
>  2.6.36/wacom_wac.c |4 ++--
>  2.6.38/wacom_wac.c |6 --
>  3.7/wacom_wac.c|6 --
>  4 files changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
> index 78cd7b7..4184644 100644
> --- a/2.6.30/wacom_wac.c
> +++ b/2.6.30/wacom_wac.c
> @@ -1134,16 +1134,16 @@ static int wacom_multitouch_generic(struct wacom_wac 
> *wacom)
> offset = WACOM_BYTES_PER_MSPROT_PACKET * i + 3;
> prox = data[offset] & 0x01;
> contact_id = get_unaligned_le16([offset + 1]);
> -   x  = get_unaligned_le16([offset + 3]);
> -   y  = get_unaligned_le16([offset + 5]);
> +   x = get_unaligned_le16([offset + 3]);
> +   y = get_unaligned_le16([offset + 5]);
> break;
>
> case INTUOSP2:
> offset = WACOM_BYTES_PER_INTUOSP2_PACKET * i + 2;
> contact_id = data[offset];
> prox = data[offset + 1] & 0x01;
> -   x  = get_unaligned_le16([offset + 2]);
> -   y  = get_unaligned_le16([offset + 4]);
> +   x = get_unaligned_le16([offset + 2]);
> +   y = get_unaligned_le16([offset + 4]);
> break;
>
> default:
> diff --git a/2.6.36/wacom_wac.c b/2.6.36/wacom_wac.c
> index f3b9a4d..f9ceb58 100644
> --- a/2.6.36/wacom_wac.c
> +++ b/2.6.36/wacom_wac.c
> @@ -1298,8 +1298,8 @@ static int wacom_multitouch_generic(struct wacom_wac 
> *wacom)
> offset = WACOM_BYTES_PER_INTUOSP2_PACKET * i + 2;
> contact_id = data[offset];
> prox = data[offset + 1] & 0x01;
> -   x  = get_unaligned_le16([offset + 2]);
> -   y  = get_unaligned_le16([offset + 4]);
> +   x = get_unaligned_le16([offset + 2]);
> +   y = get_unaligned_le16([offset + 4]);
> break;
>
> default:
> diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
> index f66f283..8cfcb6c 100644
> --- a/2.6.38/wacom_wac.c
> +++ b/2.6.38/wacom_wac.c
> @@ -1179,8 +1179,10 @@ static int wacom_multitouch_generic(struct wacom_wac 
> *wacom)
> offset = WACOM_BYTES_PER_INTUOSP2_PACKET * i + 2;
> contact_id = data[offset];
> prox = data[offset + 1] & 0x01;
> -   x  = get_unaligned_le16([offset + 2]);
> -   y  = get_unaligned_le16([offset + 4]);
> +   x = get_unaligned_le16([offset + 2]);
> +   y = get_unaligned_le16([offset + 4]);
> +   w = data[offset + 6];
> +   h = data[offset + 7];
> break;
>
> default:
> diff --git a/3.7/wacom_wac.c b/3.7/wacom_wac.c
> index 096864e..3fb1c33 100644
> --- a/3.7/wacom_wac.c
> +++ b/3.7/wacom_wac.c
> @@ -1159,8 +1159,10 @@ static int wacom_multitouch_generic(struct wacom_wac 
> *wacom)
> offset = WACOM_BYTES_PER_INTUOSP2_PACKET * i + 2;
> contact_id = data[offset];
> prox = data[offset + 1] & 0x01;
> -   x  = get_unaligned_le16([offset + 2]);
> -   y  = get_unaligned_le16([offset + 4]);
> +   x = get_unaligned_le16([offset + 2]);
> +   y = get_unaligned_le16([offset + 4]);
> +   w = data[offset + 6];
> +   h = data[offset + 7];
> break;
>
> default:
> --
> 1.7.9.5
>

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

[Linuxwacom-devel] [PATCH input-wacom 1/2] backport: report width and height for Intuos Pro 2 on 3.7 and 2.6.38

2017-04-13 Thread Aaron Armstrong Skomra 
Also remove extra spaces.

Signed-off-by: Aaron Armstrong Skomra 
---
 2.6.30/wacom_wac.c |8 
 2.6.36/wacom_wac.c |4 ++--
 2.6.38/wacom_wac.c |6 --
 3.7/wacom_wac.c|6 --
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 78cd7b7..4184644 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -1134,16 +1134,16 @@ static int wacom_multitouch_generic(struct wacom_wac 
*wacom)
offset = WACOM_BYTES_PER_MSPROT_PACKET * i + 3;
prox = data[offset] & 0x01;
contact_id = get_unaligned_le16([offset + 1]);
-   x  = get_unaligned_le16([offset + 3]);
-   y  = get_unaligned_le16([offset + 5]);
+   x = get_unaligned_le16([offset + 3]);
+   y = get_unaligned_le16([offset + 5]);
break;
 
case INTUOSP2:
offset = WACOM_BYTES_PER_INTUOSP2_PACKET * i + 2;
contact_id = data[offset];
prox = data[offset + 1] & 0x01;
-   x  = get_unaligned_le16([offset + 2]);
-   y  = get_unaligned_le16([offset + 4]);
+   x = get_unaligned_le16([offset + 2]);
+   y = get_unaligned_le16([offset + 4]);
break;
 
default:
diff --git a/2.6.36/wacom_wac.c b/2.6.36/wacom_wac.c
index f3b9a4d..f9ceb58 100644
--- a/2.6.36/wacom_wac.c
+++ b/2.6.36/wacom_wac.c
@@ -1298,8 +1298,8 @@ static int wacom_multitouch_generic(struct wacom_wac 
*wacom)
offset = WACOM_BYTES_PER_INTUOSP2_PACKET * i + 2;
contact_id = data[offset];
prox = data[offset + 1] & 0x01;
-   x  = get_unaligned_le16([offset + 2]);
-   y  = get_unaligned_le16([offset + 4]);
+   x = get_unaligned_le16([offset + 2]);
+   y = get_unaligned_le16([offset + 4]);
break;
 
default:
diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
index f66f283..8cfcb6c 100644
--- a/2.6.38/wacom_wac.c
+++ b/2.6.38/wacom_wac.c
@@ -1179,8 +1179,10 @@ static int wacom_multitouch_generic(struct wacom_wac 
*wacom)
offset = WACOM_BYTES_PER_INTUOSP2_PACKET * i + 2;
contact_id = data[offset];
prox = data[offset + 1] & 0x01;
-   x  = get_unaligned_le16([offset + 2]);
-   y  = get_unaligned_le16([offset + 4]);
+   x = get_unaligned_le16([offset + 2]);
+   y = get_unaligned_le16([offset + 4]);
+   w = data[offset + 6];
+   h = data[offset + 7];
break;
 
default:
diff --git a/3.7/wacom_wac.c b/3.7/wacom_wac.c
index 096864e..3fb1c33 100644
--- a/3.7/wacom_wac.c
+++ b/3.7/wacom_wac.c
@@ -1159,8 +1159,10 @@ static int wacom_multitouch_generic(struct wacom_wac 
*wacom)
offset = WACOM_BYTES_PER_INTUOSP2_PACKET * i + 2;
contact_id = data[offset];
prox = data[offset + 1] & 0x01;
-   x  = get_unaligned_le16([offset + 2]);
-   y  = get_unaligned_le16([offset + 4]);
+   x = get_unaligned_le16([offset + 2]);
+   y = get_unaligned_le16([offset + 4]);
+   w = data[offset + 6];
+   h = data[offset + 7];
break;
 
default:
-- 
1.7.9.5


--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel