From f906785e88d330453620f9731a1abea3b6104a9b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 9 Jun 2018 15:50:20 -0400 Subject: [PATCH] WiimoteDevice: Make EventPagingChanged() a const member function This only queries internal state, it doesn't modify it. With minor adjustments to BTEmu, this also allows us to make its usage instance a constant reference. --- Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp | 4 ++-- Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h | 2 +- Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp | 2 +- Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp index df33bd99b0..7fe2ea235c 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp @@ -339,7 +339,7 @@ void BluetoothEmu::Update() // Create ACL connection if (m_HCIEndpoint && (m_ScanEnable & HCI_PAGE_SCAN_ENABLE)) { - for (auto& wiimote : m_WiiMotes) + for (const auto& wiimote : m_WiiMotes) { if (wiimote.EventPagingChanged(m_ScanEnable)) SendEventRequestConnection(wiimote); @@ -524,7 +524,7 @@ bool BluetoothEmu::SendEventConnectionComplete(const bdaddr_t& _bd) } // This is called from Update() after ScanEnable has been enabled. -bool BluetoothEmu::SendEventRequestConnection(WiimoteDevice& _rWiiMote) +bool BluetoothEmu::SendEventRequestConnection(const WiimoteDevice& _rWiiMote) { SQueuedEvent Event(sizeof(SHCIEventRequestConnection), 0); diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h index 19463e72c0..f695cfb4a1 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h +++ b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.h @@ -112,7 +112,7 @@ private: bool SendEventInquiryResponse(); bool SendEventInquiryComplete(); bool SendEventRemoteNameReq(const bdaddr_t& _bd); - bool SendEventRequestConnection(WiimoteDevice& _rWiiMote); + bool SendEventRequestConnection(const WiimoteDevice& _rWiiMote); bool SendEventConnectionComplete(const bdaddr_t& _bd); bool SendEventReadClockOffsetComplete(u16 _connectionHandle); bool SendEventConPacketTypeChange(u16 _connectionHandle, u16 _packetType); diff --git a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp index bf5f600372..9d785dd886 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp @@ -222,7 +222,7 @@ void WiimoteDevice::EventDisconnect() ResetChannels(); } -bool WiimoteDevice::EventPagingChanged(u8 page_mode) +bool WiimoteDevice::EventPagingChanged(u8 page_mode) const { return (m_ConnectionState == ConnectionState::Ready) && (page_mode & HCI_PAGE_SCAN_ENABLE); } diff --git a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.h b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.h index 6614fb3281..c1eef851cc 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.h +++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.h @@ -40,7 +40,7 @@ public: void EventConnectionAccepted(); void EventDisconnect(); - bool EventPagingChanged(u8 page_mode); + bool EventPagingChanged(u8 page_mode) const; const bdaddr_t& GetBD() const { return m_BD; } const uint8_t* GetClass() const { return uclass; }