archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Skylander Portal: Trap Team Audio Transfers

Browse source
This commit is contained in:
Joshua de Reeper 2023-03-20 16:13:32 +13:00 • committed by Megamouse
parent 06b0e35fb9
commit 86b3229746
1 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -196,12 +196,12 @@ u8 sky_portal::load_skylander(u8* buf, fs::file in_file)
usb_device_skylander::usb_device_skylander(const std::array<u8, 7>& location) usb_device_skylander::usb_device_skylander(const std::array<u8, 7>& location)
: usb_device_emulated(location) : usb_device_emulated(location)
{ {
device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{0x0200, 0x00, 0x00, 0x00, 0x20, 0x1430, 0x0150, 0x0100, 0x01, 0x02, 0x00, 0x01}); device = UsbDescriptorNode(USB_DESCRIPTOR_DEVICE, UsbDeviceDescriptor{0x0200, 0x00, 0x00, 0x00, 0x40, 0x1430, 0x0150, 0x0100, 0x01, 0x02, 0x00, 0x01});
auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG, UsbDeviceConfiguration{0x0029, 0x01, 0x01, 0x00, 0x80, 0x96})); auto& config0 = device.add_node(UsbDescriptorNode(USB_DESCRIPTOR_CONFIG, UsbDeviceConfiguration{0x0029, 0x01, 0x01, 0x00, 0x80, 0xFA}));
config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE, UsbDeviceInterface{0x00, 0x00, 0x02, 0x03, 0x00, 0x00, 0x00})); config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_INTERFACE, UsbDeviceInterface{0x00, 0x00, 0x02, 0x03, 0x00, 0x00, 0x00}));
config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_HID, UsbDeviceHID{0x0111, 0x00, 0x01, 0x22, 0x001d})); config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_HID, UsbDeviceHID{0x0111, 0x00, 0x01, 0x22, 0x001d}));
config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x81, 0x03, 0x0020, 0x01})); config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x81, 0x03, 0x40, 0x01}));
config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x01, 0x03, 0x0020, 0x01})); config0.add_node(UsbDescriptorNode(USB_DESCRIPTOR_ENDPOINT, UsbDeviceEndpoint{0x02, 0x03, 0x40, 0x01}));
} }
usb_device_skylander::~usb_device_skylander() usb_device_skylander::~usb_device_skylander()
@ -256,10 +256,9 @@ void usb_device_skylander::control_transfer(u8 bmRequestType, u8 bRequest, u16 w
} }
case 'L': case 'L':
{ {
// Audio Download status? // Trap Team Portal Side Lights
ensure(buf_size == 5); ensure(buf_size == 5);
q_result[0] = 0x4C; // TODO Proper Light side structs
q_queries.push(q_result);
break; break;
} }
case 'M': case 'M':
@ -268,8 +267,7 @@ void usb_device_skylander::control_transfer(u8 bmRequestType, u8 bRequest, u16 w
// Return version of 0 to prevent attempts to // Return version of 0 to prevent attempts to
// play audio on the portal // play audio on the portal
ensure(buf_size == 2); ensure(buf_size == 2);
q_result[0] = 0x4D; q_result = {0x4D, buf[1], 0x00, 0x19};
q_result[1] = buf[1];
q_queries.push(q_result); q_queries.push(q_result);
break; break;
} }
@ -335,16 +333,24 @@ void usb_device_skylander::control_transfer(u8 bmRequestType, u8 bRequest, u16 w
} }
} }
void usb_device_skylander::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpoint*/, UsbTransfer* transfer) void usb_device_skylander::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer)
{ {
ensure(buf_size == 0x20); ensure(buf_size == 0x20);
transfer->fake = true; transfer->fake = true;
transfer->expected_count = buf_size; transfer->expected_count = buf_size;
transfer->expected_result = HC_CC_NOERR; transfer->expected_result = HC_CC_NOERR;
if (endpoint == 0x02)
{
// Audio transfers are fairly quick(~1ms)
transfer->expected_time = get_timestamp() + 1000;
// The response is simply the request, echoed back
}
else
{
// Interrupt transfers are slow(~22ms) // Interrupt transfers are slow(~22ms)
transfer->expected_time = get_timestamp() + 22000; transfer->expected_time = get_timestamp() + 22000;
if (!q_queries.empty()) if (!q_queries.empty())
{ {
memcpy(buf, q_queries.front().data(), 0x20); memcpy(buf, q_queries.front().data(), 0x20);
@ -354,4 +360,5 @@ void usb_device_skylander::interrupt_transfer(u32 buf_size, u8* buf, u32 /*endpo
{ {
g_skyportal.get_status(buf); g_skyportal.get_status(buf);
} }
}
} }