ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-13 04:38:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libusb: re-enable timeout setting for control urbs

Browse Source 
Fix genodelabs/genode#5259
This commit is contained in:
Stefan Kalkowski
2024-06-26 14:52:30 +02:00
committed by Norman Feske
parent 73b65084e2
commit f1f2d759af
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
repos/libports/src/lib/libusb/genode_usb_raw.cc
View File

@ -489,7 +489,8 @@ static int genode_submit_transfer(struct usbi_transfer * itransfer)
Usb_device::Urb(addr, setup->wLength, itransfer, Usb_device::Urb(addr, setup->wLength, itransfer,
device()._device, setup->bRequest, device()._device, setup->bRequest,
setup->bmRequestType, setup->wValue, setup->bmRequestType, setup->wValue,
setup->wIndex, setup->wLength); setup->wIndex, setup->wLength,
transfer->timeout);
device().handle_events(); device().handle_events();
return LIBUSB_SUCCESS; return LIBUSB_SUCCESS;
} }

7
repos/os/include/usb_session/device.h
View File

@ -460,6 +460,7 @@ class Usb::Device
Type::access_t _request_type; Type::access_t _request_type;
uint16_t _value; uint16_t _value;
uint16_t _index; uint16_t _index;
size_t _timeout;
Packet_descriptor _create() const override Packet_descriptor _create() const override
{ {
@ -468,6 +469,7 @@ class Usb::Device
p.request = _request; p.request = _request;
p.value = _value; p.value = _value;
p.index = _index; p.index = _index;
p.timeout = _timeout;
return p; return p;
} }
@ -475,14 +477,15 @@ class Usb::Device
Urb(Device &device, Urb(Device &device,
uint8_t request, Type::access_t request_type, uint8_t request, Type::access_t request_type,
uint16_t value, uint16_t index, size_t size = 0) uint16_t value, uint16_t index, size_t size = 0,
size_t timeout = 0)
: :
Base(device._urb_handler, Base(device._urb_handler,
Type::D::get(request_type) ? Endpoint::IN Type::D::get(request_type) ? Endpoint::IN
: Endpoint::OUT, : Endpoint::OUT,
size), size),
_request(request), _request_type(request_type), _request(request), _request_type(request_type),
_value(value), _index(index) {} _value(value), _index(index), _timeout(timeout) {}
}; };
private: private: