From 32ef8a46a1403288c3def1df318effa5856d4f2c Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 19 Sep 2020 18:00:22 -0500 Subject: [PATCH] Core/BTEmu: Change a member variable to a local variable. --- Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp | 5 +---- Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp index e3b7cc4340..40a9ad69fa 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp @@ -102,7 +102,6 @@ void BluetoothEmu::DoState(PointerWrap& p) p.Do(m_is_active); p.Do(m_controller_bd); - DoStateForMessage(m_ios, p, m_ctrl_setup); DoStateForMessage(m_ios, p, m_hci_endpoint); DoStateForMessage(m_ios, p, m_acl_endpoint); p.Do(m_last_ticks); @@ -149,10 +148,8 @@ IPCCommandResult BluetoothEmu::IOCtlV(const IOCtlVRequest& request) { case USB::IOCTLV_USBV0_CTRLMSG: // HCI command is received from the stack { - m_ctrl_setup = std::make_unique(m_ios, request); // Replies are generated inside - ExecuteHCICommandMessage(*m_ctrl_setup); - m_ctrl_setup.reset(); + ExecuteHCICommandMessage(USB::V0CtrlMessage(m_ios, request)); send_reply = false; break; } diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h index 6a518a2180..a0367545cc 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h +++ b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h @@ -70,7 +70,6 @@ private: // this is used to trigger connecting via ACL u8 m_scan_enable = 0; - std::unique_ptr m_ctrl_setup; std::unique_ptr m_hci_endpoint; std::unique_ptr m_acl_endpoint; std::deque m_event_queue;