mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-04-28 12:58:05 +03:00
Merge pull request #13590 from tygyh/UCodes-Remove-redundant-qualifiers
UCodes: Remove redundant qualifiers
This commit is contained in:
commit
8ee64a84c7
9 changed files with 13 additions and 13 deletions
|
@ -96,7 +96,7 @@ void AESndUCode::Update()
|
||||||
// This is dubious in general, since we set the interrupt parameter on m_mail_handler.PushMail
|
// This is dubious in general, since we set the interrupt parameter on m_mail_handler.PushMail
|
||||||
if (m_mail_handler.HasPending())
|
if (m_mail_handler.HasPending())
|
||||||
{
|
{
|
||||||
m_dsphle->GetSystem().GetDSP().GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
|
m_dsphle->GetSystem().GetDSP().GenerateDSPInterruptFromDSPEmu(INT_DSP);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -240,7 +240,7 @@ void AESndUCode::DMAOutParameterBlock()
|
||||||
HLEMemory_Write_U32(memory, m_parameter_block_addr + 40, m_parameter_block.flags);
|
HLEMemory_Write_U32(memory, m_parameter_block_addr + 40, m_parameter_block.flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
AESndAccelerator::AESndAccelerator(DSP::DSPManager& dsp) : m_dsp(dsp)
|
AESndAccelerator::AESndAccelerator(DSPManager& dsp) : m_dsp(dsp)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ class DSPHLE;
|
||||||
class AESndAccelerator final : public Accelerator
|
class AESndAccelerator final : public Accelerator
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit AESndAccelerator(DSP::DSPManager& dsp);
|
explicit AESndAccelerator(DSPManager& dsp);
|
||||||
AESndAccelerator(const AESndAccelerator&) = delete;
|
AESndAccelerator(const AESndAccelerator&) = delete;
|
||||||
AESndAccelerator(AESndAccelerator&&) = delete;
|
AESndAccelerator(AESndAccelerator&&) = delete;
|
||||||
AESndAccelerator& operator=(const AESndAccelerator&) = delete;
|
AESndAccelerator& operator=(const AESndAccelerator&) = delete;
|
||||||
|
@ -35,7 +35,7 @@ protected:
|
||||||
void WriteMemory(u32 address, u8 value) override;
|
void WriteMemory(u32 address, u8 value) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DSP::DSPManager& m_dsp;
|
DSPManager& m_dsp;
|
||||||
};
|
};
|
||||||
|
|
||||||
class AESndUCode final : public UCodeInterface
|
class AESndUCode final : public UCodeInterface
|
||||||
|
|
|
@ -82,7 +82,7 @@ void ASndUCode::Update()
|
||||||
// This is dubious in general, since we set the interrupt parameter on m_mail_handler.PushMail
|
// This is dubious in general, since we set the interrupt parameter on m_mail_handler.PushMail
|
||||||
if (m_mail_handler.HasPending())
|
if (m_mail_handler.HasPending())
|
||||||
{
|
{
|
||||||
m_dsphle->GetSystem().GetDSP().GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
|
m_dsphle->GetSystem().GetDSP().GenerateDSPInterruptFromDSPEmu(INT_DSP);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -124,7 +124,7 @@ union AXBuffers
|
||||||
class HLEAccelerator final : public Accelerator
|
class HLEAccelerator final : public Accelerator
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit HLEAccelerator(DSP::DSPManager& dsp) : m_dsp(dsp) {}
|
explicit HLEAccelerator(DSPManager& dsp) : m_dsp(dsp) {}
|
||||||
HLEAccelerator(const HLEAccelerator&) = delete;
|
HLEAccelerator(const HLEAccelerator&) = delete;
|
||||||
HLEAccelerator(HLEAccelerator&&) = delete;
|
HLEAccelerator(HLEAccelerator&&) = delete;
|
||||||
HLEAccelerator& operator=(const HLEAccelerator&) = delete;
|
HLEAccelerator& operator=(const HLEAccelerator&) = delete;
|
||||||
|
@ -168,7 +168,7 @@ protected:
|
||||||
void WriteMemory(u32 address, u8 value) override { m_dsp.WriteARAM(value, address); }
|
void WriteMemory(u32 address, u8 value) override { m_dsp.WriteARAM(value, address); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DSP::DSPManager& m_dsp;
|
DSPManager& m_dsp;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Sets up the simulated accelerator.
|
// Sets up the simulated accelerator.
|
||||||
|
|
|
@ -28,7 +28,7 @@ void CARDUCode::Update()
|
||||||
// check if we have something to send
|
// check if we have something to send
|
||||||
if (m_mail_handler.HasPending())
|
if (m_mail_handler.HasPending())
|
||||||
{
|
{
|
||||||
m_dsphle->GetSystem().GetDSP().GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
|
m_dsphle->GetSystem().GetDSP().GenerateDSPInterruptFromDSPEmu(INT_DSP);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,7 @@ void GBAUCode::Update()
|
||||||
// check if we have something to send
|
// check if we have something to send
|
||||||
if (m_mail_handler.HasPending())
|
if (m_mail_handler.HasPending())
|
||||||
{
|
{
|
||||||
m_dsphle->GetSystem().GetDSP().GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
|
m_dsphle->GetSystem().GetDSP().GenerateDSPInterruptFromDSPEmu(INT_DSP);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -102,8 +102,8 @@ void ROMUCode::BootUCode()
|
||||||
|
|
||||||
if (Config::Get(Config::MAIN_DUMP_UCODE))
|
if (Config::Get(Config::MAIN_DUMP_UCODE))
|
||||||
{
|
{
|
||||||
DSP::DumpDSPCode(static_cast<u8*>(HLEMemory_Get_Pointer(memory, m_current_ucode.m_ram_address)),
|
DumpDSPCode(static_cast<u8*>(HLEMemory_Get_Pointer(memory, m_current_ucode.m_ram_address)),
|
||||||
m_current_ucode.m_length, ector_crc);
|
m_current_ucode.m_length, ector_crc);
|
||||||
}
|
}
|
||||||
|
|
||||||
INFO_LOG_FMT(DSPHLE, "CurrentUCode SOURCE Addr: {:#010x}", m_current_ucode.m_ram_address);
|
INFO_LOG_FMT(DSPHLE, "CurrentUCode SOURCE Addr: {:#010x}", m_current_ucode.m_ram_address);
|
||||||
|
|
|
@ -192,7 +192,7 @@ void UCodeInterface::PrepareBootUCode(u32 mail)
|
||||||
{
|
{
|
||||||
const u8* pointer =
|
const u8* pointer =
|
||||||
memory.GetPointerForRange(m_next_ucode.iram_mram_addr, m_next_ucode.iram_size);
|
memory.GetPointerForRange(m_next_ucode.iram_mram_addr, m_next_ucode.iram_size);
|
||||||
DSP::DumpDSPCode(pointer, m_next_ucode.iram_size, ector_crc);
|
DumpDSPCode(pointer, m_next_ucode.iram_size, ector_crc);
|
||||||
}
|
}
|
||||||
|
|
||||||
DEBUG_LOG_FMT(DSPHLE, "PrepareBootUCode {:#010x}", ector_crc);
|
DEBUG_LOG_FMT(DSPHLE, "PrepareBootUCode {:#010x}", ector_crc);
|
||||||
|
|
|
@ -368,7 +368,7 @@ void ZeldaUCode::HandleMailLight(u32 mail)
|
||||||
m_sync_max_voice_id = 0xFFFFFFFF;
|
m_sync_max_voice_id = 0xFFFFFFFF;
|
||||||
m_sync_voice_skip_flags.fill(0xFFFF);
|
m_sync_voice_skip_flags.fill(0xFFFF);
|
||||||
RenderAudio();
|
RenderAudio();
|
||||||
m_dsphle->GetSystem().GetDSP().GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
|
m_dsphle->GetSystem().GetDSP().GenerateDSPInterruptFromDSPEmu(INT_DSP);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MailState::HALTED:
|
case MailState::HALTED:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue