Merge pull request #9786 from Tilka/dsp

DSP: small cleanup
This commit is contained in:
Mai M 2021-06-06 00:48:28 -04:00 committed by GitHub
commit 5470aceb63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 8 deletions

View File

@ -200,14 +200,14 @@ int Interpreter::RunCycles(int cycles)
void Interpreter::WriteCR(u16 val) void Interpreter::WriteCR(u16 val)
{ {
// reset // reset
if ((val & 1) != 0) if ((val & CR_RESET) != 0)
{ {
INFO_LOG_FMT(DSPLLE, "DSP_CONTROL RESET"); INFO_LOG_FMT(DSPLLE, "DSP_CONTROL RESET");
m_dsp_core.Reset(); m_dsp_core.Reset();
val &= ~CR_RESET; val &= ~CR_RESET;
} }
// init // init
else if (val == 4) else if (val == CR_HALT)
{ {
// HAX! // HAX!
// OSInitAudioSystem ucode should send this mail - not DSP core itself // OSInitAudioSystem ucode should send this mail - not DSP core itself

View File

@ -26,10 +26,6 @@ void INITUCode::Initialize()
m_mail_handler.PushMail(0x80544348); m_mail_handler.PushMail(0x80544348);
} }
void INITUCode::Init()
{
}
void INITUCode::Update() void INITUCode::Update()
{ {
} }

View File

@ -20,6 +20,5 @@ public:
void Initialize() override; void Initialize() override;
void HandleMail(u32 mail) override; void HandleMail(u32 mail) override;
void Update() override; void Update() override;
void Init();
}; };
} // namespace DSP::HLE } // namespace DSP::HLE

View File

@ -186,7 +186,7 @@ u16 DSPLLE::DSP_WriteControlRegister(u16 value)
{ {
m_dsp_core.GetInterpreter().WriteCR(value); m_dsp_core.GetInterpreter().WriteCR(value);
if ((value & 2) != 0) if ((value & CR_EXTERNAL_INT) != 0)
{ {
if (m_is_dsp_on_thread) if (m_is_dsp_on_thread)
{ {