RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

sys_usbd improvements (#11202)

Browse source
This commit is contained in:
RipleyTom 2021-11-27 02:49:35 +01:00 • committed by GitHub
parent 276ee81da8
commit 4fe17fcecf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 117 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

29
rpcs3/Emu/Io/usb_device.cpp
View file

@ -57,10 +57,33 @@ usb_device_passthrough::usb_device_passthrough(libusb_device* _device, libusb_de
usb_device_passthrough::~usb_device_passthrough()
{
if (lusb_handle)
{
libusb_release_interface(lusb_handle, 0);
libusb_close(lusb_handle);
}
if (lusb_device)
{
libusb_unref_device(lusb_device);
}
}
void usb_device_passthrough::send_libusb_transfer(libusb_transfer* transfer)
{
while (true)
{
auto res = libusb_submit_transfer(transfer);
switch (res)
{
case LIBUSB_SUCCESS: return;
case LIBUSB_ERROR_BUSY: continue;
default:
{
sys_usbd.error("Unexpected error from libusb_submit_transfer: %d", res);
return;
}
}
}
}
bool usb_device_passthrough::open_device()
@ -120,13 +143,13 @@ void usb_device_passthrough::control_transfer(u8 bmRequestType, u8 bRequest, u16
libusb_fill_control_setup(transfer->setup_buf.data(), bmRequestType, bRequest, wValue, wIndex, buf_size);
memcpy(transfer->setup_buf.data() + 8, buf, buf_size);
libusb_fill_control_transfer(transfer->transfer, lusb_handle, transfer->setup_buf.data(), callback_transfer, transfer, 0);
libusb_submit_transfer(transfer->transfer);
send_libusb_transfer(transfer->transfer);
}
void usb_device_passthrough::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer)
{
libusb_fill_interrupt_transfer(transfer->transfer, lusb_handle, endpoint, buf, buf_size, callback_transfer, transfer, 0);
libusb_submit_transfer(transfer->transfer);
send_libusb_transfer(transfer->transfer);
}
void usb_device_passthrough::isochronous_transfer(UsbTransfer* transfer)
@ -140,7 +163,7 @@ void usb_device_passthrough::isochronous_transfer(UsbTransfer* transfer)
transfer->transfer->iso_packet_desc[index].length = transfer->iso_request.packets[index];
}
libusb_submit_transfer(transfer->transfer);
send_libusb_transfer(transfer->transfer);
}
//////////////////////////////////////////////////////////////////