dev-serial: style changes to improve readability and checkpatch fixes
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Message-id: 20201027150456.24606-2-mark.cave-ayland@ilande.co.uk Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
3d6e32347a
commit
adab8d48cf
|
@ -44,8 +44,10 @@ do { printf("usb-serial: " fmt , ## __VA_ARGS__); } while (0)
|
|||
#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 DeviceOutVendor \
|
||||
((USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE) << 8)
|
||||
#define DeviceInVendor \
|
||||
((USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE) << 8)
|
||||
|
||||
/* RESET */
|
||||
|
||||
|
@ -81,24 +83,25 @@ do { printf("usb-serial: " fmt , ## __VA_ARGS__); } while (0)
|
|||
|
||||
/* 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;
|
||||
|
@ -269,17 +277,19 @@ 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);
|
||||
|
@ -317,6 +329,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p,
|
|||
DPRINTF("unsupported parity %d\n", value & FTDI_PARITY);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
switch (value & FTDI_STOP) {
|
||||
case FTDI_STOP1:
|
||||
s->params.stop_bits = 1;
|
||||
|
@ -328,6 +341,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p,
|
|||
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);
|
||||
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue