diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-03-10 13:52:03 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-03-10 13:52:03 +0000 |
| commit | 7bc4d1980f95387c4cc921d7a066217ff4e42b70 (patch) | |
| tree | 366702ebe11d73e21ed7492b973913246711c847 | |
| parent | 7f368aed672117980f7f09933e1eb3e1139caae6 (diff) | |
| parent | e13a22db0d47012e19ad02c9dafacbe25f94e1b4 (diff) | |
| download | qemu-7bc4d1980f95387c4cc921d7a066217ff4e42b70.zip qemu-7bc4d1980f95387c4cc921d7a066217ff4e42b70.tar.gz qemu-7bc4d1980f95387c4cc921d7a066217ff4e42b70.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20200310-pull-request' into staging
usb: bugfixes for ehci & serial.
# gpg: Signature made Tue 10 Mar 2020 08:23:37 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/usb-20200310-pull-request:
usb/hcd-ehci: Remove redundant statements
usb-serial: wakeup device on input
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/usb/dev-serial.c | 6 | ||||
| -rw-r--r-- | hw/usb/hcd-ehci.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 9846599..daac75b 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -98,6 +98,7 @@ do { printf("usb-serial: " fmt , ## __VA_ARGS__); } while (0) typedef struct { USBDevice dev; + USBEndpoint *intr; uint8_t recv_buf[RECV_BUF]; uint16_t recv_ptr; uint16_t recv_used; @@ -153,7 +154,7 @@ static const USBDescDevice desc_device = { { .bNumInterfaces = 1, .bConfigurationValue = 1, - .bmAttributes = USB_CFG_ATT_ONE, + .bmAttributes = USB_CFG_ATT_ONE | USB_CFG_ATT_WAKEUP, .bMaxPower = 50, .nif = 1, .ifs = &desc_iface0, @@ -459,6 +460,8 @@ static void usb_serial_read(void *opaque, const uint8_t *buf, int size) memcpy(s->recv_buf + start, buf, size); } s->recv_used += size; + + usb_wakeup(s->intr, 0); } static void usb_serial_event(void *opaque, QEMUChrEvent event) @@ -513,6 +516,7 @@ static void usb_serial_realize(USBDevice *dev, Error **errp) if (qemu_chr_fe_backend_open(&s->cs) && !dev->attached) { usb_device_attach(dev, &error_abort); } + s->intr = usb_ep_get(dev, USB_TOKEN_IN, 1); } static USBDevice *usb_braille_init(USBBus *bus, const char *unused) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 56ab2f4..29d49c2 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -1301,7 +1301,6 @@ static void ehci_execute_complete(EHCIQueue *q) /* should not be triggerable */ fprintf(stderr, "USB invalid response %d\n", p->packet.status); g_assert_not_reached(); - break; } /* TODO check 4.12 for splits */ @@ -2105,9 +2104,7 @@ static void ehci_advance_state(EHCIState *ehci, int async) default: fprintf(stderr, "Bad state!\n"); - again = -1; g_assert_not_reached(); - break; } if (again < 0 || itd_count > 16) { |