ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DSPHLE: Cleanup GBA.{cpp,h}

This commit is contained in:
Pierre Bourdon 2014-03-30 00:31:32 +01:00
parent 061e3f998a
commit 41e9d8e1a4
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp
View File

@ -7,8 +7,8 @@
#include "Core/HW/DSPHLE/UCodes/GBA.h" #include "Core/HW/DSPHLE/UCodes/GBA.h"
#include "Core/HW/DSPHLE/UCodes/UCodes.h" #include "Core/HW/DSPHLE/UCodes/UCodes.h"
GBAUCode::GBAUCode(DSPHLE *dsp_hle, u32 crc) GBAUCode::GBAUCode(DSPHLE *dsphle, u32 crc)
: UCodeInterface(dsp_hle, crc) : UCodeInterface(dsphle, crc)
{ {
m_mail_handler.PushMail(DSP_INIT); m_mail_handler.PushMail(DSP_INIT);
} }
@ -32,23 +32,23 @@ u32 GBAUCode::GetUpdateMs()
return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5; return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
} }
void GBAUCode::HandleMail(u32 _uMail) void GBAUCode::HandleMail(u32 mail)
{ {
static bool nextmail_is_mramaddr = false; static bool nextmail_is_mramaddr = false;
static bool calc_done = false; static bool calc_done = false;
if (m_upload_setup_in_progress) if (m_upload_setup_in_progress)
{ {
PrepareBootUCode(_uMail); PrepareBootUCode(mail);
} }
else if ((_uMail >> 16 == 0xabba) && !nextmail_is_mramaddr) else if ((mail >> 16 == 0xabba) && !nextmail_is_mramaddr)
{ {
nextmail_is_mramaddr = true; nextmail_is_mramaddr = true;
} }
else if (nextmail_is_mramaddr) else if (nextmail_is_mramaddr)
{ {
nextmail_is_mramaddr = false; nextmail_is_mramaddr = false;
u32 mramaddr = _uMail; u32 mramaddr = mail;
struct sec_params_t struct sec_params_t
{ {
@ -125,9 +125,9 @@ void GBAUCode::HandleMail(u32 _uMail)
calc_done = true; calc_done = true;
m_mail_handler.PushMail(DSP_DONE); m_mail_handler.PushMail(DSP_DONE);
} }
else if ((_uMail >> 16 == 0xcdd1) && calc_done) else if ((mail >> 16 == 0xcdd1) && calc_done)
{ {
switch (_uMail & 0xffff) switch (mail & 0xffff)
{ {
case 1: case 1:
m_upload_setup_in_progress = true; m_upload_setup_in_progress = true;
@ -136,12 +136,12 @@ void GBAUCode::HandleMail(u32 _uMail)
m_dsphle->SetUCode(UCODE_ROM); m_dsphle->SetUCode(UCODE_ROM);
break; break;
default: default:
DEBUG_LOG(DSPHLE, "GBAUCode - unknown 0xcdd1 command: %08x", _uMail); DEBUG_LOG(DSPHLE, "GBAUCode - unknown 0xcdd1 command: %08x", mail);
break; break;
} }
} }
else else
{ {
DEBUG_LOG(DSPHLE, "GBAUCode - unknown command: %08x", _uMail); DEBUG_LOG(DSPHLE, "GBAUCode - unknown command: %08x", mail);
} }
} }

4
Source/Core/Core/HW/DSPHLE/UCodes/GBA.h
View File

@ -8,10 +8,10 @@
struct GBAUCode : public UCodeInterface struct GBAUCode : public UCodeInterface
{ {
GBAUCode(DSPHLE *dsp_hle, u32 crc); GBAUCode(DSPHLE *dsphle, u32 crc);
virtual ~GBAUCode(); virtual ~GBAUCode();
u32 GetUpdateMs() override; u32 GetUpdateMs() override;
void HandleMail(u32 _uMail) override; void HandleMail(u32 mail) override;
void Update(int cycles) override; void Update(int cycles) override;
}; };