| Message ID | 20201026083401.13231-2-mark.cave-ayland@ilande.co.uk |
|---|---|
| State | Superseded |
| Headers | show |
| Series | dev-serial: minor fixes and improvements | expand |
Mark Cave-Ayland, le lun. 26 oct. 2020 08:33:53 +0000, a ecrit: > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Samuel thibault <samuel.thibault@ens-lyon.org> > --- > 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__); } while (0) > #define RECV_BUF (512 - (2 * 8)) > > /* 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) > > /* RESET */ > > -#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 > > /* SET_MDM_CTRL */ > > -#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) > > /* SET_FLOW_CTRL */ > > -#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 > > /* SET_DATA */ > > -#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) > > -#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) > > /* 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 */ > > /* Status */ > > -#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 */ > > 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) > > if (qemu_chr_fe_ioctl(&s->cs, > CHR_IOCTL_SERIAL_GET_TIOCM, &flags) == -ENOTSUP) { > - return FTDI_CTS|FTDI_DSR|FTDI_RLSD; > + return FTDI_CTS | FTDI_DSR | FTDI_RLSD; > } > > ret = 0; > - if (flags & CHR_TIOCM_CTS) > + if (flags & CHR_TIOCM_CTS) { > ret |= FTDI_CTS; > - if (flags & CHR_TIOCM_DSR) > + } > + if (flags & CHR_TIOCM_DSR) { > ret |= FTDI_DSR; > - if (flags & CHR_TIOCM_RI) > + } > + if (flags & CHR_TIOCM_RI) { > ret |= FTDI_RI; > - if (flags & CHR_TIOCM_CAR) > + } > + if (flags & CHR_TIOCM_CAR) { > ret |= FTDI_RLSD; > + } > > return ret; > } > > static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, > - int request, int value, int index, int length, uint8_t *data) > + int request, int value, int index, > + int length, uint8_t *data) > { > USBSerialState *s = (USBSerialState *)dev; > int ret; > > - DPRINTF("got control %x, value %x\n",request, value); > + DPRINTF("got control %x, value %x\n", request, value); > ret = usb_desc_handle_control(dev, p, request, value, index, length, data); > if (ret >= 0) { > return; > @@ -248,7 +256,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, > case EndpointOutRequest | USB_REQ_CLEAR_FEATURE: > break; > > - /* 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 |= CHR_TIOCM_RTS; > - else > + } else { > flags &= ~CHR_TIOCM_RTS; > + } > } > if (value & FTDI_SET_DTR) { > - if (value & FTDI_DTR) > + if (value & FTDI_DTR) { > flags |= CHR_TIOCM_DTR; > - else > + } else { > flags &= ~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 = value & 0x3fff; > > /* chip special cases */ > - if (divisor == 1 && subdivisor8 == 0) > + if (divisor == 1 && subdivisor8 == 0) { > subdivisor8 = 4; > - if (divisor == 0 && subdivisor8 == 0) > + } > + if (divisor == 0 && subdivisor8 == 0) { > divisor = 1; > + } > > s->params.speed = (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 = 'N'; > - break; > - case FTDI_ODD: > - s->params.parity = 'O'; > - break; > - case FTDI_EVEN: > - s->params.parity = 'E'; > - break; > - default: > - DPRINTF("unsupported parity %d\n", value & FTDI_PARITY); > - goto fail; > + case 0: > + s->params.parity = 'N'; > + break; > + case FTDI_ODD: > + s->params.parity = 'O'; > + break; > + case FTDI_EVEN: > + s->params.parity = 'E'; > + break; > + default: > + DPRINTF("unsupported parity %d\n", value & FTDI_PARITY); > + goto fail; > } > + > switch (value & FTDI_STOP) { > - case FTDI_STOP1: > - s->params.stop_bits = 1; > - break; > - case FTDI_STOP2: > - s->params.stop_bits = 2; > - break; > - default: > - DPRINTF("unsupported stop bits %d\n", value & FTDI_STOP); > - goto fail; > + case FTDI_STOP1: > + s->params.stop_bits = 1; > + break; > + case FTDI_STOP2: > + s->params.stop_bits = 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, USBPacket *p) > > switch (p->pid) { > case USB_TOKEN_OUT: > - if (devep != 2) > + if (devep != 2) { > goto fail; > + } > for (i = 0; i < p->iov.niov; i++) { > iov = 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 = p->iov.size; > break; > > case USB_TOKEN_IN: > - if (devep != 1) > + if (devep != 1) { > goto fail; > + } > usb_serial_token_in(s, p); > break; > > @@ -464,21 +482,24 @@ static void usb_serial_read(void *opaque, const uint8_t *buf, int size) > int first_size, start; > > /* room in the buffer? */ > - if (size > (RECV_BUF - s->recv_used)) > + if (size > (RECV_BUF - s->recv_used)) { > size = RECV_BUF - s->recv_used; > + } > > start = s->recv_ptr + s->recv_used; > if (start < RECV_BUF) { > /* copy data to end of buffer */ > first_size = RECV_BUF - start; > - if (first_size > size) > + if (first_size > size) { > first_size = size; > + } > > memcpy(s->recv_buf + start, buf, first_size); > > /* 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 -= RECV_BUF; > memcpy(s->recv_buf + start, buf, size); > @@ -493,23 +514,23 @@ static void usb_serial_event(void *opaque, QEMUChrEvent event) > USBSerialState *s = opaque; > > switch (event) { > - case CHR_EVENT_BREAK: > - s->event_trigger |= 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 |= 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; > } > } > > @@ -549,8 +570,9 @@ static USBDevice *usb_braille_init(const char *unused) > Chardev *cdrv; > > cdrv = qemu_chr_new("braille", "braille", NULL); > - if (!cdrv) > + if (!cdrv) { > return NULL; > + } > > dev = usb_new("usb-braille"); > qdev_prop_set_chr(&dev->qdev, "chardev", cdrv); > -- > 2.20.1 >
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__); } while (0) #define RECV_BUF (512 - (2 * 8)) /* 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) /* RESET */ -#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 /* SET_MDM_CTRL */ -#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) /* SET_FLOW_CTRL */ -#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 /* SET_DATA */ -#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) -#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) /* 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 */ /* Status */ -#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 */ 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) if (qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_GET_TIOCM, &flags) == -ENOTSUP) { - return FTDI_CTS|FTDI_DSR|FTDI_RLSD; + return FTDI_CTS | FTDI_DSR | FTDI_RLSD; } ret = 0; - if (flags & CHR_TIOCM_CTS) + if (flags & CHR_TIOCM_CTS) { ret |= FTDI_CTS; - if (flags & CHR_TIOCM_DSR) + } + if (flags & CHR_TIOCM_DSR) { ret |= FTDI_DSR; - if (flags & CHR_TIOCM_RI) + } + if (flags & CHR_TIOCM_RI) { ret |= FTDI_RI; - if (flags & CHR_TIOCM_CAR) + } + if (flags & CHR_TIOCM_CAR) { ret |= FTDI_RLSD; + } return ret; } static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, - int request, int value, int index, int length, uint8_t *data) + int request, int value, int index, + int length, uint8_t *data) { USBSerialState *s = (USBSerialState *)dev; int ret; - DPRINTF("got control %x, value %x\n",request, value); + DPRINTF("got control %x, value %x\n", request, value); ret = usb_desc_handle_control(dev, p, request, value, index, length, data); if (ret >= 0) { return; @@ -248,7 +256,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, case EndpointOutRequest | USB_REQ_CLEAR_FEATURE: break; - /* 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 |= CHR_TIOCM_RTS; - else + } else { flags &= ~CHR_TIOCM_RTS; + } } if (value & FTDI_SET_DTR) { - if (value & FTDI_DTR) + if (value & FTDI_DTR) { flags |= CHR_TIOCM_DTR; - else + } else { flags &= ~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 = value & 0x3fff; /* chip special cases */ - if (divisor == 1 && subdivisor8 == 0) + if (divisor == 1 && subdivisor8 == 0) { subdivisor8 = 4; - if (divisor == 0 && subdivisor8 == 0) + } + if (divisor == 0 && subdivisor8 == 0) { divisor = 1; + } s->params.speed = (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 = 'N'; - break; - case FTDI_ODD: - s->params.parity = 'O'; - break; - case FTDI_EVEN: - s->params.parity = 'E'; - break; - default: - DPRINTF("unsupported parity %d\n", value & FTDI_PARITY); - goto fail; + case 0: + s->params.parity = 'N'; + break; + case FTDI_ODD: + s->params.parity = 'O'; + break; + case FTDI_EVEN: + s->params.parity = 'E'; + break; + default: + DPRINTF("unsupported parity %d\n", value & FTDI_PARITY); + goto fail; } + switch (value & FTDI_STOP) { - case FTDI_STOP1: - s->params.stop_bits = 1; - break; - case FTDI_STOP2: - s->params.stop_bits = 2; - break; - default: - DPRINTF("unsupported stop bits %d\n", value & FTDI_STOP); - goto fail; + case FTDI_STOP1: + s->params.stop_bits = 1; + break; + case FTDI_STOP2: + s->params.stop_bits = 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, USBPacket *p) switch (p->pid) { case USB_TOKEN_OUT: - if (devep != 2) + if (devep != 2) { goto fail; + } for (i = 0; i < p->iov.niov; i++) { iov = 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 = p->iov.size; break; case USB_TOKEN_IN: - if (devep != 1) + if (devep != 1) { goto fail; + } usb_serial_token_in(s, p); break; @@ -464,21 +482,24 @@ static void usb_serial_read(void *opaque, const uint8_t *buf, int size) int first_size, start; /* room in the buffer? */ - if (size > (RECV_BUF - s->recv_used)) + if (size > (RECV_BUF - s->recv_used)) { size = RECV_BUF - s->recv_used; + } start = s->recv_ptr + s->recv_used; if (start < RECV_BUF) { /* copy data to end of buffer */ first_size = RECV_BUF - start; - if (first_size > size) + if (first_size > size) { first_size = size; + } memcpy(s->recv_buf + start, buf, first_size); /* 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 -= RECV_BUF; memcpy(s->recv_buf + start, buf, size); @@ -493,23 +514,23 @@ static void usb_serial_event(void *opaque, QEMUChrEvent event) USBSerialState *s = opaque; switch (event) { - case CHR_EVENT_BREAK: - s->event_trigger |= 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 |= 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; } } @@ -549,8 +570,9 @@ static USBDevice *usb_braille_init(const char *unused) Chardev *cdrv; cdrv = qemu_chr_new("braille", "braille", NULL); - if (!cdrv) + if (!cdrv) { return NULL; + } dev = usb_new("usb-braille"); qdev_prop_set_chr(&dev->qdev, "chardev", cdrv);
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/usb/dev-serial.c | 230 ++++++++++++++++++++++++-------------------- 1 file changed, 126 insertions(+), 104 deletions(-)