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

Remove unused EXI update functions.
dolphin-emu · Jun 16, 2014 · ee690fe · ee690fe
2 parents 7416b9c + 525965a
commit ee690fe
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 41 deletions.
diff --git a/Source/Core/Core/HW/EXI.cpp b/Source/Core/Core/HW/EXI.cpp
@@ -105,14 +105,6 @@ IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex)
 	return nullptr;
 }
 
-// Unused (?!)
-void Update()
-{
-	g_Channels[0]->Update();
-	g_Channels[1]->Update();
-	g_Channels[2]->Update();
-}
-
 void UpdateInterrupts()
 {
 	// Interrupts are mapped a bit strangely:

diff --git a/Source/Core/Core/HW/EXI.h b/Source/Core/Core/HW/EXI.h
@@ -27,7 +27,6 @@ void PauseAndLock(bool doLock, bool unpauseOnUnlock);
 
 void RegisterMMIO(MMIO::Mapping* mmio, u32 base);
 
-void Update();
 void UpdateInterrupts();
 
 void ChangeDeviceCallback(u64 userdata, int cyclesLate);

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

diff --git a/Source/Core/Core/HW/EXI_Channel.h b/Source/Core/Core/HW/EXI_Channel.h
@@ -102,7 +102,6 @@ class CEXIChannel
 	// Remove all devices
 	void RemoveDevices();
 
-	void Update();
 	bool IsCausingInterrupt();
 	void DoState(PointerWrap &p);
 	void PauseAndLock(bool doLock, bool unpauseOnUnlock);

diff --git a/Source/Core/Core/HW/EXI_Device.h b/Source/Core/Core/HW/EXI_Device.h
@@ -42,9 +42,6 @@ class IEXIDevice
 	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) {}
 	virtual IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1) { return (device_type == m_deviceType) ? this : nullptr; }
 
-	// Update
-	virtual void Update() {}
-
 	// Is generating interrupt ?
 	virtual bool IsInterruptSet() {return false;}
 	virtual ~IEXIDevice() {}

diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp
@@ -60,7 +60,6 @@ CEXIMemoryCard::CEXIMemoryCard(const int index)
 	status = MC_STATUS_BUSY | MC_STATUS_UNLOCKED | MC_STATUS_READY;
 	m_uPosition = 0;
 	memset(programming_buffer, 0, sizeof(programming_buffer));
-	formatDelay = 0;
 
 	//Nintendo Memory Card EXI IDs
 	//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()
 {
 	if (interruptSwitch)
@@ -481,7 +464,6 @@ void CEXIMemoryCard::DoState(PointerWrap &p)
 		p.Do(status);
 		p.Do(m_uPosition);
 		p.Do(programming_buffer);
-		p.Do(formatDelay);
 		p.Do(m_bDirty);
 		p.Do(address);
 

diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/HW/EXI_DeviceMemoryCard.h
@@ -21,7 +21,6 @@ class CEXIMemoryCard : public IEXIDevice
 	CEXIMemoryCard(const int index);
 	virtual ~CEXIMemoryCard();
 	void SetCS(int cs) override;
-	void Update() override;
 	bool IsInterruptSet() override;
 	bool IsPresent() override;
 	void DoState(PointerWrap &p) override;
@@ -76,7 +75,6 @@ class CEXIMemoryCard : public IEXIDevice
 	int status;
 	u32 m_uPosition;
 	u8 programming_buffer[128];
-	u32 formatDelay;
 	bool m_bDirty;
 	//! memory card parameters
 	unsigned int nintendo_card_id, card_id;

diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp
@@ -63,7 +63,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
 static std::thread g_save_thread;
 
 // 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
 {