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

EXI: Move enum constants into the ExpansionInterface namespace 

Given these are related to EXI itself, these should be within the
namespace itself.
This commit is contained in:
Lioncash 2017-03-16 02:04:19 -04:00
parent a728d858b3
commit 9c3b35fccb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/BootManager.cpp
View File

@ -62,7 +62,7 @@ public:
bool bSetVolume; bool bSetVolume;
std::array<bool, MAX_BBMOTES> bSetWiimoteSource; std::array<bool, MAX_BBMOTES> bSetWiimoteSource;
std::array<bool, SerialInterface::MAX_SI_CHANNELS> bSetPads; std::array<bool, SerialInterface::MAX_SI_CHANNELS> bSetPads;
std::array<bool, MAX_EXI_CHANNELS> bSetEXIDevice; std::array<bool, ExpansionInterface::MAX_EXI_CHANNELS> bSetEXIDevice;
private: private:
bool valid; bool valid;
@ -93,7 +93,7 @@ private:
std::string m_strGPUDeterminismMode; std::string m_strGPUDeterminismMode;
std::array<int, MAX_BBMOTES> iWiimoteSource; std::array<int, MAX_BBMOTES> iWiimoteSource;
std::array<SIDevices, SerialInterface::MAX_SI_CHANNELS> Pads; std::array<SIDevices, SerialInterface::MAX_SI_CHANNELS> Pads;
std::array<TEXIDevices, MAX_EXI_CHANNELS> m_EXIDevice; std::array<TEXIDevices, ExpansionInterface::MAX_EXI_CHANNELS> m_EXIDevice;
}; };
void ConfigCache::SaveConfig(const SConfig& config) void ConfigCache::SaveConfig(const SConfig& config)
@ -189,7 +189,7 @@ void ConfigCache::RestoreConfig(SConfig* config)
if (bSetEmulationSpeed) if (bSetEmulationSpeed)
config->m_EmulationSpeed = m_EmulationSpeed; config->m_EmulationSpeed = m_EmulationSpeed;
for (unsigned int i = 0; i < MAX_EXI_CHANNELS; ++i) for (unsigned int i = 0; i < ExpansionInterface::MAX_EXI_CHANNELS; ++i)
{ {
if (bSetEXIDevice[i]) if (bSetEXIDevice[i])
config->m_EXIDevice[i] = m_EXIDevice[i]; config->m_EXIDevice[i] = m_EXIDevice[i];

4
Source/Core/Core/HW/EXI/EXI.h
View File

@ -19,14 +19,14 @@ namespace MMIO
class Mapping; class Mapping;
} }
namespace ExpansionInterface
{
enum enum
{ {
MAX_MEMORYCARD_SLOTS = 2, MAX_MEMORYCARD_SLOTS = 2,
MAX_EXI_CHANNELS = 3 MAX_EXI_CHANNELS = 3
}; };
namespace ExpansionInterface
{
void Init(); void Init();
void Shutdown(); void Shutdown();
void DoState(PointerWrap& p); void DoState(PointerWrap& p);