From nobody Mon Nov 17 15:45:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604492333; cv=none; d=zohomail.com; s=zohoarc; b=gS70DXLAGx9SnG6YES93PvoKnx0X2MHBxJejt/9tQxkw1GNGFNE+UCiHry2N7aF3J6pS3QfLxwd4bJ+ZL4+qYMeRrRNpZAe6bBQ3HXx95b3IqfeQSDr6fQoYprVrMi04/NZzlKDzXzzu866lC2bgjflpLOTQh4ySdKrhcqZ7qJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604492333; h=Content-Type: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=646hBwDT3ly74j+7kRJ85Jb/eYj/a88qAi8iM6HKKUM=; b=Veb3Bou743REUBFGKoTiUk3viCwGxgJO0MXS2XMF4zvI2N8twYSOpVTHc9Z+AXvvDCHWC4sl15B8hAZ4XjQyL0OPCLTxHGqeN0QXfiiY2mCzRclxu7A5XUy4qp9GxubSJ/o9DjbDmtIBZ2O57H9oyuF9n5Cger5NpTYNgb2VnfE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604492333895757.3667993119835; Wed, 4 Nov 2020 04:18:53 -0800 (PST) Received: from localhost ([::1]:55142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaHka-0004QQ-Ov for importer@patchew.org; Wed, 04 Nov 2020 07:18:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaHfU-0007Zl-21 for qemu-devel@nongnu.org; Wed, 04 Nov 2020 07:13:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:48925) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaHfR-0007pQ-Sp for qemu-devel@nongnu.org; Wed, 04 Nov 2020 07:13:35 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-358-4YShpDS5MKGyQ7Ebodd7xw-1; Wed, 04 Nov 2020 07:13:28 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 92C7B804749; Wed, 4 Nov 2020 12:13:27 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-66.ams2.redhat.com [10.36.114.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2843676649; Wed, 4 Nov 2020 12:13:27 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 770539C87; Wed, 4 Nov 2020 13:13:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604492013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=646hBwDT3ly74j+7kRJ85Jb/eYj/a88qAi8iM6HKKUM=; b=S1WKYtkOxwycJyxtQ4nJAL/YvvC3rNKtpXwAL+lUdRu/R2AyrLpINkR7WaeSISyUqG4C1h cl7Tu31dCP5U/0M3rQpG54t7bpWrZqR5y462JAVZGRDIFVN26srGOmTLnNmVRs4Gir1OHW iDGvB4fhyTg+Q80d52PDOt64cvfBpvk= X-MC-Unique: 4YShpDS5MKGyQ7Ebodd7xw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 5/8] dev-serial: replace DeviceOutVendor/DeviceInVendor with equivalent macros from usb.h Date: Wed, 4 Nov 2020 13:13:18 +0100 Message-Id: <20201104121321.7772-6-kraxel@redhat.com> In-Reply-To: <20201104121321.7772-1-kraxel@redhat.com> References: <20201104121321.7772-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 22:09:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Cc: Samuel Thibault , Mark Cave-Ayland , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Mark Cave-Ayland 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: Samuel Thibault Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20201027150456.24606-6-mark.cave-ayland@ilande.co.uk Signed-off-by: Gerd Hoffmann --- 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 badf8785db46..92c35615eb13 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.27.0