Make msmouse send serial pnp data.
Enables you to see nice qemu device name in Win9x.
Signed-off-by: Arwed Meyer <arwed.meyer@gmx.de>
---
chardev/msmouse.c | 101 +++++++++++++++++++++++++++++++---------------
1 file changed, 68 insertions(+), 33 deletions(-)
diff --git a/chardev/msmouse.c b/chardev/msmouse.c
index 0ecf26a436..b4ddaee778 100644
--- a/chardev/msmouse.c
+++ b/chardev/msmouse.c
@@ -24,6 +24,7 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
+#include "qemu/fifo8.h"
#include "chardev/char.h"
#include "chardev/char-serial.h"
#include "ui/console.h"
@@ -34,6 +35,25 @@
#define MSMOUSE_HI2(n) (((n) & 0xc0) >> 6)
#define MSMOUSE_PWR(cm) (cm & (CHR_TIOCM_RTS | CHR_TIOCM_DTR))
+/* Serial PnP for 6 bit devices/mice sends all ASCII chars - 0x20 */
+#define M(c) (c - 0x20)
+/* Serial fifo size. */
+#define MSMOUSE_BUF_SZ 64
+
+/* Mouse ID: Send "M3" cause we behave like a 3 button logitech mouse. */
+const uint8_t mouse_id[] = {'M', '3'};
+/*
+ * PnP start "(", PnP version (1.0), vendor ID, product ID, '\\',
+ * serial ID (omitted), '\\', MS class name, '\\', driver ID (omitted), '\\',
+ * product description, checksum, ")"
+ * Missing parts are inserted later.
+ */
+const uint8_t pnp_data[] = {M('('), 1, '$', M('Q'), M('M'), M('U'),
+ M('0'), M('0'), M('0'), M('1'),
+ M('\\'), M('\\'),
+ M('M'), M('O'), M('U'), M('S'), M('E'),
+ M('\\'), M('\\')};
+
struct MouseChardev {
Chardev parent;
@@ -42,8 +62,7 @@ struct MouseChardev {
int axis[INPUT_AXIS__MAX];
bool btns[INPUT_BUTTON__MAX];
bool btnc[INPUT_BUTTON__MAX];
- uint8_t outbuf[32];
- int outlen;
+ Fifo8 outbuf;
Could you make this outbuf replacement a different patch?
};
typedef struct MouseChardev MouseChardev;
@@ -54,21 +73,15 @@ DECLARE_INSTANCE_CHECKER(MouseChardev, MOUSE_CHARDEV,
static void msmouse_chr_accept_input(Chardev *chr)
{
MouseChardev *mouse = MOUSE_CHARDEV(chr);
- int len;
+ uint32_t len_out, len;
- len = qemu_chr_be_can_write(chr);
- if (len > mouse->outlen) {
- len = mouse->outlen;
- }
- if (!len) {
+ len_out = qemu_chr_be_can_write(chr);
+ if (!len_out || fifo8_is_empty(&mouse->outbuf)) {
return;
}
-
- qemu_chr_be_write(chr, mouse->outbuf, len);
- mouse->outlen -= len;
- if (mouse->outlen) {
- memmove(mouse->outbuf, mouse->outbuf + len, mouse->outlen);
- }
+ len = MIN(fifo8_num_used(&mouse->outbuf), len_out);
+ qemu_chr_be_write(chr, fifo8_pop_buf(&mouse->outbuf, len, &len_out),
+ len_out);
}
static void msmouse_queue_event(MouseChardev *mouse)
@@ -94,12 +107,11 @@ static void msmouse_queue_event(MouseChardev *mouse)
mouse->btnc[INPUT_BUTTON_MIDDLE]) {
bytes[3] |= (mouse->btns[INPUT_BUTTON_MIDDLE] ? 0x20 : 0x00);
mouse->btnc[INPUT_BUTTON_MIDDLE] = false;
- count = 4;
+ count++;
}
- if (mouse->outlen <= sizeof(mouse->outbuf) - count) {
- memcpy(mouse->outbuf + mouse->outlen, bytes, count);
- mouse->outlen += count;
+ if (fifo8_num_free(&mouse->outbuf) >= count) {
+ fifo8_push_all(&mouse->outbuf, bytes, count);
} else {
/* queue full -> drop event */
}
@@ -155,11 +167,22 @@ static int msmouse_chr_write(struct Chardev *s, const uint8_t *buf, int len)
return len;
}
+static QemuInputHandler msmouse_handler = {
+ .name = "QEMU Microsoft Mouse",
+ .mask = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_REL,
+ .event = msmouse_input_event,
+ .sync = msmouse_input_sync,
+};
+
static int msmouse_ioctl(Chardev *chr, int cmd, void *arg)
{
MouseChardev *mouse = MOUSE_CHARDEV(chr);
- int c;
+ int c, i, j;
+ uint8_t bytes[MSMOUSE_BUF_SZ / 2];
int *targ = (int *)arg;
+ const uint8_t hexchr[16] = {M('0'), M('1'), M('2'), M('3'), M('4'), M('5'),
+ M('6'), M('7'), M('8'), M('9'), M('A'), M('B'),
+ M('C'), M('D'), M('E'), M('F')};
switch (cmd) {
case CHR_IOCTL_SERIAL_SET_TIOCM:
@@ -168,13 +191,30 @@ static int msmouse_ioctl(Chardev *chr, int cmd, void *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.
+ * Power on after reset: Send ID and PnP data
+ * No need to check fifo space as it is empty at this point.
+ */
+ fifo8_push_all(&mouse->outbuf, mouse_id, sizeof(mouse_id));
+ /* Add PnP data: */
+ fifo8_push_all(&mouse->outbuf, pnp_data, sizeof(pnp_data));
+ /*
+ * Add device description from qemu handler name.
+ * Make sure this all fits into the queue beforehand!
*/
- mouse->outbuf[0] = 'M';
- mouse->outbuf[1] = '3';
- mouse->outlen = 2;
+ c = M(')');
+ for (i = 0; msmouse_handler.name[i]; i++) {
+ bytes[i] = M(msmouse_handler.name[i]);
+ c += bytes[i];
+ }
+ /* Calc more of checksum */
+ for (j = 0; j < sizeof(pnp_data); j++) {
+ c += pnp_data[j];
+ }
+ c &= 0xff;
+ bytes[i++] = hexchr[c >> 4];
+ bytes[i++] = hexchr[c & 0x0f];
+ bytes[i++] = M(')');
+ fifo8_push_all(&mouse->outbuf, bytes, i);
/* Start sending data to serial. */
msmouse_chr_accept_input(chr);
}
@@ -184,7 +224,7 @@ static int msmouse_ioctl(Chardev *chr, int cmd, void *arg)
* Reset mouse buffers on power down.
* Mouse won't send anything without power.
*/
- mouse->outlen = 0;
+ fifo8_reset(&mouse->outbuf);
memset(mouse->axis, 0, sizeof(mouse->axis));
for (c = INPUT_BUTTON__MAX - 1; c >= 0; c--) {
mouse->btns[c] = false;
@@ -206,15 +246,9 @@ static void char_msmouse_finalize(Object *obj)
MouseChardev *mouse = MOUSE_CHARDEV(obj);
qemu_input_handler_unregister(mouse->hs);
+ fifo8_destroy(&mouse->outbuf);
}
-static QemuInputHandler msmouse_handler = {
- .name = "QEMU Microsoft Mouse",
- .mask = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_REL,
- .event = msmouse_input_event,
- .sync = msmouse_input_sync,
-};
-
static void msmouse_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
@@ -226,6 +260,7 @@ static void msmouse_chr_open(Chardev *chr,
mouse->hs = qemu_input_handler_register((DeviceState *)mouse,
&msmouse_handler);
mouse->tiocm = 0;
+ fifo8_create(&mouse->outbuf, MSMOUSE_BUF_SZ);
}
static void char_msmouse_class_init(ObjectClass *oc, void *data)
--
2.34.1