Merge pull request #231 from delroth/dsphle-cleanups

DSPHLE: Rename files to remove redundant 'UCode' prefix.

Source/Core/Core/CMakeLists.txt

@@ -67,17 +67,17 @@ set(SRCS	ActionReplay.cpp
 			HW/AudioInterface.cpp
 			HW/CPU.cpp
 			HW/DSP.cpp
-			HW/DSPHLE/UCodes/UCode_AX.cpp
-			HW/DSPHLE/UCodes/UCode_AXWii.cpp
-			HW/DSPHLE/UCodes/UCode_CARD.cpp
-			HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
-			HW/DSPHLE/UCodes/UCode_ROM.cpp
+			HW/DSPHLE/UCodes/AX.cpp
+			HW/DSPHLE/UCodes/AXWii.cpp
+			HW/DSPHLE/UCodes/CARD.cpp
+			HW/DSPHLE/UCodes/GBA.cpp
+			HW/DSPHLE/UCodes/INIT.cpp
+			HW/DSPHLE/UCodes/ROM.cpp
 			HW/DSPHLE/UCodes/UCodes.cpp
-			HW/DSPHLE/UCodes/UCode_GBA.cpp
-			HW/DSPHLE/UCodes/UCode_Zelda.cpp
-			HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp
-			HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
-			HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
+			HW/DSPHLE/UCodes/Zelda.cpp
+			HW/DSPHLE/UCodes/ZeldaADPCM.cpp
+			HW/DSPHLE/UCodes/ZeldaSynth.cpp
+			HW/DSPHLE/UCodes/ZeldaVoice.cpp
 			HW/DSPHLE/MailHandler.cpp
 			HW/DSPHLE/DSPHLE.cpp
 			HW/DSPLLE/DSPDebugInterface.cpp

Source/Core/Core/Core.vcxproj

@@ -108,16 +108,16 @@
     <ClCompile Include="HW\DSPHLE\DSPHLE.cpp" />
     <ClCompile Include="HW\DSPHLE\MailHandler.cpp" />
     <ClCompile Include="HW\DSPHLE\UCodes\UCodes.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_AX.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_AXWii.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_CARD.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_GBA.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_InitAudioSystem.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_ROM.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda_ADPCM.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda_Synth.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda_Voice.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\AX.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\AXWii.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\CARD.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\GBA.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\INIT.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\ROM.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\Zelda.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaADPCM.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaSynth.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaVoice.cpp" />
     <ClCompile Include="HW\DSPLLE\DSPDebugInterface.cpp" />
     <ClCompile Include="HW\DSPLLE\DSPHost.cpp" />
     <ClCompile Include="HW\DSPLLE\DSPLLE.cpp" />
@@ -306,15 +306,15 @@
     <ClInclude Include="HW\DSPHLE\DSPHLE.h" />
     <ClInclude Include="HW\DSPHLE\MailHandler.h" />
     <ClInclude Include="HW\DSPHLE\UCodes\UCodes.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AX.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AXStructs.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AXWii.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AX_Voice.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_CARD.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_GBA.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_InitAudioSystem.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_ROM.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_Zelda.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\AX.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\AXStructs.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\AXWii.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\AXVoice.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\CARD.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\GBA.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\INIT.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\ROM.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\Zelda.h" />
     <ClInclude Include="HW\DSPLLE\DSPDebugInterface.h" />
     <ClInclude Include="HW\DSPLLE\DSPLLE.h" />
     <ClInclude Include="HW\DSPLLE\DSPLLEGlobals.h" />
@@ -470,4 +470,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Source/Core/Core/Core.vcxproj.filters

@@ -311,34 +311,34 @@
     <ClCompile Include="HW\DVDInterface.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DI - Drive Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_AX.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\AX.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_AXWii.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\AXWii.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_CARD.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\CARD.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_GBA.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\GBA.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_InitAudioSystem.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\INIT.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_ROM.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\ROM.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\Zelda.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda_ADPCM.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaADPCM.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda_Synth.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaSynth.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda_Voice.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaVoice.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
     <ClCompile Include="HW\DSPHLE\UCodes\UCodes.cpp">
@@ -837,31 +837,31 @@
     <ClInclude Include="HW\DVDInterface.h">
       <Filter>HW %28Flipper/Hollywood%29\DI - Drive Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AX.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\AX.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AX_Voice.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\AXVoice.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AXStructs.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\AXStructs.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AXWii.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\AXWii.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_CARD.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\CARD.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_GBA.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\GBA.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_InitAudioSystem.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\INIT.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_ROM.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\ROM.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_Zelda.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\Zelda.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
     <ClInclude Include="HW\DSPHLE\UCodes\UCodes.h">
@@ -1211,4 +1211,4 @@
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
+</Project>

Source/Core/Core/HW/DSPHLE/DSPHLE.cpp

@@ -95,7 +95,7 @@ void DSPHLE::SendMailToDSP(u32 _uMail)
 	}
 }
 
