sfc: brr bank -> brr page

ares-emulator · Jun 30, 2023 · 1ed43da · 1ed43da
1 parent c4aea44
commit 1ed43da
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/ares/sfc/dsp/dsp.hpp b/ares/sfc/dsp/dsp.hpp
@@ -77,9 +77,9 @@ struct DSP : Thread {
   } noise;
 
   struct BRR {
-    n8  bank;
+    n8  page;
 
-    n8  _bank;
+    n8  _page;
     n8  _source;
     n16 _address;
     n16 _nextAddress;

diff --git a/ares/sfc/dsp/memory.cpp b/ares/sfc/dsp/memory.cpp
@@ -49,7 +49,7 @@ auto DSP::write(n7 address, n8 data) -> void {
     for(u32 n : range(8)) voice[n].echo = data.bit(n);
     break;
   case 0x5d:  //DIR
-    brr.bank = data;
+    brr.page = data;
     break;
   case 0x6d:  //ESA
     echo.bank = data;

diff --git a/ares/sfc/dsp/misc.cpp b/ares/sfc/dsp/misc.cpp
@@ -4,7 +4,7 @@ auto DSP::misc27() -> void {
 
 auto DSP::misc28() -> void {
   for(auto& v : voice) v._noise = v.noise, v._echo  = v.echo;
-  brr._bank = brr.bank;
+  brr._page = brr.page;
 }
 
 auto DSP::misc29() -> void {

diff --git a/ares/sfc/dsp/serialization.cpp b/ares/sfc/dsp/serialization.cpp
@@ -32,8 +32,8 @@ auto DSP::serialize(serializer& s) -> void {
   s(noise.frequency);
   s(noise.lfsr);
 
-  s(brr.bank);
-  s(brr._bank);
+  s(brr.page);
+  s(brr._page);
   s(brr._source);
   s(brr._address);
   s(brr._nextAddress);

diff --git a/ares/sfc/dsp/voice.cpp b/ares/sfc/dsp/voice.cpp
@@ -14,7 +14,7 @@ inline auto DSP::voiceOutput(Voice& v, n1 channel) -> void {
 }
 
 auto DSP::voice1(Voice& v) -> void {
-  brr._address = (brr._bank << 8) + (brr._source << 2);
+  brr._address = (brr._page << 8) + (brr._source << 2);
   brr._source = v.source;
 }