From 8da0a94ab9c7ad2ffe44aa3d91e32910837416d3 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Fri, 20 Feb 2026 15:44:56 -0600
Subject: [PATCH] SI_DeviceAMBaseboard: Add baseboard 0x70 command to
 SerialInterface::EBufferCommands enum to eliminate BaseBoardCommand enum.

---
 Source/Core/Core/HW/SI/SI_Device.h              | 1 +
 Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.cpp | 6 +++---
 Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.h   | 6 ------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Source/Core/Core/HW/SI/SI_Device.h b/Source/Core/Core/HW/SI/SI_Device.h
index c3171f42e8..d8713f9273 100644
--- a/Source/Core/Core/HW/SI/SI_Device.h
+++ b/Source/Core/Core/HW/SI/SI_Device.h
@@ -59,6 +59,7 @@ enum class EBufferCommands : u8
   CMD_ORIGIN = 0x41,
   CMD_RECALIBRATE = 0x42,
   CMD_DIRECT_KB = 0x54,
+  CMD_AM_BASEBOARD = 0x70,
   CMD_RESET = 0xFF
 };
 
diff --git a/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.cpp b/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.cpp
index ea8fb8fd6d..f221151a1b 100644
--- a/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.cpp
@@ -221,19 +221,19 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* buffer, int request_length)
   u32 buffer_position = 0;
   while (buffer_position < buffer_length)
   {
-    const auto bb_command = static_cast<BaseBoardCommand>(buffer[buffer_position]);
+    const auto bb_command = EBufferCommands(buffer[buffer_position]);
     buffer_position++;
 
     switch (bb_command)
     {
-    case BaseBoardCommand::GCAM_Reset:  // Returns ID and dip switches
+    case EBufferCommands::CMD_STATUS:  // Returns ID and dip switches
     {
       const u32 id = Common::swap32(SI_AM_BASEBOARD | 0x100);
       std::memcpy(buffer, &id, sizeof(id));
       return sizeof(id);
     }
     break;
-    case BaseBoardCommand::GCAM_Command:
+    case EBufferCommands::CMD_AM_BASEBOARD:
     {
       u32 checksum = 0;
       for (u32 i = 0; i < buffer_length; ++i)
diff --git a/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.h b/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.h
index b235de1476..4e7be13f00 100644
--- a/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.h
+++ b/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.h
@@ -47,12 +47,6 @@ public:
   void DoState(PointerWrap&) override;
 
 private:
-  enum BaseBoardCommand
-  {
-    GCAM_Reset = 0x00,
-    GCAM_Command = 0x70,
-  };
-
   enum GCAMCommand
   {
     StatusSwitches = 0x10,