Merge pull request #9786 from Tilka/dsp

DSP: small cleanup
dolphin-emu · Jun 6, 2021 · 5470ace · 5470ace
2 parents 89af7b8 + f2c4041
commit 5470ace
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/Source/Core/Core/DSP/Interpreter/DSPInterpreter.cpp b/Source/Core/Core/DSP/Interpreter/DSPInterpreter.cpp
@@ -200,14 +200,14 @@ int Interpreter::RunCycles(int cycles)
 void Interpreter::WriteCR(u16 val)
 {
   // reset
-  if ((val & 1) != 0)
+  if ((val & CR_RESET) != 0)
   {
     INFO_LOG_FMT(DSPLLE, "DSP_CONTROL RESET");
     m_dsp_core.Reset();
     val &= ~CR_RESET;
   }
   // init
-  else if (val == 4)
+  else if (val == CR_HALT)
   {
     // HAX!
     // OSInitAudioSystem ucode should send this mail - not DSP core itself

diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp
@@ -26,10 +26,6 @@ void INITUCode::Initialize()
   m_mail_handler.PushMail(0x80544348);
 }
 
-void INITUCode::Init()
-{
-}
-
 void INITUCode::Update()
 {
 }

diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/INIT.h b/Source/Core/Core/HW/DSPHLE/UCodes/INIT.h
@@ -20,6 +20,5 @@ class INITUCode : public UCodeInterface
   void Initialize() override;
   void HandleMail(u32 mail) override;
   void Update() override;
-  void Init();
 };
 }  // namespace DSP::HLE
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
@@ -186,7 +186,7 @@ u16 DSPLLE::DSP_WriteControlRegister(u16 value)
 {
   m_dsp_core.GetInterpreter().WriteCR(value);
 
-  if ((value & 2) != 0)
+  if ((value & CR_EXTERNAL_INT) != 0)
   {
     if (m_is_dsp_on_thread)
     {