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

Mark several DVDInterface functions as static

This commit is contained in:
Pokechu22 2020-04-13 15:58:19 -07:00
parent 4415df463f
commit e5e23c6b27
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/Core/Core/HW/DVD/DVDInterface.cpp
View File

@ -186,19 +186,19 @@ static void EjectDiscCallback(u64 userdata, s64 cyclesLate);
static void InsertDiscCallback(u64 userdata, s64 cyclesLate); static void InsertDiscCallback(u64 userdata, s64 cyclesLate);
static void FinishExecutingCommandCallback(u64 userdata, s64 cycles_late); static void FinishExecutingCommandCallback(u64 userdata, s64 cycles_late);
void SetLidOpen(); static void SetLidOpen();
void UpdateInterrupts(); static void UpdateInterrupts();
void GenerateDIInterrupt(DIInterruptType _DVDInterrupt); static void GenerateDIInterrupt(DIInterruptType dvd_interrupt);
bool ExecuteReadCommand(u64 dvd_offset, u32 output_address, u32 dvd_length, u32 output_length, static bool ExecuteReadCommand(u64 dvd_offset, u32 output_address, u32 dvd_length,
const DiscIO::Partition& partition, ReplyType reply_type, u32 output_length, const DiscIO::Partition& partition,
DIInterruptType* interrupt_type); ReplyType reply_type, DIInterruptType* interrupt_type);
u64 PackFinishExecutingCommandUserdata(ReplyType reply_type, DIInterruptType interrupt_type); static u64 PackFinishExecutingCommandUserdata(ReplyType reply_type, DIInterruptType interrupt_type);
void ScheduleReads(u64 offset, u32 length, const DiscIO::Partition& partition, u32 output_address, static void ScheduleReads(u64 offset, u32 length, const DiscIO::Partition& partition,
ReplyType reply_type); u32 output_address, ReplyType reply_type);
void DoState(PointerWrap& p) void DoState(PointerWrap& p)
{ {
@ -542,7 +542,7 @@ bool AutoChangeDisc()
return true; return true;
} }
void SetLidOpen() static void SetLidOpen()
{ {
u32 old_value = s_DICVR.CVR; u32 old_value = s_DICVR.CVR;
s_DICVR.CVR = IsDiscInside() ? 0 : 1; s_DICVR.CVR = IsDiscInside() ? 0 : 1;
@ -631,7 +631,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
MMIO::InvalidWrite<u32>()); MMIO::InvalidWrite<u32>());
} }
void UpdateInterrupts() static void UpdateInterrupts()
{ {
const bool set_mask = (s_DISR.DEINT & s_DISR.DEINTMASK) || (s_DISR.TCINT & s_DISR.TCINTMASK) || const bool set_mask = (s_DISR.DEINT & s_DISR.DEINTMASK) || (s_DISR.TCINT & s_DISR.TCINTMASK) ||
(s_DISR.BRKINT & s_DISR.BRKINTMASK) || (s_DISR.BRKINT & s_DISR.BRKINTMASK) ||
@ -643,7 +643,7 @@ void UpdateInterrupts()
CoreTiming::ForceExceptionCheck(50); CoreTiming::ForceExceptionCheck(50);
} }
void GenerateDIInterrupt(DIInterruptType dvd_interrupt) static void GenerateDIInterrupt(DIInterruptType dvd_interrupt)
{ {
switch (dvd_interrupt) switch (dvd_interrupt)
{ {
@ -735,9 +735,9 @@ static bool CheckReadPreconditions()
} }
// Iff false is returned, ScheduleEvent must be used to finish executing the command // Iff false is returned, ScheduleEvent must be used to finish executing the command
bool ExecuteReadCommand(u64 dvd_offset, u32 output_address, u32 dvd_length, u32 output_length, static bool ExecuteReadCommand(u64 dvd_offset, u32 output_address, u32 dvd_length,
const DiscIO::Partition& partition, ReplyType reply_type, u32 output_length, const DiscIO::Partition& partition,
DIInterruptType* interrupt_type) ReplyType reply_type, DIInterruptType* interrupt_type)
{ {
if (!CheckReadPreconditions()) if (!CheckReadPreconditions())
{ {
@ -1244,7 +1244,7 @@ void AudioBufferConfig(bool enable_dtk, u8 dtk_buffer_length)
INFO_LOG(DVDINTERFACE, "DTK disabled"); INFO_LOG(DVDINTERFACE, "DTK disabled");
} }
u64 PackFinishExecutingCommandUserdata(ReplyType reply_type, DIInterruptType interrupt_type) static u64 PackFinishExecutingCommandUserdata(ReplyType reply_type, DIInterruptType interrupt_type)
{ {
return (static_cast<u64>(reply_type) << 32) + static_cast<u32>(interrupt_type); return (static_cast<u64>(reply_type) << 32) + static_cast<u32>(interrupt_type);
} }
@ -1317,8 +1317,8 @@ void FinishExecutingCommand(ReplyType reply_type, DIInterruptType interrupt_type
// Determines from a given read request how much of the request is buffered, // Determines from a given read request how much of the request is buffered,
// and how much is required to be read from disc. // and how much is required to be read from disc.
void ScheduleReads(u64 offset, u32 length, const DiscIO::Partition& partition, u32 output_address, static void ScheduleReads(u64 offset, u32 length, const DiscIO::Partition& partition,
ReplyType reply_type) u32 output_address, ReplyType reply_type)
{ {
// The drive continues to read 1 MiB beyond the last read position when idle. // The drive continues to read 1 MiB beyond the last read position when idle.
// If a future read falls within this window, part of the read may be returned // If a future read falls within this window, part of the read may be returned