From c64910d9638742e9984696f1a70bb07b388d756b Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Fri, 1 Sep 2023 18:38:00 +0300
Subject: [PATCH 1/2] Reorder function in Y2R::handleSyncRequest

---
 src/core/services/y2r.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/services/y2r.cpp b/src/core/services/y2r.cpp
index 3e7507bc..3c527230 100644
--- a/src/core/services/y2r.cpp
+++ b/src/core/services/y2r.cpp
@@ -57,6 +57,10 @@ void Y2RService::handleSyncRequest(u32 messagePointer) {
 	switch (command) {
 		case Y2RCommands::DriverInitialize: driverInitialize(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::IsBusyConversion: isBusyConversion(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::StartConversion: [[likely]] startConversion(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);
 	}
 }
@@ -356,4 +356,4 @@ void Y2RService::startConversion(u32 messagePointer) {
 	if (transferEndEvent.has_value()) {
 		kernel.signalEvent(transferEndEvent.value());
 	}
-}
\ No newline at end of file
+}

From 55af70586001d3de00d29b8b1556f5f90f123013 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Fri, 1 Sep 2023 18:42:41 +0300
Subject: [PATCH 2/2] Fix clang-format stupidity

---
 src/core/services/y2r.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/core/services/y2r.cpp b/src/core/services/y2r.cpp
index 3c527230..40a6a04d 100644
--- a/src/core/services/y2r.cpp
+++ b/src/core/services/y2r.cpp
@@ -107,7 +107,9 @@ void Y2RService::driverFinalize(u32 messagePointer) {
 
 void Y2RService::getTransferEndEvent(u32 messagePointer) {
 	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 + 4, Result::Success);
@@ -284,7 +286,9 @@ void Y2RService::setInputLines(u32 messagePointer) {
 		Helpers::panic("Y2R: Invalid input line count");
 	} else {
 		// 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);
 	}
 }