SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dev-mtp: add support for canceling transaction

Browse Source 
The initiator can choose to cancel an ongoing request which
is specified by bRequest=0x64. If such a request arrives,
free up any pending state

Signed-off-by: Bandan Das <bsd@redhat.com>
Message-id: 20180720214020.22897-2-bsd@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Bandan Das 2018-07-20 17:40:16 -04:00 committed by Gerd Hoffmann
parent 7c48b95df4
commit 47bff13cea
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/usb/dev-mtp.c
View File

@ -82,6 +82,7 @@ enum mtp_code {
FMT_ASSOCIATION = 0x3001, FMT_ASSOCIATION = 0x3001,
/* event codes */ /* event codes */
EVT_CANCEL_TRANSACTION = 0x4001,
EVT_OBJ_ADDED = 0x4002, EVT_OBJ_ADDED = 0x4002,
EVT_OBJ_REMOVED = 0x4003, EVT_OBJ_REMOVED = 0x4003,
EVT_OBJ_INFO_CHANGED = 0x4007, EVT_OBJ_INFO_CHANGED = 0x4007,
@ -1551,14 +1552,35 @@ static void usb_mtp_handle_control(USBDevice *dev, USBPacket *p,
int length, uint8_t *data) int length, uint8_t *data)
{ {
int ret; int ret;
MTPState *s = USB_MTP(dev);
uint16_t *event = (uint16_t *)data;
ret = usb_desc_handle_control(dev, p, request, value, index, length, data); switch (request) {
if (ret >= 0) { case ClassInterfaceOutRequest | 0x64:
return; if (*event == EVT_CANCEL_TRANSACTION) {
g_free(s->result);
s->result = NULL;
usb_mtp_data_free(s->data_in);
s->data_in = NULL;
if (s->write_pending) {
g_free(s->dataset.filename);
s->write_pending = false;
}
usb_mtp_data_free(s->data_out);
s->data_out = NULL;
} else {
p->status = USB_RET_STALL;
}
break;
default:
ret = usb_desc_handle_control(dev, p, request,
value, index, length, data);
if (ret >= 0) {
return;
}
} }
trace_usb_mtp_stall(dev->addr, "unknown control request"); trace_usb_mtp_stall(dev->addr, "unknown control request");
p->status = USB_RET_STALL;
} }
static void usb_mtp_cancel_packet(USBDevice *dev, USBPacket *p) static void usb_mtp_cancel_packet(USBDevice *dev, USBPacket *p)