From nobody Mon Nov 17 09:52:04 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1603701658; cv=none; d=zohomail.com; s=zohoarc; b=SjfSQyds3RWumd28F/sgQjh+P0Tj8uPMpD09V+BytxCRbetvtlSpQnaXJcjcJWw3grNC5f9GYLBiAMhxD4I6nTEiV9qP6eKyLHbrzGxNmiZjPrw+hg87gW/bSKjY4HM90jw6KKLh2n3SCaSiOLpJHFEwje9STUWbEkHw8BzQZ08= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603701658; h=Content-Transfer-Encoding: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=1gWlYMArrNR/4V9nCB9YhP7PzUNZ6pI9JrvuwfK3YjY=; b=khlP20q0olbRIAPhBQWMxeXJCbKC7H7sHv5o3khDGg0EciuEc8bQdIB31HIXkoc5foBgTexalWFch/RiNyiMOguW+HnBAkWDNBy4zEZUZzVLCgr5HDB+YAwc124bofPzYFdAvFTxYTchuiCxFruL9ZbEAOp6pLcbULCWVXQ5WFQ= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603701658791301.88152346992297; Mon, 26 Oct 2020 01:40:58 -0700 (PDT) Received: from localhost ([::1]:45388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWy3l-0001F0-PH for importer@patchew.org; Mon, 26 Oct 2020 04:40:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWxxj-0003JD-ON for qemu-devel@nongnu.org; Mon, 26 Oct 2020 04:34:43 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:46974 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWxxg-000601-T7 for qemu-devel@nongnu.org; Mon, 26 Oct 2020 04:34:43 -0400 Received: from host86-148-103-79.range86-148.btcentralplus.com ([86.148.103.79] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kWxxj-00082O-UZ; Mon, 26 Oct 2020 08:34:48 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, kraxel@redhat.com, samuel.thibault@ens-lyon.org Date: Mon, 26 Oct 2020 08:33:57 +0000 Message-Id: <20201026083401.13231-6-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201026083401.13231-1-mark.cave-ayland@ilande.co.uk> References: <20201026083401.13231-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.103.79 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 5/9] dev-serial: replace DeviceOutVendor/DeviceInVendor with equivalent macros from usb.h X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" Content-Type: text/plain; charset="utf-8" The DeviceOutVendor and DeviceInVendor macros can be replaced with their equivalent VendorDeviceOutRequest and VendorDeviceRequest macros from usb.h. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Samuel Thibault --- hw/usb/dev-serial.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index badf8785db..92c35615eb 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -37,11 +37,6 @@ #define FTDI_SET_LATENCY 9 #define FTDI_GET_LATENCY 10 =20 -#define DeviceOutVendor \ - ((USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE) << 8) -#define DeviceInVendor \ - ((USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE) << 8) - /* RESET */ =20 #define FTDI_RESET_SIO 0 @@ -253,7 +248,7 @@ static void usb_serial_handle_control(USBDevice *dev, U= SBPacket *p, break; =20 /* Class specific requests. */ - case DeviceOutVendor | FTDI_RESET: + case VendorDeviceOutRequest | FTDI_RESET: switch (value) { case FTDI_RESET_SIO: usb_serial_reset(s); @@ -268,7 +263,7 @@ static void usb_serial_handle_control(USBDevice *dev, U= SBPacket *p, break; } break; - case DeviceOutVendor | FTDI_SET_MDM_CTRL: + case VendorDeviceOutRequest | FTDI_SET_MDM_CTRL: { static int flags; qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_GET_TIOCM, &flags); @@ -289,10 +284,10 @@ static void usb_serial_handle_control(USBDevice *dev,= USBPacket *p, qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_TIOCM, &flags); break; } - case DeviceOutVendor | FTDI_SET_FLOW_CTRL: + case VendorDeviceOutRequest | FTDI_SET_FLOW_CTRL: /* TODO: ioctl */ break; - case DeviceOutVendor | FTDI_SET_BAUD: { + case VendorDeviceOutRequest | FTDI_SET_BAUD: { static const int subdivisors8[8] =3D { 0, 4, 2, 1, 3, 5, 6, 7 }; int subdivisor8 =3D subdivisors8[((value & 0xc000) >> 14) | ((index & 1) << 2)]; @@ -311,7 +306,7 @@ static void usb_serial_handle_control(USBDevice *dev, U= SBPacket *p, qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params); break; } - case DeviceOutVendor | FTDI_SET_DATA: + case VendorDeviceOutRequest | FTDI_SET_DATA: switch (value & FTDI_PARITY) { case 0: s->params.parity =3D 'N'; @@ -346,23 +341,23 @@ static void usb_serial_handle_control(USBDevice *dev,= USBPacket *p, qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params); /* TODO: TX ON/OFF */ break; - case DeviceInVendor | FTDI_GET_MDM_ST: + case VendorDeviceRequest | FTDI_GET_MDM_ST: data[0] =3D usb_get_modem_lines(s) | 1; data[1] =3D FTDI_THRE | FTDI_TEMT; p->actual_length =3D 2; break; - case DeviceOutVendor | FTDI_SET_EVENT_CHR: + case VendorDeviceOutRequest | FTDI_SET_EVENT_CHR: /* TODO: handle it */ s->event_chr =3D value; break; - case DeviceOutVendor | FTDI_SET_ERROR_CHR: + case VendorDeviceOutRequest | FTDI_SET_ERROR_CHR: /* TODO: handle it */ s->error_chr =3D value; break; - case DeviceOutVendor | FTDI_SET_LATENCY: + case VendorDeviceOutRequest | FTDI_SET_LATENCY: s->latency =3D value; break; - case DeviceInVendor | FTDI_GET_LATENCY: + case VendorDeviceRequest | FTDI_GET_LATENCY: data[0] =3D s->latency; p->actual_length =3D 1; break; --=20 2.20.1