ABS_RESERVED was added in d9ca1c990a7 and accidentally removed as part of
ffe0e7cf290f5c9 when the high-resolution scrolling code was removed.
Signed-off-by: Peter Hutterer <[email protected]>
---
include/uapi/linux/input-event-codes.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index 3eb5a4c3d60a..ae366b87426a 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -752,6 +752,15 @@
#define ABS_MISC 0x28
+/*
+ * 0x2e is reserved and should not be used in input drivers.
+ * It was used by HID as ABS_MISC+6 and userspace needs to detect if
+ * the next ABS_* event is correct or is just ABS_MISC + n.
+ * We define here ABS_RESERVED so userspace can rely on it and detect
+ * the situation described above.
+ */
+#define ABS_RESERVED 0x2e
+
#define ABS_MT_SLOT 0x2f /* MT slot being modified */
#define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */
#define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */
--
2.19.2
On 06.12.18 00:03, Peter Hutterer wrote:
> ABS_RESERVED was added in d9ca1c990a7 and accidentally removed as part of
> ffe0e7cf290f5c9 when the high-resolution scrolling code was removed.
>
> Signed-off-by: Peter Hutterer <[email protected]>
Reviewed-by: Martin Kepplinger <[email protected]>
On Thu, Dec 6, 2018 at 9:36 AM Martin Kepplinger
<[email protected]> wrote:
>
> On 06.12.18 00:03, Peter Hutterer wrote:
> > ABS_RESERVED was added in d9ca1c990a7 and accidentally removed as part of
> > ffe0e7cf290f5c9 when the high-resolution scrolling code was removed.
> >
> > Signed-off-by: Peter Hutterer <[email protected]>
>
> Reviewed-by: Martin Kepplinger <[email protected]>
Acked-by: Benjamin Tissoires <[email protected]>
Dmitry, I do not think this one will conflict with the high res wheel
patches, so I think it should be safe to take it through your tree.
If you think it'll be an issue, I can also take it through the HID one.
Cheers,
Benjamin
On Thu, Dec 06, 2018 at 10:24:11AM +0100, Benjamin Tissoires wrote:
> On Thu, Dec 6, 2018 at 9:36 AM Martin Kepplinger
> <[email protected]> wrote:
> >
> > On 06.12.18 00:03, Peter Hutterer wrote:
> > > ABS_RESERVED was added in d9ca1c990a7 and accidentally removed as part of
> > > ffe0e7cf290f5c9 when the high-resolution scrolling code was removed.
> > >
> > > Signed-off-by: Peter Hutterer <[email protected]>
> >
> > Reviewed-by: Martin Kepplinger <[email protected]>
>
> Acked-by: Benjamin Tissoires <[email protected]>
>
> Dmitry, I do not think this one will conflict with the high res wheel
> patches, so I think it should be safe to take it through your tree.
> If you think it'll be an issue, I can also take it through the HID one.
fwiw, patch was made on top of v4.20-rc5, so it shouldn't conflict.
Cheers,
Peter
On Fri, Dec 07, 2018 at 08:46:05AM +1000, Peter Hutterer wrote:
> On Thu, Dec 06, 2018 at 10:24:11AM +0100, Benjamin Tissoires wrote:
> > On Thu, Dec 6, 2018 at 9:36 AM Martin Kepplinger
> > <[email protected]> wrote:
> > >
> > > On 06.12.18 00:03, Peter Hutterer wrote:
> > > > ABS_RESERVED was added in d9ca1c990a7 and accidentally removed as part of
> > > > ffe0e7cf290f5c9 when the high-resolution scrolling code was removed.
> > > >
> > > > Signed-off-by: Peter Hutterer <[email protected]>
> > >
> > > Reviewed-by: Martin Kepplinger <[email protected]>
> >
> > Acked-by: Benjamin Tissoires <[email protected]>
> >
> > Dmitry, I do not think this one will conflict with the high res wheel
> > patches, so I think it should be safe to take it through your tree.
> > If you think it'll be an issue, I can also take it through the HID one.
>
> fwiw, patch was made on top of v4.20-rc5, so it shouldn't conflict.
My tree is behind that ;) so I would actually prefer if Benjamin/Jiri
would take it through their tree with my:
Acked-by: Dmitry Torokhov <[email protected]>
Thanks.
--
Dmitry
On Thu, Dec 6, 2018 at 11:56 PM Dmitry Torokhov
<[email protected]> wrote:
>
> On Fri, Dec 07, 2018 at 08:46:05AM +1000, Peter Hutterer wrote:
> > On Thu, Dec 06, 2018 at 10:24:11AM +0100, Benjamin Tissoires wrote:
> > > On Thu, Dec 6, 2018 at 9:36 AM Martin Kepplinger
> > > <[email protected]> wrote:
> > > >
> > > > On 06.12.18 00:03, Peter Hutterer wrote:
> > > > > ABS_RESERVED was added in d9ca1c990a7 and accidentally removed as part of
> > > > > ffe0e7cf290f5c9 when the high-resolution scrolling code was removed.
> > > > >
> > > > > Signed-off-by: Peter Hutterer <[email protected]>
> > > >
> > > > Reviewed-by: Martin Kepplinger <[email protected]>
> > >
> > > Acked-by: Benjamin Tissoires <[email protected]>
> > >
> > > Dmitry, I do not think this one will conflict with the high res wheel
> > > patches, so I think it should be safe to take it through your tree.
> > > If you think it'll be an issue, I can also take it through the HID one.
> >
> > fwiw, patch was made on top of v4.20-rc5, so it shouldn't conflict.
>
> My tree is behind that ;) so I would actually prefer if Benjamin/Jiri
> would take it through their tree with my:
>
> Acked-by: Dmitry Torokhov <[email protected]>
>
OK, thanks Dmitry.
Jiri, I have pushed this in for-4.20/upstream-fixes.
I think the branch has enough now to justify a PR towards Linus.
I believe https://patchwork.kernel.org/patch/10693337/ would be a good
material too, but OTOH, this only happens when the device fails at
probing, so maybe not so urgent.
Cheers,
Benjamin
> Thanks.
>
> --
> Dmitry
On Fri, 7 Dec 2018, Benjamin Tissoires wrote:
> OK, thanks Dmitry.
>
> Jiri, I have pushed this in for-4.20/upstream-fixes.
>
> I think the branch has enough now to justify a PR towards Linus.
Agreed. I will be sending it today. Thanks,
--
Jiri Kosina
SUSE Labs