piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

EXI_Channel: Change m_pDevices to m_devices

Browse Source 
Basic name change to get rid of (incorrect) Hungarian notation
This commit is contained in:
Lioncash 2016-07-15 01:43:04 -04:00
parent 642284fec4
commit 5b2ddbc4b2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Core/HW/EXI_Channel.cpp
View File

@ -30,7 +30,7 @@ CEXIChannel::CEXIChannel(u32 ChannelId)
if (m_ChannelId == 1) if (m_ChannelId == 1)
m_Status.CHIP_SELECT = 1; m_Status.CHIP_SELECT = 1;
for (auto& device : m_pDevices) for (auto& device : m_devices)
device = EXIDevice_Create(EXIDEVICE_NONE, m_ChannelId); device = EXIDevice_Create(EXIDEVICE_NONE, m_ChannelId);
} }
@ -161,7 +161,7 @@ void CEXIChannel::SendTransferComplete()
void CEXIChannel::RemoveDevices() void CEXIChannel::RemoveDevices()
{ {
for (auto& device : m_pDevices) for (auto& device : m_devices)
device.reset(nullptr); device.reset(nullptr);
} }
@ -176,7 +176,7 @@ void CEXIChannel::AddDevice(std::unique_ptr<IEXIDevice> device, const int device
_dbg_assert_(EXPANSIONINTERFACE, device_num < NUM_DEVICES); _dbg_assert_(EXPANSIONINTERFACE, device_num < NUM_DEVICES);
// Replace it with the new one // Replace it with the new one
m_pDevices[device_num] = std::move(device); m_devices[device_num] = std::move(device);
if (notify_presence_changed) if (notify_presence_changed)
{ {
@ -214,11 +214,11 @@ IEXIDevice* CEXIChannel::GetDevice(const u8 chip_select)
switch (chip_select) switch (chip_select)
{ {
case 1: case 1:
return m_pDevices[0].get(); return m_devices[0].get();
case 2: case 2:
return m_pDevices[1].get(); return m_devices[1].get();
case 4: case 4:
return m_pDevices[2].get(); return m_devices[2].get();
} }
return nullptr; return nullptr;
} }
@ -233,7 +233,7 @@ void CEXIChannel::DoState(PointerWrap& p)
for (int device_index = 0; device_index < NUM_DEVICES; ++device_index) for (int device_index = 0; device_index < NUM_DEVICES; ++device_index)
{ {
std::unique_ptr<IEXIDevice>& device = m_pDevices[device_index]; std::unique_ptr<IEXIDevice>& device = m_devices[device_index];
TEXIDevices type = device->m_deviceType; TEXIDevices type = device->m_deviceType;
p.Do(type); p.Do(type);
@ -252,13 +252,13 @@ void CEXIChannel::DoState(PointerWrap& p)
void CEXIChannel::PauseAndLock(bool doLock, bool unpauseOnUnlock) void CEXIChannel::PauseAndLock(bool doLock, bool unpauseOnUnlock)
{ {
for (auto& device : m_pDevices) for (auto& device : m_devices)
device->PauseAndLock(doLock, unpauseOnUnlock); device->PauseAndLock(doLock, unpauseOnUnlock);
} }
IEXIDevice* CEXIChannel::FindDevice(TEXIDevices device_type, int customIndex) IEXIDevice* CEXIChannel::FindDevice(TEXIDevices device_type, int customIndex)
{ {
for (auto& sup : m_pDevices) for (auto& sup : m_devices)
{ {
IEXIDevice* device = sup->FindDevice(device_type, customIndex); IEXIDevice* device = sup->FindDevice(device_type, customIndex);
if (device) if (device)

2
Source/Core/Core/HW/EXI_Channel.h
View File

@ -80,7 +80,7 @@ private:
NUM_DEVICES = 3 NUM_DEVICES = 3
}; };
std::array<std::unique_ptr<IEXIDevice>, NUM_DEVICES> m_pDevices; std::array<std::unique_ptr<IEXIDevice>, NUM_DEVICES> m_devices;
// Since channels operate a bit differently from each other // Since channels operate a bit differently from each other
u32 m_ChannelId; u32 m_ChannelId;