-IUCode* DSPHLE::GetUCode()
+UCodeInterface* DSPHLE::GetUCode()
 {
 	return m_pUCode;
 }
@@ -160,9 +160,9 @@ void DSPHLE::DoState(PointerWrap &p)
 	p.DoPOD(m_DSPControl);
 	p.DoPOD(m_dspState);
 
-	int ucode_crc = IUCode::GetCRC(m_pUCode);
+	int ucode_crc = UCodeInterface::GetCRC(m_pUCode);
 	int ucode_crc_beforeLoad = ucode_crc;
-	int lastucode_crc = IUCode::GetCRC(m_lastUCode);
+	int lastucode_crc = UCodeInterface::GetCRC(m_lastUCode);
 	int lastucode_crc_beforeLoad = lastucode_crc;
 
 	p.Do(ucode_crc);
@@ -170,8 +170,8 @@ void DSPHLE::DoState(PointerWrap &p)
 
 	// if a different type of ucode was being used when the savestate was created,
 	// we have to reconstruct the old type of ucode so that we have a valid thing to call DoState on.
-	IUCode*     ucode =     (ucode_crc ==     ucode_crc_beforeLoad) ?    m_pUCode : UCodeFactory(    ucode_crc, this, m_bWii);
-	IUCode* lastucode = (lastucode_crc != lastucode_crc_beforeLoad) ? m_lastUCode : UCodeFactory(lastucode_crc, this, m_bWii);
+	UCodeInterface*     ucode =     (ucode_crc ==     ucode_crc_beforeLoad) ?    m_pUCode : UCodeFactory(    ucode_crc, this, m_bWii);
+	UCodeInterface* lastucode = (lastucode_crc != lastucode_crc_beforeLoad) ? m_lastUCode : UCodeFactory(lastucode_crc, this, m_bWii);
 
 	if (ucode)
 		ucode->DoState(p);

Source/Core/Core/HW/DSPHLE/DSPHLE.h

@@ -10,7 +10,7 @@
 #include "Core/DSPEmulator.h"
 #include "Core/HW/DSPHLE/MailHandler.h"
 
-class IUCode;
+class UCodeInterface;
 
 class DSPHLE : public DSPEmulator {
 public:
@@ -38,7 +38,7 @@ public:
 	CMailHandler& AccessMailHandler() { return m_MailHandler; }
 
 	// Formerly DSPHandler
-	IUCode *GetUCode();
+	UCodeInterface *GetUCode();
 	void SetUCode(u32 _crc);
 	void SwapUCode(u32 _crc);
 
@@ -70,8 +70,8 @@ private:
 	};
 	DSPState m_dspState;
 
-	IUCode* m_pUCode;
-	IUCode* m_lastUCode;
+	UCodeInterface* m_pUCode;
+	UCodeInterface* m_lastUCode;
 
 	UDSPControl m_DSPControl;
 	CMailHandler m_MailHandler;

Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp

@@ -7,29 +7,29 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/HW/DSP.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_AX.h"
+#include "Core/HW/DSPHLE/UCodes/AX.h"
 
 #define AX_GC
-#include "Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h"
+#include "Core/HW/DSPHLE/UCodes/AXVoice.h"
 
-CUCode_AX::CUCode_AX(DSPHLE* dsp_hle, u32 crc)
-	: IUCode(dsp_hle, crc)
+AXUCode::AXUCode(DSPHLE* dsp_hle, u32 crc)
+	: UCodeInterface(dsp_hle, crc)
 	, m_work_available(false)
 	, m_cmdlist_size(0)
 {
-	WARN_LOG(DSPHLE, "Instantiating CUCode_AX: crc=%08x", crc);
+	WARN_LOG(DSPHLE, "Instantiating AXUCode: crc=%08x", crc);
 	m_rMailHandler.PushMail(DSP_INIT);
 	DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
 
 	LoadResamplingCoefficients();
 }
 
-CUCode_AX::~CUCode_AX()
+AXUCode::~AXUCode()
 {
 	m_rMailHandler.Clear();
 }
 
