From 01cc36693a46abcdba7f129a7075836aaf49cef3 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Fri, 5 May 2017 02:24:02 -0700 Subject: [PATCH 1/2] Zelda-HLE: run pending commands when replacing ucode Part 1/2 of a fix for using multiple GBAs in Four Swords Adventures. --- Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp index 2d7ab824f7..3dd922f183 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp @@ -208,6 +208,8 @@ void ZeldaUCode::HandleMailDefault(u32 mail) switch (mail & 0xFFFF) { case 1: + m_cmd_can_execute = true; + RunPendingCommands(); NOTICE_LOG(DSPHLE, "UCode being replaced."); m_upload_setup_in_progress = true; SetMailState(MailState::HALTED); From b14466b7e39fe6c704c93c097e1082d7ada54fde Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Fri, 5 May 2017 02:24:41 -0700 Subject: [PATCH 2/2] Zelda-HLE: set state to waiting when replacing ucode Part 2/2 of a fix for using multiple GBAs in Four Swords Adventures. --- Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp index 3dd922f183..9ca15f9d17 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp @@ -212,7 +212,7 @@ void ZeldaUCode::HandleMailDefault(u32 mail) RunPendingCommands(); NOTICE_LOG(DSPHLE, "UCode being replaced."); m_upload_setup_in_progress = true; - SetMailState(MailState::HALTED); + SetMailState(MailState::WAITING); break; case 2: