prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed enum to enum class

Browse Source
This commit is contained in:
David Marcec
2018-06-22 17:29:41 +10:00
parent a342f550d8
commit 409d636602
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/hle/service/audio/audren_u.cpp
View File

@@ -76,10 +76,10 @@ private:
std::memcpy(output.data(), &response_data, sizeof(AudioRendererResponse)); std::memcpy(output.data(), &response_data, sizeof(AudioRendererResponse));
std::vector<MemoryPoolEntry> memory_pool(memory_pool_count); std::vector<MemoryPoolEntry> memory_pool(memory_pool_count);
for (unsigned i = 0; i < memory_pool.size(); i++) { for (unsigned i = 0; i < memory_pool.size(); i++) {
if (mem_pool_info[i].pool_state == MemoryPoolStates::MPS_RequestAttach) if (mem_pool_info[i].pool_state == MemoryPoolStates::RequestAttach)
memory_pool[i].state = MemoryPoolStates::MPS_Attached; memory_pool[i].state = MemoryPoolStates::Attached;
else if (mem_pool_info[i].pool_state == MemoryPoolStates::MPS_RequestDetatch) else if (mem_pool_info[i].pool_state == MemoryPoolStates::RequestDetatch)
memory_pool[i].state = MemoryPoolStates::MPS_Detatched; memory_pool[i].state = MemoryPoolStates::Detatched;
else else
memory_pool[i].state = mem_pool_info[i].pool_state; memory_pool[i].state = mem_pool_info[i].pool_state;
} }
@@ -120,8 +120,18 @@ private:
NGLOG_WARNING(Service_Audio, "(STUBBED) called"); NGLOG_WARNING(Service_Audio, "(STUBBED) called");
} }
enum class MemoryPoolStates : u32_le {
Invalid = 0x0,
Unknown = 0x1,
RequestDetatch = 0x2,
Detatched = 0x3,
RequestAttach = 0x4,
Attached = 0x5,
Released = 0x6,
};
struct MemoryPoolEntry { struct MemoryPoolEntry {
u32_le state; MemoryPoolStates state;
u32_le unknown_4; u32_le unknown_4;
u32_le unknown_8; u32_le unknown_8;
u32_le unknown_c; u32_le unknown_c;
@@ -131,21 +141,11 @@ private:
struct MemoryPoolInfo { struct MemoryPoolInfo {
u64_le pool_address; u64_le pool_address;
u64_le pool_size; u64_le pool_size;
u32_le pool_state; MemoryPoolStates pool_state;
INSERT_PADDING_WORDS(3); // Unknown INSERT_PADDING_WORDS(3); // Unknown
}; };
static_assert(sizeof(MemoryPoolInfo) == 0x20, "MemoryPoolInfo has wrong size"); static_assert(sizeof(MemoryPoolInfo) == 0x20, "MemoryPoolInfo has wrong size");
enum MemoryPoolStates : u32 {
MPS_Invalid = 0x0,
MPS_Unknown = 0x1,
MPS_RequestDetatch = 0x2,
MPS_Detatched = 0x3,
MPS_RequestAttach = 0x4,
MPS_Attached = 0x5,
MPS_Released = 0x6,
};
struct AudioRendererConfig { struct AudioRendererConfig {
u32 revision; u32 revision;
u32 behavior_size; u32 behavior_size;