summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-05-07 06:54:31 +0200
committerbunnei <bunneidev@gmail.com>2016-05-07 06:54:31 +0200
commit1a6cd7eb4b0b17f51d5cce036aa586f909a068e0 (patch)
tree0b6ce13f42bd581d7dce3228f05992bd9e84aa7e
parentMerge pull request #1544 from linkmauve/move-glad-init (diff)
downloadyuzu-1a6cd7eb4b0b17f51d5cce036aa586f909a068e0.tar
yuzu-1a6cd7eb4b0b17f51d5cce036aa586f909a068e0.tar.gz
yuzu-1a6cd7eb4b0b17f51d5cce036aa586f909a068e0.tar.bz2
yuzu-1a6cd7eb4b0b17f51d5cce036aa586f909a068e0.tar.lz
yuzu-1a6cd7eb4b0b17f51d5cce036aa586f909a068e0.tar.xz
yuzu-1a6cd7eb4b0b17f51d5cce036aa586f909a068e0.tar.zst
yuzu-1a6cd7eb4b0b17f51d5cce036aa586f909a068e0.zip
-rw-r--r--src/audio_core/hle/dsp.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/audio_core/hle/dsp.h b/src/audio_core/hle/dsp.h
index 4459a5668..f6e53f68f 100644
--- a/src/audio_core/hle/dsp.h
+++ b/src/audio_core/hle/dsp.h
@@ -33,13 +33,9 @@ namespace HLE {
// double-buffer. The frame counter is located as the very last u16 of each region and is incremented
// each audio tick.
-struct SharedMemory;
-
constexpr VAddr region0_base = 0x1FF50000;
constexpr VAddr region1_base = 0x1FF70000;
-extern std::array<SharedMemory, 2> g_regions;
-
/**
* The DSP is native 16-bit. The DSP also appears to be big-endian. When reading 32-bit numbers from
* its memory regions, the higher and lower 16-bit halves are swapped compared to the little-endian
@@ -507,6 +503,8 @@ struct SharedMemory {
};
ASSERT_DSP_STRUCT(SharedMemory, 0x8000);
+extern std::array<SharedMemory, 2> g_regions;
+
// Structures must have an offset that is a multiple of two.
static_assert(offsetof(SharedMemory, frame_counter) % 2 == 0, "Structures in DSP::HLE::SharedMemory must be 2-byte aligned");
static_assert(offsetof(SharedMemory, source_configurations) % 2 == 0, "Structures in DSP::HLE::SharedMemory must be 2-byte aligned");