[Project64] Clean up PifRam.h

This commit is contained in:
zilmar 2016-01-14 08:29:55 +11:00
parent aea724b81a
commit fbe8ca9719
1 changed files with 24 additions and 25 deletions

View File

@ -16,48 +16,47 @@
class CPifRamSettings class CPifRamSettings
{ {
protected: protected:
CPifRamSettings(); CPifRamSettings();
virtual ~CPifRamSettings(); virtual ~CPifRamSettings();
bool bShowPifRamErrors() const bool bShowPifRamErrors() const
{ {
return m_bShowPifRamErrors; return m_bShowPifRamErrors;
} }
private: private:
static void RefreshSettings(void*); static void RefreshSettings(void*);
static bool m_bShowPifRamErrors;
static int m_RefCount; static bool m_bShowPifRamErrors;
static int m_RefCount;
}; };
class CPifRam : class CPifRam :
public CLogging, public CLogging,
private CPifRamSettings, private CPifRamSettings,
private CEeprom private CEeprom
{ {
public: public:
CPifRam(bool SavesReadOnly); CPifRam(bool SavesReadOnly);
~CPifRam(); ~CPifRam();
void Reset(); void Reset();
void PifRamWrite(); void PifRamWrite();
void PifRamRead(); void PifRamRead();
void SI_DMA_READ(); void SI_DMA_READ();
void SI_DMA_WRITE(); void SI_DMA_WRITE();
protected: protected:
uint8_t m_PifRom[0x7C0]; uint8_t m_PifRom[0x7C0];
uint8_t m_PifRam[0x40]; uint8_t m_PifRam[0x40];
private: private:
#define CHALLENGE_LENGTH 0x20 #define CHALLENGE_LENGTH 0x20
void ProcessControllerCommand ( int Control, uint8_t * Command ); void ProcessControllerCommand(int Control, uint8_t * Command);
void ReadControllerCommand ( int Control, uint8_t * Command ); void ReadControllerCommand(int Control, uint8_t * Command);
void LogControllerPakData ( char * Description ); void LogControllerPakData(char * Description);
void n64_cic_nus_6105 (char challenge[], char response[], int length); void n64_cic_nus_6105(char challenge[], char response[], int length);
}; };