From 41e9d8e1a41b88fa3275315ec9f93310603af9d4 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sun, 30 Mar 2014 00:31:32 +0100
Subject: [PATCH] DSPHLE: Cleanup GBA.{cpp,h}

---
 Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp | 20 ++++++++++----------
 Source/Core/Core/HW/DSPHLE/UCodes/GBA.h   |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp
index ab99f56e29..23c99c1eb4 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp
@@ -7,8 +7,8 @@
 #include "Core/HW/DSPHLE/UCodes/GBA.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
-GBAUCode::GBAUCode(DSPHLE *dsp_hle, u32 crc)
-: UCodeInterface(dsp_hle, crc)
+GBAUCode::GBAUCode(DSPHLE *dsphle, u32 crc)
+: UCodeInterface(dsphle, crc)
 {
 	m_mail_handler.PushMail(DSP_INIT);
 }
@@ -32,23 +32,23 @@ u32 GBAUCode::GetUpdateMs()
 	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 calc_done = false;
 
 	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;
 	}
 	else if (nextmail_is_mramaddr)
 	{
 		nextmail_is_mramaddr = false;
-		u32 mramaddr = _uMail;
+		u32 mramaddr = mail;
 
 		struct sec_params_t
 		{
@@ -125,9 +125,9 @@ void GBAUCode::HandleMail(u32 _uMail)
 		calc_done = true;
 		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:
 			m_upload_setup_in_progress = true;
@@ -136,12 +136,12 @@ void GBAUCode::HandleMail(u32 _uMail)
 			m_dsphle->SetUCode(UCODE_ROM);
 			break;
 		default:
-			DEBUG_LOG(DSPHLE, "GBAUCode - unknown 0xcdd1 command: %08x", _uMail);
+			DEBUG_LOG(DSPHLE, "GBAUCode - unknown 0xcdd1 command: %08x", mail);
 			break;
 		}
 	}
 	else
 	{
-		DEBUG_LOG(DSPHLE, "GBAUCode - unknown command: %08x", _uMail);
+		DEBUG_LOG(DSPHLE, "GBAUCode - unknown command: %08x", mail);
 	}
 }
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/GBA.h b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.h
index c4b7985d13..77964da9b4 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/GBA.h
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.h
@@ -8,10 +8,10 @@
 
 struct GBAUCode : public UCodeInterface
 {
-	GBAUCode(DSPHLE *dsp_hle, u32 crc);
+	GBAUCode(DSPHLE *dsphle, u32 crc);
 	virtual ~GBAUCode();
 	u32 GetUpdateMs() override;
 
-	void HandleMail(u32 _uMail) override;
+	void HandleMail(u32 mail) override;
 	void Update(int cycles) override;
 };