From f7017b2992cd262336f27d633bb2d4e936c98f98 Mon Sep 17 00:00:00 2001 From: John Pansera Date: Wed, 5 Jul 2017 00:35:55 -0400 Subject: [PATCH] IOS: Add IOS4v3 Constants Fix indentation --- Source/Core/Core/IOS/MemoryValues.cpp | 11 +++++++++-- Source/Core/Core/IOS/MemoryValues.h | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/IOS/MemoryValues.cpp b/Source/Core/Core/IOS/MemoryValues.cpp index 1fe60dfd29..ec05088df5 100644 --- a/Source/Core/Core/IOS/MemoryValues.cpp +++ b/Source/Core/Core/IOS/MemoryValues.cpp @@ -27,8 +27,15 @@ constexpr u32 RAM_VENDOR_MIOS = 0xCAFEBABE; // The writes are usually contained in a single function that // mostly writes raw literals to the relevant locations. // e.g. IOS9, version 1034, content id 0x00000006, function at 0xffff6884 -constexpr std::array ios_memory_values = { +constexpr std::array ios_memory_values = { {{ + 4, 0x40003, 0x81006, MEM1_SIZE, + MEM1_SIZE, MEM1_END, MEM1_ARENA_BEGIN, MEM1_ARENA_END, + MEM2_SIZE, MEM2_SIZE, 0x93400000, MEM2_ARENA_BEGIN, + 0x933E0000, 0x933E0000, 0x93400000, HOLLYWOOD_REVISION, + RAM_VENDOR, PLACEHOLDER, PLACEHOLDER, 0, + }, + { 9, 0x9040a, 0x030110, MEM1_SIZE, MEM1_SIZE, MEM1_END, MEM1_ARENA_BEGIN, MEM1_ARENA_END, MEM2_SIZE, MEM2_SIZE, 0x93400000, MEM2_ARENA_BEGIN, @@ -324,7 +331,7 @@ constexpr std::array ios_memory_values = { PLACEHOLDER, }}}; -const std::array& GetMemoryValues() +const std::array& GetMemoryValues() { return ios_memory_values; } diff --git a/Source/Core/Core/IOS/MemoryValues.h b/Source/Core/Core/IOS/MemoryValues.h index f2478a9d8a..d04dedd9c5 100644 --- a/Source/Core/Core/IOS/MemoryValues.h +++ b/Source/Core/Core/IOS/MemoryValues.h @@ -36,6 +36,6 @@ struct MemoryValues u32 sysmenu_sync; }; -const std::array& GetMemoryValues(); +const std::array& GetMemoryValues(); } }