mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb-redir: simplify packet copy 

usb_packet_copy can handle combined packets now,
so it isn't needed to special-case them any more.

Also use the new usb_packet_size() function.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2013-01-24 15:40:37 +01:00
parent 6a98d1c0f9
commit 6ef3ccd18f
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/usb/redirect.c
View File

@ -737,7 +737,7 @@ static void usbredir_handle_bulk_data(USBRedirDevice *dev, USBPacket *p,
uint8_t ep) uint8_t ep)
{ {
struct usb_redir_bulk_packet_header bulk_packet; struct usb_redir_bulk_packet_header bulk_packet;
size_t size = (p->combined) ? p->combined->iov.size : p->iov.size; size_t size = usb_packet_size(p);
const int maxp = dev->endpoint[EP2I(ep)].max_packet_size; const int maxp = dev->endpoint[EP2I(ep)].max_packet_size;
if (usbredir_already_in_flight(dev, p->id)) { if (usbredir_already_in_flight(dev, p->id)) {
@ -771,12 +771,7 @@ static void usbredir_handle_bulk_data(USBRedirDevice *dev, USBPacket *p,
&bulk_packet, NULL, 0); &bulk_packet, NULL, 0);
} else { } else {
uint8_t buf[size]; uint8_t buf[size];
if (p->combined) { usb_packet_copy(p, buf, size);
iov_to_buf(p->combined->iov.iov, p->combined->iov.niov,
0, buf, size);
} else {
usb_packet_copy(p, buf, size);
}
usbredir_log_data(dev, "bulk data out:", buf, size); usbredir_log_data(dev, "bulk data out:", buf, size);
usbredirparser_send_bulk_packet(dev->parser, p->id, usbredirparser_send_bulk_packet(dev->parser, p->id,
&bulk_packet, buf, size); &bulk_packet, buf, size);
@ -1830,7 +1825,7 @@ static void usbredir_bulk_packet(void *priv, uint64_t id,
p = usbredir_find_packet_by_id(dev, ep, id); p = usbredir_find_packet_by_id(dev, ep, id);
if (p) { if (p) {
size_t size = (p->combined) ? p->combined->iov.size : p->iov.size; size_t size = usb_packet_size(p);
usbredir_handle_status(dev, p, bulk_packet->status); usbredir_handle_status(dev, p, bulk_packet->status);
if (data_len > 0) { if (data_len > 0) {
usbredir_log_data(dev, "bulk data in:", data, data_len); usbredir_log_data(dev, "bulk data in:", data, data_len);
@ -1840,12 +1835,7 @@ static void usbredir_bulk_packet(void *priv, uint64_t id,
p->status = USB_RET_BABBLE; p->status = USB_RET_BABBLE;
data_len = len = size; data_len = len = size;
} }
if (p->combined) { usb_packet_copy(p, data, data_len);
iov_from_buf(p->combined->iov.iov, p->combined->iov.niov,
0, data, data_len);
} else {
usb_packet_copy(p, data, data_len);
}
} }
p->actual_length = len; p->actual_length = len;
if (p->pid == USB_TOKEN_IN && p->ep->pipeline) { if (p->pid == USB_TOKEN_IN && p->ep->pipeline) {