ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ProcessorInterface: Remove unused fields

This commit is contained in:
Pokechu22 2022-07-20 17:27:37 -07:00
parent 76fd0479b8
commit b76f4dd5f8
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/Core/HW/ProcessorInterface.cpp
View File

@ -22,6 +22,10 @@
namespace ProcessorInterface namespace ProcessorInterface
{ {
constexpr u32 FLIPPER_REV_A = 0x046500B0;
constexpr u32 FLIPPER_REV_B = 0x146500B1;
constexpr u32 FLIPPER_REV_C = 0x246500B1;
// STATE_TO_SAVE // STATE_TO_SAVE
u32 m_InterruptCause; u32 m_InterruptCause;
u32 m_InterruptMask; u32 m_InterruptMask;
@ -30,10 +34,7 @@ u32 Fifo_CPUBase;
u32 Fifo_CPUEnd; u32 Fifo_CPUEnd;
u32 Fifo_CPUWritePointer; u32 Fifo_CPUWritePointer;
static u32 m_Fifo_Reset;
static u32 m_ResetCode; static u32 m_ResetCode;
static u32 m_FlipperRev;
static u32 m_Unknown;
// ID and callback for scheduling reset button presses/releases // ID and callback for scheduling reset button presses/releases
static CoreTiming::EventType* toggleResetButton; static CoreTiming::EventType* toggleResetButton;
@ -55,10 +56,7 @@ void DoState(PointerWrap& p)
p.Do(Fifo_CPUBase); p.Do(Fifo_CPUBase);
p.Do(Fifo_CPUEnd); p.Do(Fifo_CPUEnd);
p.Do(Fifo_CPUWritePointer); p.Do(Fifo_CPUWritePointer);
p.Do(m_Fifo_Reset);
p.Do(m_ResetCode); p.Do(m_ResetCode);
p.Do(m_FlipperRev);
p.Do(m_Unknown);
} }
void Init() void Init()
@ -69,13 +67,6 @@ void Init()
Fifo_CPUBase = 0; Fifo_CPUBase = 0;
Fifo_CPUEnd = 0; Fifo_CPUEnd = 0;
Fifo_CPUWritePointer = 0; Fifo_CPUWritePointer = 0;
/*
Previous Flipper IDs:
0x046500B0 = A
0x146500B1 = B
*/
m_FlipperRev = 0x246500B1; // revision C
m_Unknown = 0;
m_ResetCode = 0; // Cold reset m_ResetCode = 0; // Cold reset
m_InterruptCause = INT_CAUSE_RST_BUTTON | INT_CAUSE_VI; m_InterruptCause = INT_CAUSE_RST_BUTTON | INT_CAUSE_VI;
@ -131,7 +122,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
} }
})); }));
mmio->Register(base | PI_FLIPPER_REV, MMIO::DirectRead<u32>(&m_FlipperRev), mmio->Register(base | PI_FLIPPER_REV, MMIO::Constant<u32>(FLIPPER_REV_C),
MMIO::InvalidWrite<u32>()); MMIO::InvalidWrite<u32>());
// 16 bit reads are based on 32 bit reads. // 16 bit reads are based on 32 bit reads.

2
Source/Core/Core/State.cpp
View File

@ -74,7 +74,7 @@ static std::recursive_mutex g_save_thread_mutex;
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
constexpr u32 STATE_VERSION = 145; // Last changed in PR 10879 constexpr u32 STATE_VERSION = 146; // Last changed in PR 10883
// Maps savestate versions to Dolphin versions. // Maps savestate versions to Dolphin versions.
// Versions after 42 don't need to be added to this list, // Versions after 42 don't need to be added to this list,