[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/5] usb-mtp: add support for basic mtp events
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 4/5] usb-mtp: add support for basic mtp events |
Date: |
Tue, 15 Dec 2015 11:02:32 +0100 |
From: Bandan Das <address@hidden>
When the host polls for events, we check our
events qlist and send one event at a time. Also, note
that the event packet needs to be sent in one go, so
I increased the max packet size to 64.
Tested with a linux guest.
Signed-off-by: Bandan Das <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/dev-mtp.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index def2f5e..af056c7 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -213,7 +213,7 @@ static const USBDescIface desc_iface_full = {
},{
.bEndpointAddress = USB_DIR_IN | EP_EVENT,
.bmAttributes = USB_ENDPOINT_XFER_INT,
- .wMaxPacketSize = 8,
+ .wMaxPacketSize = 64,
.bInterval = 0x0a,
},
}
@@ -255,7 +255,7 @@ static const USBDescIface desc_iface_high = {
},{
.bEndpointAddress = USB_DIR_IN | EP_EVENT,
.bmAttributes = USB_ENDPOINT_XFER_INT,
- .wMaxPacketSize = 8,
+ .wMaxPacketSize = 64,
.bInterval = 0x0a,
},
}
@@ -1297,6 +1297,31 @@ static void usb_mtp_handle_data(USBDevice *dev,
USBPacket *p)
}
break;
case EP_EVENT:
+#ifdef __linux__
+ if (!QTAILQ_EMPTY(&s->events)) {
+ struct MTPMonEntry *e = QTAILQ_LAST(&s->events, events);
+ uint32_t handle;
+ int len = sizeof(container) + sizeof(uint32_t);
+
+ if (p->iov.size < len) {
+ trace_usb_mtp_stall(s->dev.addr,
+ "packet too small to send event");
+ p->status = USB_RET_STALL;
+ return;
+ }
+
+ QTAILQ_REMOVE(&s->events, e, next);
+ container.length = cpu_to_le32(len);
+ container.type = cpu_to_le32(TYPE_EVENT);
+ container.code = cpu_to_le16(e->event);
+ container.trans = 0; /* no trans specific events */
+ handle = cpu_to_le32(e->handle);
+ usb_packet_copy(p, &container, sizeof(container));
+ usb_packet_copy(p, &handle, sizeof(uint32_t));
+ g_free(e);
+ return;
+ }
+#endif
p->status = USB_RET_NAK;
return;
default:
--
1.8.3.1
- [Qemu-devel] [PULL 0/5] usb: ehci idt fix, event support for mtp, Gerd Hoffmann, 2015/12/15
- [Qemu-devel] [PULL 2/5] usb-mtp: free objects on a mtp reset, Gerd Hoffmann, 2015/12/15
- [Qemu-devel] [PULL 4/5] usb-mtp: add support for basic mtp events,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 3/5] usb-mtp: Add support for inotify based file monitoring, Gerd Hoffmann, 2015/12/15
- [Qemu-devel] [PULL 5/5] ehci: make idt processing more robust, Gerd Hoffmann, 2015/12/15
- [Qemu-devel] [PULL 1/5] usb-mtp: use a list for keeping track of children, Gerd Hoffmann, 2015/12/15
- Re: [Qemu-devel] [PULL 0/5] usb: ehci idt fix, event support for mtp, Peter Maydell, 2015/12/17