SI: Add 16bit accessors for SI IO buffer

dolphin-emu · Aug 15, 2018 · 79f6d57 · 79f6d57
1 parent 60f12e1
commit 79f6d57
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/Source/Core/Core/HW/SI/SI.cpp b/Source/Core/Core/HW/SI/SI.cpp
@@ -50,6 +50,7 @@ enum
   SI_COM_CSR = 0x34,
   SI_STATUS_REG = 0x38,
   SI_EXI_CLOCK_COUNT = 0x3C,
+  SI_IO_BUFFER = 0x80,
 };
 
 // SI Channel Output
@@ -416,11 +417,18 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
   // Register SI buffer direct accesses.
   for (size_t i = 0; i < s_si_buffer.size(); i += sizeof(u32))
   {
-    const u32 address = base | static_cast<u32>(s_si_buffer.size() + i);
+    const u32 address = base | static_cast<u32>(SI_IO_BUFFER + i);
 
     mmio->Register(address, MMIO::DirectRead<u32>((u32*)&s_si_buffer[i]),
                    MMIO::DirectWrite<u32>((u32*)&s_si_buffer[i]));
   }
+  for (size_t i = 0; i < s_si_buffer.size(); i += sizeof(u16))
+  {
+    const u32 address = base | static_cast<u32>(SI_IO_BUFFER + i);
+
+    mmio->Register(address, MMIO::DirectRead<u16>((u16*)&s_si_buffer[i]),
+                   MMIO::DirectWrite<u16>((u16*)&s_si_buffer[i]));
+  }
 
   // In and out for the 4 SI channels.
   for (int i = 0; i < MAX_SI_CHANNELS; ++i)