Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skylander - Change portal version #10061

Merged
merged 3 commits into from
Apr 15, 2021
Merged

Skylander - Change portal version #10061

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
769c7bf
Skylander - Change portal version
Apr 2, 2021
366f6ff
Skylander - Traptanium portal cleanup
Apr 8, 2021
7532ac2
Merge branch 'master' into master
Megamouse Apr 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 27 additions & 2 deletions rpcs3/Emu/Io/Skylander.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,28 @@ void usb_device_skylander::control_transfer(u8 bmRequestType, u8 bRequest, u16 w
g_skyportal.set_leds(buf[1], buf[2], buf[3]);
break;
}
case 'J':
{
// Sync status from game?
ensure(buf_size == 7);
q_result[0] = 0x4A;
q_queries.push(q_result);
break;
}
case 'L':
{
// Audio Download status?
ensure(buf_size == 5);
q_result[0] = 0x4C;
q_queries.push(q_result);
break;
}
case 'M':
{
// ?
// Audio Firmware version
// Return version of 0 to prevent attempts to
// play audio on the portal
ensure(buf_size == 2);
q_result[0] = 0x4D;
q_result[1] = buf[1];
q_queries.push(q_result);
Expand All @@ -272,7 +291,7 @@ void usb_device_skylander::control_transfer(u8 bmRequestType, u8 bRequest, u16 w
// Shutdowns the portal
ensure(buf_size == 2 || buf_size == 32);
q_result = {
0x52, 0x02, 0x0A, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
0x52, 0x02, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
q_queries.push(q_result);
g_skyportal.deactivate();
break;
Expand All @@ -283,6 +302,12 @@ void usb_device_skylander::control_transfer(u8 bmRequestType, u8 bRequest, u16 w
ensure(buf_size == 1 || buf_size == 32);
break;
}
case 'V':
{
// ?
ensure(buf_size == 4);
break;
}
case 'W':
{
// Writes a block
Expand Down