AudioInterface: Amend variable naming
Normalizes variable names to conform to our coding conventions. Previously we were signifying some variables as externally linked globals, which wasn't the case.
This commit is contained in:
Lioncash
parent
4fb2d580d8
commit
b59cda1435
|
|
@ -106,53 +106,54 @@ union AIVR
|
|||
|
||||
// STATE_TO_SAVE
|
||||
// Registers
|
||||
static AICR m_Control;
|
||||
static AIVR m_Volume;
|
||||
static u32 m_SampleCounter = 0;
|
||||
static u32 m_InterruptTiming = 0;
|
||||
static AICR s_control;
|
||||
static AIVR s_volume;
|
||||
static u32 s_sample_counter = 0;
|
||||
static u32 s_interrupt_timing = 0;
|
||||
|
||||
static u64 g_LastCPUTime = 0;
|
||||
static u64 g_CPUCyclesPerSample = 0xFFFFFFFFFFFULL;
|
||||
static u64 s_last_cpu_time = 0;
|
||||
static u64 s_cpu_cycles_per_sample = 0xFFFFFFFFFFFULL;
|
||||
|
||||
static unsigned int g_AISSampleRate = 48000;
|
||||
static unsigned int g_AIDSampleRate = 32000;
|
||||
static u32 s_ais_sample_rate = 48000;
|
||||
static u32 s_aid_sample_rate = 32000;
|
||||
|
||||
void DoState(PointerWrap& p)
|
||||
{
|
||||
p.DoPOD(m_Control);
|
||||
p.DoPOD(m_Volume);
|
||||
p.Do(m_SampleCounter);
|
||||
p.Do(m_InterruptTiming);
|
||||
p.Do(g_LastCPUTime);
|
||||
p.Do(g_AISSampleRate);
|
||||
p.Do(g_AIDSampleRate);
|
||||
p.Do(g_CPUCyclesPerSample);
|
||||
p.DoPOD(s_control);
|
||||
p.DoPOD(s_volume);
|
||||
p.Do(s_sample_counter);
|
||||
p.Do(s_interrupt_timing);
|
||||
p.Do(s_last_cpu_time);
|
||||
p.Do(s_ais_sample_rate);
|
||||
p.Do(s_aid_sample_rate);
|
||||
p.Do(s_cpu_cycles_per_sample);
|
||||
|
||||
g_sound_stream->GetMixer()->DoState(p);
|
||||
}
|
||||
|
||||
static void GenerateAudioInterrupt();
|
||||
static void UpdateInterrupts();
|
||||
static void IncreaseSampleCount(const u32 _uAmount);
|
||||
static void IncreaseSampleCount(u32 amount);
|
||||
static int GetAIPeriod();
|
||||
static CoreTiming::EventType* et_AI;
|
||||
static void Update(u64 userdata, s64 cyclesLate);
|
||||
static void Update(u64 userdata, s64 cycles_late);
|
||||
|
||||
static CoreTiming::EventType* event_type_ai;
|
||||
|
||||
void Init()
|
||||
{
|
||||
m_Control.hex = 0;
|
||||
m_Control.AISFR = AIS_48KHz;
|
||||
m_Volume.hex = 0;
|
||||
m_SampleCounter = 0;
|
||||
m_InterruptTiming = 0;
|
||||
s_control.hex = 0;
|
||||
s_control.AISFR = AIS_48KHz;
|
||||
s_volume.hex = 0;
|
||||
s_sample_counter = 0;
|
||||
s_interrupt_timing = 0;
|
||||
|
||||
g_LastCPUTime = 0;
|
||||
g_CPUCyclesPerSample = 0xFFFFFFFFFFFULL;
|
||||
s_last_cpu_time = 0;
|
||||
s_cpu_cycles_per_sample = 0xFFFFFFFFFFFULL;
|
||||
|
||||
g_AISSampleRate = 48000;
|
||||
g_AIDSampleRate = 32000;
|
||||
s_ais_sample_rate = 48000;
|
||||
s_aid_sample_rate = 32000;
|
||||
|
||||
et_AI = CoreTiming::RegisterEvent("AICallback", Update);
|
||||
event_type_ai = CoreTiming::RegisterEvent("AICallback", Update);
|
||||
}
|
||||
|
||||
void Shutdown()
|
||||
|
|
@ -162,114 +163,114 @@ void Shutdown()
|
|||
void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
|
||||
{
|
||||
mmio->Register(
|
||||
base | AI_CONTROL_REGISTER, MMIO::DirectRead<u32>(&m_Control.hex),
|
||||
base | AI_CONTROL_REGISTER, MMIO::DirectRead<u32>(&s_control.hex),
|
||||
MMIO::ComplexWrite<u32>([](u32, u32 val) {
|
||||
AICR tmpAICtrl(val);
|
||||
const AICR tmp_ai_ctrl(val);
|
||||
|
||||
if (m_Control.AIINTMSK != tmpAICtrl.AIINTMSK)
|
||||
if (s_control.AIINTMSK != tmp_ai_ctrl.AIINTMSK)
|
||||
{
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "Change AIINTMSK to %d", tmpAICtrl.AIINTMSK);
|
||||
m_Control.AIINTMSK = tmpAICtrl.AIINTMSK;
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "Change AIINTMSK to %d", tmp_ai_ctrl.AIINTMSK);
|
||||
s_control.AIINTMSK = tmp_ai_ctrl.AIINTMSK;
|
||||
}
|
||||
|
||||
if (m_Control.AIINTVLD != tmpAICtrl.AIINTVLD)
|
||||
if (s_control.AIINTVLD != tmp_ai_ctrl.AIINTVLD)
|
||||
{
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "Change AIINTVLD to %d", tmpAICtrl.AIINTVLD);
|
||||
m_Control.AIINTVLD = tmpAICtrl.AIINTVLD;
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "Change AIINTVLD to %d", tmp_ai_ctrl.AIINTVLD);
|
||||
s_control.AIINTVLD = tmp_ai_ctrl.AIINTVLD;
|
||||
}
|
||||
|
||||
// Set frequency of streaming audio
|
||||
if (tmpAICtrl.AISFR != m_Control.AISFR)
|
||||
if (tmp_ai_ctrl.AISFR != s_control.AISFR)
|
||||
{
|
||||
// AISFR rates below are intentionally inverted wrt yagcd
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "Change AISFR to %s", tmpAICtrl.AISFR ? "48khz" : "32khz");
|
||||
m_Control.AISFR = tmpAICtrl.AISFR;
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "Change AISFR to %s", tmp_ai_ctrl.AISFR ? "48khz" : "32khz");
|
||||
s_control.AISFR = tmp_ai_ctrl.AISFR;
|
||||
if (SConfig::GetInstance().bWii)
|
||||
g_AISSampleRate = tmpAICtrl.AISFR ? 48000 : 32000;
|
||||
s_ais_sample_rate = tmp_ai_ctrl.AISFR ? 48000 : 32000;
|
||||
else
|
||||
g_AISSampleRate = tmpAICtrl.AISFR ? 48043 : 32029;
|
||||
g_sound_stream->GetMixer()->SetStreamInputSampleRate(g_AISSampleRate);
|
||||
g_CPUCyclesPerSample = SystemTimers::GetTicksPerSecond() / g_AISSampleRate;
|
||||
s_ais_sample_rate = tmp_ai_ctrl.AISFR ? 48043 : 32029;
|
||||
g_sound_stream->GetMixer()->SetStreamInputSampleRate(s_ais_sample_rate);
|
||||
s_cpu_cycles_per_sample = SystemTimers::GetTicksPerSecond() / s_ais_sample_rate;
|
||||
}
|
||||
// Set frequency of DMA
|
||||
if (tmpAICtrl.AIDFR != m_Control.AIDFR)
|
||||
if (tmp_ai_ctrl.AIDFR != s_control.AIDFR)
|
||||
{
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "Change AIDFR to %s", tmpAICtrl.AIDFR ? "32khz" : "48khz");
|
||||
m_Control.AIDFR = tmpAICtrl.AIDFR;
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "Change AIDFR to %s", tmp_ai_ctrl.AIDFR ? "32khz" : "48khz");
|
||||
s_control.AIDFR = tmp_ai_ctrl.AIDFR;
|
||||
if (SConfig::GetInstance().bWii)
|
||||
g_AIDSampleRate = tmpAICtrl.AIDFR ? 32000 : 48000;
|
||||
s_aid_sample_rate = tmp_ai_ctrl.AIDFR ? 32000 : 48000;
|
||||
else
|
||||
g_AIDSampleRate = tmpAICtrl.AIDFR ? 32029 : 48043;
|
||||
g_sound_stream->GetMixer()->SetDMAInputSampleRate(g_AIDSampleRate);
|
||||
s_aid_sample_rate = tmp_ai_ctrl.AIDFR ? 32029 : 48043;
|
||||
g_sound_stream->GetMixer()->SetDMAInputSampleRate(s_aid_sample_rate);
|
||||
}
|
||||
|
||||
// Streaming counter
|
||||
if (tmpAICtrl.PSTAT != m_Control.PSTAT)
|
||||
if (tmp_ai_ctrl.PSTAT != s_control.PSTAT)
|
||||
{
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "%s streaming audio", tmpAICtrl.PSTAT ? "start" : "stop");
|
||||
m_Control.PSTAT = tmpAICtrl.PSTAT;
|
||||
g_LastCPUTime = CoreTiming::GetTicks();
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "%s streaming audio", tmp_ai_ctrl.PSTAT ? "start" : "stop");
|
||||
s_control.PSTAT = tmp_ai_ctrl.PSTAT;
|
||||
s_last_cpu_time = CoreTiming::GetTicks();
|
||||
|
||||
CoreTiming::RemoveEvent(et_AI);
|
||||
CoreTiming::ScheduleEvent(GetAIPeriod(), et_AI);
|
||||
CoreTiming::RemoveEvent(event_type_ai);
|
||||
CoreTiming::ScheduleEvent(GetAIPeriod(), event_type_ai);
|
||||
}
|
||||
|
||||
// AI Interrupt
|
||||
if (tmpAICtrl.AIINT)
|
||||
if (tmp_ai_ctrl.AIINT)
|
||||
{
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "Clear AIS Interrupt");
|
||||
m_Control.AIINT = 0;
|
||||
s_control.AIINT = 0;
|
||||
}
|
||||
|
||||
// Sample Count Reset
|
||||
if (tmpAICtrl.SCRESET)
|
||||
if (tmp_ai_ctrl.SCRESET)
|
||||
{
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "Reset AIS sample counter");
|
||||
m_SampleCounter = 0;
|
||||
s_sample_counter = 0;
|
||||
|
||||
g_LastCPUTime = CoreTiming::GetTicks();
|
||||
s_last_cpu_time = CoreTiming::GetTicks();
|
||||
}
|
||||
|
||||
UpdateInterrupts();
|
||||
}));
|
||||
|
||||
mmio->Register(base | AI_VOLUME_REGISTER, MMIO::DirectRead<u32>(&m_Volume.hex),
|
||||
mmio->Register(base | AI_VOLUME_REGISTER, MMIO::DirectRead<u32>(&s_volume.hex),
|
||||
MMIO::ComplexWrite<u32>([](u32, u32 val) {
|
||||
m_Volume.hex = val;
|
||||
g_sound_stream->GetMixer()->SetStreamingVolume(m_Volume.left, m_Volume.right);
|
||||
s_volume.hex = val;
|
||||
g_sound_stream->GetMixer()->SetStreamingVolume(s_volume.left, s_volume.right);
|
||||
}));
|
||||
|
||||
mmio->Register(base | AI_SAMPLE_COUNTER, MMIO::ComplexRead<u32>([](u32) {
|
||||
return m_SampleCounter +
|
||||
static_cast<u32>((CoreTiming::GetTicks() - g_LastCPUTime) /
|
||||
g_CPUCyclesPerSample);
|
||||
return s_sample_counter +
|
||||
static_cast<u32>((CoreTiming::GetTicks() - s_last_cpu_time) /
|
||||
s_cpu_cycles_per_sample);
|
||||
}),
|
||||
MMIO::ComplexWrite<u32>([](u32, u32 val) {
|
||||
m_SampleCounter = val;
|
||||
g_LastCPUTime = CoreTiming::GetTicks();
|
||||
CoreTiming::RemoveEvent(et_AI);
|
||||
CoreTiming::ScheduleEvent(GetAIPeriod(), et_AI);
|
||||
s_sample_counter = val;
|
||||
s_last_cpu_time = CoreTiming::GetTicks();
|
||||
CoreTiming::RemoveEvent(event_type_ai);
|
||||
CoreTiming::ScheduleEvent(GetAIPeriod(), event_type_ai);
|
||||
}));
|
||||
|
||||
mmio->Register(base | AI_INTERRUPT_TIMING, MMIO::DirectRead<u32>(&m_InterruptTiming),
|
||||
mmio->Register(base | AI_INTERRUPT_TIMING, MMIO::DirectRead<u32>(&s_interrupt_timing),
|
||||
MMIO::ComplexWrite<u32>([](u32, u32 val) {
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "AI_INTERRUPT_TIMING=%08x@%08x", val,
|
||||
PowerPC::ppcState.pc);
|
||||
m_InterruptTiming = val;
|
||||
CoreTiming::RemoveEvent(et_AI);
|
||||
CoreTiming::ScheduleEvent(GetAIPeriod(), et_AI);
|
||||
s_interrupt_timing = val;
|
||||
CoreTiming::RemoveEvent(event_type_ai);
|
||||
CoreTiming::ScheduleEvent(GetAIPeriod(), event_type_ai);
|
||||
}));
|
||||
}
|
||||
|
||||
static void UpdateInterrupts()
|
||||
{
|
||||
ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_AI,
|
||||
m_Control.AIINT & m_Control.AIINTMSK);
|
||||
s_control.AIINT & s_control.AIINTMSK);
|
||||
}
|
||||
|
||||
static void GenerateAudioInterrupt()
|
||||
{
|
||||
m_Control.AIINT = 1;
|
||||
s_control.AIINT = 1;
|
||||
UpdateInterrupts();
|
||||
}
|
||||
|
||||
|
|
@ -278,17 +279,17 @@ void GenerateAISInterrupt()
|
|||
GenerateAudioInterrupt();
|
||||
}
|
||||
|
||||
static void IncreaseSampleCount(const u32 _iAmount)
|
||||
static void IncreaseSampleCount(const u32 amount)
|
||||
{
|
||||
if (m_Control.PSTAT)
|
||||
if (s_control.PSTAT)
|
||||
{
|
||||
u32 old_SampleCounter = m_SampleCounter + 1;
|
||||
m_SampleCounter += _iAmount;
|
||||
const u32 old_sample_counter = s_sample_counter + 1;
|
||||
s_sample_counter += amount;
|
||||
|
||||
if ((m_InterruptTiming - old_SampleCounter) <= (m_SampleCounter - old_SampleCounter))
|
||||
if ((s_interrupt_timing - old_sample_counter) <= (s_sample_counter - old_sample_counter))
|
||||
{
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "GenerateAudioInterrupt %08x:%08x @ %08x m_Control.AIINTVLD=%d",
|
||||
m_SampleCounter, m_InterruptTiming, PowerPC::ppcState.pc, m_Control.AIINTVLD);
|
||||
DEBUG_LOG(AUDIO_INTERFACE, "GenerateAudioInterrupt %08x:%08x @ %08x s_control.AIINTVLD=%d",
|
||||
s_sample_counter, s_interrupt_timing, PowerPC::ppcState.pc, s_control.AIINTVLD);
|
||||
GenerateAudioInterrupt();
|
||||
}
|
||||
}
|
||||
|
|
@ -296,33 +297,33 @@ static void IncreaseSampleCount(const u32 _iAmount)
|
|||
|
||||
bool IsPlaying()
|
||||
{
|
||||
return (m_Control.PSTAT == 1);
|
||||
return (s_control.PSTAT == 1);
|
||||
}
|
||||
|
||||
unsigned int GetAIDSampleRate()
|
||||
{
|
||||
return g_AIDSampleRate;
|
||||
return s_aid_sample_rate;
|
||||
}
|
||||
|
||||
static void Update(u64 userdata, s64 cyclesLate)
|
||||
static void Update(u64 userdata, s64 cycles_late)
|
||||
{
|
||||
if (m_Control.PSTAT)
|
||||
if (s_control.PSTAT)
|
||||
{
|
||||
const u64 Diff = CoreTiming::GetTicks() - g_LastCPUTime;
|
||||
if (Diff > g_CPUCyclesPerSample)
|
||||
const u64 diff = CoreTiming::GetTicks() - s_last_cpu_time;
|
||||
if (diff > s_cpu_cycles_per_sample)
|
||||
{
|
||||
const u32 Samples = static_cast<u32>(Diff / g_CPUCyclesPerSample);
|
||||
g_LastCPUTime += Samples * g_CPUCyclesPerSample;
|
||||
IncreaseSampleCount(Samples);
|
||||
const u32 samples = static_cast<u32>(diff / s_cpu_cycles_per_sample);
|
||||
s_last_cpu_time += samples * s_cpu_cycles_per_sample;
|
||||
IncreaseSampleCount(samples);
|
||||
}
|
||||
CoreTiming::ScheduleEvent(GetAIPeriod() - cyclesLate, et_AI);
|
||||
CoreTiming::ScheduleEvent(GetAIPeriod() - cycles_late, event_type_ai);
|
||||
}
|
||||
}
|
||||
|
||||
int GetAIPeriod()
|
||||
{
|
||||
u64 period = g_CPUCyclesPerSample * (m_InterruptTiming - m_SampleCounter);
|
||||
u64 s_period = g_CPUCyclesPerSample * g_AISSampleRate;
|
||||
u64 period = s_cpu_cycles_per_sample * (s_interrupt_timing - s_sample_counter);
|
||||
u64 s_period = s_cpu_cycles_per_sample * s_ais_sample_rate;
|
||||
if (period == 0)
|
||||
return static_cast<int>(s_period);
|
||||
return static_cast<int>(std::min(period, s_period));
|
||||
|
|
|
|||
Loading…
Reference in New Issue