usb-serial: iovec support
Add full support for iovecs to usb-serial. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
4f4321c11f
commit
9440b7e555
@ -359,38 +359,42 @@ static int usb_serial_handle_control(USBDevice *dev, USBPacket *p,
|
||||
static int usb_serial_handle_data(USBDevice *dev, USBPacket *p)
|
||||
{
|
||||
USBSerialState *s = (USBSerialState *)dev;
|
||||
int ret = 0;
|
||||
int i, ret = 0;
|
||||
uint8_t devep = p->devep;
|
||||
uint8_t *data = p->iov.iov[0].iov_base;
|
||||
int len = p->iov.iov[0].iov_len;
|
||||
int first_len;
|
||||
struct iovec *iov;
|
||||
uint8_t header[2];
|
||||
int first_len, len;
|
||||
|
||||
assert(p->iov.niov == 1); /* temporary */
|
||||
switch (p->pid) {
|
||||
case USB_TOKEN_OUT:
|
||||
if (devep != 2)
|
||||
goto fail;
|
||||
qemu_chr_write(s->cs, data, len);
|
||||
for (i = 0; i < p->iov.niov; i++) {
|
||||
iov = p->iov.iov + i;
|
||||
qemu_chr_write(s->cs, iov->iov_base, iov->iov_len);
|
||||
}
|
||||
break;
|
||||
|
||||
case USB_TOKEN_IN:
|
||||
if (devep != 1)
|
||||
goto fail;
|
||||
first_len = RECV_BUF - s->recv_ptr;
|
||||
len = p->iov.size;
|
||||
if (len <= 2) {
|
||||
ret = USB_RET_NAK;
|
||||
break;
|
||||
}
|
||||
*data++ = usb_get_modem_lines(s) | 1;
|
||||
header[0] = usb_get_modem_lines(s) | 1;
|
||||
/* We do not have the uart details */
|
||||
/* handle serial break */
|
||||
if (s->event_trigger && s->event_trigger & FTDI_BI) {
|
||||
s->event_trigger &= ~FTDI_BI;
|
||||
*data = FTDI_BI;
|
||||
header[1] = FTDI_BI;
|
||||
usb_packet_copy(p, header, 2);
|
||||
ret = 2;
|
||||
break;
|
||||
} else {
|
||||
*data++ = 0;
|
||||
header[1] = 0;
|
||||
}
|
||||
len -= 2;
|
||||
if (len > s->recv_used)
|
||||
@ -401,9 +405,10 @@ static int usb_serial_handle_data(USBDevice *dev, USBPacket *p)
|
||||
}
|
||||
if (first_len > len)
|
||||
first_len = len;
|
||||
memcpy(data, s->recv_buf + s->recv_ptr, first_len);
|
||||
usb_packet_copy(p, header, 2);
|
||||
usb_packet_copy(p, s->recv_buf + s->recv_ptr, first_len);
|
||||
if (len > first_len)
|
||||
memcpy(data + first_len, s->recv_buf, len - first_len);
|
||||
usb_packet_copy(p, s->recv_buf, len - first_len);
|
||||
s->recv_used -= len;
|
||||
s->recv_ptr = (s->recv_ptr + len) % RECV_BUF;
|
||||
ret = len + 2;
|
||||
|
Loading…
Reference in New Issue
Block a user