mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-27 22:03:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

usb-bt: Return NAK instead of STALL when interrupt ep has no data

Browse Source 
I noticed this while making all devices with interrupt endpoints properly
do wakeup. While at it also add wakeup support.

Note that I've not tested this, but returning STALL for an interrupt ep
which has no data is cleary the wrong thing to do.

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-17 12:15:01 +01:00 committed by Gerd Hoffmann
parent 71d2c9cf65
commit 33c1a6856f
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/usb/dev-bluetooth.c
View File

@ -27,6 +27,7 @@
struct USBBtState { struct USBBtState {
USBDevice dev; USBDevice dev;
struct HCIInfo *hci; struct HCIInfo *hci;
USBEndpoint *intr;
int config; int config;
@ -290,10 +291,7 @@ static inline void usb_bt_fifo_dequeue(struct usb_hci_in_fifo_s *fifo,
{ {
int len; int len;
if (likely(!fifo->len)) { assert(fifo->len != 0);
p->status = USB_RET_STALL;
return;
}
len = MIN(p->iov.size, fifo->fifo[fifo->start].len); len = MIN(p->iov.size, fifo->fifo[fifo->start].len);
usb_packet_copy(p, fifo->fifo[fifo->start].data, len); usb_packet_copy(p, fifo->fifo[fifo->start].data, len);
@ -422,14 +420,26 @@ static void usb_bt_handle_data(USBDevice *dev, USBPacket *p)
case USB_TOKEN_IN: case USB_TOKEN_IN:
switch (p->ep->nr) { switch (p->ep->nr) {
case USB_EVT_EP: case USB_EVT_EP:
if (s->evt.len == 0) {
p->status = USB_RET_NAK;
break;
}
usb_bt_fifo_dequeue(&s->evt, p); usb_bt_fifo_dequeue(&s->evt, p);
break; break;
case USB_ACL_EP: case USB_ACL_EP:
if (s->evt.len == 0) {
p->status = USB_RET_STALL;
break;
}
usb_bt_fifo_dequeue(&s->acl, p); usb_bt_fifo_dequeue(&s->acl, p);
break; break;
case USB_SCO_EP: case USB_SCO_EP:
if (s->evt.len == 0) {
p->status = USB_RET_STALL;
break;
}
usb_bt_fifo_dequeue(&s->sco, p); usb_bt_fifo_dequeue(&s->sco, p);
break; break;
@ -467,6 +477,9 @@ static void usb_bt_out_hci_packet_event(void *opaque,
{ {
struct USBBtState *s = (struct USBBtState *) opaque; struct USBBtState *s = (struct USBBtState *) opaque;
if (s->evt.len == 0) {
usb_wakeup(s->intr);
}
usb_bt_fifo_enqueue(&s->evt, data, len); usb_bt_fifo_enqueue(&s->evt, data, len);
} }
@ -489,8 +502,12 @@ static void usb_bt_handle_destroy(USBDevice *dev)
static int usb_bt_initfn(USBDevice *dev) static int usb_bt_initfn(USBDevice *dev)
{ {
struct USBBtState *s = DO_UPCAST(struct USBBtState, dev, dev);
usb_desc_create_serial(dev); usb_desc_create_serial(dev);
usb_desc_init(dev); usb_desc_init(dev);
s->intr = usb_ep_get(dev, USB_TOKEN_IN, USB_EVT_EP);
return 0; return 0;
} }