* [PATCH] hid: Implement support for side and extra buttons
@ 2021-11-26 14:04 Noah Bergbauer
2021-12-04 11:20 ` Noah Bergbauer
2022-02-22 10:51 ` [PATCH] hid: Implement support for " Laurent Vivier
0 siblings, 2 replies; 6+ messages in thread
From: Noah Bergbauer @ 2021-11-26 14:04 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Noah Bergbauer
Simply set the respective bits and update the descriptor accordingly.
Signed-off-by: Noah Bergbauer <noah@statshelix.com>
---
hw/input/hid.c | 2 ++
hw/usb/dev-hid.c | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/input/hid.c b/hw/input/hid.c
index 8aab0521f4..e7ecebdf8f 100644
--- a/hw/input/hid.c
+++ b/hw/input/hid.c
@@ -114,6 +114,8 @@ static void hid_pointer_event(DeviceState *dev, QemuConsole *src,
[INPUT_BUTTON_LEFT] = 0x01,
[INPUT_BUTTON_RIGHT] = 0x02,
[INPUT_BUTTON_MIDDLE] = 0x04,
+ [INPUT_BUTTON_SIDE] = 0x08,
+ [INPUT_BUTTON_EXTRA] = 0x10,
};
HIDState *hs = (HIDState *)dev;
HIDPointerEvent *e;
diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index 1c7ae97c30..bdd6d1ffaf 100644
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -461,14 +461,14 @@ static const uint8_t qemu_mouse_hid_report_descriptor[] = {
0xa1, 0x00, /* Collection (Physical) */
0x05, 0x09, /* Usage Page (Button) */
0x19, 0x01, /* Usage Minimum (1) */
- 0x29, 0x03, /* Usage Maximum (3) */
+ 0x29, 0x05, /* Usage Maximum (5) */
0x15, 0x00, /* Logical Minimum (0) */
0x25, 0x01, /* Logical Maximum (1) */
- 0x95, 0x03, /* Report Count (3) */
+ 0x95, 0x05, /* Report Count (5) */
0x75, 0x01, /* Report Size (1) */
0x81, 0x02, /* Input (Data, Variable, Absolute) */
0x95, 0x01, /* Report Count (1) */
- 0x75, 0x05, /* Report Size (5) */
+ 0x75, 0x03, /* Report Size (3) */
0x81, 0x01, /* Input (Constant) */
0x05, 0x01, /* Usage Page (Generic Desktop) */
0x09, 0x30, /* Usage (X) */
--
2.34.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] hid: Implement support for side and extra buttons
2021-11-26 14:04 [PATCH] hid: Implement support for side and extra buttons Noah Bergbauer
@ 2021-12-04 11:20 ` Noah Bergbauer
2022-01-22 9:57 ` [PATCH] hid: trivial change to support " Noah Bergbauer
2022-02-22 10:51 ` [PATCH] hid: Implement support for " Laurent Vivier
1 sibling, 1 reply; 6+ messages in thread
From: Noah Bergbauer @ 2021-12-04 11:20 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, kraxel
[-- Attachment #1: Type: text/plain, Size: 2210 bytes --]
ping https://patchew.org/QEMU/20211126140437.79745-1-noah@statshelix.com/
On Fri, Nov 26, 2021 at 3:04 PM Noah Bergbauer <noah@statshelix.com> wrote:
> Simply set the respective bits and update the descriptor accordingly.
>
> Signed-off-by: Noah Bergbauer <noah@statshelix.com>
> ---
> hw/input/hid.c | 2 ++
> hw/usb/dev-hid.c | 6 +++---
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/hw/input/hid.c b/hw/input/hid.c
> index 8aab0521f4..e7ecebdf8f 100644
> --- a/hw/input/hid.c
> +++ b/hw/input/hid.c
> @@ -114,6 +114,8 @@ static void hid_pointer_event(DeviceState *dev,
> QemuConsole *src,
> [INPUT_BUTTON_LEFT] = 0x01,
> [INPUT_BUTTON_RIGHT] = 0x02,
> [INPUT_BUTTON_MIDDLE] = 0x04,
> + [INPUT_BUTTON_SIDE] = 0x08,
> + [INPUT_BUTTON_EXTRA] = 0x10,
> };
> HIDState *hs = (HIDState *)dev;
> HIDPointerEvent *e;
> diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
> index 1c7ae97c30..bdd6d1ffaf 100644
> --- a/hw/usb/dev-hid.c
> +++ b/hw/usb/dev-hid.c
> @@ -461,14 +461,14 @@ static const uint8_t
> qemu_mouse_hid_report_descriptor[] = {
> 0xa1, 0x00, /* Collection (Physical) */
> 0x05, 0x09, /* Usage Page (Button) */
> 0x19, 0x01, /* Usage Minimum (1) */
> - 0x29, 0x03, /* Usage Maximum (3) */
> + 0x29, 0x05, /* Usage Maximum (5) */
> 0x15, 0x00, /* Logical Minimum (0) */
> 0x25, 0x01, /* Logical Maximum (1) */
> - 0x95, 0x03, /* Report Count (3) */
> + 0x95, 0x05, /* Report Count (5) */
> 0x75, 0x01, /* Report Size (1) */
> 0x81, 0x02, /* Input (Data, Variable, Absolute) */
> 0x95, 0x01, /* Report Count (1) */
> - 0x75, 0x05, /* Report Size (5) */
> + 0x75, 0x03, /* Report Size (3) */
> 0x81, 0x01, /* Input (Constant) */
> 0x05, 0x01, /* Usage Page (Generic Desktop) */
> 0x09, 0x30, /* Usage (X) */
> --
> 2.34.0
>
>
[-- Attachment #2: Type: text/html, Size: 3053 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] hid: trivial change to support side and extra buttons
2021-12-04 11:20 ` Noah Bergbauer
@ 2022-01-22 9:57 ` Noah Bergbauer
2022-02-22 9:32 ` Laurent Vivier
0 siblings, 1 reply; 6+ messages in thread
From: Noah Bergbauer @ 2022-01-22 9:57 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, mjt, kraxel, laurent
[-- Attachment #1: Type: text/plain, Size: 2650 bytes --]
ping https://patchew.org/QEMU/20211126140437.79745-1-noah@statshelix.com/
This patch is really small because all of the necessary functionality is
already in place. It's just a matter of setting the respective flags
(instead of just ignoring the buttons) and allocating these bits in the HID
descriptor.
On Sat, Dec 4, 2021 at 12:20 PM Noah Bergbauer <noah@statshelix.com> wrote:
> ping https://patchew.org/QEMU/20211126140437.79745-1-noah@statshelix.com/
>
> On Fri, Nov 26, 2021 at 3:04 PM Noah Bergbauer <noah@statshelix.com>
> wrote:
>
>> Simply set the respective bits and update the descriptor accordingly.
>>
>> Signed-off-by: Noah Bergbauer <noah@statshelix.com>
>> ---
>> hw/input/hid.c | 2 ++
>> hw/usb/dev-hid.c | 6 +++---
>> 2 files changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/hw/input/hid.c b/hw/input/hid.c
>> index 8aab0521f4..e7ecebdf8f 100644
>> --- a/hw/input/hid.c
>> +++ b/hw/input/hid.c
>> @@ -114,6 +114,8 @@ static void hid_pointer_event(DeviceState *dev,
>> QemuConsole *src,
>> [INPUT_BUTTON_LEFT] = 0x01,
>> [INPUT_BUTTON_RIGHT] = 0x02,
>> [INPUT_BUTTON_MIDDLE] = 0x04,
>> + [INPUT_BUTTON_SIDE] = 0x08,
>> + [INPUT_BUTTON_EXTRA] = 0x10,
>> };
>> HIDState *hs = (HIDState *)dev;
>> HIDPointerEvent *e;
>> diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
>> index 1c7ae97c30..bdd6d1ffaf 100644
>> --- a/hw/usb/dev-hid.c
>> +++ b/hw/usb/dev-hid.c
>> @@ -461,14 +461,14 @@ static const uint8_t
>> qemu_mouse_hid_report_descriptor[] = {
>> 0xa1, 0x00, /* Collection (Physical) */
>> 0x05, 0x09, /* Usage Page (Button) */
>> 0x19, 0x01, /* Usage Minimum (1) */
>> - 0x29, 0x03, /* Usage Maximum (3) */
>> + 0x29, 0x05, /* Usage Maximum (5) */
>> 0x15, 0x00, /* Logical Minimum (0) */
>> 0x25, 0x01, /* Logical Maximum (1) */
>> - 0x95, 0x03, /* Report Count (3) */
>> + 0x95, 0x05, /* Report Count (5) */
>> 0x75, 0x01, /* Report Size (1) */
>> 0x81, 0x02, /* Input (Data, Variable, Absolute) */
>> 0x95, 0x01, /* Report Count (1) */
>> - 0x75, 0x05, /* Report Size (5) */
>> + 0x75, 0x03, /* Report Size (3) */
>> 0x81, 0x01, /* Input (Constant) */
>> 0x05, 0x01, /* Usage Page (Generic Desktop) */
>> 0x09, 0x30, /* Usage (X) */
>> --
>> 2.34.0
>>
>>
[-- Attachment #2: Type: text/html, Size: 3940 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] hid: trivial change to support side and extra buttons
2022-01-22 9:57 ` [PATCH] hid: trivial change to support " Noah Bergbauer
@ 2022-02-22 9:32 ` Laurent Vivier
2022-02-22 10:34 ` Gerd Hoffmann
0 siblings, 1 reply; 6+ messages in thread
From: Laurent Vivier @ 2022-02-22 9:32 UTC (permalink / raw)
To: kraxel; +Cc: qemu-trivial, mjt, qemu-devel, Noah Bergbauer
Gerd,
if you acknowledge the patch I can merge it via the trivial branch.
Thanks,
Laurent
Le 22/01/2022 à 10:57, Noah Bergbauer a écrit :
> ping https://patchew.org/QEMU/20211126140437.79745-1-noah@statshelix.com/
> <https://patchew.org/QEMU/20211126140437.79745-1-noah@statshelix.com/>
>
> This patch is really small because all of the necessary functionality is already in place. It's just
> a matter of setting the respective flags (instead of just ignoring the buttons) and allocating these
> bits in the HID descriptor.
>
> On Sat, Dec 4, 2021 at 12:20 PM Noah Bergbauer <noah@statshelix.com <mailto:noah@statshelix.com>> wrote:
>
> ping https://patchew.org/QEMU/20211126140437.79745-1-noah@statshelix.com/
> <https://patchew.org/QEMU/20211126140437.79745-1-noah@statshelix.com/>
>
> On Fri, Nov 26, 2021 at 3:04 PM Noah Bergbauer <noah@statshelix.com
> <mailto:noah@statshelix.com>> wrote:
>
> Simply set the respective bits and update the descriptor accordingly.
>
> Signed-off-by: Noah Bergbauer <noah@statshelix.com <mailto:noah@statshelix.com>>
> ---
> hw/input/hid.c | 2 ++
> hw/usb/dev-hid.c | 6 +++---
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/hw/input/hid.c b/hw/input/hid.c
> index 8aab0521f4..e7ecebdf8f 100644
> --- a/hw/input/hid.c
> +++ b/hw/input/hid.c
> @@ -114,6 +114,8 @@ static void hid_pointer_event(DeviceState *dev, QemuConsole *src,
> [INPUT_BUTTON_LEFT] = 0x01,
> [INPUT_BUTTON_RIGHT] = 0x02,
> [INPUT_BUTTON_MIDDLE] = 0x04,
> + [INPUT_BUTTON_SIDE] = 0x08,
> + [INPUT_BUTTON_EXTRA] = 0x10,
> };
> HIDState *hs = (HIDState *)dev;
> HIDPointerEvent *e;
> diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
> index 1c7ae97c30..bdd6d1ffaf 100644
> --- a/hw/usb/dev-hid.c
> +++ b/hw/usb/dev-hid.c
> @@ -461,14 +461,14 @@ static const uint8_t qemu_mouse_hid_report_descriptor[] = {
> 0xa1, 0x00, /* Collection (Physical) */
> 0x05, 0x09, /* Usage Page (Button) */
> 0x19, 0x01, /* Usage Minimum (1) */
> - 0x29, 0x03, /* Usage Maximum (3) */
> + 0x29, 0x05, /* Usage Maximum (5) */
> 0x15, 0x00, /* Logical Minimum (0) */
> 0x25, 0x01, /* Logical Maximum (1) */
> - 0x95, 0x03, /* Report Count (3) */
> + 0x95, 0x05, /* Report Count (5) */
> 0x75, 0x01, /* Report Size (1) */
> 0x81, 0x02, /* Input (Data, Variable, Absolute) */
> 0x95, 0x01, /* Report Count (1) */
> - 0x75, 0x05, /* Report Size (5) */
> + 0x75, 0x03, /* Report Size (3) */
> 0x81, 0x01, /* Input (Constant) */
> 0x05, 0x01, /* Usage Page (Generic Desktop) */
> 0x09, 0x30, /* Usage (X) */
> --
> 2.34.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] hid: Implement support for side and extra buttons
2021-11-26 14:04 [PATCH] hid: Implement support for side and extra buttons Noah Bergbauer
2021-12-04 11:20 ` Noah Bergbauer
@ 2022-02-22 10:51 ` Laurent Vivier
1 sibling, 0 replies; 6+ messages in thread
From: Laurent Vivier @ 2022-02-22 10:51 UTC (permalink / raw)
To: Noah Bergbauer, qemu-devel; +Cc: qemu-trivial
Le 26/11/2021 à 15:04, Noah Bergbauer a écrit :
> Simply set the respective bits and update the descriptor accordingly.
>
> Signed-off-by: Noah Bergbauer <noah@statshelix.com>
> ---
> hw/input/hid.c | 2 ++
> hw/usb/dev-hid.c | 6 +++---
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/hw/input/hid.c b/hw/input/hid.c
> index 8aab0521f4..e7ecebdf8f 100644
> --- a/hw/input/hid.c
> +++ b/hw/input/hid.c
> @@ -114,6 +114,8 @@ static void hid_pointer_event(DeviceState *dev, QemuConsole *src,
> [INPUT_BUTTON_LEFT] = 0x01,
> [INPUT_BUTTON_RIGHT] = 0x02,
> [INPUT_BUTTON_MIDDLE] = 0x04,
> + [INPUT_BUTTON_SIDE] = 0x08,
> + [INPUT_BUTTON_EXTRA] = 0x10,
> };
> HIDState *hs = (HIDState *)dev;
> HIDPointerEvent *e;
> diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
> index 1c7ae97c30..bdd6d1ffaf 100644
> --- a/hw/usb/dev-hid.c
> +++ b/hw/usb/dev-hid.c
> @@ -461,14 +461,14 @@ static const uint8_t qemu_mouse_hid_report_descriptor[] = {
> 0xa1, 0x00, /* Collection (Physical) */
> 0x05, 0x09, /* Usage Page (Button) */
> 0x19, 0x01, /* Usage Minimum (1) */
> - 0x29, 0x03, /* Usage Maximum (3) */
> + 0x29, 0x05, /* Usage Maximum (5) */
> 0x15, 0x00, /* Logical Minimum (0) */
> 0x25, 0x01, /* Logical Maximum (1) */
> - 0x95, 0x03, /* Report Count (3) */
> + 0x95, 0x05, /* Report Count (5) */
> 0x75, 0x01, /* Report Size (1) */
> 0x81, 0x02, /* Input (Data, Variable, Absolute) */
> 0x95, 0x01, /* Report Count (1) */
> - 0x75, 0x05, /* Report Size (5) */
> + 0x75, 0x03, /* Report Size (3) */
> 0x81, 0x01, /* Input (Constant) */
> 0x05, 0x01, /* Usage Page (Generic Desktop) */
> 0x09, 0x30, /* Usage (X) */
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-02-22 10:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-26 14:04 [PATCH] hid: Implement support for side and extra buttons Noah Bergbauer
2021-12-04 11:20 ` Noah Bergbauer
2022-01-22 9:57 ` [PATCH] hid: trivial change to support " Noah Bergbauer
2022-02-22 9:32 ` Laurent Vivier
2022-02-22 10:34 ` Gerd Hoffmann
2022-02-22 10:51 ` [PATCH] hid: Implement support for " Laurent Vivier
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).