Hi On Wed, Sep 7, 2022 at 2:03 AM Arwed Meyer <arwed.me...@gmx.de> wrote:
> 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.me...@gmx.de> > --- > chardev/msmouse.c | 65 +++++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 63 insertions(+), 2 deletions(-) > > diff --git a/chardev/msmouse.c b/chardev/msmouse.c > index eb9231dcdb..0ecf26a436 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,52 @@ 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)); > + for (c = INPUT_BUTTON__MAX - 1; c >= 0; c--) { > + mouse->btns[c] = false; > + mouse->btnc[c] = false; > + } > Why not memset those fields as well? > + 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 +225,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 +235,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 = { > -- > 2.34.1 > > > lgtm otherwise, Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com> -- Marc-André Lureau
