fc: serialize controller state

ares-emulator · Oct 17, 2023 · 401df96 · 401df96
1 parent 5deec7e
commit 401df96
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/ares/fc/controller/controller.hpp b/ares/fc/controller/controller.hpp
@@ -26,6 +26,7 @@ struct Controller {
 
   virtual auto data() -> n3 { return 0b000; }
   virtual auto latch(n1 data) -> void {}
+  virtual auto serialize(serializer&) -> void {}
 };
 
 #include "port.hpp"

diff --git a/ares/fc/controller/gamepad/gamepad.cpp b/ares/fc/controller/gamepad/gamepad.cpp
@@ -60,3 +60,16 @@ auto Gamepad::latch(n1 data) -> void {
     }
   }
 }
+
+auto Gamepad::serialize(serializer& s) -> void {
+  s(latched);
+  s(counter);
+
+  s(yHold);
+  s(upLatch);
+  s(downLatch);
+  s(xHold);
+  s(leftLatch);
+  s(rightLatch);
+}
+
diff --git a/ares/fc/controller/gamepad/gamepad.hpp b/ares/fc/controller/gamepad/gamepad.hpp
@@ -11,6 +11,7 @@ struct Gamepad : Controller {
   Gamepad(Node::Port);
   auto data() -> n3 override;
   auto latch(n1 data) -> void override;
+  auto serialize(serializer&) -> void override;
 
 private:
   bool latched = 0;

diff --git a/ares/fc/controller/port.cpp b/ares/fc/controller/port.cpp
@@ -26,4 +26,5 @@ auto ControllerPort::allocate(string name) -> Node::Peripheral {
 }
 
 auto ControllerPort::serialize(serializer& s) -> void {
+  if(device) device->serialize(s);
 }
diff --git a/ares/fc/system/serialization.cpp b/ares/fc/system/serialization.cpp
@@ -1,4 +1,4 @@
-static const string SerializerVersion = "v131";
+static const string SerializerVersion = "v132";
 
 auto System::serialize(bool synchronize) -> serializer {
   if(synchronize) scheduler.enter(Scheduler::Mode::Synchronize);
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     auto ControllerPort::serialize(serializer& s) -> void {
+      if(device) device->serialize(s);
     }