From 9c3b35fccb54440140c51eb19671fa23757dffd8 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 16 Mar 2017 02:04:19 -0400
Subject: [PATCH] EXI: Move enum constants into the ExpansionInterface
 namespace

Given these are related to EXI itself, these should be within the
namespace itself.
---
 Source/Core/Core/BootManager.cpp | 6 +++---
 Source/Core/Core/HW/EXI/EXI.h    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp
index 3e42fe9ec8..42e5351aac 100644
--- a/Source/Core/Core/BootManager.cpp
+++ b/Source/Core/Core/BootManager.cpp
@@ -62,7 +62,7 @@ public:
   bool bSetVolume;
   std::array<bool, MAX_BBMOTES> bSetWiimoteSource;
   std::array<bool, SerialInterface::MAX_SI_CHANNELS> bSetPads;
-  std::array<bool, MAX_EXI_CHANNELS> bSetEXIDevice;
+  std::array<bool, ExpansionInterface::MAX_EXI_CHANNELS> bSetEXIDevice;
 
 private:
   bool valid;
@@ -93,7 +93,7 @@ private:
   std::string m_strGPUDeterminismMode;
   std::array<int, MAX_BBMOTES> iWiimoteSource;
   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)
@@ -189,7 +189,7 @@ void ConfigCache::RestoreConfig(SConfig* config)
   if (bSetEmulationSpeed)
     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])
       config->m_EXIDevice[i] = m_EXIDevice[i];
diff --git a/Source/Core/Core/HW/EXI/EXI.h b/Source/Core/Core/HW/EXI/EXI.h
index 9476e10c16..abaf435c7a 100644
--- a/Source/Core/Core/HW/EXI/EXI.h
+++ b/Source/Core/Core/HW/EXI/EXI.h
@@ -19,14 +19,14 @@ namespace MMIO
 class Mapping;
 }
 
+namespace ExpansionInterface
+{
 enum
 {
   MAX_MEMORYCARD_SLOTS = 2,
   MAX_EXI_CHANNELS = 3
 };
 
-namespace ExpansionInterface
-{
 void Init();
 void Shutdown();
 void DoState(PointerWrap& p);