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

DVDInterface: Reorder variables 

Might as well do this while I'm already breaking
savestate compatibility.
This commit is contained in:
JosJuice 2016-08-14 17:17:01 +02:00
parent 98fb037dee
commit f1879cc356
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Core/Core/HW/DVDInterface.cpp
View File

@ -218,7 +218,8 @@ union UDICFG {
static std::unique_ptr<DiscIO::IVolume> s_inserted_volume; static std::unique_ptr<DiscIO::IVolume> s_inserted_volume;
// STATE_TO_SAVE // STATE_TO_SAVE
// hardware registers
// Hardware registers
static UDISR s_DISR; static UDISR s_DISR;
static UDICVR s_DICVR; static UDICVR s_DICVR;
static UDICMDBUF s_DICMDBUF[3]; static UDICMDBUF s_DICMDBUF[3];
@ -228,6 +229,9 @@ static UDICR s_DICR;
static UDIIMMBUF s_DIIMMBUF; static UDIIMMBUF s_DIIMMBUF;
static UDICFG s_DICFG; static UDICFG s_DICFG;
// DTK
static bool s_stream = false;
static bool s_stop_at_track_end = false;
static u64 s_audio_position; static u64 s_audio_position;
static u64 s_current_start; static u64 s_current_start;
static u32 s_current_length; static u32 s_current_length;
@ -235,17 +239,19 @@ static u64 s_next_start;
static u32 s_next_length; static u32 s_next_length;
static u32 s_pending_samples; static u32 s_pending_samples;
// Disc drive state
static u32 s_error_code = 0; static u32 s_error_code = 0;
static bool s_disc_inside = false; static bool s_disc_inside = false;
static bool s_stream = false;
static bool s_stop_at_track_end = false;
static CoreTiming::EventType* s_finish_executing_command;
// Disc drive timing
static u64 s_last_read_offset; static u64 s_last_read_offset;
static u64 s_last_read_time; static u64 s_last_read_time;
// Disc changing
static std::string s_disc_path_to_insert; static std::string s_disc_path_to_insert;
// Events
static CoreTiming::EventType* s_finish_executing_command;
static CoreTiming::EventType* s_eject_disc; static CoreTiming::EventType* s_eject_disc;
static CoreTiming::EventType* s_insert_disc; static CoreTiming::EventType* s_insert_disc;
@ -278,26 +284,23 @@ void DoState(PointerWrap& p)
p.Do(s_DIIMMBUF); p.Do(s_DIIMMBUF);
p.DoPOD(s_DICFG); p.DoPOD(s_DICFG);
p.Do(s_next_start); p.Do(s_stream);
p.Do(s_stop_at_track_end);
p.Do(s_audio_position); p.Do(s_audio_position);
p.Do(s_current_start);
p.Do(s_current_length);
p.Do(s_next_start);
p.Do(s_next_length); p.Do(s_next_length);
p.Do(s_pending_samples);
p.Do(s_error_code); p.Do(s_error_code);
p.Do(s_disc_inside); p.Do(s_disc_inside);
p.Do(s_stream);
p.Do(s_current_start);
p.Do(s_current_length);
p.Do(s_pending_samples);
p.Do(s_last_read_offset); p.Do(s_last_read_offset);
p.Do(s_last_read_time); p.Do(s_last_read_time);
p.Do(s_disc_path_to_insert); p.Do(s_disc_path_to_insert);
p.Do(s_stop_at_track_end);
DVDThread::DoState(p); DVDThread::DoState(p);
// s_inserted_volume isn't savestated (because it points to // s_inserted_volume isn't savestated (because it points to
@ -419,6 +422,8 @@ void Init()
s_DICFG.Hex = 0; s_DICFG.Hex = 0;
s_DICFG.CONFIG = 1; // Disable bootrom descrambler s_DICFG.CONFIG = 1; // Disable bootrom descrambler
s_stream = false;
s_stop_at_track_end = false;
s_audio_position = 0; s_audio_position = 0;
s_next_start = 0; s_next_start = 0;
s_next_length = 0; s_next_length = 0;
@ -428,8 +433,6 @@ void Init()
s_error_code = 0; s_error_code = 0;
s_disc_inside = false; s_disc_inside = false;
s_stream = false;
s_stop_at_track_end = false;
s_last_read_offset = 0; s_last_read_offset = 0;
s_last_read_time = 0; s_last_read_time = 0;