From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D719C4363A for ; Mon, 26 Oct 2020 09:42:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A596F2075B for ; Mon, 26 Oct 2020 09:42:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A596F2075B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gnu.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWz1T-000528-Gf for qemu-devel@archiver.kernel.org; Mon, 26 Oct 2020 05:42:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWz0T-0003lm-L5 for qemu-devel@nongnu.org; Mon, 26 Oct 2020 05:41:37 -0400 Received: from hera.aquilenet.fr ([2a0c:e300::1]:55986) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWz0R-0005pX-RQ for qemu-devel@nongnu.org; Mon, 26 Oct 2020 05:41:37 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 5FEBBB8; Mon, 26 Oct 2020 10:41:34 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wWMiCo2B_gHJ; Mon, 26 Oct 2020 10:41:33 +0100 (CET) Received: from function (lfbn-bor-1-56-204.w90-50.abo.wanadoo.fr [90.50.148.204]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 773829D; Mon, 26 Oct 2020 10:41:33 +0100 (CET) Received: from samy by function with local (Exim 4.94) (envelope-from ) id 1kWz0O-006i2p-Qg; Mon, 26 Oct 2020 10:41:32 +0100 Date: Mon, 26 Oct 2020 10:41:32 +0100 From: Samuel Thibault To: Mark Cave-Ayland Subject: Re: [PATCH 5/9] dev-serial: replace DeviceOutVendor/DeviceInVendor with equivalent macros from usb.h Message-ID: <20201026094132.65noafdyxe6ssxi7@function> References: <20201026083401.13231-1-mark.cave-ayland@ilande.co.uk> <20201026083401.13231-6-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201026083401.13231-6-mark.cave-ayland@ilande.co.uk> Organization: I am not organized User-Agent: NeoMutt/20170609 (1.8.3) Received-SPF: softfail client-ip=2a0c:e300::1; envelope-from=samuel.thibault@gnu.org; helo=hera.aquilenet.fr X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_SOFTFAIL=0.665 autolearn=no 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: qemu-devel@nongnu.org, kraxel@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Mark Cave-Ayland, le lun. 26 oct. 2020 08:33:57 +0000, a ecrit: > 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 > --- > 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 > > -#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 */ > > #define FTDI_RESET_SIO 0 > @@ -253,7 +248,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, > break; > > /* 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, USBPacket *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] = { 0, 4, 2, 1, 3, 5, 6, 7 }; > int subdivisor8 = subdivisors8[((value & 0xc000) >> 14) > | ((index & 1) << 2)]; > @@ -311,7 +306,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *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 = '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] = usb_get_modem_lines(s) | 1; > data[1] = FTDI_THRE | FTDI_TEMT; > p->actual_length = 2; > break; > - case DeviceOutVendor | FTDI_SET_EVENT_CHR: > + case VendorDeviceOutRequest | FTDI_SET_EVENT_CHR: > /* TODO: handle it */ > s->event_chr = value; > break; > - case DeviceOutVendor | FTDI_SET_ERROR_CHR: > + case VendorDeviceOutRequest | FTDI_SET_ERROR_CHR: > /* TODO: handle it */ > s->error_chr = value; > break; > - case DeviceOutVendor | FTDI_SET_LATENCY: > + case VendorDeviceOutRequest | FTDI_SET_LATENCY: > s->latency = value; > break; > - case DeviceInVendor | FTDI_GET_LATENCY: > + case VendorDeviceRequest | FTDI_GET_LATENCY: > data[0] = s->latency; > p->actual_length = 1; > break; > -- > 2.20.1 > -- Samuel How do I type "for i in *.dvi do xdvi i done" in a GUI? (Discussion in comp.os.linux.misc on the intuitiveness of interfaces.)