sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pad: Convert to namespace

Browse Source
This commit is contained in:
Connor McLaughlin
2023-01-11 19:10:21 +10:00
parent 835834f8f4
commit 3e16746e85
6 changed files with 308 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/dma.cpp
View File

@ -447,19 +447,19 @@ enum : u32
TickCount DMA::GetTransferSliceTicks()
{
#ifdef _DEBUG
if (g_pad.IsTransmitting())
if (Pad::IsTransmitting())
{
Log_DebugPrintf("DMA transfer while transmitting pad - using lower slice size of %u vs %u",
SLICE_SIZE_WHEN_TRANSMITTING_PAD, s_max_slice_ticks);
}
#endif
return g_pad.IsTransmitting() ? SLICE_SIZE_WHEN_TRANSMITTING_PAD : s_max_slice_ticks;
return Pad::IsTransmitting() ? SLICE_SIZE_WHEN_TRANSMITTING_PAD : s_max_slice_ticks;
}
TickCount DMA::GetTransferHaltTicks()
{
return g_pad.IsTransmitting() ? HALT_TICKS_WHEN_TRANSMITTING_PAD : s_halt_ticks;
return Pad::IsTransmitting() ? HALT_TICKS_WHEN_TRANSMITTING_PAD : s_halt_ticks;
}
bool DMA::TransferChannel(Channel channel)