mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-01 12:32:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DVDInterface: Remove the SetLidOpen parameter

Browse Source 
The lid must always be consistent with whether a disc is inserted.
Callers shouldn't be able to set inconsistent states.
This commit is contained in:
JosJuice 2016-01-30 18:55:28 +01:00
parent 900793ef1d
commit 167d16ded6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,7 +264,7 @@ static void InsertDiscCallback(u64 userdata, s64 cyclesLate);
static void FinishExecutingCommandCallback(u64 userdata, s64 cycles_late);
void SetDiscInside(bool disc_inside);
void SetLidOpen(bool open);
void SetLidOpen();
void UpdateInterrupts();
void GenerateDIInterrupt(DIInterruptType _DVDInterrupt);
@ -507,7 +507,7 @@ bool VolumeIsValid()
void SetDiscInside(bool disc_inside)
{
SetLidOpen(!disc_inside);
SetLidOpen();
}
bool IsDiscInside()
@ -567,10 +567,10 @@ void ChangeDiscAsCPU(const std::string& new_path)
Movie::SignalDiscChange(new_path);
}
void SetLidOpen(bool open)
void SetLidOpen()
{
u32 old_value = s_DICVR.CVR;
s_DICVR.CVR = open ? 1 : 0;
s_DICVR.CVR = IsDiscInside() ? 0 : 1;
if (s_DICVR.CVR != old_value)
GenerateDIInterrupt(INT_CVRINT);
}