-void CUCode_AX::LoadResamplingCoefficients()
+void AXUCode::LoadResamplingCoefficients()
 {
 	m_coeffs_available = false;
 
@@ -66,14 +66,14 @@ void CUCode_AX::LoadResamplingCoefficients()
 	m_coeffs_available = true;
 }
 
-void CUCode_AX::SignalWorkEnd()
+void AXUCode::SignalWorkEnd()
 {
 	// Signal end of processing
 	m_rMailHandler.PushMail(DSP_YIELD);
 	DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
 }
 
-void CUCode_AX::HandleCommandList()
+void AXUCode::HandleCommandList()
 {
 	// Temp variables for addresses computation
 	u16 addr_hi, addr_lo;
@@ -250,7 +250,7 @@ void CUCode_AX::HandleCommandList()
 	}
 }
 
-void CUCode_AX::ApplyUpdatesForMs(int curr_ms, u16* pb, u16* num_updates, u16* updates)
+void AXUCode::ApplyUpdatesForMs(int curr_ms, u16* pb, u16* num_updates, u16* updates)
 {
 	u32 start_idx = 0;
 	for (int i = 0; i < curr_ms; ++i)
@@ -265,7 +265,7 @@ void CUCode_AX::ApplyUpdatesForMs(int curr_ms, u16* pb, u16* num_updates, u16* u
 	}
 }
 
-AXMixControl CUCode_AX::ConvertMixerControl(u32 mixer_control)
+AXMixControl AXUCode::ConvertMixerControl(u32 mixer_control)
 {
 	u32 ret = 0;
 
@@ -313,7 +313,7 @@ AXMixControl CUCode_AX::ConvertMixerControl(u32 mixer_control)
 	return (AXMixControl)ret;
 }
 
-void CUCode_AX::SetupProcessing(u32 init_addr)
+void AXUCode::SetupProcessing(u32 init_addr)
 {
 	u16 init_data[0x20];
 
@@ -356,7 +356,7 @@ void CUCode_AX::SetupProcessing(u32 init_addr)
 	}
 }
 
-void CUCode_AX::DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u16 vol_auxb)
+void AXUCode::DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u16 vol_auxb)
 {
 	int* buffers_main[3] = { m_samples_left, m_samples_right, m_samples_surround };
 	int* buffers_auxa[3] = { m_samples_auxA_left, m_samples_auxA_right, m_samples_auxA_surround };
@@ -381,7 +381,7 @@ void CUCode_AX::DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u
 	}
 }
 
-void CUCode_AX::ProcessPBList(u32 pb_addr)
+void AXUCode::ProcessPBList(u32 pb_addr)
 {
 	// Samples per millisecond. In theory DSP sampling rate can be changed from
 	// 32KHz to 48KHz, but AX always process at 32KHz.
@@ -426,7 +426,7 @@ void CUCode_AX::ProcessPBList(u32 pb_addr)
 	}
 }
 
-void CUCode_AX::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr)
+void AXUCode::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr)
 {
 	int* buffers[3] = { nullptr };
 
@@ -465,7 +465,7 @@ void CUCode_AX::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr)
 		sample += (int)Common::swap32(*ptr++);
 }
 
-void CUCode_AX::UploadLRS(u32 dst_addr)
+void AXUCode::UploadLRS(u32 dst_addr)
 {
 	int buffers[3][5 * 32];
 
@@ -478,7 +478,7 @@ void CUCode_AX::UploadLRS(u32 dst_addr)
 	memcpy(HLEMemory_Get_Pointer(dst_addr), buffers, sizeof (buffers));
 }
 
-void CUCode_AX::SetMainLR(u32 src_addr)
+void AXUCode::SetMainLR(u32 src_addr)
 {
 	int* ptr = (int*)HLEMemory_Get_Pointer(src_addr);
 	for (u32 i = 0; i < 5 * 32; ++i)
@@ -490,7 +490,7 @@ void CUCode_AX::SetMainLR(u32 src_addr)
 	}
 }
 
-void CUCode_AX::OutputSamples(u32 lr_addr, u32 surround_addr)
+void AXUCode::OutputSamples(u32 lr_addr, u32 surround_addr)
 {
 	int surround_buffer[5 * 32];
 
@@ -517,7 +517,7 @@ void CUCode_AX::OutputSamples(u32 lr_addr, u32 surround_addr)
 	memcpy(HLEMemory_Get_Pointer(lr_addr), buffer, sizeof (buffer));
 }
 
