summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2017-01-15 15:53:31 -0500
committerLioncash <mathew1800@gmail.com>2017-01-15 16:03:12 -0500
commitc6ec5de65962cb3c3edeeef76e9405096e67fd4b (patch)
treec00cefbc9a040e93bae0091ac9b3c752fe5a1870 /Source/Core
parent28f0d8e8a73af1323d3d88b91459911469f2ac1c (diff)
HW/DSP: Use member initializers with structs/unions where applicable
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/HW/DSP.cpp47
1 files changed, 12 insertions, 35 deletions
diff --git a/Source/Core/Core/HW/DSP.cpp b/Source/Core/Core/HW/DSP.cpp
index 7de4909c3f..f5884a0521 100644
--- a/Source/Core/Core/HW/DSP.cpp
+++ b/Source/Core/Core/HW/DSP.cpp
@@ -67,7 +67,7 @@ enum
// UARAMCount
union UARAMCount
{
- u32 Hex;
+ u32 Hex = 0;
struct
{
u32 count : 31;
@@ -78,61 +78,38 @@ union UARAMCount
// Blocks are 32 bytes.
union UAudioDMAControl
{
- u16 Hex;
+ u16 Hex = 0;
struct
{
u16 NumBlocks : 15;
u16 Enable : 1;
};
-
- UAudioDMAControl(u16 _Hex = 0) : Hex(_Hex) {}
};
// AudioDMA
struct AudioDMA
{
- u32 current_source_address;
- u16 remaining_blocks_count;
- u32 SourceAddress;
+ u32 current_source_address = 0;
+ u16 remaining_blocks_count = 0;
+ u32 SourceAddress = 0;
UAudioDMAControl AudioDMAControl;
-
- AudioDMA()
- : current_source_address(0), remaining_blocks_count(0), SourceAddress(0), AudioDMAControl(0)
- {
- }
};
// ARAM_DMA
struct ARAM_DMA
{
- u32 MMAddr;
- u32 ARAddr;
+ u32 MMAddr = 0;
+ u32 ARAddr = 0;
UARAMCount Cnt;
-
- ARAM_DMA()
- {
- MMAddr = 0;
- ARAddr = 0;
- Cnt.Hex = 0;
- }
};
// So we may abstract GC/Wii differences a little
struct ARAMInfo
{
- bool wii_mode; // Wii EXRAM is managed in Memory:: so we need to skip statesaving, etc
- u32 size;
- u32 mask;
- u8* ptr; // aka audio ram, auxiliary ram, MEM2, EXRAM, etc...
-
- // Default to GC mode
- ARAMInfo()
- {
- wii_mode = false;
- size = ARAM_SIZE;
- mask = ARAM_MASK;
- ptr = nullptr;
- }
+ bool wii_mode = false; // Wii EXRAM is managed in Memory:: so we need to skip statesaving, etc
+ u32 size = ARAM_SIZE;
+ u32 mask = ARAM_MASK;
+ u8* ptr = nullptr; // aka audio ram, auxiliary ram, MEM2, EXRAM, etc...
};
// STATE_TO_SAVE
@@ -143,7 +120,7 @@ UDSPControl g_dspState;
union ARAM_Info
{
- u16 Hex;
+ u16 Hex = 0;
struct
{
u16 size : 6;