summaryrefslogtreecommitdiffstats
path: root/src/audio_core/hle/dsp.cpp
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-05-01 06:36:00 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2017-05-10 06:44:00 +0200
commitb4a93cfddecdb939562e56d7609657d2f14b6702 (patch)
tree75da1f521209b74fa82a982356b878bd1c475562 /src/audio_core/hle/dsp.cpp
parentMemory: Add constants for the n3DS additional RAM (diff)
downloadyuzu-b4a93cfddecdb939562e56d7609657d2f14b6702.tar
yuzu-b4a93cfddecdb939562e56d7609657d2f14b6702.tar.gz
yuzu-b4a93cfddecdb939562e56d7609657d2f14b6702.tar.bz2
yuzu-b4a93cfddecdb939562e56d7609657d2f14b6702.tar.lz
yuzu-b4a93cfddecdb939562e56d7609657d2f14b6702.tar.xz
yuzu-b4a93cfddecdb939562e56d7609657d2f14b6702.tar.zst
yuzu-b4a93cfddecdb939562e56d7609657d2f14b6702.zip
Diffstat (limited to 'src/audio_core/hle/dsp.cpp')
-rw-r--r--src/audio_core/hle/dsp.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/audio_core/hle/dsp.cpp b/src/audio_core/hle/dsp.cpp
index 31421fdc6..260b182ed 100644
--- a/src/audio_core/hle/dsp.cpp
+++ b/src/audio_core/hle/dsp.cpp
@@ -16,31 +16,33 @@ namespace HLE {
// Region management
-std::array<SharedMemory, 2> g_regions;
+DspMemory g_dsp_memory;
static size_t CurrentRegionIndex() {
// The region with the higher frame counter is chosen unless there is wraparound.
// This function only returns a 0 or 1.
+ u16 frame_counter_0 = g_dsp_memory.region_0.frame_counter;
+ u16 frame_counter_1 = g_dsp_memory.region_1.frame_counter;
- if (g_regions[0].frame_counter == 0xFFFFu && g_regions[1].frame_counter != 0xFFFEu) {
+ if (frame_counter_0 == 0xFFFFu && frame_counter_1 != 0xFFFEu) {
// Wraparound has occurred.
return 1;
}
- if (g_regions[1].frame_counter == 0xFFFFu && g_regions[0].frame_counter != 0xFFFEu) {
+ if (frame_counter_1 == 0xFFFFu && frame_counter_0 != 0xFFFEu) {
// Wraparound has occurred.
return 0;
}
- return (g_regions[0].frame_counter > g_regions[1].frame_counter) ? 0 : 1;
+ return (frame_counter_0 > frame_counter_1) ? 0 : 1;
}
static SharedMemory& ReadRegion() {
- return g_regions[CurrentRegionIndex()];
+ return CurrentRegionIndex() == 0 ? g_dsp_memory.region_0 : g_dsp_memory.region_1;
}
static SharedMemory& WriteRegion() {
- return g_regions[1 - CurrentRegionIndex()];
+ return CurrentRegionIndex() != 0 ? g_dsp_memory.region_0 : g_dsp_memory.region_1;
}
// Audio processing and mixing