archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 19:31:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9097 from jordan-woyak/bt-emu-kill-mem-var

Browse source 
Core/BTEmu: Change a member variable to a local variable.
This commit is contained in:
Jordan Woyak 2020-09-20 08:26:32 -05:00 committed by GitHub
commit c9a1134dd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp
View file

@ -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<USB::V0CtrlMessage>(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;
}

1
Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h
View file

@ -70,7 +70,6 @@ private:
// this is used to trigger connecting via ACL
u8 m_scan_enable = 0;
std::unique_ptr<USB::V0CtrlMessage> m_ctrl_setup;
std::unique_ptr<USB::V0IntrMessage> m_hci_endpoint;
std::unique_ptr<USB::V0BulkMessage> m_acl_endpoint;
std::deque<SQueuedEvent> m_event_queue;

2
Source/Core/Core/State.cpp
View file

@ -74,7 +74,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
static std::thread g_save_thread;
// Don't forget to increase this after doing changes on the savestate system
constexpr u32 STATE_VERSION = 123; // Last changed in PR 8985
constexpr u32 STATE_VERSION = 124; // Last changed in PR 9097
// Maps savestate versions to Dolphin versions.
// Versions after 42 don't need to be added to this list,