Merge pull request #468 from RachelBryk/remove-exi-update

Remove unused EXI update functions.
This commit is contained in:
Ryan Houdek 2014-06-16 16:36:13 -05:00
commit ee690fe401
8 changed files with 1 additions and 41 deletions

View File

@ -105,14 +105,6 @@ IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex)
return nullptr; return nullptr;
} }
// Unused (?!)
void Update()
{
g_Channels[0]->Update();
g_Channels[1]->Update();
g_Channels[2]->Update();
}
void UpdateInterrupts() void UpdateInterrupts()
{ {
// Interrupts are mapped a bit strangely: // Interrupts are mapped a bit strangely:

View File

@ -27,7 +27,6 @@ void PauseAndLock(bool doLock, bool unpauseOnUnlock);
void RegisterMMIO(MMIO::Mapping* mmio, u32 base); void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
void Update();
void UpdateInterrupts(); void UpdateInterrupts();
void ChangeDeviceCallback(u64 userdata, int cyclesLate); void ChangeDeviceCallback(u64 userdata, int cyclesLate);

View File

@ -219,13 +219,6 @@ IEXIDevice* CEXIChannel::GetDevice(const u8 chip_select)
return nullptr; return nullptr;
} }
void CEXIChannel::Update()
{
// start the transfer
for (auto& device : m_pDevices)
device->Update();
}
void CEXIChannel::DoState(PointerWrap &p) void CEXIChannel::DoState(PointerWrap &p)
{ {
p.DoPOD(m_Status); p.DoPOD(m_Status);

View File

@ -102,7 +102,6 @@ public:
// Remove all devices // Remove all devices
void RemoveDevices(); void RemoveDevices();
void Update();
bool IsCausingInterrupt(); bool IsCausingInterrupt();
void DoState(PointerWrap &p); void DoState(PointerWrap &p);
void PauseAndLock(bool doLock, bool unpauseOnUnlock); void PauseAndLock(bool doLock, bool unpauseOnUnlock);

View File

@ -42,9 +42,6 @@ public:
virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) {} virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) {}
virtual IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1) { return (device_type == m_deviceType) ? this : nullptr; } virtual IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1) { return (device_type == m_deviceType) ? this : nullptr; }
// Update
virtual void Update() {}
// Is generating interrupt ? // Is generating interrupt ?
virtual bool IsInterruptSet() {return false;} virtual bool IsInterruptSet() {return false;}
virtual ~IEXIDevice() {} virtual ~IEXIDevice() {}

View File

@ -60,7 +60,6 @@ CEXIMemoryCard::CEXIMemoryCard(const int index)
status = MC_STATUS_BUSY | MC_STATUS_UNLOCKED | MC_STATUS_READY; status = MC_STATUS_BUSY | MC_STATUS_UNLOCKED | MC_STATUS_READY;
m_uPosition = 0; m_uPosition = 0;
memset(programming_buffer, 0, sizeof(programming_buffer)); memset(programming_buffer, 0, sizeof(programming_buffer));
formatDelay = 0;
//Nintendo Memory Card EXI IDs //Nintendo Memory Card EXI IDs
//0x00000004 Memory Card 59 4Mbit //0x00000004 Memory Card 59 4Mbit
@ -272,22 +271,6 @@ void CEXIMemoryCard::SetCS(int cs)
} }
} }
void CEXIMemoryCard::Update()
{
if (formatDelay)
{
formatDelay--;
if (!formatDelay)
{
status |= MC_STATUS_READY;
status &= ~MC_STATUS_BUSY;
m_bInterruptSet = 1;
}
}
}
bool CEXIMemoryCard::IsInterruptSet() bool CEXIMemoryCard::IsInterruptSet()
{ {
if (interruptSwitch) if (interruptSwitch)
@ -481,7 +464,6 @@ void CEXIMemoryCard::DoState(PointerWrap &p)
p.Do(status); p.Do(status);
p.Do(m_uPosition); p.Do(m_uPosition);
p.Do(programming_buffer); p.Do(programming_buffer);
p.Do(formatDelay);
p.Do(m_bDirty); p.Do(m_bDirty);
p.Do(address); p.Do(address);

View File

@ -21,7 +21,6 @@ public:
CEXIMemoryCard(const int index); CEXIMemoryCard(const int index);
virtual ~CEXIMemoryCard(); virtual ~CEXIMemoryCard();
void SetCS(int cs) override; void SetCS(int cs) override;
void Update() override;
bool IsInterruptSet() override; bool IsInterruptSet() override;
bool IsPresent() override; bool IsPresent() override;
void DoState(PointerWrap &p) override; void DoState(PointerWrap &p) override;
@ -76,7 +75,6 @@ private:
int status; int status;
u32 m_uPosition; u32 m_uPosition;
u8 programming_buffer[128]; u8 programming_buffer[128];
u32 formatDelay;
bool m_bDirty; bool m_bDirty;
//! memory card parameters //! memory card parameters
unsigned int nintendo_card_id, card_id; unsigned int nintendo_card_id, card_id;

View File

@ -63,7 +63,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
static std::thread g_save_thread; static std::thread g_save_thread;
// Don't forget to increase this after doing changes on the savestate system // Don't forget to increase this after doing changes on the savestate system
static const u32 STATE_VERSION = 22; static const u32 STATE_VERSION = 23;
enum enum
{ {