ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7105 from lioncash/cast 

WiimoteDevice: Remove unnecessary cast
This commit is contained in:
Markus Wick 2018-06-10 17:57:45 +02:00 committed by GitHub
parent 69f079b371 0d0f58005b
commit 88f8df0ad9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
View File

@ -271,14 +271,14 @@ void WiimoteDevice::ExecuteL2capCmd(u8* _pData, u32 _Size)
{ {
DEBUG_ASSERT_MSG(IOS_WIIMOTE, DoesChannelExist(pHeader->dcid), DEBUG_ASSERT_MSG(IOS_WIIMOTE, DoesChannelExist(pHeader->dcid),
"L2CAP: SendACLPacket to unknown channel %i", pHeader->dcid); "L2CAP: SendACLPacket to unknown channel %i", pHeader->dcid);
CChannelMap::iterator itr = m_Channel.find(pHeader->dcid);
const auto itr = m_Channel.find(pHeader->dcid);
const int number = m_ConnectionHandle & 0xFF; const int number = m_ConnectionHandle & 0xFF;
if (itr != m_Channel.end()) if (itr != m_Channel.end())
{ {
SChannel& rChannel = itr->second; const SChannel& channel = itr->second;
switch (rChannel.PSM) switch (channel.PSM)
{ {
case L2CAP_PSM_SDP: case L2CAP_PSM_SDP:
HandleSDP(pHeader->dcid, pData, DataSize); HandleSDP(pHeader->dcid, pData, DataSize);
@ -295,8 +295,8 @@ void WiimoteDevice::ExecuteL2capCmd(u8* _pData, u32 _Size)
{ {
DEBUG_LOG(WIIMOTE, "Wiimote_InterruptChannel"); DEBUG_LOG(WIIMOTE, "Wiimote_InterruptChannel");
DEBUG_LOG(WIIMOTE, " Channel ID: %04x", pHeader->dcid); DEBUG_LOG(WIIMOTE, " Channel ID: %04x", pHeader->dcid);
std::string Temp = ArrayToString((const u8*)pData, DataSize); const std::string temp = ArrayToString(pData, DataSize);
DEBUG_LOG(WIIMOTE, " Data: %s", Temp.c_str()); DEBUG_LOG(WIIMOTE, " Data: %s", temp.c_str());
Wiimote::InterruptChannel(number, pHeader->dcid, pData, DataSize); Wiimote::InterruptChannel(number, pHeader->dcid, pData, DataSize);
} }
@ -304,7 +304,7 @@ void WiimoteDevice::ExecuteL2capCmd(u8* _pData, u32 _Size)
break; break;
default: default:
ERROR_LOG(IOS_WIIMOTE, "Channel 0x04%x has unknown PSM %x", pHeader->dcid, rChannel.PSM); ERROR_LOG(IOS_WIIMOTE, "Channel 0x04%x has unknown PSM %x", pHeader->dcid, channel.PSM);
break; break;
} }
} }