protocols/hw: Remove the old PmResetRequest

Signed-off-by: Dennis Bonke <[email protected]>
Dennisbonke · Oct 3, 2024 · d8948ba · d8948ba
1 parent 04b2735
commit d8948ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 25 deletions.
diff --git a/kernel/thor/system/acpi/pm-interface.cpp b/kernel/thor/system/acpi/pm-interface.cpp
@@ -56,24 +56,7 @@ struct PmInterfaceBusObject : private KernelBusObject {
 		if (preamble.error())
 			co_return Error::protocolViolation;
 
-		if(preamble.id() == bragi::message_id<managarm::hw::PmResetRequest>) {
-			auto req = bragi::parse_head_only<managarm::hw::PmResetRequest>(reqBuffer, *kernelAlloc);
-
-			if (!req) {
-				infoLogger() << "thor: Closing lane due to illegal HW request." << frg::endlog;
-				co_return Error::protocolViolation;
-			}
-
-			auto ret = uacpi_reboot();
-			if(uacpi_unlikely_error(ret))
-				infoLogger() << "thor: ACPI reset failed: " << uacpi_status_to_string(ret) << frg::endlog;
-
-#ifdef __x86_64__
-			issuePs2Reset();
-			infoLogger() << "thor: Reset using PS/2 controller failed" << frg::endlog;
-#endif
-			panicLogger() << "thor: We do not know how to reset" << frg::endlog;
-		} else if(preamble.id() == bragi::message_id<managarm::hw::RebootRequest>) {
+		if(preamble.id() == bragi::message_id<managarm::hw::RebootRequest>) {
 			auto req = bragi::parse_head_only<managarm::hw::RebootRequest>(reqBuffer, *kernelAlloc);
 
 			if(!req) {

diff --git a/protocols/hw/hw.bragi b/protocols/hw/hw.bragi
@@ -98,8 +98,10 @@ message AccessFbMemoryRequest 11 {
 head(128):
 }
 
-message PmResetRequest 12 {
+message RebootRequest 12 {
 head(128):
+	Errors error;
+	int64 cmd;
 }
 
 message SvrResponse 13 {
@@ -121,9 +123,3 @@ tail:
 		tag(8) uint32 fb_type;
 	}
 }
-
-message RebootRequest 17 {
-head(128):
-	Errors error;
-	int64 cmd;
-}