From nobody Sun May 19 08:26:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1662658956; cv=none; d=zohomail.com; s=zohoarc; b=ClPy04iWHVWef/56pf7WxOTqaS3q+732TwWEM8vZjb9fXKCiGsgT9WEIcG7vGxTtFs3tkCAoU4ZuGmuDHWEE+L0gmoyYqNkWVUJjpt8iWsAASSSw9HENO7ajbReXXIqfzA7a5WuOyCUKHFjiE1JZkgR3w/TLmUwMiGJH8utz+fI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662658956; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dvGhsjKfH/6uBIXVzF/0HviFUPi3fcdzclqKZ1+7Us0=; b=ixeQB2ReQaxK3NSy732Mb9qPrQlWsUf+H0hKJ1UtSQIOETM+eDeGVeduJA2gKVlT/koemVUDFHkv6IfrHW97mPn6UjQAJEMkHhNPbmiM1sqEqvaEZetl4qHBMiwzYAdpzaHSbeyGWsIhXx4tWhP+NluzkdSWWfCCjAUCcszrGbE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1662658956225679.4916003294863; Thu, 8 Sep 2022 10:42:36 -0700 (PDT) Received: from localhost ([::1]:60442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWLXp-0007xV-Bb for importer@patchew.org; Thu, 08 Sep 2022 13:42:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWLNc-0003y6-QK; Thu, 08 Sep 2022 13:31:57 -0400 Received: from mout.gmx.net ([212.227.15.19]:54741) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWLNL-0002B4-Sj; Thu, 08 Sep 2022 13:31:41 -0400 Received: from btm-mobil4.fritz.box ([178.8.103.19]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1Mxm3Q-1pHJcW1Q22-00zD0Y; Thu, 08 Sep 2022 19:31:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1662658294; bh=UtF0BPLI6AKxkQWay5ut7m72rH2xhRa4EgDH/2mF2T4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=CLwisVyb1nKxwgI5C7aNc4No0QRph3KKZyHK5PAH0ISRaH6dejZGER0pmZLZ8J4GS uBjyaXzjY+gntZS9DXQQREyPhCWyNAB8xI8G/vX/7O8KiJRv70PlnyRZyVQJFkxJ6p dttid9rToPJzbQ+WbGW4rNfaq96Qq9KAakBHgaTo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Arwed Meyer To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Arwed Meyer , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Subject: [PATCH v2 1/5] msmouse: Handle mouse reset Date: Thu, 8 Sep 2022 19:31:16 +0200 Message-Id: <20220908173120.16779-2-arwed.meyer@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220908173120.16779-1-arwed.meyer@gmx.de> References: <20220908173120.16779-1-arwed.meyer@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:vnL3f/XuybhdcCQxs61kE+MGDiv14GcATEqXn/H1j8XPHp3IQhb RLCUU52lTp3HUnB9YyhSjmICIY9PNmOKbd4TjSENjsGsu8kWq18xyflkowXstYX9xKmTjfK 9ecnzfwQX0bh3EW5oiqpVI8wtz0/fYJzCreKBkZPl/jRy18L/uBXj8NP3gQYmMItJYjfqgE rRvWt3Qa3xq8eILB1KKuA== X-UI-Out-Filterresults: notjunk:1;V03:K0:q7XRKE3UI5s=:9uJ4PIxWUXnIqdVLt80eOF /HCvnAR8yg0B1iAsZmtmmyCsAdhyYOr/hDpUguGFW7woyXEQHe3rUUYJ0o/yQPOc0Jqfn3R7E 3/l7oy4aFA5II3nw5X0NSO8+tq/gusz5dx+XOW74ExjSaLHl/7lf5AxEGYKfMMGREqHR28JqX MrEdDWOwMKLNdQ6yb4DWDzj1ZbpkWX7I/ayFvMCyOohOOIyGNui3KTeV1OGXOFNe9VuHzi1gQ 5IOjcQNZ27JqQRbQ38y4VUftFADg2SRUbVzg4OPGscW2sOSHEV/5welO89SZssNN8EjMvHtGx fvLNm26mkPD023EkT3WzWgq+P1wn94cMZVg4nhTce2Nq0xP4cLCmfc0eJtDBJie1vjnBYoh82 9w1CCz4BsD55Pr41N29oX72H8u265tgN9cbsD5aNa37XEGeN38QglsuddPx/qNmMqfid7zbNl GP/jaIO9JMucfjZl1s8i85mTW02QonHQoPPH+Vnp9e2ldDWQsPXqzFq55M2lYbj8nxWveIdMy 6LimG42ifcMVI4hSUk3f2zbz3jO1wus7nBSKfOkVfVUpXvQr4Ec5+433kQxhgVZb34ClHP0lX 1zP12WDFYffttXHK3DSQEr3kyEtvzn3YtT7yNEIzKK6g2qDQIGsrcuWSUKuK3mdO/HTuRIU3P QdsC7uJLF0qyvEZFNnGfHHuyMS3ba6GwnKK6PuvrGZB91UuwdJIr3oUnGnIyW9OO5Q0jNy5Xa XVWwMd3T5hZuU93zjWm/jAaGpcWDPudrqpV4QIfifbptPs2WxBDfox5WMwrgamRq0j4zq/3ql KaiV3adXjY0X7zBw4DxI0PrksBobMX1EEHRHy+t0Ipp+0LI38PfRayWz8mahDvJGs73myDUv/ XV0SvfAhum74u2M/lYluyc064Llc4Rtyv4CAtyjFzz0xFgoSLjAk0Kp5dga2GYiNAJppZZ2Sn uWEU80Inv++Qz1yZmfX5Le0f0xvBBU1HqdrB4AwtFB13TZHm9yJClPCDpSNPaWEWaTGds22ZD DolFXMnKPlTRBLYKZITeoVWfkp1wa/t9Eemz8Et8z7+TJiZ6kmOaIllXBjWK9a76R5imFSHTl vQWZOmNIIDqEKku5TT/bEdaJ4tG1K2r9U5XhBbCNEHwQsCic3ixCAA8EuAv0BFGv92BkbUewD DHXl52phPSa66N9NSvyuW2jtJU Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.15.19; envelope-from=arwed.meyer@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1662658957107100001 Content-Type: text/plain; charset="utf-8" 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 --- chardev/msmouse.c | 63 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file 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, Qemu= Console *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 =3D evt->u.rel.data; @@ -132,6 +140,11 @@ static void msmouse_input_sync(DeviceState *dev) MouseChardev *mouse =3D MOUSE_CHARDEV(dev); Chardev *chr =3D 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 =3D MOUSE_CHARDEV(chr); + int c; + int *targ =3D (int *)arg; + + switch (cmd) { + case CHR_IOCTL_SERIAL_SET_TIOCM: + c =3D mouse->tiocm; + mouse->tiocm =3D *(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] =3D 'M'; + mouse->outbuf[1] =3D '3'; + mouse->outlen =3D 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 =3D 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 =3D mouse->tiocm; + break; + default: + return -ENOTSUP; + } + return 0; +} + static void char_msmouse_finalize(Object *obj) { MouseChardev *mouse =3D MOUSE_CHARDEV(obj); @@ -166,6 +223,7 @@ static void msmouse_chr_open(Chardev *chr, *be_opened =3D false; mouse->hs =3D qemu_input_handler_register((DeviceState *)mouse, &msmouse_handler); + mouse->tiocm =3D 0; } static void char_msmouse_class_init(ObjectClass *oc, void *data) @@ -175,6 +233,7 @@ static void char_msmouse_class_init(ObjectClass *oc, vo= id *data) cc->open =3D msmouse_chr_open; cc->chr_write =3D msmouse_chr_write; cc->chr_accept_input =3D msmouse_chr_accept_input; + cc->chr_ioctl =3D msmouse_ioctl; } static const TypeInfo char_msmouse_type_info =3D { -- 2.34.1 From nobody Sun May 19 08:26:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1662659216; cv=none; d=zohomail.com; s=zohoarc; b=Ep6jFmN8m0zo/eg1zCpsOwrF2wdg7YQ6dhLfGXM2F3pek30Jm+lgvhvfCd2l5lAwEDgyawCL2hyRbm/VXJAOMpiE8Sc0WtTGElVo6phX21p3VZBj5ZTLegrVEQbERCHYrZmH4DfeX0bscGf/gFS8pi5Ka7iwgSHhMXnG/L7E8Dw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662659216; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LDJ8Pm2etEaxWOx9sw9M8n57N3+21BJpn0EiJ2gkiKU=; b=mfyizr2UuuXF2Zb3ooBMStMNrtw3Th3nqwvbjzLqTZOG8d62YE4PHdS2AZYsD3bC0VhihhaL2YAEl/hRjV/AvY/CNgoNvTwmPpv8A+cwSxoYZKtliDWr+Bp4DoWircYlkVwpc+h/QOdkptZef0OMXPRwxV8gK+xp3Gn6HErz5eI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16626592158291010.8103345176842; Thu, 8 Sep 2022 10:46:55 -0700 (PDT) Received: from localhost ([::1]:49314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWLc6-0004Lw-SQ for importer@patchew.org; Thu, 08 Sep 2022 13:46:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWLNc-0003yC-Sr; Thu, 08 Sep 2022 13:31:57 -0400 Received: from mout.gmx.net ([212.227.15.18]:33797) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWLNM-0002B3-Dv; Thu, 08 Sep 2022 13:31:44 -0400 Received: from btm-mobil4.fritz.box ([178.8.103.19]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MyKHm-1pHrqt0srk-00yf2i; Thu, 08 Sep 2022 19:31:35 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1662658295; bh=uPyd7/rGq79X5CYUYadT3vXFghOORV+xlXGmB3n27+o=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=EzszpB61HFWdz26N2B68+zKFsxVyoeaikD/R70mdKPdHR2pUveOtty40+rq2ZGOkC kcHufuxdtI7o9FoAPsK7KH/MkZ9rGx2ARAnIsCJO3EVPlJw7joTQ+qyRMa0GpyGRmx nqDHs292MULV7UxBmbGVYJ6UVgypGRQY2l9v7VVQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Arwed Meyer To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Arwed Meyer , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Pavel Dovgalyuk Subject: [PATCH v2 2/5] chardev: src buffer const for write functions Date: Thu, 8 Sep 2022 19:31:17 +0200 Message-Id: <20220908173120.16779-3-arwed.meyer@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220908173120.16779-1-arwed.meyer@gmx.de> References: <20220908173120.16779-1-arwed.meyer@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:HFwzM8KNRkA7fW+29nhuyBQiku2xDMh9MOU//2mlLJZ5k7e44IW yyR/MvIXSlyKp9tmtYeofzVc0Jj+NuIonEuPEvLh5LYw1CvCjc+pBbsFhIGh0/nR/33U0oS vutN2vfymZxGzEsZEXxluNvH0E5GXgZpqwYtJW3SEq8scRKCQ9w1/68lJ9PKGsNR822W1+8 quRcLZlTKF4syThPhamFw== X-UI-Out-Filterresults: notjunk:1;V03:K0:iDhXBZbGu0g=:/IN4HIA44D/iN5/nOc9qiY oV8GFRUxMXQQrHvK22dIDg3Ti79SB288i1Aewg4JoOW4aOwXOdDK6nHo6mJbhD9EoReQ+DfuU gf4J6jhXYDKqPv2CuXPlzgy5rieO6BkB6Od1R5IrKOItp8tyUnJU0TcoC0Rnt9l3vJzEOXQef quV0jOYev382ItM/UJNPscYph7vGsYVDHauUCdrxCZOpdURh5643Jm8CQbfdH/uUYoen7qAPr 4raopy65AP7DDgWS5bs6zDC2HOGr7pIyNz+8eORKiT33BHdZoXbid22IykFzG+nfcxhk+m8cz ZHVZy/KCWQgeOxDkXXCOy2LO3c3FFX0y5KwSW9+rP3dJTSA/PbNor+OyWGan3JIDzYTtm0eNC X1vADlte4GveLt+QeUyn+/qIr6mXkafNS67prq+YKgnAqv+1gpT7oOJ1Bn7MoW1/0UDl99rFx 90QZtYN+Imppp6C77mjhVSEJKF/a36teW7pA+/pX8C+hACrLoEfN/sCTV14GcWfSnMe84ZpCP 2swCkXBgIfGKLg5lpNUo30iyEEFBptQlTXatC6iKYvK/Mtxr1VwQ5TRX0MwJLDCGo4rXlSvqI RZdE/sTLE0ee1PdYfNy16UD6oHnjFFTtSWfbCH4ojl9aeCKJoyKWZ8MLUxcWo1a8gH7fmb3Br rKVtc/O+WdH3BFsgUp6CuZMD4RFe1CoY/G8kXUhnhTO+G7f2fYw1BNpPC2BCh5r+KxkuOO4rz +rR1kEfxMIuJySRUpANzrQ/VQWGD8VLSMs0drmJZrXyu4sXjGn9MXRCClCYUpZgoASYmCh2Jy KomK3kv7zU5cZ51T8xK/38RNOXwkPpWx7xyWFmNwHSFENGX5NlW9E2hyif5hwwYUoWroHtVi0 MUWc0tfzP3vnLakAwNdGWozDEVVneeuXWb62R3wI0E/X/KpMYj5SvvgifC3Sp4iOrK4uNymsq 6uzXZR1Ti86JR1FRtr3Wb0NPVilvVolzZ/W7d7uqVxtnr4t6G6AxZW5hcbDvPu41BuR+2vf/l GjACHy2IrpIZYapV4wIjx/yGQZfcDw46SUW4H9dBE6fXf94tr3+b73BhMJdVytJ7UUSmPclYX Ya2kUiBMOJcTNqstrghsUEoWqnrZ37f7EzTDHFkBtvSUgJzc1EF/Q8eAUzNIctWcxzUaqLcgU 6RPZa2ezrFLWan9mWEyQA2nECn Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.15.18; envelope-from=arwed.meyer@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1662659216995100001 Content-Type: text/plain; charset="utf-8" Make source buffers const for char be write functions. This allows using buffers returned by fifo as buf parameter and source buff= er should not be changed by write functions anyway. Signed-off-by: Arwed Meyer Reviewed-by: Marc-Andr=C3=A9 Lureau --- chardev/char.c | 4 ++-- include/chardev/char.h | 4 ++-- include/sysemu/replay.h | 2 +- replay/replay-char.c | 2 +- stubs/replay-tools.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/chardev/char.c b/chardev/char.c index 0169d8dde4..b005df3ccf 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -193,7 +193,7 @@ int qemu_chr_be_can_write(Chardev *s) return be->chr_can_read(be->opaque); } -void qemu_chr_be_write_impl(Chardev *s, uint8_t *buf, int len) +void qemu_chr_be_write_impl(Chardev *s, const uint8_t *buf, int len) { CharBackend *be =3D s->be; @@ -202,7 +202,7 @@ void qemu_chr_be_write_impl(Chardev *s, uint8_t *buf, i= nt len) } } -void qemu_chr_be_write(Chardev *s, uint8_t *buf, int len) +void qemu_chr_be_write(Chardev *s, const uint8_t *buf, int len) { if (qemu_chr_replay(s)) { if (replay_mode =3D=3D REPLAY_MODE_PLAY) { diff --git a/include/chardev/char.h b/include/chardev/char.h index a319b5fdff..44cd82e405 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -186,7 +186,7 @@ int qemu_chr_be_can_write(Chardev *s); * the caller should call @qemu_chr_be_can_write to determine how much data * the front end can currently accept. */ -void qemu_chr_be_write(Chardev *s, uint8_t *buf, int len); +void qemu_chr_be_write(Chardev *s, const uint8_t *buf, int len); /** * qemu_chr_be_write_impl: @@ -195,7 +195,7 @@ void qemu_chr_be_write(Chardev *s, uint8_t *buf, int le= n); * * Implementation of back end writing. Used by replay module. */ -void qemu_chr_be_write_impl(Chardev *s, uint8_t *buf, int len); +void qemu_chr_be_write_impl(Chardev *s, const uint8_t *buf, int len); /** * qemu_chr_be_update_read_handlers: diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index 73dee9ccdf..7ec0882b50 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -198,7 +198,7 @@ uint64_t blkreplay_next_id(void); /*! Registers char driver to save it's events */ void replay_register_char_driver(struct Chardev *chr); /*! Saves write to char device event to the log */ -void replay_chr_be_write(struct Chardev *s, uint8_t *buf, int len); +void replay_chr_be_write(struct Chardev *s, const uint8_t *buf, int len); /*! Writes char write return value to the replay log. */ void replay_char_write_event_save(int res, int offset); /*! Reads char write return value from the replay log. */ diff --git a/replay/replay-char.c b/replay/replay-char.c index d2025948cf..a31aded032 100644 --- a/replay/replay-char.c +++ b/replay/replay-char.c @@ -48,7 +48,7 @@ void replay_register_char_driver(Chardev *chr) char_drivers[drivers_count++] =3D chr; } -void replay_chr_be_write(Chardev *s, uint8_t *buf, int len) +void replay_chr_be_write(Chardev *s, const uint8_t *buf, int len) { CharEvent *event =3D g_new0(CharEvent, 1); diff --git a/stubs/replay-tools.c b/stubs/replay-tools.c index f2e72bb225..3e8ca3212d 100644 --- a/stubs/replay-tools.c +++ b/stubs/replay-tools.c @@ -53,7 +53,7 @@ void replay_register_char_driver(struct Chardev *chr) { } -void replay_chr_be_write(struct Chardev *s, uint8_t *buf, int len) +void replay_chr_be_write(struct Chardev *s, const uint8_t *buf, int len) { abort(); } -- 2.34.1 From nobody Sun May 19 08:26:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1662658928; cv=none; d=zohomail.com; s=zohoarc; b=EjOCz1slrCKhjZfnEOBHIfOOLkkIA23/NEVsFbMIZF8H6ATXXyjWnP/lN00q1uu1Uhai24lN/MlVLhKfVQk0NLNE6enaJk2WC3uwDTT3WnWi0RL3jCmeNSWvp9XLmUW0VAMkvwpsBN3R9yb6/Bi3CsV6Q84Ez3ybuRhnnM7bUmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662658928; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UGzJ+tPHJGzm3avTg4Tg3/romM35tpma8DB+zRW8akY=; b=a1JiYcC7lBzoN17AUbsWvb6kgpt7+aNn+Pgt1CjtM37Xwo/xLbYNvqJsZQIXcraVQMkG/C/kR59FDbZ14pHc6FZXmCT3DD3qn9yc5L+7mOEy7T7CBl1v1GjLN7E45P3WXJjTT8tAGv3geySq4BgrUFUN63wOp3S6HLvDxpZTdXE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1662658928303654.5673915897437; Thu, 8 Sep 2022 10:42:08 -0700 (PDT) Received: from localhost ([::1]:44112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWLXR-0007Qk-M9 for importer@patchew.org; Thu, 08 Sep 2022 13:42:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWLNc-0003yD-RC; Thu, 08 Sep 2022 13:31:57 -0400 Received: from mout.gmx.net ([212.227.15.15]:36661) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWLNM-0002B9-Du; Thu, 08 Sep 2022 13:31:44 -0400 Received: from btm-mobil4.fritz.box ([178.8.103.19]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M6UZv-1oQ2uc330b-006yan; Thu, 08 Sep 2022 19:31:35 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1662658296; bh=uz0HEKPQXy5htiKKPgDEqSPCV3sLLfX7XGDzK4H4rcE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=MuQlEbVs86w89j1QRPeSk1mf4ZQJ87YUdvr8ptTgfqRwyw14wXock9/k9wzodqrSW tsLnu+uiifZPVd6JjY9Bxwm4YPmFNoE2eE2LVfuluGBLvEvHa2u+X/jVbCC6OLfweA 1hicTwYkz+sYtQsKuHwXEI4T8qlYpYbVDBgfHopw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Arwed Meyer To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Arwed Meyer , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Subject: [PATCH v2 3/5] msmouse: Use fifo8 instead of array Date: Thu, 8 Sep 2022 19:31:18 +0200 Message-Id: <20220908173120.16779-4-arwed.meyer@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220908173120.16779-1-arwed.meyer@gmx.de> References: <20220908173120.16779-1-arwed.meyer@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:bPmiLkjmeuF2sp1B4g9lNY6Be/BsYbcLnjx1XjnGP67Y2vscNUU aMi/tSTyAv711TLp0Trpnm2H3W1t072trubWvwJfTu/bZrqS/njEqmzT2lUkjjzUEa28TRu a8XmK2U/TPczCWAIVZrkWmCWcT2fRthGrKF5YQ3r3WPt1M+7YFnCQ69I6gYea3l6kc0x7MC PZXs71EVXHQzjPRpAvsDA== X-UI-Out-Filterresults: notjunk:1;V03:K0:9COAYLUEnUE=:AHcsYyFSSx1tWpscM6lebO FvrQ1K9j/lvZW8PCw+zHngRQjtYkVuGSTc1KJF5D01USc7ufOeivtUiHK+X5yEsQnNKWOM6Re E36vs6xOuKLbhf/k3Mp7KFAKI2UrPP1q+Q6OTCl/no/ZkD7FR1CEk2pV/n70S0mI7J5gMdvNG WLcBDVgaWGo5HWgoaddhdESuB9BHOL0nEF78RqBN/5BE2HqsGJWRKJkn3hHQrTUuv31bMAglj Qy6U0nHsZ7WpFe/HTitwnEe/3oN8b+2o1dvqx3DjbRguT1s4dLO3AJUVs7rJS5ItjKN9mTBYg I5SuxiLl2u8L1/b0Y73qAiaaHVnqSY+1tAbalSc9UHjobbHT0tUedyjADIqoZuM7OtcBO65h9 Bkdb4ttM+YzmxEW7YZaYm9LdauPnm5iLvCY1fz/kFdfc2xw0A6uwMukc46FdnHZYs0EDzvQ/H B5wmmyK2GTztwE9BlglGZugZgIthnSU9H69unyG4xwxTPwf88WCowj9KVhiLhKf9kIi4DAlNQ aaU61WmCr52vt/QtVJKhLJQPi+7Pbv2bYF5huJngkxfr8+7wNhv63mLyr0AIb5ZnrJJlTuS5G aCQEFHv3WXYJoz/ONionRNCCBvroW8FNzQbDIF2VVGc1mzwZl/2QyqmUB13oBZUEpPAj0X6Ic wd2dJ9rnYjN7mB5nntR34FWTZyVNtohGPjTfMy+qn60AYiajdq4Db6oZ1KhFiSDdGh1sq+vL9 kblCVziEdvHc0/joTQ3qghKHsrUVgaSZkDbFVke5KK69PzaBLYq2FGKB9vAbA2mS7NSmeacNn OfgvA5ioNWciVyPlD/IXS1mlf0mQBOwm7z/nM5kVM8EpJqa2jFAwUSYFtL55uIlJ4QXDq3p4a WbSUQqqc+jX+3jUnvQoodFGqoOiwAqus+WfV5eaw5UlrNkmiByym9Ifblnh7PgTHS6fKeVfBU +lN45upj0mkM1AuS6tM0j1CfyCBh5ad3W1Lato8pt0xHf/jyioy9Ap0wD2VsbLdT/FXcSdhMx LbhaXL2a0zikxeuZQ/ZLbJV/yPevuINru5xHrazWGIo6HG2HTHf/pCoN/7hj2XO2C+cmBrqM4 QMZPeQ2Svx7RRWpirkR8iFIJHWXkN/Jt4j382nlBVbSnfwzzL+YC8gxkKGSHHvJxlSrlZWe0Q UwSX4Vw3Rbpe6ZmWBrj0/KLWCy Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.15.15; envelope-from=arwed.meyer@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1662658929002100001 Content-Type: text/plain; charset="utf-8" Make use of fifo8 functions instead of implementing own fifo code. This makes the code more readable and reduces risk of bugs. Signed-off-by: Arwed Meyer Reviewed-by: Marc-Andr=C3=A9 Lureau --- chardev/msmouse.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/chardev/msmouse.c b/chardev/msmouse.c index 95fa488339..e9aa3eab55 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,12 @@ #define MSMOUSE_HI2(n) (((n) & 0xc0) >> 6) #define MSMOUSE_PWR(cm) (cm & (CHR_TIOCM_RTS | CHR_TIOCM_DTR)) +/* 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[] =3D {'M', '3'}; + struct MouseChardev { Chardev parent; @@ -42,8 +49,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; }; typedef struct MouseChardev MouseChardev; @@ -54,21 +60,15 @@ DECLARE_INSTANCE_CHECKER(MouseChardev, MOUSE_CHARDEV, static void msmouse_chr_accept_input(Chardev *chr) { MouseChardev *mouse =3D MOUSE_CHARDEV(chr); - int len; + uint32_t len_out, len; - len =3D qemu_chr_be_can_write(chr); - if (len > mouse->outlen) { - len =3D mouse->outlen; - } - if (!len) { + len_out =3D 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 -=3D len; - if (mouse->outlen) { - memmove(mouse->outbuf, mouse->outbuf + len, mouse->outlen); - } + len =3D 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 +94,11 @@ static void msmouse_queue_event(MouseChardev *mouse) mouse->btnc[INPUT_BUTTON_MIDDLE]) { bytes[3] |=3D (mouse->btns[INPUT_BUTTON_MIDDLE] ? 0x20 : 0x00); mouse->btnc[INPUT_BUTTON_MIDDLE] =3D false; - count =3D 4; + count++; } - if (mouse->outlen <=3D sizeof(mouse->outbuf) - count) { - memcpy(mouse->outbuf + mouse->outlen, bytes, count); - mouse->outlen +=3D count; + if (fifo8_num_free(&mouse->outbuf) >=3D count) { + fifo8_push_all(&mouse->outbuf, bytes, count); } else { /* queue full -> drop event */ } @@ -172,9 +171,7 @@ static int msmouse_ioctl(Chardev *chr, int cmd, void *a= rg) * cause we behave like a 3 button logitech * mouse. */ - mouse->outbuf[0] =3D 'M'; - mouse->outbuf[1] =3D '3'; - mouse->outlen =3D 2; + fifo8_push_all(&mouse->outbuf, mouse_id, sizeof(mouse_id)); /* Start sending data to serial. */ msmouse_chr_accept_input(chr); } @@ -184,7 +181,7 @@ static int msmouse_ioctl(Chardev *chr, int cmd, void *a= rg) * Reset mouse buffers on power down. * Mouse won't send anything without power. */ - mouse->outlen =3D 0; + fifo8_reset(&mouse->outbuf); memset(mouse->axis, 0, sizeof(mouse->axis)); memset(mouse->btns, false, sizeof(mouse->btns)); memset(mouse->btnc, false, sizeof(mouse->btns)); @@ -204,6 +201,7 @@ static void char_msmouse_finalize(Object *obj) MouseChardev *mouse =3D MOUSE_CHARDEV(obj); qemu_input_handler_unregister(mouse->hs); + fifo8_destroy(&mouse->outbuf); } static QemuInputHandler msmouse_handler =3D { @@ -224,6 +222,7 @@ static void msmouse_chr_open(Chardev *chr, mouse->hs =3D qemu_input_handler_register((DeviceState *)mouse, &msmouse_handler); mouse->tiocm =3D 0; + fifo8_create(&mouse->outbuf, MSMOUSE_BUF_SZ); } static void char_msmouse_class_init(ObjectClass *oc, void *data) -- 2.34.1 From nobody Sun May 19 08:26:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1662658582; cv=none; d=zohomail.com; s=zohoarc; b=ma6X7uAHFu8nrJEdNAZX5pFaYbJhsPBblWeaPNoPerL56OEpGliMwTD6FbYrCqLB519LpxXMUnKhpZ4qUZPXVcbaSr6dyFe/Lg7fJ51tZ8YCY8yupC+P6VMr/tFfvnBlNvqlb/tK7yA32Pqaej8AKuwaI3Hrzt22y313WclSf78= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662658582; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rrb/iOmTMcLjFjzBuaIZVgZfhPOFwlYLr2l4+drzpSk=; b=GDZqfPZt3/yBKTo5FjTf9r06fH9ccPVKxrWFQE3ONjROlVL58vpvtw8IW5sc/pRebb7A6qMu4pPyrkfj5AMpMjZHnaJb8pij2P3fiNke1qmd3DIVOJnUpb2ZHF0+c4N8rYlRRW/FrslHZp4d6cVuIMeSNy8R2iLjmcqgI0xSiHw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 166265858215061.744253381705676; Thu, 8 Sep 2022 10:36:22 -0700 (PDT) Received: from localhost ([::1]:39314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWLRs-0007eD-EO for importer@patchew.org; Thu, 08 Sep 2022 13:36:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWLNc-0003yF-PF; Thu, 08 Sep 2022 13:31:57 -0400 Received: from mout.gmx.net ([212.227.15.15]:60427) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWLNP-0002BW-5z; Thu, 08 Sep 2022 13:31:45 -0400 Received: from btm-mobil4.fritz.box ([178.8.103.19]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1McpNo-1p57ta15d4-00ZxQI; Thu, 08 Sep 2022 19:31:36 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1662658296; bh=KtEGs5wxM9g3romJagvGMVcYfeh66UA9NF3HN/vnA1w=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=R7YS7yi3udMnfcYyBat0U/rH97jYGyjk+TSBsG437AbkZXaeJBbQAbkm6Uf3S6dit 4iCRDA9p+0czvnYD6ZQHp7PcMoova5T87Hm91e8hr9SFH/MLe7j/e8pz4TwIEpAf+X VlcsaqJha6WftJmnymZAQHuJZVXhOnuMZKF/8eP0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Arwed Meyer To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Arwed Meyer , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Subject: [PATCH v2 4/5] msmouse: Add pnp data Date: Thu, 8 Sep 2022 19:31:19 +0200 Message-Id: <20220908173120.16779-5-arwed.meyer@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220908173120.16779-1-arwed.meyer@gmx.de> References: <20220908173120.16779-1-arwed.meyer@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:ICuHtBkdI80ycNUsNaHKeyiiQ5co7OlJXnUze0xCfQnNQdMpd1+ 1FlqcL9OS95aiJ3DRHo2LbpxuKK+paE30rWnqcCyC5OENpdT0JQX9gG4UOAwSiXHdXDCz37 32kFFkIPtctfULctWObqUkbQrIVvlzQl3OFKybrhVcL/nTeSHfvriKNGVbCxcq+L4qLyrky yQHhjmzp/WRFg8GL1KIoQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:HKyI+5bJ6Tw=:dv7yLxcpSQx4/0LDqeBHr7 PqXZ95Z9JexHp+2/6cA1No4lrdAqXXxAUjrI4kPZAWHavRh700HH2/ryAVFiS3z4NJteiJ1uo CUkCg37CKfeb3KjEtrZ1haoXdNQQhEHOW8fqxJOKqLCtWw6m/gqH/A8UsftAf6P5TEBMQJ+IM fgxXrxL3FNXzXf2Jam0EJgOynFxlaRBUAmdFbE1U/P4ZtFAekafR94IXnRp23jTjktR45bOJP jpEH2AI7qDIH53DoPSXrHmCoVHquq1OT9F/GMBrH1AUghkXo8TyFRtdrvtaPA/CyjGLZCzvoy TIz7ZQxR5/Fuhs3K51E7zJJaKk1+WYLh+WYClG57mgGuLC4x17JA1o/kE1ZFfNIB1udfCoAyv YyF+Mb2yO3o2CI0RQ9/rZN/JsGdFSGN9n5WIN/EOGHVJADSxtvfc72UEhzhhoALMyGY0Je6G9 C0QqkUt+9TXjEmazwvvlJwIb4igGO4D7hdJshcSeLLybiXGFTYDirN5TcO6xxZyOiULr+sDI2 Nuv9GyYxwtHjqxY44FX60ID9rP6l0QayWsl/gtF+FVw0y6ajxtpYOk2z19hyvgChy6hmeN30O 27Qbln54c7GNL1A/+Xxb+AxZ++yoz27wQeqY+sJ8elneqM+q/7B2QZtUKVDUHfX3bf+8EjPZ4 3iBc1goim8jcgJOtaNmd1Rwaa1K7Z4XtZrgKM/LC8MOLGkNbiIew4Eipm7ZZg4m3J9OW7zTgc AYEBQi7wYCS3v0VO33HkRAtNiqRQ/65pcMqS7URUjJ8n1kgkxa1DXPb4ZJte7KAjndLZMyqaB DA7aCDYtPMKOZzFvx/geJ6hLX+J54V/qDjryNug1Fus6RgPDAQexLUKeF5rsPtWsdUImbQw/H q85PX9/8RtQODtV2oCUDuCeguqGy8lFh0+h9EWMchOx/TvsBgUwgZwnIMQ8+/pLqcL5LcR2dQ rq4BIMkQNPTIugj9iP+B/dIRFCqbPT/qvaX//y+rQGziMrBL65btBT/TYVBUG0SsX7fVtNOVz hX3MuIzb3UwHx5xBtqc7L4WsB0Z4d9L2RqNCC8GQwPL6MgbSNpbt3cQsICZ6SHwJ9o+MpFyPF JNVNmGHRPC1AIm82A9sEcatIRExxL7CMSn/WthCJ7wNYvtIy4n98W6f+4HFBvjlaKz6KIoJZD 3U1shmGgojyATtn79RQNPhczlA Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.15.15; envelope-from=arwed.meyer@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1662658583418100001 Content-Type: text/plain; charset="utf-8" Make msmouse send serial pnp data. Enables you to see nice qemu device name in Win9x. Signed-off-by: Arwed Meyer Reviewed-by: Marc-Andr=C3=A9 Lureau --- chardev/msmouse.c | 58 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/chardev/msmouse.c b/chardev/msmouse.c index e9aa3eab55..29eb97fedc 100644 --- a/chardev/msmouse.c +++ b/chardev/msmouse.c @@ -35,11 +35,24 @@ #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[] =3D {'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[] =3D {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; @@ -154,11 +167,22 @@ static int msmouse_chr_write(struct Chardev *s, const= uint8_t *buf, int len) return len; } +static QemuInputHandler msmouse_handler =3D { + .name =3D "QEMU Microsoft Mouse", + .mask =3D INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_REL, + .event =3D msmouse_input_event, + .sync =3D msmouse_input_sync, +}; + static int msmouse_ioctl(Chardev *chr, int cmd, void *arg) { MouseChardev *mouse =3D MOUSE_CHARDEV(chr); - int c; + int c, i, j; + uint8_t bytes[MSMOUSE_BUF_SZ / 2]; int *targ =3D (int *)arg; + const uint8_t hexchr[16] =3D {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: @@ -167,11 +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 poin= t. */ 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! + */ + c =3D M(')'); + for (i =3D 0; msmouse_handler.name[i]; i++) { + bytes[i] =3D M(msmouse_handler.name[i]); + c +=3D bytes[i]; + } + /* Calc more of checksum */ + for (j =3D 0; j < sizeof(pnp_data); j++) { + c +=3D pnp_data[j]; + } + c &=3D 0xff; + bytes[i++] =3D hexchr[c >> 4]; + bytes[i++] =3D hexchr[c & 0x0f]; + bytes[i++] =3D M(')'); + fifo8_push_all(&mouse->outbuf, bytes, i); /* Start sending data to serial. */ msmouse_chr_accept_input(chr); } @@ -204,13 +247,6 @@ static void char_msmouse_finalize(Object *obj) fifo8_destroy(&mouse->outbuf); } -static QemuInputHandler msmouse_handler =3D { - .name =3D "QEMU Microsoft Mouse", - .mask =3D INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_REL, - .event =3D msmouse_input_event, - .sync =3D msmouse_input_sync, -}; - static void msmouse_chr_open(Chardev *chr, ChardevBackend *backend, bool *be_opened, -- 2.34.1 From nobody Sun May 19 08:26:12 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1662658647; cv=none; d=zohomail.com; s=zohoarc; b=QwdybCVNSzKohXkd1QPHBoLN0q0U0nDEYLfamx2DcaBm67PJOoraNcMPAyHZyLPpQceLuCOspZt8ebW1onjsrZAj8fGN8bViwP0aLfe+C4ElvnBgjX3IJMTs07irYUAReOkXFWUyB/HnVcQb7UF9ewwbZ+WUaJj7fbTPauU/Bh0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662658647; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=olegijg/zzmn/qwcpcwSdoRjn/mieoR+9bXcKiUMyYg=; b=iCl9b65lReqS0Gq8ic+7Sg7unaKH1Ur/ojzWHiXWiMZ0hCohyymrAoPOp0PjdC5hF7rEQSGtdo94TYW1pWAR8JmDoM8TYUomY0+mjJdebhZiHnp/anX3+FHusnzMRYV+JVXp3hTUaZrhjh9WJTFnLNVZFFNnNQYzm94LkykCdME= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1662658647162667.9665656467731; Thu, 8 Sep 2022 10:37:27 -0700 (PDT) Received: from localhost ([::1]:46384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWLSv-00025A-Td for importer@patchew.org; Thu, 08 Sep 2022 13:37:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWLNc-0003yE-Mg; Thu, 08 Sep 2022 13:31:57 -0400 Received: from mout.gmx.net ([212.227.15.18]:39757) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWLNP-0002BK-5n; Thu, 08 Sep 2022 13:31:45 -0400 Received: from btm-mobil4.fritz.box ([178.8.103.19]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MCsU6-1of6nh09b6-008uOW; Thu, 08 Sep 2022 19:31:37 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1662658297; bh=6tNsnvyALQCekAEnGgE4v3vfbs9lSzguI1+wfNRfGJU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=H+oSUyP7e6lRS4hcaJAO3X85kguth4HnGR0xdUyiH2jqyfTiIElthRUayKmQyDbcV Pt6YNvZOVE/WWE8wgKncD6HZ3D3Iv+KDlCmzuohDJaPRmldXWzzUwgQmpUar899o9D RaIdRq8jSwBA1YYrmw7D7IL+emlYUuRis1BQuDd4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Arwed Meyer To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Arwed Meyer , "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 5/5] serial: Allow unaligned i/o access Date: Thu, 8 Sep 2022 19:31:20 +0200 Message-Id: <20220908173120.16779-6-arwed.meyer@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220908173120.16779-1-arwed.meyer@gmx.de> References: <20220908173120.16779-1-arwed.meyer@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:C+DfGC9Mx9hS4qYSHt+P9guSTmGOFbC3ivCXrl1UAyPVFCtziWk +dDxlNZ8WIHQXXmycn8GeK9pbHb6veXBD2kePZj9SSnwY/yOUwlGNf70w+shDpwDVDxdmZo BQAWNwI1cie0Pc2sN3wI1470TvE5qWjD6IfAkd/29I8kXtZ9asHem5Wj2OcdmeKDprxo+U5 KytYJeLrUh11VRva7NdTQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:6WXX/W6a0bc=:kXY/MxuZQ0r+VhOvk5xNey GXPPsSytGLUcH7hcrcxT61cT+wNmfyO5Vm9wC9gQwZRPOzjQUJ23cjx0e7RH5tOTTe/hGf+7k 6aIXgxIwQzeCyaxoIJaEyXmspO7O5DU7MQA4cnRATmeUScm3ItrldWUcnutfRPHIx/YM6pMOT 8mUVwvQjUUtn42yZnTw9NATJje0242M537FJbjHrtysAikE73w3OBk1lL29iS6Sb6RHz3GDx5 /0mMb9SrHb53a0xZ67DPu5GcS2E9TnzKzK92ON66bz2b3cWodQLLy4NNhJJ2Lkii5dJx0LdLa 2TT8ryscP/XmYfdMAoi02Q6YmcgzVK6l5N7+DmU9lkte3RG/uOn+Pnc7vCed12U9AL/APEu8S +LeKqN8B3YneuszPBnur0sOGpMQdWoQ6IsAlA8uXxBKY6ExDdbshjkE3QOxy1uxy4oe2WaXwQ W8l/x2OvEJSfxSX5lR6a3qpkdVn6I1OE77arQRgKItR1QZOoAATGEpvhWZbIyacL607f5pCJ1 U6ICHZ62j6I7Fad/KSVMEATGZEFN5AJYytTwdh92V9gNWgR6dZnS8EN9jo8+yySEMOYyCBJVb iZyPS1tywk+F+M2q1Nes0DzEymTB8hfsqN/SZ5l+vNVV93l5p93YMZ4IKtW+vBKtz+aVzFvTD jcnZjPks0Zdgf0YVaC7Ae6zlrX5AfaOAezqY87m3jlITtlMdewdnIOi+9DASu7AJeVmB2DSHI GZFhl0/V4IAVzdVgk3tisRwZEuJwJV2ph5S1zAflH3n1e/phNSXzLmuZc62v6X7YlICZw+3oK rduIrNCBeqzZd01YvuK9+lt4QYMMRi4kPE4ftB0PMsSb9JsTFTdyjpPMitkgKfO9ep9XfwdCe 0vIOe7nyiVtIwoS/7Ls7BGFOFxuF7UK704xrVLPV4ALqjI6B3J6+aPfoFt/+aFiq76zL4xIpR 6JK81HWxyL59g1oVKm5b1V79mfy69sPAS2Emt20fWfKHSiL0yFj+FZ4RmkWjJAJuYFRHPEBAq DpEu6irNJDUpZi8OOR+CIK6JlhdiQDIju2JmFfrwzDTSDbb2Yc02sSaoz7MDNxNcB1yVf5kX2 7aMvdGAVXfKnNoCW8qt+OkvJDFnGdQ01byaeaEvzNWtzvunA6ULgv4I+vLECUSfkCOQEDHcjH KONCDt+s9Q6vWMQXcVax7Ca/jh Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.15.18; envelope-from=arwed.meyer@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1662658649124100002 Content-Type: text/plain; charset="utf-8" Unaligned i/o access on serial UART works on real PCs. This is used for example by FreeDOS CTMouse driver. Without this it can't reset and detect serial mice. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/77 Signed-off-by: Arwed Meyer --- hw/char/serial.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/char/serial.c b/hw/char/serial.c index 7061aacbce..41b5e61977 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -961,6 +961,9 @@ void serial_set_frequency(SerialState *s, uint32_t freq= uency) const MemoryRegionOps serial_io_ops =3D { .read =3D serial_ioport_read, .write =3D serial_ioport_write, + .valid =3D { + .unaligned =3D 1, + }, .impl =3D { .min_access_size =3D 1, .max_access_size =3D 1, -- 2.34.1