-void CUCode_AX::MixAUXBLR(u32 ul_addr, u32 dl_addr)
+void AXUCode::MixAUXBLR(u32 ul_addr, u32 dl_addr)
 {
 	// Upload AUXB L/R
 	int* ptr = (int*)HLEMemory_Get_Pointer(ul_addr);
@@ -542,7 +542,7 @@ void CUCode_AX::MixAUXBLR(u32 ul_addr, u32 dl_addr)
 	}
 }
 
-void CUCode_AX::SetOppositeLR(u32 src_addr)
+void AXUCode::SetOppositeLR(u32 src_addr)
 {
 	int* ptr = (int*)HLEMemory_Get_Pointer(src_addr);
 	for (u32 i = 0; i < 5 * 32; ++i)
@@ -554,7 +554,7 @@ void CUCode_AX::SetOppositeLR(u32 src_addr)
 	}
 }
 
-void CUCode_AX::SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl,
+void AXUCode::SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl,
                               u32 main_r_dl, u32 auxb_l_dl, u32 auxb_r_dl)
 {
 	// Buffers to upload first
@@ -598,7 +598,7 @@ void CUCode_AX::SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl,
 	}
 }
 
-void CUCode_AX::HandleMail(u32 mail)
+void AXUCode::HandleMail(u32 mail)
 {
 	// Indicates if the next message is a command list address.
 	static bool next_is_cmdlist = false;
@@ -648,7 +648,7 @@ void CUCode_AX::HandleMail(u32 mail)
 	next_is_cmdlist = set_next_is_cmdlist;
 }
 
-void CUCode_AX::CopyCmdList(u32 addr, u16 size)
+void AXUCode::CopyCmdList(u32 addr, u16 size)
 {
 	if (size >= (sizeof (m_cmdlist) / sizeof (u16)))
 	{
@@ -661,7 +661,7 @@ void CUCode_AX::CopyCmdList(u32 addr, u16 size)
 	m_cmdlist_size = size;
 }
 
-void CUCode_AX::Update(int cycles)
+void AXUCode::Update(int cycles)
 {
 	// Used for UCode switching.
 	if (NeedsResumeMail())
@@ -677,12 +677,12 @@ void CUCode_AX::Update(int cycles)
 	}
 }
 
-u32 CUCode_AX::GetUpdateMs()
+u32 AXUCode::GetUpdateMs()
 {
 	return 5;
 }
 
-void CUCode_AX::DoAXState(PointerWrap& p)
+void AXUCode::DoAXState(PointerWrap& p)
 {
 	p.Do(m_cmdlist);
 	p.Do(m_cmdlist_size);
@@ -698,7 +698,7 @@ void CUCode_AX::DoAXState(PointerWrap& p)
 	p.Do(m_samples_auxB_surround);
 }
 
-void CUCode_AX::DoState(PointerWrap& p)
+void AXUCode::DoState(PointerWrap& p)
 {
 	DoStateShared(p);
 	DoAXState(p);

Source/Core/Core/HW/DSPHLE/UCodes/AX.h

@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include "Core/HW/DSPHLE/UCodes/UCode_AXStructs.h"
+#include "Core/HW/DSPHLE/UCodes/AXStructs.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 // We can't directly use the mixer_control field from the PB because it does
@@ -49,11 +49,11 @@ enum AXMixControl
 	MIX_AUXC_S_RAMP = 0x800000
 };
 
