piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-28 09:59:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DSPAccelerator: rename MMIOPCMHalt to MMIOPCMNoInc

Browse Source
This commit is contained in:
Tillmann Karras
2025-04-24 13:50:31 +01:00
parent 7c7c179b44
commit f0bacb826a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/DSP/DSPAccelerator.cpp
View File

@ -126,7 +126,7 @@ u16 Accelerator::ReadSample(const s16* coefs)
u16 val = 0; u16 val = 0;
u8 step_size = 0; u8 step_size = 0;
s16 raw_sample; s16 raw_sample;
if (m_sample_format.decode == FormatDecode::MMIOPCMHalt || if (m_sample_format.decode == FormatDecode::MMIOPCMNoInc ||
m_sample_format.decode == FormatDecode::MMIOPCMInc) m_sample_format.decode == FormatDecode::MMIOPCMInc)
{ {
// The addresses can be complete nonsense in either of these modes // The addresses can be complete nonsense in either of these modes
@ -184,7 +184,7 @@ u16 Accelerator::ReadSample(const s16* coefs)
} }
break; break;
} }
case FormatDecode::MMIOPCMHalt: case FormatDecode::MMIOPCMNoInc:
case FormatDecode::PCM: // 16-bit PCM audio case FormatDecode::PCM: // 16-bit PCM audio
case FormatDecode::MMIOPCMInc: case FormatDecode::MMIOPCMInc:
{ {
@ -211,7 +211,7 @@ u16 Accelerator::ReadSample(const s16* coefs)
m_yn2 = m_yn1; m_yn2 = m_yn1;
m_yn1 = val; m_yn1 = val;
step_size = 2; step_size = 2;
if (m_sample_format.decode != FormatDecode::MMIOPCMHalt) if (m_sample_format.decode != FormatDecode::MMIOPCMNoInc)
{ {
m_current_address += 1; m_current_address += 1;
} }

8
Source/Core/Core/DSP/DSPAccelerator.h
View File

@ -64,10 +64,10 @@ protected:
enum class FormatDecode : u16 enum class FormatDecode : u16
{ {
ADPCM = 0, // ADPCM reads from ARAM, ACCA increments ADPCM = 0, // ADPCM reads from ARAM, ACCA increments
MMIOPCMHalt = 1, // PCM Reads from ACIN, ACCA doesn't increment MMIOPCMNoInc = 1, // PCM Reads from ACIN, ACCA doesn't increment
PCM = 2, // PCM reads from ARAM, ACCA increments PCM = 2, // PCM reads from ARAM, ACCA increments
MMIOPCMInc = 3 // PCM reads from ACIN, ACCA increments MMIOPCMInc = 3 // PCM reads from ACIN, ACCA increments
}; };
// When reading samples (at least in PCM mode), they are multiplied by the gain, then divided by // When reading samples (at least in PCM mode), they are multiplied by the gain, then divided by