[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/7] usb-bt: Return NAK instead of STALL when interr
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 4/7] usb-bt: Return NAK instead of STALL when interrupt ep has no data |
Date: |
Wed, 21 Nov 2012 15:00:01 +0100 |
From: Hans de Goede <address@hidden>
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 <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/dev-bluetooth.c | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index bfb96bf..39984f5 100644
--- a/hw/usb/dev-bluetooth.c
+++ b/hw/usb/dev-bluetooth.c
@@ -27,6 +27,7 @@
struct USBBtState {
USBDevice dev;
struct HCIInfo *hci;
+ USBEndpoint *intr;
int config;
@@ -290,10 +291,7 @@ static inline void usb_bt_fifo_dequeue(struct
usb_hci_in_fifo_s *fifo,
{
int len;
- if (likely(!fifo->len)) {
- p->status = USB_RET_STALL;
- return;
- }
+ assert(fifo->len != 0);
len = MIN(p->iov.size, fifo->fifo[fifo->start].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:
switch (p->ep->nr) {
case USB_EVT_EP:
+ if (s->evt.len == 0) {
+ p->status = USB_RET_NAK;
+ break;
+ }
usb_bt_fifo_dequeue(&s->evt, p);
break;
case USB_ACL_EP:
+ if (s->evt.len == 0) {
+ p->status = USB_RET_STALL;
+ break;
+ }
usb_bt_fifo_dequeue(&s->acl, p);
break;
case USB_SCO_EP:
+ if (s->evt.len == 0) {
+ p->status = USB_RET_STALL;
+ break;
+ }
usb_bt_fifo_dequeue(&s->sco, p);
break;
@@ -467,6 +477,9 @@ static void usb_bt_out_hci_packet_event(void *opaque,
{
struct USBBtState *s = (struct USBBtState *) opaque;
+ if (s->evt.len == 0) {
+ usb_wakeup(s->intr);
+ }
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)
{
+ struct USBBtState *s = DO_UPCAST(struct USBBtState, dev, dev);
+
usb_desc_create_serial(dev);
usb_desc_init(dev);
+ s->intr = usb_ep_get(dev, USB_TOKEN_IN, USB_EVT_EP);
+
return 0;
}
--
1.7.1
- [Qemu-devel] [PULL for-1.3 0/7] usb patch queue, Gerd Hoffmann, 2012/11/21
- [Qemu-devel] [PATCH 2/7] uhci: Don't allow the guest to set port-enabled when there is no dev connected, Gerd Hoffmann, 2012/11/21
- [Qemu-devel] [PATCH 7/7] usb-redir: Don't handle interrupt output packets async, Gerd Hoffmann, 2012/11/21
- [Qemu-devel] [PATCH 6/7] usb-redir: Split usb_handle_interrupt_data into separate in/out functions, Gerd Hoffmann, 2012/11/21
- [Qemu-devel] [PATCH 5/7] usb-smartcard-reader: Properly NAK interrupt eps when we've no events, Gerd Hoffmann, 2012/11/21
- [Qemu-devel] [PATCH 1/7] uhci: Add a completions_only flag for async completions, Gerd Hoffmann, 2012/11/21
- [Qemu-devel] [PATCH 4/7] usb-bt: Return NAK instead of STALL when interrupt ep has no data,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 3/7] uhci: Fix double unlink, Gerd Hoffmann, 2012/11/21
- Re: [Qemu-devel] [PULL for-1.3 0/7] usb patch queue, Anthony Liguori, 2012/11/26