From 5336c233299ab49ce5df20eb752c76d9cb44438c Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Mon, 7 Jul 2025 07:24:48 -0500
Subject: [PATCH] Core: Move HCICommandPayload struct template from BTReal to
 LibUSBBluetoothAdapter header.

---
 Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp          | 10 ----------
 .../Core/IOS/USB/Bluetooth/LibUSBBluetoothAdapter.h    |  8 ++++++++
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp
index b5a9d030a1..88dd05af28 100644
--- a/Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp
+++ b/Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp
@@ -28,16 +28,6 @@
 
 #include "VideoCommon/OnScreenDisplay.h"
 
-namespace
-{
-template <u16 Opcode, typename CommandType>
-struct HCICommandPayload
-{
-  hci_cmd_hdr_t header{Opcode, sizeof(CommandType)};
-  CommandType command{};
-};
-}  // namespace
-
 namespace IOS::HLE
 {
 
diff --git a/Source/Core/Core/IOS/USB/Bluetooth/LibUSBBluetoothAdapter.h b/Source/Core/Core/IOS/USB/Bluetooth/LibUSBBluetoothAdapter.h
index 7add7c073e..c2bd693b10 100644
--- a/Source/Core/Core/IOS/USB/Bluetooth/LibUSBBluetoothAdapter.h
+++ b/Source/Core/Core/IOS/USB/Bluetooth/LibUSBBluetoothAdapter.h
@@ -12,12 +12,20 @@
 #include "Common/Timer.h"
 #include "Common/WorkQueueThread.h"
 
+#include "Core/IOS/USB/Bluetooth/hci.h"
 #include "Core/LibusbUtils.h"
 
 struct libusb_device_handle;
 struct libusb_device_descriptor;
 struct libusb_transfer;
 
+template <u16 Opcode, typename CommandType>
+struct HCICommandPayload
+{
+  hci_cmd_hdr_t header{Opcode, sizeof(CommandType)};
+  CommandType command{};
+};
+
 class LibUSBBluetoothAdapter
 {
 public: