ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-08 11:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qemu-usb: add ring-buffer for ISOCH OUT transfers

Browse Source 
Be more in line with the original host implementation in Qemu and
buffer transfers. Having transfers in-flight helps to smoothen playback
in case other components utilize the CPU.

Issue #4018.
This commit is contained in:
Josef Söntgen 2021-01-12 13:28:47 +01:00 committed by Norman Feske
parent 19d9409a34
commit 1b77cb3832
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
repos/libports/src/lib/qemu-usb/host.cc
View File

@ -11,6 +11,7 @@
#include <usb_session/connection.h>
#include <usb/usb.h>
#include <util/xml_node.h>
#include <os/ring_buffer.h>
#include <extern_c_begin.h>
#include <qemu_emul.h>
@ -63,6 +64,10 @@ class Isoc_packet : Fifo<Isoc_packet>::Element
_size (_packet.read_transfer() ? _packet.transfer.actual_size : _packet.size())
{ }
Isoc_packet()
: _packet { Usb::Packet_descriptor() }, _content { nullptr }, _size { 0 }
{ }
bool copy(USBPacket *usb_packet)
{
if (!valid()) return false;
@ -243,6 +248,9 @@ struct Usb_host_device : List<Usb_host_device>::Element
Fifo<Isoc_packet> isoc_read_queue { };
Reconstructible<Isoc_packet> isoc_write_packet { Usb::Packet_descriptor(), nullptr };
Genode::Ring_buffer<Isoc_packet, 5, Genode::Ring_buffer_unsynchronized> _isoch_out_queue { };
unsigned _isoch_out_pending { 0 };
Entrypoint &_ep;
Signal_handler<Usb_host_device> state_dispatcher { _ep, *this, &Usb_host_device::state_change };
@ -334,8 +342,12 @@ struct Usb_host_device : List<Usb_host_device>::Element
Usb::Packet_descriptor packet = usb_raw.source()->get_acked_packet();
Completion *c = dynamic_cast<Completion *>(packet.completion);
if ((packet.type == Packet_type::ISOC && !packet.read_transfer()) ||
(c && c->state == Completion::CANCELED)) {
if ((packet.type == Packet_type::ISOC && !packet.read_transfer())) {
free_packet(packet);
_isoch_out_pending--;
continue;
}
if ((c && c->state == Completion::CANCELED)) {
free_packet(packet);
continue;
}
@ -447,7 +459,7 @@ struct Usb_host_device : List<Usb_host_device>::Element
if (isoc_write_packet->packet_count() < NUMBER_OF_PACKETS)
return;
submit(isoc_write_packet->packet());
_isoch_out_queue.add(*&*isoc_write_packet);
}
size_t size = usb_packet->ep->max_packet_size * NUMBER_OF_PACKETS;
@ -467,6 +479,16 @@ struct Usb_host_device : List<Usb_host_device>::Element
isoc_write_packet.construct(Usb::Packet_descriptor(), nullptr);
return;
}
if (_isoch_out_pending == 0 && _isoch_out_queue.avail_capacity() > 1) {
return;
}
while (!_isoch_out_queue.empty()) {
Isoc_packet i = _isoch_out_queue.get();
submit(i.packet());
_isoch_out_pending++;
}
}