From 541dbdfead2a4a6cb08d1436fec1094b1a198276 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Wed, 11 Jun 2025 07:07:55 -0500
Subject: [PATCH] IOS: Move DoStateForMessage from BTEmu to BTBase.

---
 Source/Core/Core/IOS/USB/Bluetooth/BTBase.h  | 15 ++++++++++++---
 Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp | 12 ------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTBase.h b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.h
index 44cc011290..7a93f4f7d4 100644
--- a/Source/Core/Core/IOS/USB/Bluetooth/BTBase.h
+++ b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.h
@@ -3,9 +3,6 @@
 
 #pragma once
 
-#include <cstddef>
-#include <string>
-
 #include "Common/CommonTypes.h"
 #include "Core/IOS/Device.h"
 #include "Core/IOS/IOS.h"
@@ -15,6 +12,18 @@ class SysConf;
 
 namespace IOS::HLE
 {
+template <typename T>
+static void DoStateForMessage(EmulationKernel& ios, PointerWrap& p, std::unique_ptr<T>& message)
+{
+  u32 request_address = (message != nullptr) ? message->ios_request.address : 0;
+  p.Do(request_address);
+  if (request_address != 0)
+  {
+    IOCtlVRequest request{ios.GetSystem(), request_address};
+    message = std::make_unique<T>(ios, request);
+  }
+}
+
 void BackUpBTInfoSection(const SysConf* sysconf);
 void RestoreBTInfoSection(SysConf* sysconf);
 
diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp
index 8e89cc927f..000883ec3f 100644
--- a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp
+++ b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp
@@ -79,18 +79,6 @@ BluetoothEmuDevice::BluetoothEmuDevice(EmulationKernel& ios, const std::string&
 
 BluetoothEmuDevice::~BluetoothEmuDevice() = default;
 
-template <typename T>
-static void DoStateForMessage(EmulationKernel& ios, PointerWrap& p, std::unique_ptr<T>& message)
-{
-  u32 request_address = (message != nullptr) ? message->ios_request.address : 0;
-  p.Do(request_address);
-  if (request_address != 0)
-  {
-    IOCtlVRequest request{ios.GetSystem(), request_address};
-    message = std::make_unique<T>(ios, request);
-  }
-}
-
 void BluetoothEmuDevice::DoState(PointerWrap& p)
 {
   bool passthrough_bluetooth = false;