-class CUCode_AX : public IUCode
+class AXUCode : public UCodeInterface
 {
 public:
-	CUCode_AX(DSPHLE* dsp_hle, u32 crc);
-	virtual ~CUCode_AX();
+	AXUCode(DSPHLE* dsp_hle, u32 crc);
+	virtual ~AXUCode();
 
 	virtual void HandleMail(u32 mail) override;
 	virtual void Update(int cycles) override;

Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #if !defined(AX_GC) && !defined(AX_WII)
-#error UCode_AX_Voice.h included without specifying version
+#error AXVoice.h included without specifying version
 #endif
 
 #include <functional>
@@ -18,8 +18,8 @@
 #include "Common/MathUtil.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/Memmap.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_AX.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_AXStructs.h"
+#include "Core/HW/DSPHLE/UCodes/AX.h"
+#include "Core/HW/DSPHLE/UCodes/AXStructs.h"
 
 #ifdef AX_GC
 # define PB_TYPE AXPB

Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp

@@ -2,36 +2,36 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 //
-#define AX_WII // Used in UCode_AX_Voice.
+#define AX_WII // Used in AXVoice.
 
 #include "Common/MathUtil.h"
 #include "Common/StringUtil.h"
 
 #include "Core/HW/DSPHLE/MailHandler.h"
 
-#include "Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_AXStructs.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_AXWii.h"
+#include "Core/HW/DSPHLE/UCodes/AXStructs.h"
+#include "Core/HW/DSPHLE/UCodes/AXVoice.h"
+#include "Core/HW/DSPHLE/UCodes/AXWii.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 
-CUCode_AXWii::CUCode_AXWii(DSPHLE *dsp_hle, u32 l_CRC)
-	: CUCode_AX(dsp_hle, l_CRC),
+AXWiiUCode::AXWiiUCode(DSPHLE *dsp_hle, u32 l_CRC)
+	: AXUCode(dsp_hle, l_CRC),
 	  m_last_main_volume(0x8000)
 {
 	for (u16& volume : m_last_aux_volumes)
 		volume = 0x8000;
 
-	WARN_LOG(DSPHLE, "Instantiating CUCode_AXWii");
+	WARN_LOG(DSPHLE, "Instantiating AXWiiUCode");
 
 	m_old_axwii = (l_CRC == 0xfa450138);
 }
 
-CUCode_AXWii::~CUCode_AXWii()
+AXWiiUCode::~AXWiiUCode()
 {
 }
 
-void CUCode_AXWii::HandleCommandList()
+void AXWiiUCode::HandleCommandList()
 {
 	// Temp variables for addresses computation
 	u16 addr_hi, addr_lo;
@@ -243,7 +243,7 @@ void CUCode_AXWii::HandleCommandList()
 	}
 }
 
-void CUCode_AXWii::SetupProcessing(u32 init_addr)
+void AXWiiUCode::SetupProcessing(u32 init_addr)
 {
 	// TODO: should be easily factorizable with AX
 	s16 init_data[60];
@@ -302,7 +302,7 @@ void CUCode_AXWii::SetupProcessing(u32 init_addr)
 	}
 }
 
-void CUCode_AXWii::AddToLR(u32 val_addr, bool neg)
+void AXWiiUCode::AddToLR(u32 val_addr, bool neg)
 {
 	int* ptr = (int*)HLEMemory_Get_Pointer(val_addr);
 	for (int i = 0; i < 32 * 3; ++i)
@@ -316,7 +316,7 @@ void CUCode_AXWii::AddToLR(u32 val_addr, bool neg)
 	}
 }
 
-void CUCode_AXWii::AddSubToLR(u32 val_addr)
+void AXWiiUCode::AddSubToLR(u32 val_addr)
 {
 	int* ptr = (int*)HLEMemory_Get_Pointer(val_addr);
 	for (int i = 0; i < 32 * 3; ++i)
@@ -331,7 +331,7 @@ void CUCode_AXWii::AddSubToLR(u32 val_addr)
 	}
 }
 
-AXMixControl CUCode_AXWii::ConvertMixerControl(u32 mixer_control)
+AXMixControl AXWiiUCode::ConvertMixerControl(u32 mixer_control)
 {
 	u32 ret = 0;
 
@@ -359,7 +359,7 @@ AXMixControl CUCode_AXWii::ConvertMixerControl(u32 mixer_control)
 	return (AXMixControl)ret;
 }
 
-void CUCode_AXWii::GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nvals)
+void AXWiiUCode::GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nvals)
 {
 	float curr = vol1;
 	for (size_t i = 0; i < nvals; ++i)
@@ -369,7 +369,7 @@ void CUCode_AXWii::GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nv
 	}
 }
 
-bool CUCode_AXWii::ExtractUpdatesFields(AXPBWii& pb, u16* num_updates, u16* updates,
+bool AXWiiUCode::ExtractUpdatesFields(AXPBWii& pb, u16* num_updates, u16* updates,
                                         u32* updates_addr)
 {
 	u16* pb_mem = (u16*)&pb;
@@ -409,7 +409,7 @@ bool CUCode_AXWii::ExtractUpdatesFields(AXPBWii& pb, u16* num_updates, u16* upda
 	return true;
 }
 
-void CUCode_AXWii::ReinjectUpdatesFields(AXPBWii& pb, u16* num_updates, u32 updates_addr)
+void AXWiiUCode::ReinjectUpdatesFields(AXPBWii& pb, u16* num_updates, u32 updates_addr)
 {
 	u16* pb_mem = (u16*)&pb;
 
@@ -424,7 +424,7 @@ void CUCode_AXWii::ReinjectUpdatesFields(AXPBWii& pb, u16* num_updates, u32 upda
 	pb_mem[45] = updates_addr & 0xFFFF;
 }
 
-void CUCode_AXWii::ProcessPBList(u32 pb_addr)
+void AXWiiUCode::ProcessPBList(u32 pb_addr)
 {
 	AXPBWii pb;
 
@@ -486,7 +486,7 @@ void CUCode_AXWii::ProcessPBList(u32 pb_addr)
 	}
 }
 
-void CUCode_AXWii::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume)
+void AXWiiUCode::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 volume)
 {
 	u16 volume_ramp[96];
 	GenerateVolumeRamp(volume_ramp, m_last_aux_volumes[aux_id], volume, 96);
@@ -540,7 +540,7 @@ void CUCode_AXWii::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16
 		}
 }
 
