ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb-redir: Allow packets to have both data and an error-status 

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2012-11-01 17:15:02 +01:00 committed by Gerd Hoffmann
parent 9a77a0f589
commit e94ca437ba
1 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
hw/usb/redirect.c
View File

@ -521,22 +521,16 @@ static void usbredir_handle_iso_data(USBRedirDevice *dev, USBPacket *p,
isop->status, isop->len, dev->endpoint[EP2I(ep)].bufpq_size); isop->status, isop->len, dev->endpoint[EP2I(ep)].bufpq_size);
status = isop->status; status = isop->status;
if (status != usb_redir_success) {
bufp_free(dev, isop, ep);
p->status = USB_RET_IOERROR;
return;
}
len = isop->len; len = isop->len;
if (len > p->iov.size) { if (len > p->iov.size) {
ERROR("received iso data is larger then packet ep %02X (%d > %d)\n", ERROR("received iso data is larger then packet ep %02X (%d > %d)\n",
ep, len, (int)p->iov.size); ep, len, (int)p->iov.size);
bufp_free(dev, isop, ep); len = p->iov.size;
p->status = USB_RET_BABBLE; status = usb_redir_babble;
return;
} }
usb_packet_copy(p, isop->data, len); usb_packet_copy(p, isop->data, len);
bufp_free(dev, isop, ep); bufp_free(dev, isop, ep);
usbredir_handle_status(dev, p, status);
} else { } else {
/* If the stream was not started because of a pending error don't /* If the stream was not started because of a pending error don't
send the packet to the usb-host */ send the packet to the usb-host */
@ -656,21 +650,15 @@ static void usbredir_handle_interrupt_data(USBRedirDevice *dev,
intp->status, intp->len); intp->status, intp->len);
status = intp->status; status = intp->status;
if (status != usb_redir_success) {
bufp_free(dev, intp, ep);
usbredir_handle_status(dev, p, status);
return;
}
len = intp->len; len = intp->len;
if (len > p->iov.size) { if (len > p->iov.size) {
ERROR("received int data is larger then packet ep %02X\n", ep); ERROR("received int data is larger then packet ep %02X\n", ep);
bufp_free(dev, intp, ep); len = p->iov.size;
p->status = USB_RET_BABBLE; status = usb_redir_babble;
return;
} }
usb_packet_copy(p, intp->data, len); usb_packet_copy(p, intp->data, len);
bufp_free(dev, intp, ep); bufp_free(dev, intp, ep);
usbredir_handle_status(dev, p, status);
} else { } else {
/* Output interrupt endpoint, normal async operation */ /* Output interrupt endpoint, normal async operation */
struct usb_redir_interrupt_packet_header interrupt_packet; struct usb_redir_interrupt_packet_header interrupt_packet;
@ -1542,16 +1530,15 @@ static void usbredir_control_packet(void *priv, uint64_t id,
p = usbredir_find_packet_by_id(dev, 0, id); p = usbredir_find_packet_by_id(dev, 0, id);
if (p) { if (p) {
usbredir_handle_status(dev, p, control_packet->status); usbredir_handle_status(dev, p, control_packet->status);
if (p->status == USB_RET_SUCCESS) { if (data_len > 0) {
usbredir_log_data(dev, "ctrl data in:", data, data_len); usbredir_log_data(dev, "ctrl data in:", data, data_len);
if (data_len <= sizeof(dev->dev.data_buf)) { if (data_len > sizeof(dev->dev.data_buf)) {
memcpy(dev->dev.data_buf, data, data_len);
} else {
ERROR("ctrl buffer too small (%d > %zu)\n", ERROR("ctrl buffer too small (%d > %zu)\n",
data_len, sizeof(dev->dev.data_buf)); data_len, sizeof(dev->dev.data_buf));
p->status = USB_RET_STALL; p->status = USB_RET_STALL;
len = 0; data_len = len = sizeof(dev->dev.data_buf);
} }
memcpy(dev->dev.data_buf, data, data_len);
} }
p->actual_length = len; p->actual_length = len;
usb_generic_async_ctrl_complete(&dev->dev, p); usb_generic_async_ctrl_complete(&dev->dev, p);
@ -1575,21 +1562,20 @@ static void usbredir_bulk_packet(void *priv, uint64_t id,
if (p) { if (p) {
size_t size = (p->combined) ? p->combined->iov.size : p->iov.size; size_t size = (p->combined) ? p->combined->iov.size : p->iov.size;
usbredir_handle_status(dev, p, bulk_packet->status); usbredir_handle_status(dev, p, bulk_packet->status);
if (p->status == USB_RET_SUCCESS) { if (data_len > 0) {
usbredir_log_data(dev, "bulk data in:", data, data_len); usbredir_log_data(dev, "bulk data in:", data, data_len);
if (data_len <= size) { if (data_len > size) {
ERROR("bulk got more data then requested (%d > %zd)\n",
data_len, p->iov.size);
p->status = USB_RET_BABBLE;
data_len = len = size;
}
if (p->combined) { if (p->combined) {
iov_from_buf(p->combined->iov.iov, p->combined->iov.niov, iov_from_buf(p->combined->iov.iov, p->combined->iov.niov,
0, data, data_len); 0, data, data_len);
} else { } else {
usb_packet_copy(p, data, data_len); usb_packet_copy(p, data, data_len);
} }
} else {
ERROR("bulk got more data then requested (%d > %zd)\n",
data_len, p->iov.size);
p->status = USB_RET_BABBLE;
len = 0;
}
} }
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) {
@ -1653,12 +1639,10 @@ static void usbredir_interrupt_packet(void *priv, uint64_t id,
/* bufp_alloc also adds the packet to the ep queue */ /* bufp_alloc also adds the packet to the ep queue */
bufp_alloc(dev, data, data_len, interrupt_packet->status, ep); bufp_alloc(dev, data, data_len, interrupt_packet->status, ep);
} else { } else {
int len = interrupt_packet->length;
USBPacket *p = usbredir_find_packet_by_id(dev, ep, id); USBPacket *p = usbredir_find_packet_by_id(dev, ep, id);
if (p) { if (p) {
usbredir_handle_status(dev, p, interrupt_packet->status); usbredir_handle_status(dev, p, interrupt_packet->status);
p->actual_length = len; p->actual_length = interrupt_packet->length;
usb_packet_complete(&dev->dev, p); usb_packet_complete(&dev->dev, p);
} }
} }