[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 7/7] hid: Implement support for side and extra buttons
From: |
Laurent Vivier |
Subject: |
[PULL 7/7] hid: Implement support for side and extra buttons |
Date: |
Tue, 22 Feb 2022 17:16:24 +0100 |
From: Noah Bergbauer <noah@statshelix.com>
Simply set the respective bits and update the descriptor accordingly.
Signed-off-by: Noah Bergbauer <noah@statshelix.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20211126140437.79745-1-noah@statshelix.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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 8aab0521f405..e7ecebdf8f88 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 1c7ae97c3033..bdd6d1ffafe4 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.35.1
- [PULL 0/7] Trivial branch for 7.0 patches, Laurent Vivier, 2022/02/22
- [PULL 2/7] target/avr: Correct AVRCPUClass docstring, Laurent Vivier, 2022/02/22
- [PULL 1/7] configure: Disable capstone and slirp in the --without-default-features mode, Laurent Vivier, 2022/02/22
- [PULL 5/7] qemu-options: fix incorrect description for '-drive index=', Laurent Vivier, 2022/02/22
- [PULL 7/7] hid: Implement support for side and extra buttons,
Laurent Vivier <=
- [PULL 4/7] hw/nvram: use at24 macro, Laurent Vivier, 2022/02/22
- [PULL 6/7] vdpa: Make ncs autofree, Laurent Vivier, 2022/02/22
- [PULL 3/7] target/rx: Remove unused ENV_OFFSET definition, Laurent Vivier, 2022/02/22
- Re: [PULL 0/7] Trivial branch for 7.0 patches, Peter Maydell, 2022/02/23