From nobody Mon Nov 17 09:50:44 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=1603701542; cv=none; d=zohomail.com; s=zohoarc; b=QuOK3Aex4fCZGF430E4eO1csQQuzLPgRMzE026Ypy2hhijzl0+TlSxanIxjcK7JkEmS/bEGYONId+AtZDFD+fyJtsOHqtfzMDaL44P7zE1mhmumKSaK9ED4Q6uNJNjSzVR6mJ79nkYG0Osj7qlLYU1IpWhhnmevgaoN0qBkLdsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603701542; 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=iTF7PgeUWGQDt/JowmGgAQx5tPJ7Jo8FUwiewiRHnyI=; b=O2KZGkdSyt2C3M9W9HcEnBaFpS+mH8xyD3Vk86pKvx/G3ueqJOaxB+SvnYYTdzuWAEiCS97WkJ0Rpt48aPyXGXbfODgSY99H6y3HrI+Sn47Uss5aDclYDvaUQj/O8hszknRjhNzXC34GV2UUFHxodxe7LsegItT2Qu+GG5m80ZM= 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 1603701542943457.5043608126441; Mon, 26 Oct 2020 01:39:02 -0700 (PDT) Received: from localhost ([::1]:41144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kWy1t-0007rs-PU for importer@patchew.org; Mon, 26 Oct 2020 04:39:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWxxX-0003CO-Ga for qemu-devel@nongnu.org; Mon, 26 Oct 2020 04:34:31 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:46942 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 1kWxxV-0005wj-Bb for qemu-devel@nongnu.org; Mon, 26 Oct 2020 04:34:31 -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 1kWxxY-00082O-14; Mon, 26 Oct 2020 08:34:36 +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:53 +0000 Message-Id: <20201026083401.13231-2-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 1/9] dev-serial: style changes to improve readability and checkpatch fixes 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" Signed-off-by: Mark Cave-Ayland Reviewed-by: Samuel thibault --- hw/usb/dev-serial.c | 230 ++++++++++++++++++++++++-------------------- 1 file changed, 126 insertions(+), 104 deletions(-) diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index b1622b7c7f..7a5fa3770e 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -33,72 +33,75 @@ do { printf("usb-serial: " fmt , ## __VA_ARGS__); } whi= le (0) #define RECV_BUF (512 - (2 * 8)) =20 /* Commands */ -#define FTDI_RESET 0 -#define FTDI_SET_MDM_CTRL 1 -#define FTDI_SET_FLOW_CTRL 2 -#define FTDI_SET_BAUD 3 -#define FTDI_SET_DATA 4 -#define FTDI_GET_MDM_ST 5 -#define FTDI_SET_EVENT_CHR 6 -#define FTDI_SET_ERROR_CHR 7 -#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) +#define FTDI_RESET 0 +#define FTDI_SET_MDM_CTRL 1 +#define FTDI_SET_FLOW_CTRL 2 +#define FTDI_SET_BAUD 3 +#define FTDI_SET_DATA 4 +#define FTDI_GET_MDM_ST 5 +#define FTDI_SET_EVENT_CHR 6 +#define FTDI_SET_ERROR_CHR 7 +#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) =20 /* RESET */ =20 -#define FTDI_RESET_SIO 0 -#define FTDI_RESET_RX 1 -#define FTDI_RESET_TX 2 +#define FTDI_RESET_SIO 0 +#define FTDI_RESET_RX 1 +#define FTDI_RESET_TX 2 =20 /* SET_MDM_CTRL */ =20 -#define FTDI_DTR 1 -#define FTDI_SET_DTR (FTDI_DTR << 8) -#define FTDI_RTS 2 -#define FTDI_SET_RTS (FTDI_RTS << 8) +#define FTDI_DTR 1 +#define FTDI_SET_DTR (FTDI_DTR << 8) +#define FTDI_RTS 2 +#define FTDI_SET_RTS (FTDI_RTS << 8) =20 /* SET_FLOW_CTRL */ =20 -#define FTDI_RTS_CTS_HS 1 -#define FTDI_DTR_DSR_HS 2 -#define FTDI_XON_XOFF_HS 4 +#define FTDI_RTS_CTS_HS 1 +#define FTDI_DTR_DSR_HS 2 +#define FTDI_XON_XOFF_HS 4 =20 /* SET_DATA */ =20 -#define FTDI_PARITY (0x7 << 8) -#define FTDI_ODD (0x1 << 8) -#define FTDI_EVEN (0x2 << 8) -#define FTDI_MARK (0x3 << 8) -#define FTDI_SPACE (0x4 << 8) +#define FTDI_PARITY (0x7 << 8) +#define FTDI_ODD (0x1 << 8) +#define FTDI_EVEN (0x2 << 8) +#define FTDI_MARK (0x3 << 8) +#define FTDI_SPACE (0x4 << 8) =20 -#define FTDI_STOP (0x3 << 11) -#define FTDI_STOP1 (0x0 << 11) -#define FTDI_STOP15 (0x1 << 11) -#define FTDI_STOP2 (0x2 << 11) +#define FTDI_STOP (0x3 << 11) +#define FTDI_STOP1 (0x0 << 11) +#define FTDI_STOP15 (0x1 << 11) +#define FTDI_STOP2 (0x2 << 11) =20 /* GET_MDM_ST */ /* TODO: should be sent every 40ms */ -#define FTDI_CTS (1<<4) // CTS line status -#define FTDI_DSR (1<<5) // DSR line status -#define FTDI_RI (1<<6) // RI line status -#define FTDI_RLSD (1<<7) // Receive Line Signal Detect +#define FTDI_CTS (1 << 4) /* CTS line status */ +#define FTDI_DSR (1 << 5) /* DSR line status */ +#define FTDI_RI (1 << 6) /* RI line status */ +#define FTDI_RLSD (1 << 7) /* Receive Line Signal Detect */ =20 /* Status */ =20 -#define FTDI_DR (1<<0) // Data Ready -#define FTDI_OE (1<<1) // Overrun Err -#define FTDI_PE (1<<2) // Parity Err -#define FTDI_FE (1<<3) // Framing Err -#define FTDI_BI (1<<4) // Break Interrupt -#define FTDI_THRE (1<<5) // Transmitter Holding Register -#define FTDI_TEMT (1<<6) // Transmitter Empty -#define FTDI_FIFO (1<<7) // Error in FIFO +#define FTDI_DR (1 << 0) /* Data Ready */ +#define FTDI_OE (1 << 1) /* Overrun Err */ +#define FTDI_PE (1 << 2) /* Parity Err */ +#define FTDI_FE (1 << 3) /* Framing Err */ +#define FTDI_BI (1 << 4) /* Break Interrupt */ +#define FTDI_THRE (1 << 5) /* Transmitter Holding Register */ +#define FTDI_TEMT (1 << 6) /* Transmitter Empty */ +#define FTDI_FIFO (1 << 7) /* Error in FIFO */ =20 struct USBSerialState { USBDevice dev; + USBEndpoint *intr; uint8_t recv_buf[RECV_BUF]; uint16_t recv_ptr; @@ -216,29 +219,34 @@ static uint8_t usb_get_modem_lines(USBSerialState *s) =20 if (qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_GET_TIOCM, &flags) =3D=3D -ENOT= SUP) { - return FTDI_CTS|FTDI_DSR|FTDI_RLSD; + return FTDI_CTS | FTDI_DSR | FTDI_RLSD; } =20 ret =3D 0; - if (flags & CHR_TIOCM_CTS) + if (flags & CHR_TIOCM_CTS) { ret |=3D FTDI_CTS; - if (flags & CHR_TIOCM_DSR) + } + if (flags & CHR_TIOCM_DSR) { ret |=3D FTDI_DSR; - if (flags & CHR_TIOCM_RI) + } + if (flags & CHR_TIOCM_RI) { ret |=3D FTDI_RI; - if (flags & CHR_TIOCM_CAR) + } + if (flags & CHR_TIOCM_CAR) { ret |=3D FTDI_RLSD; + } =20 return ret; } =20 static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, - int request, int value, int index, int length, uint8_t *dat= a) + int request, int value, int index, + int length, uint8_t *data) { USBSerialState *s =3D (USBSerialState *)dev; int ret; =20 - DPRINTF("got control %x, value %x\n",request, value); + DPRINTF("got control %x, value %x\n", request, value); ret =3D usb_desc_handle_control(dev, p, request, value, index, length,= data); if (ret >=3D 0) { return; @@ -248,7 +256,7 @@ static void usb_serial_handle_control(USBDevice *dev, U= SBPacket *p, case EndpointOutRequest | USB_REQ_CLEAR_FEATURE: break; =20 - /* Class specific requests. */ + /* Class specific requests. */ case DeviceOutVendor | FTDI_RESET: switch (value) { case FTDI_RESET_SIO: @@ -269,16 +277,18 @@ static void usb_serial_handle_control(USBDevice *dev,= USBPacket *p, static int flags; qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_GET_TIOCM, &flags); if (value & FTDI_SET_RTS) { - if (value & FTDI_RTS) + if (value & FTDI_RTS) { flags |=3D CHR_TIOCM_RTS; - else + } else { flags &=3D ~CHR_TIOCM_RTS; + } } if (value & FTDI_SET_DTR) { - if (value & FTDI_DTR) + if (value & FTDI_DTR) { flags |=3D CHR_TIOCM_DTR; - else + } else { flags &=3D ~CHR_TIOCM_DTR; + } } qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_TIOCM, &flags); break; @@ -293,10 +303,12 @@ static void usb_serial_handle_control(USBDevice *dev,= USBPacket *p, int divisor =3D value & 0x3fff; =20 /* chip special cases */ - if (divisor =3D=3D 1 && subdivisor8 =3D=3D 0) + if (divisor =3D=3D 1 && subdivisor8 =3D=3D 0) { subdivisor8 =3D 4; - if (divisor =3D=3D 0 && subdivisor8 =3D=3D 0) + } + if (divisor =3D=3D 0 && subdivisor8 =3D=3D 0) { divisor =3D 1; + } =20 s->params.speed =3D (48000000 / 2) / (8 * divisor + subdivisor8); qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params); @@ -304,30 +316,32 @@ static void usb_serial_handle_control(USBDevice *dev,= USBPacket *p, } case DeviceOutVendor | FTDI_SET_DATA: switch (value & FTDI_PARITY) { - case 0: - s->params.parity =3D 'N'; - break; - case FTDI_ODD: - s->params.parity =3D 'O'; - break; - case FTDI_EVEN: - s->params.parity =3D 'E'; - break; - default: - DPRINTF("unsupported parity %d\n", value & FTDI_PARITY); - goto fail; + case 0: + s->params.parity =3D 'N'; + break; + case FTDI_ODD: + s->params.parity =3D 'O'; + break; + case FTDI_EVEN: + s->params.parity =3D 'E'; + break; + default: + DPRINTF("unsupported parity %d\n", value & FTDI_PARITY); + goto fail; } + switch (value & FTDI_STOP) { - case FTDI_STOP1: - s->params.stop_bits =3D 1; - break; - case FTDI_STOP2: - s->params.stop_bits =3D 2; - break; - default: - DPRINTF("unsupported stop bits %d\n", value & FTDI_STOP); - goto fail; + case FTDI_STOP1: + s->params.stop_bits =3D 1; + break; + case FTDI_STOP2: + s->params.stop_bits =3D 2; + break; + default: + DPRINTF("unsupported stop bits %d\n", value & FTDI_STOP); + goto fail; } + qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params); /* TODO: TX ON/OFF */ break; @@ -423,20 +437,24 @@ static void usb_serial_handle_data(USBDevice *dev, US= BPacket *p) =20 switch (p->pid) { case USB_TOKEN_OUT: - if (devep !=3D 2) + if (devep !=3D 2) { goto fail; + } for (i =3D 0; i < p->iov.niov; i++) { iov =3D p->iov.iov + i; - /* XXX this blocks entire thread. Rewrite to use - * qemu_chr_fe_write and background I/O callbacks */ + /* + * XXX this blocks entire thread. Rewrite to use + * qemu_chr_fe_write and background I/O callbacks + */ qemu_chr_fe_write_all(&s->cs, iov->iov_base, iov->iov_len); } p->actual_length =3D p->iov.size; break; =20 case USB_TOKEN_IN: - if (devep !=3D 1) + if (devep !=3D 1) { goto fail; + } usb_serial_token_in(s, p); break; =20 @@ -464,21 +482,24 @@ static void usb_serial_read(void *opaque, const uint8= _t *buf, int size) int first_size, start; =20 /* room in the buffer? */ - if (size > (RECV_BUF - s->recv_used)) + if (size > (RECV_BUF - s->recv_used)) { size =3D RECV_BUF - s->recv_used; + } =20 start =3D s->recv_ptr + s->recv_used; if (start < RECV_BUF) { /* copy data to end of buffer */ first_size =3D RECV_BUF - start; - if (first_size > size) + if (first_size > size) { first_size =3D size; + } =20 memcpy(s->recv_buf + start, buf, first_size); =20 /* wrap around to front if needed */ - if (size > first_size) + if (size > first_size) { memcpy(s->recv_buf, buf + first_size, size - first_size); + } } else { start -=3D RECV_BUF; memcpy(s->recv_buf + start, buf, size); @@ -493,23 +514,23 @@ static void usb_serial_event(void *opaque, QEMUChrEve= nt event) USBSerialState *s =3D opaque; =20 switch (event) { - case CHR_EVENT_BREAK: - s->event_trigger |=3D FTDI_BI; - break; - case CHR_EVENT_OPENED: - if (!s->dev.attached) { - usb_device_attach(&s->dev, &error_abort); - } - break; - case CHR_EVENT_CLOSED: - if (s->dev.attached) { - usb_device_detach(&s->dev); - } - break; - case CHR_EVENT_MUX_IN: - case CHR_EVENT_MUX_OUT: - /* Ignore */ - break; + case CHR_EVENT_BREAK: + s->event_trigger |=3D FTDI_BI; + break; + case CHR_EVENT_OPENED: + if (!s->dev.attached) { + usb_device_attach(&s->dev, &error_abort); + } + break; + case CHR_EVENT_CLOSED: + if (s->dev.attached) { + usb_device_detach(&s->dev); + } + break; + case CHR_EVENT_MUX_IN: + case CHR_EVENT_MUX_OUT: + /* Ignore */ + break; } } =20 @@ -549,8 +570,9 @@ static USBDevice *usb_braille_init(const char *unused) Chardev *cdrv; =20 cdrv =3D qemu_chr_new("braille", "braille", NULL); - if (!cdrv) + if (!cdrv) { return NULL; + } =20 dev =3D usb_new("usb-braille"); qdev_prop_set_chr(&dev->qdev, "chardev", cdrv); --=20 2.20.1