-void CUCode_AXWii::UploadAUXMixLRSC(int aux_id, u32* addresses, u16 volume)
+void AXWiiUCode::UploadAUXMixLRSC(int aux_id, u32* addresses, u16 volume)
 {
 	int* aux_left = aux_id ? m_samples_auxB_left : m_samples_auxA_left;
 	int* aux_right = aux_id ? m_samples_auxB_right : m_samples_auxA_right;
@@ -584,7 +584,7 @@ void CUCode_AXWii::UploadAUXMixLRSC(int aux_id, u32* addresses, u16 volume)
 	}
 }
 
-void CUCode_AXWii::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume,
+void AXWiiUCode::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume,
                                  bool upload_auxc)
 {
 	u16 volume_ramp[96];
@@ -637,7 +637,7 @@ void CUCode_AXWii::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume,
 	// sounds to go at half speed. I have no idea why.
 }
 
-void CUCode_AXWii::OutputWMSamples(u32* addresses)
+void AXWiiUCode::OutputWMSamples(u32* addresses)
 {
 	int* buffers[] = {
 		m_samples_wm0,
@@ -659,12 +659,12 @@ void CUCode_AXWii::OutputWMSamples(u32* addresses)
 	}
 }
 
-u32 CUCode_AXWii::GetUpdateMs()
+u32 AXWiiUCode::GetUpdateMs()
 {
 	return 3;
 }
 
