moonpower/P3DS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #248 from wheremyfoodat/wheremyfoodat-patch-1

Browse Source 
Reorder functions in Y2R::handleSyncRequest
This commit is contained in:
wheremyfoodat
2023-09-01 18:54:16 +03:00
committed by GitHub
parent 5261a4c927 55af705860
commit bc19aa8e3c
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/services/y2r.cpp
View File

@@ -57,6 +57,10 @@ void Y2RService::handleSyncRequest(u32 messagePointer) {
switch (command) { switch (command) {
case Y2RCommands::DriverInitialize: driverInitialize(messagePointer); break; case Y2RCommands::DriverInitialize: driverInitialize(messagePointer); break;
case Y2RCommands::DriverFinalize: driverFinalize(messagePointer); break; case Y2RCommands::DriverFinalize: driverFinalize(messagePointer); break;
case Y2RCommands::GetBlockAlignment: getBlockAlignment(messagePointer); break;
case Y2RCommands::GetInputLines: getInputLines(messagePointer); break;
case Y2RCommands::GetInputLineWidth: getInputLineWidth(messagePointer); break;
case Y2RCommands::GetOutputFormat: getOutputFormat(messagePointer); break;
case Y2RCommands::GetTransferEndEvent: getTransferEndEvent(messagePointer); break; case Y2RCommands::GetTransferEndEvent: getTransferEndEvent(messagePointer); break;
case Y2RCommands::IsBusyConversion: isBusyConversion(messagePointer); break; case Y2RCommands::IsBusyConversion: isBusyConversion(messagePointer); break;
case Y2RCommands::PingProcess: pingProcess(messagePointer); break; case Y2RCommands::PingProcess: pingProcess(messagePointer); break;
@@ -78,10 +82,6 @@ void Y2RService::handleSyncRequest(u32 messagePointer) {
case Y2RCommands::SetTransferEndInterrupt: setTransferEndInterrupt(messagePointer); break; case Y2RCommands::SetTransferEndInterrupt: setTransferEndInterrupt(messagePointer); break;
case Y2RCommands::StartConversion: [[likely]] startConversion(messagePointer); break; case Y2RCommands::StartConversion: [[likely]] startConversion(messagePointer); break;
case Y2RCommands::StopConversion: stopConversion(messagePointer); break; case Y2RCommands::StopConversion: stopConversion(messagePointer); break;
case Y2RCommands::GetBlockAlignment: getBlockAlignment(messagePointer); break;
case Y2RCommands::GetInputLines: getInputLines(messagePointer); break;
case Y2RCommands::GetInputLineWidth: getInputLineWidth(messagePointer); break;
case Y2RCommands::GetOutputFormat: getOutputFormat(messagePointer); break;
default: Helpers::panic("Y2R service requested. Command: %08X\n", command); default: Helpers::panic("Y2R service requested. Command: %08X\n", command);
} }
} }
@@ -107,7 +107,9 @@ void Y2RService::driverFinalize(u32 messagePointer) {
void Y2RService::getTransferEndEvent(u32 messagePointer) { void Y2RService::getTransferEndEvent(u32 messagePointer) {
log("Y2R::GetTransferEndEvent\n"); log("Y2R::GetTransferEndEvent\n");
if (!transferEndEvent.has_value()) transferEndEvent = kernel.makeEvent(ResetType::OneShot); if (!transferEndEvent.has_value()) {
transferEndEvent = kernel.makeEvent(ResetType::OneShot);
}
mem.write32(messagePointer, IPC::responseHeader(0xF, 1, 2)); mem.write32(messagePointer, IPC::responseHeader(0xF, 1, 2));
mem.write32(messagePointer + 4, Result::Success); mem.write32(messagePointer + 4, Result::Success);
@@ -284,7 +286,9 @@ void Y2RService::setInputLines(u32 messagePointer) {
Helpers::panic("Y2R: Invalid input line count"); Helpers::panic("Y2R: Invalid input line count");
} else { } else {
// According to Citra, the Y2R module seems to accidentally skip setting the line # if it's 1024 // According to Citra, the Y2R module seems to accidentally skip setting the line # if it's 1024
if (lines != 1024) inputLines = lines; if (lines != 1024) {
inputLines = lines;
}
mem.write32(messagePointer + 4, Result::Success); mem.write32(messagePointer + 4, Result::Success);
} }
} }