From 489e4c49bc9156889a34bcba3c388e352bd99db9 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 21 Jan 2017 18:42:18 -0500 Subject: [PATCH] EXI_Channel: Move private interface below public interface --- Source/Core/Core/HW/EXI/EXI_Channel.h | 52 +++++++++++++-------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Source/Core/Core/HW/EXI/EXI_Channel.h b/Source/Core/Core/HW/EXI/EXI_Channel.h index a0cb404705..4dc53b2430 100644 --- a/Source/Core/Core/HW/EXI/EXI_Channel.h +++ b/Source/Core/Core/HW/EXI/EXI_Channel.h @@ -18,6 +18,32 @@ class Mapping; class CEXIChannel { +public: + CEXIChannel(u32 ChannelId); + ~CEXIChannel(); + + // get device + IEXIDevice* GetDevice(const u8 _CHIP_SELECT); + IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex = -1); + + void RegisterMMIO(MMIO::Mapping* mmio, u32 base); + + void SendTransferComplete(); + + void AddDevice(const TEXIDevices device_type, const int device_num); + void AddDevice(std::unique_ptr device, const int device_num, + bool notify_presence_changed = true); + + // Remove all devices + void RemoveDevices(); + + bool IsCausingInterrupt(); + void DoState(PointerWrap& p); + void PauseAndLock(bool doLock, bool unpauseOnUnlock); + + // This should only be used to transition interrupts from SP1 to Channel 2 + void SetEXIINT(bool exiint) { m_Status.EXIINT = !!exiint; } + private: enum { @@ -86,30 +112,4 @@ private: // Since channels operate a bit differently from each other u32 m_ChannelId; - -public: - // get device - IEXIDevice* GetDevice(const u8 _CHIP_SELECT); - IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex = -1); - - CEXIChannel(u32 ChannelId); - ~CEXIChannel(); - - void RegisterMMIO(MMIO::Mapping* mmio, u32 base); - - void SendTransferComplete(); - - void AddDevice(const TEXIDevices device_type, const int device_num); - void AddDevice(std::unique_ptr device, const int device_num, - bool notify_presence_changed = true); - - // Remove all devices - void RemoveDevices(); - - bool IsCausingInterrupt(); - void DoState(PointerWrap& p); - void PauseAndLock(bool doLock, bool unpauseOnUnlock); - - // This should only be used to transition interrupts from SP1 to Channel 2 - void SetEXIINT(bool exiint) { m_Status.EXIINT = !!exiint; } };