-void CUCode_AXWii::DoState(PointerWrap &p)
+void AXWiiUCode::DoState(PointerWrap &p)
 {
 	DoStateShared(p);
 	DoAXState(p);

Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h

@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include "Core/HW/DSPHLE/UCodes/UCode_AX.h"
+#include "Core/HW/DSPHLE/UCodes/AX.h"
 
-class CUCode_AXWii : public CUCode_AX
+class AXWiiUCode : public AXUCode
 {
 public:
-	CUCode_AXWii(DSPHLE *dsp_hle, u32 _CRC);
-	virtual ~CUCode_AXWii();
+	AXWiiUCode(DSPHLE *dsp_hle, u32 _CRC);
+	virtual ~AXWiiUCode();
 	u32 GetUpdateMs() override;
 
 	virtual void DoState(PointerWrap &p) override;

Source/Core/Core/HW/DSPHLE/UCodes/CARD.cpp

@@ -5,25 +5,25 @@
 #include "Core/ConfigManager.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/DSPHLE/DSPHLE.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_CARD.h"
+#include "Core/HW/DSPHLE/UCodes/CARD.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 
-CUCode_CARD::CUCode_CARD(DSPHLE *dsp_hle, u32 crc)
-	: IUCode(dsp_hle, crc)
+CARDUCode::CARDUCode(DSPHLE *dsp_hle, u32 crc)
+	: UCodeInterface(dsp_hle, crc)
 {
-	DEBUG_LOG(DSPHLE, "CUCode_CARD - initialized");
+	DEBUG_LOG(DSPHLE, "CARDUCode - initialized");
 	m_rMailHandler.PushMail(DSP_INIT);
 }
 
 
-CUCode_CARD::~CUCode_CARD()
+CARDUCode::~CARDUCode()
 {
 	m_rMailHandler.Clear();
 }
 
 
-void CUCode_CARD::Update(int cycles)
+void CARDUCode::Update(int cycles)
 {
 	// check if we have to sent something
 	if (!m_rMailHandler.IsEmpty())
@@ -32,12 +32,12 @@ void CUCode_CARD::Update(int cycles)
 	}
 }
 
-u32 CUCode_CARD::GetUpdateMs()
+u32 CARDUCode::GetUpdateMs()
 {
 	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
 }
 
-void CUCode_CARD::HandleMail(u32 _uMail)
+void CARDUCode::HandleMail(u32 _uMail)
 {
 	if (_uMail == 0xFF000000) // unlock card
 	{
@@ -45,7 +45,7 @@ void CUCode_CARD::HandleMail(u32 _uMail)
 	}
 	else
 	{
-		DEBUG_LOG(DSPHLE, "CUCode_CARD - unknown command: %x", _uMail);
+		DEBUG_LOG(DSPHLE, "CARDUCode - unknown command: %x", _uMail);
 	}
 
 	m_rMailHandler.PushMail(DSP_DONE);

Source/Core/Core/HW/DSPHLE/UCodes/CARD.h

@@ -6,11 +6,11 @@
 
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
-class CUCode_CARD : public IUCode
+class CARDUCode : public UCodeInterface
 {
 public:
-	CUCode_CARD(DSPHLE *dsp_hle, u32 crc);
-	virtual ~CUCode_CARD();
+	CARDUCode(DSPHLE *dsp_hle, u32 crc);
+	virtual ~CARDUCode();
 	u32 GetUpdateMs() override;
 
 	void HandleMail(u32 _uMail) override;

Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp

@@ -4,21 +4,21 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/HW/DSP.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_GBA.h"
+#include "Core/HW/DSPHLE/UCodes/GBA.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
-CUCode_GBA::CUCode_GBA(DSPHLE *dsp_hle, u32 crc)
-: IUCode(dsp_hle, crc)
+GBAUCode::GBAUCode(DSPHLE *dsp_hle, u32 crc)
+: UCodeInterface(dsp_hle, crc)
 {
 	m_rMailHandler.PushMail(DSP_INIT);
 }
 
-CUCode_GBA::~CUCode_GBA()
+GBAUCode::~GBAUCode()
 {
 	m_rMailHandler.Clear();
 }
 
-void CUCode_GBA::Update(int cycles)
+void GBAUCode::Update(int cycles)
 {
 	// check if we have to send something
 	if (!m_rMailHandler.IsEmpty())
@@ -27,12 +27,12 @@ void CUCode_GBA::Update(int cycles)
 	}
 }
 
-u32 CUCode_GBA::GetUpdateMs()
+u32 GBAUCode::GetUpdateMs()
 {
 	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
 }
 
-void CUCode_GBA::HandleMail(u32 _uMail)
+void GBAUCode::HandleMail(u32 _uMail)
 {
 	static bool nextmail_is_mramaddr = false;
 	static bool calc_done = false;
@@ -136,12 +136,12 @@ void CUCode_GBA::HandleMail(u32 _uMail)
 			m_DSPHLE->SetUCode(UCODE_ROM);
 			break;
 		default:
-			DEBUG_LOG(DSPHLE, "CUCode_GBA - unknown 0xcdd1 command: %08x", _uMail);
+			DEBUG_LOG(DSPHLE, "GBAUCode - unknown 0xcdd1 command: %08x", _uMail);
 			break;
 		}
 	}
 	else
 	{
-		DEBUG_LOG(DSPHLE, "CUCode_GBA - unknown command: %08x", _uMail);
+		DEBUG_LOG(DSPHLE, "GBAUCode - unknown command: %08x", _uMail);
 	}
 }

Source/Core/Core/HW/DSPHLE/UCodes/GBA.h

