From fbe8ca97199b6d0e1f0d7745c4a786935345d405 Mon Sep 17 00:00:00 2001 From: zilmar Date: Thu, 14 Jan 2016 08:29:55 +1100 Subject: [PATCH] [Project64] Clean up PifRam.h --- Source/Project64-core/N64System/Mips/PifRam.h | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/Source/Project64-core/N64System/Mips/PifRam.h b/Source/Project64-core/N64System/Mips/PifRam.h index b70c02105..c9911d4a3 100644 --- a/Source/Project64-core/N64System/Mips/PifRam.h +++ b/Source/Project64-core/N64System/Mips/PifRam.h @@ -16,48 +16,47 @@ class CPifRamSettings { protected: - CPifRamSettings(); - virtual ~CPifRamSettings(); - - bool bShowPifRamErrors() const - { - return m_bShowPifRamErrors; - } + CPifRamSettings(); + virtual ~CPifRamSettings(); + + bool bShowPifRamErrors() const + { + return m_bShowPifRamErrors; + } private: - static void RefreshSettings(void*); - - static bool m_bShowPifRamErrors; + static void RefreshSettings(void*); - static int m_RefCount; + static bool m_bShowPifRamErrors; + static int m_RefCount; }; class CPifRam : public CLogging, - private CPifRamSettings, - private CEeprom + private CPifRamSettings, + private CEeprom { public: - CPifRam(bool SavesReadOnly); - ~CPifRam(); + CPifRam(bool SavesReadOnly); + ~CPifRam(); - void Reset(); + void Reset(); - void PifRamWrite(); - void PifRamRead(); + void PifRamWrite(); + void PifRamRead(); - void SI_DMA_READ(); - void SI_DMA_WRITE(); + void SI_DMA_READ(); + void SI_DMA_WRITE(); protected: uint8_t m_PifRom[0x7C0]; uint8_t m_PifRam[0x40]; private: - #define CHALLENGE_LENGTH 0x20 - void ProcessControllerCommand ( int Control, uint8_t * Command ); - void ReadControllerCommand ( int Control, uint8_t * Command ); - void LogControllerPakData ( char * Description ); - void n64_cic_nus_6105 (char challenge[], char response[], int length); +#define CHALLENGE_LENGTH 0x20 + void ProcessControllerCommand(int Control, uint8_t * Command); + void ReadControllerCommand(int Control, uint8_t * Command); + void LogControllerPakData(char * Description); + void n64_cic_nus_6105(char challenge[], char response[], int length); };