summaryrefslogtreecommitdiffstats
path: root/chardev
diff options
context:
space:
mode:
authorArwed Meyer2022-09-11 20:18:36 +0200
committerMarc-André Lureau2022-09-29 12:38:05 +0200
commita39fe10557462648b8bee7aec5e24aad75ebd32d (patch)
tree6d28bbc15b4321353b7c9d23163dbedd4b123fa4 /chardev
parentMerge tag 'net-pull-request' of https://github.com/jasowang/qemu into staging (diff)
downloadqemu-a39fe10557462648b8bee7aec5e24aad75ebd32d.tar.gz
qemu-a39fe10557462648b8bee7aec5e24aad75ebd32d.tar.xz
qemu-a39fe10557462648b8bee7aec5e24aad75ebd32d.zip
msmouse: Handle mouse reset
Detect mouse reset via RTS or DTR line: Don't send or process anything while in reset. When coming out of reset, send ID sequence first thing. This allows msmouse to be detected by common mouse drivers. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/77 Signed-off-by: Arwed Meyer <arwed.meyer@gmx.de> Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20220911181840.8933-2-arwed.meyer@gmx.de>
Diffstat (limited to 'chardev')
-rw-r--r--chardev/msmouse.c63
1 files changed, 61 insertions, 2 deletions
diff --git a/chardev/msmouse.c b/chardev/msmouse.c
index eb9231dcdb..95fa488339 100644
--- a/chardev/msmouse.c
+++ b/chardev/msmouse.c
@@ -25,17 +25,20 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
#include "chardev/char.h"
+#include "chardev/char-serial.h"
#include "ui/console.h"
#include "ui/input.h"
#include "qom/object.h"
-#define MSMOUSE_LO6(n) ((n) & 0x3f)
-#define MSMOUSE_HI2(n) (((n) & 0xc0) >> 6)
+#define MSMOUSE_LO6(n) ((n) & 0x3f)
+#define MSMOUSE_HI2(n) (((n) & 0xc0) >> 6)
+#define MSMOUSE_PWR(cm) (cm & (CHR_TIOCM_RTS | CHR_TIOCM_DTR))
struct MouseChardev {
Chardev parent;
QemuInputHandlerState *hs;
+ int tiocm;
int axis[INPUT_AXIS__MAX];
bool btns[INPUT_BUTTON__MAX];
bool btnc[INPUT_BUTTON__MAX];
@@ -109,6 +112,11 @@ static void msmouse_input_event(DeviceState *dev, QemuConsole *src,
InputMoveEvent *move;
InputBtnEvent *btn;
+ /* Ignore events if serial mouse powered down. */
+ if (!MSMOUSE_PWR(mouse->tiocm)) {
+ return;
+ }
+
switch (evt->type) {
case INPUT_EVENT_KIND_REL:
move = evt->u.rel.data;
@@ -132,6 +140,11 @@ static void msmouse_input_sync(DeviceState *dev)
MouseChardev *mouse = MOUSE_CHARDEV(dev);
Chardev *chr = CHARDEV(dev);
+ /* Ignore events if serial mouse powered down. */
+ if (!MSMOUSE_PWR(mouse->tiocm)) {
+ return;
+ }
+
msmouse_queue_event(mouse);
msmouse_chr_accept_input(chr);
}
@@ -142,6 +155,50 @@ static int msmouse_chr_write(struct Chardev *s, const uint8_t *buf, int len)
return len;
}
+static int msmouse_ioctl(Chardev *chr, int cmd, void *arg)
+{
+ MouseChardev *mouse = MOUSE_CHARDEV(chr);
+ int c;
+ int *targ = (int *)arg;
+
+ switch (cmd) {
+ case CHR_IOCTL_SERIAL_SET_TIOCM:
+ c = mouse->tiocm;
+ mouse->tiocm = *(int *)arg;
+ if (MSMOUSE_PWR(mouse->tiocm)) {
+ if (!MSMOUSE_PWR(c)) {
+ /*
+ * Power on after reset: send "M3"
+ * cause we behave like a 3 button logitech
+ * mouse.
+ */
+ mouse->outbuf[0] = 'M';
+ mouse->outbuf[1] = '3';
+ mouse->outlen = 2;
+ /* Start sending data to serial. */
+ msmouse_chr_accept_input(chr);
+ }
+ break;
+ }
+ /*
+ * Reset mouse buffers on power down.
+ * Mouse won't send anything without power.
+ */
+ mouse->outlen = 0;
+ memset(mouse->axis, 0, sizeof(mouse->axis));
+ memset(mouse->btns, false, sizeof(mouse->btns));
+ memset(mouse->btnc, false, sizeof(mouse->btns));
+ break;
+ case CHR_IOCTL_SERIAL_GET_TIOCM:
+ /* Remember line control status. */
+ *targ = mouse->tiocm;
+ break;
+ default:
+ return -ENOTSUP;
+ }
+ return 0;
+}
+
static void char_msmouse_finalize(Object *obj)
{
MouseChardev *mouse = MOUSE_CHARDEV(obj);
@@ -166,6 +223,7 @@ static void msmouse_chr_open(Chardev *chr,
*be_opened = false;
mouse->hs = qemu_input_handler_register((DeviceState *)mouse,
&msmouse_handler);
+ mouse->tiocm = 0;
}
static void char_msmouse_class_init(ObjectClass *oc, void *data)
@@ -175,6 +233,7 @@ static void char_msmouse_class_init(ObjectClass *oc, void *data)
cc->open = msmouse_chr_open;
cc->chr_write = msmouse_chr_write;
cc->chr_accept_input = msmouse_chr_accept_input;
+ cc->chr_ioctl = msmouse_ioctl;
}
static const TypeInfo char_msmouse_type_info = {