@@ -6,10 +6,10 @@
 
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
-struct CUCode_GBA : public IUCode
+struct GBAUCode : public UCodeInterface
 {
-	CUCode_GBA(DSPHLE *dsp_hle, u32 crc);
-	virtual ~CUCode_GBA();
+	GBAUCode(DSPHLE *dsp_hle, u32 crc);
+	virtual ~GBAUCode();
 	u32 GetUpdateMs() override;
 
 	void HandleMail(u32 _uMail) override;

Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp

@@ -0,0 +1,44 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+#include "Core/ConfigManager.h"
+#include "Core/HW/DSPHLE/UCodes/INIT.h"
+#include "Core/HW/DSPHLE/UCodes/UCodes.h"
+
+INITUCode::INITUCode(DSPHLE *dsp_hle, u32 crc)
+	: UCodeInterface(dsp_hle, crc)
+{
+	DEBUG_LOG(DSPHLE, "INITUCode - initialized");
+}
+
+
+INITUCode::~INITUCode()
+{
+}
+
+
+void INITUCode::Init()
+{
+}
+
+
+void INITUCode::Update(int cycles)
+{
+	if (m_rMailHandler.IsEmpty())
+	{
+		m_rMailHandler.PushMail(0x80544348);
+		// HALT
+	}
+}
+
+u32 INITUCode::GetUpdateMs()
+{
+	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
+}
+
+void INITUCode::HandleMail(u32 _uMail)
+{
+}
+
+

Source/Core/Core/HW/DSPHLE/UCodes/INIT.h

@@ -6,11 +6,11 @@
 
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
-class CUCode_InitAudioSystem : public IUCode
+class INITUCode : public UCodeInterface
 {
 public:
-	CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc);
-	virtual ~CUCode_InitAudioSystem();
+	INITUCode(DSPHLE *dsp_hle, u32 crc);
+	virtual ~INITUCode();
 	u32 GetUpdateMs() override;
 
 	void HandleMail(u32 _uMail) override;

Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp

@@ -10,11 +10,11 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/HW/Memmap.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_ROM.h"
+#include "Core/HW/DSPHLE/UCodes/ROM.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
-CUCode_Rom::CUCode_Rom(DSPHLE *dsp_hle, u32 crc)
-	: IUCode(dsp_hle, crc)
+ROMUCode::ROMUCode(DSPHLE *dsp_hle, u32 crc)
+	: UCodeInterface(dsp_hle, crc)
 	, m_CurrentUCode()
 	, m_BootTask_numSteps(0)
 	, m_NextParameter(0)
@@ -24,13 +24,13 @@ CUCode_Rom::CUCode_Rom(DSPHLE *dsp_hle, u32 crc)
 	m_rMailHandler.PushMail(0x8071FEED);
 }
 
-CUCode_Rom::~CUCode_Rom()
+ROMUCode::~ROMUCode()
 {}
 
-void CUCode_Rom::Update(int cycles)
+void ROMUCode::Update(int cycles)
 {}
 
-void CUCode_Rom::HandleMail(u32 _uMail)
+void ROMUCode::HandleMail(u32 _uMail)
 {
 	if (m_NextParameter == 0)
 	{
@@ -82,7 +82,7 @@ void CUCode_Rom::HandleMail(u32 _uMail)
 	}
 }
 
-void CUCode_Rom::BootUCode()
+void ROMUCode::BootUCode()
 {
 	u32 ector_crc = HashEctor(
 		(u8*)HLEMemory_Get_Pointer(m_CurrentUCode.m_RAMAddress),
@@ -107,12 +107,12 @@ void CUCode_Rom::BootUCode()
 	m_DSPHLE->SetUCode(ector_crc);
 }
 
-u32 CUCode_Rom::GetUpdateMs()
+u32 ROMUCode::GetUpdateMs()
 {
 	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
 }
 
-void CUCode_Rom::DoState(PointerWrap &p)
+void ROMUCode::DoState(PointerWrap &p)
 {
 	p.Do(m_CurrentUCode);
 	p.Do(m_BootTask_numSteps);

Source/Core/Core/HW/DSPHLE/UCodes/ROM.h

@@ -6,11 +6,11 @@
 
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
-class CUCode_Rom : public IUCode
+class ROMUCode : public UCodeInterface
 {
 public:
-	CUCode_Rom(DSPHLE *dsp_hle, u32 _crc);
-	virtual ~CUCode_Rom();
+	ROMUCode(DSPHLE *dsp_hle, u32 _crc);
+	virtual ~ROMUCode();
 	u32 GetUpdateMs() override;
 
 	void HandleMail(u32 _uMail) override;

Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp

@@ -1,44 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Core/ConfigManager.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h"
-#include "Core/HW/DSPHLE/UCodes/UCodes.h"
-
-CUCode_InitAudioSystem::CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc)
-	: IUCode(dsp_hle, crc)
-{
-	DEBUG_LOG(DSPHLE, "CUCode_InitAudioSystem - initialized");
-}
-
-
-CUCode_InitAudioSystem::~CUCode_InitAudioSystem()
-{
-}
-
-
-void CUCode_InitAudioSystem::Init()
-{
-}
-
-
-void CUCode_InitAudioSystem::Update(int cycles)
-{
-	if (m_rMailHandler.IsEmpty())
-	{
-		m_rMailHandler.PushMail(0x80544348);
-		// HALT
-	}
-}
-
-u32 CUCode_InitAudioSystem::GetUpdateMs()
-{
-	return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ? 3 : 5;
-}
-
-void CUCode_InitAudioSystem::HandleMail(u32 _uMail)
-{
-}
-
-