Merge pull request #11126 from AdmiralCurtiss/globals-si

HW: Move SerialInterface variables to Core::System.

Source/Core/Core/HW/SI/SI.h

@@ -15,6 +15,23 @@ class Mapping;
 
 namespace SerialInterface
 {
+class SerialInterfaceState
+{
+public:
+  SerialInterfaceState();
+  SerialInterfaceState(const SerialInterfaceState&) = delete;
+  SerialInterfaceState(SerialInterfaceState&&) = delete;
+  SerialInterfaceState& operator=(const SerialInterfaceState&) = delete;
+  SerialInterfaceState& operator=(SerialInterfaceState&&) = delete;
+  ~SerialInterfaceState();
+
+  struct Data;
+  Data& GetData() { return *m_data; }
+
+private:
+  std::unique_ptr<Data> m_data;
+};
+
 class ISIDevice;
 enum SIDevices : int;
 

Source/Core/Core/System.cpp

@@ -12,6 +12,7 @@
 #include "Core/HW/DVD/DVDInterface.h"
 #include "Core/HW/DVD/DVDThread.h"
 #include "Core/HW/EXI/EXI.h"
+#include "Core/HW/SI/SI.h"
 #include "Core/HW/Sram.h"
 #include "Core/HW/VideoInterface.h"
 
@@ -28,6 +29,7 @@ struct System::Impl
   DVDInterface::DVDInterfaceState m_dvd_interface_state;
   DVDThread::DVDThreadState m_dvd_thread_state;
   ExpansionInterface::ExpansionInterfaceState m_expansion_interface_state;
+  SerialInterface::SerialInterfaceState m_serial_interface_state;
   Sram m_sram;
   VideoInterface::VideoInterfaceState m_video_interface_state;
 };
@@ -100,6 +102,11 @@ ExpansionInterface::ExpansionInterfaceState& System::GetExpansionInterfaceState(
   return m_impl->m_expansion_interface_state;
 }
 
+SerialInterface::SerialInterfaceState& System::GetSerialInterfaceState() const
+{
+  return m_impl->m_serial_interface_state;
+}
+
 Sram& System::GetSRAM() const
 {
   return m_impl->m_sram;

Source/Core/Core/System.h

@@ -28,6 +28,10 @@ namespace ExpansionInterface
 {
 class ExpansionInterfaceState;
 };
+namespace SerialInterface
+{
+class SerialInterfaceState;
+};
 namespace VideoInterface
 {
 class VideoInterfaceState;
@@ -72,6 +76,7 @@ public:
   DVDInterface::DVDInterfaceState& GetDVDInterfaceState() const;
   DVDThread::DVDThreadState& GetDVDThreadState() const;
   ExpansionInterface::ExpansionInterfaceState& GetExpansionInterfaceState() const;
+  SerialInterface::SerialInterfaceState& GetSerialInterfaceState() const;
   Sram& GetSRAM() const;
   VideoInterface::VideoInterfaceState& GetVideoInterfaceState() const;