From 9ea8d543431bcaf2cf4e566b1920e22d70fac128 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Wed, 4 Jan 2012 09:14:07 -0800 Subject: [PATCH] remove some code that was made unused by rca287e7957c7 --- Source/Core/Core/Src/HW/EXI.cpp | 6 ------ Source/Core/Core/Src/HW/EXI.h | 1 - Source/Core/Core/Src/HW/EXI_Channel.cpp | 6 ------ Source/Core/Core/Src/HW/EXI_Channel.h | 1 - Source/Core/Core/Src/HW/EXI_Device.h | 1 - Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp | 5 ----- Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h | 1 - Source/Core/Core/Src/HW/HW.cpp | 5 ----- Source/Core/Core/Src/HW/HW.h | 1 - Source/Core/Core/Src/State.cpp | 2 -- 10 files changed, 29 deletions(-) diff --git a/Source/Core/Core/Src/HW/EXI.cpp b/Source/Core/Core/Src/HW/EXI.cpp index 4153331ee2..8800ea6095 100644 --- a/Source/Core/Core/Src/HW/EXI.cpp +++ b/Source/Core/Core/Src/HW/EXI.cpp @@ -68,12 +68,6 @@ void DoState(PointerWrap &p) g_Channels[c]->DoState(p); } -void OnAfterLoad() -{ - for (int c = 0; c < NUM_CHANNELS; ++c) - g_Channels[c]->OnAfterLoad(); -} - void PauseAndLock(bool doLock, bool unpauseOnUnlock) { for (int c = 0; c < NUM_CHANNELS; ++c) diff --git a/Source/Core/Core/Src/HW/EXI.h b/Source/Core/Core/Src/HW/EXI.h index 2c4c9ef6dd..86134eb087 100644 --- a/Source/Core/Core/Src/HW/EXI.h +++ b/Source/Core/Core/Src/HW/EXI.h @@ -28,7 +28,6 @@ namespace ExpansionInterface void Init(); void Shutdown(); void DoState(PointerWrap &p); -void OnAfterLoad(); void PauseAndLock(bool doLock, bool unpauseOnUnlock); void Update(); diff --git a/Source/Core/Core/Src/HW/EXI_Channel.cpp b/Source/Core/Core/Src/HW/EXI_Channel.cpp index 382d83c1aa..b38009f0b1 100644 --- a/Source/Core/Core/Src/HW/EXI_Channel.cpp +++ b/Source/Core/Core/Src/HW/EXI_Channel.cpp @@ -309,12 +309,6 @@ void CEXIChannel::DoState(PointerWrap &p) } } -void CEXIChannel::OnAfterLoad() -{ - for (int d = 0; d < NUM_DEVICES; ++d) - m_pDevices[d]->OnAfterLoad(); -} - void CEXIChannel::PauseAndLock(bool doLock, bool unpauseOnUnlock) { for (int d = 0; d < NUM_DEVICES; ++d) diff --git a/Source/Core/Core/Src/HW/EXI_Channel.h b/Source/Core/Core/Src/HW/EXI_Channel.h index 4012e56896..ef6c0a4e0f 100644 --- a/Source/Core/Core/Src/HW/EXI_Channel.h +++ b/Source/Core/Core/Src/HW/EXI_Channel.h @@ -131,7 +131,6 @@ public: bool IsCausingInterrupt(); void UpdateInterrupts(); void DoState(PointerWrap &p); - void OnAfterLoad(); void PauseAndLock(bool doLock, bool unpauseOnUnlock); // This should only be used to transition interrupts from SP1 to Channel 2 diff --git a/Source/Core/Core/Src/HW/EXI_Device.h b/Source/Core/Core/Src/HW/EXI_Device.h index 9ba03e3073..630d6d224a 100644 --- a/Source/Core/Core/Src/HW/EXI_Device.h +++ b/Source/Core/Core/Src/HW/EXI_Device.h @@ -53,7 +53,6 @@ public: virtual bool IsPresent() {return false;} virtual void SetCS(int) {} virtual void DoState(PointerWrap&) {} - virtual void OnAfterLoad() {} virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) {} virtual IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1) { return (device_type == m_deviceType) ? this : NULL; } diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp index fbd1691834..6f4bc502b6 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp @@ -438,11 +438,6 @@ void CEXIMemoryCard::PauseAndLock(bool doLock, bool unpauseOnUnlock) } } -void CEXIMemoryCard::OnAfterLoad() -{ - -} - void CEXIMemoryCard::DoState(PointerWrap &p) { // for movie sync, we need to save/load memory card contents (and other data) in savestates. diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h index fb2302b8df..dfdc6349aa 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.h @@ -39,7 +39,6 @@ public: bool IsInterruptSet(); bool IsPresent(); void DoState(PointerWrap &p); - void OnAfterLoad(); void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1); diff --git a/Source/Core/Core/Src/HW/HW.cpp b/Source/Core/Core/Src/HW/HW.cpp index 0ec08b7d97..070c043166 100644 --- a/Source/Core/Core/Src/HW/HW.cpp +++ b/Source/Core/Core/Src/HW/HW.cpp @@ -116,9 +116,4 @@ namespace HW } p.DoMarker("WIIHW"); } - - void OnAfterLoad() - { - ExpansionInterface::OnAfterLoad(); - } } diff --git a/Source/Core/Core/Src/HW/HW.h b/Source/Core/Core/Src/HW/HW.h index 3c4478ac2b..cd3375d3ac 100644 --- a/Source/Core/Core/Src/HW/HW.h +++ b/Source/Core/Core/Src/HW/HW.h @@ -26,7 +26,6 @@ namespace HW void Init(); void Shutdown(); void DoState(PointerWrap &p); - void OnAfterLoad(); } #endif diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp index a5d6e5b063..8ef47467e8 100644 --- a/Source/Core/Core/Src/State.cpp +++ b/Source/Core/Core/Src/State.cpp @@ -427,8 +427,6 @@ void LoadAs(const std::string& filename) } } - HW::OnAfterLoad(); - if (g_onAfterLoadCb) g_onAfterLoadCb();