Fix simulator from merge

firmware/src/fw_update/updater_proxy.cc

@@ -1,5 +1,4 @@
 #include "updater_proxy.hh"
-#include "fw_update/ram_buffer.hh" //must be exactly this, or else simulator build picks wrong file
 #include "fw_update/update_path.hh"
 #include "manifest_parse.hh"
 #include "pr_dbg.hh"

firmware/src/fw_update/updater_proxy.hh

@@ -1,6 +1,6 @@
 #pragma once
+#include "fw_update/ram_buffer.hh" //path must be exactly this, or else simulator build picks wrong file
 #include "patch_file/file_storage_proxy.hh"
-#include "ram_buffer.hh"
 #include "update_file.hh"
 #include <cstdint>
 #include <string>

simulator/CMakeLists.txt

@@ -126,6 +126,7 @@ add_executable(
     ${FWDIR}/src/fw_update/updater_proxy.cc
     ${SHARED}/patch_convert/ryml/ryml_serial.cc
     ${SHARED}/patch_convert/yaml_to_patch.cc 
+    ${SHARED}/patch_convert/patch_to_yaml.cc 
     ${FACEPLATE_ARTWORK_SOURCES}
     ${COMP_ARTWORK_SOURCES} 
     ${SLS_SOURCES})

simulator/stubs/fw_update/ram_buffer.hh

@@ -12,12 +12,32 @@ inline std::span<uint8_t> get_ram_buffer() {
 	return buffer;
 }
 
-inline std::span<uint8_t> get_ram_buffer_client() {
-	return get_ram_buffer().first(5 * 1024 * 1024);
-}
+class OneTimeArenaAllocator {
+public:
+	OneTimeArenaAllocator(std::span<uint8_t> arena_)
+		: arena(arena_)
+		, offset(0) {
+	}
 
-inline std::span<uint8_t> get_ram_buffer_server() {
-	return get_ram_buffer().last(get_ram_buffer().size() - 5 * 1024 * 1024);
-}
+	uint8_t *allocate(std::size_t size) {
+		auto bytesRemaining = arena.size() - offset;
+		if (bytesRemaining > size) {
+			auto result = &arena[offset];
+			offset += size;
+
+			return result;
+		} else {
+			return nullptr;
+		}
+	}
+
+	void reset() {
+		offset = 0;
+	}
+
+private:
+	std::span<uint8_t> arena;
+	std::size_t offset;
+};
 
 } // namespace MetaModule

simulator/stubs/patch_file/file_storage_proxy.hh

@@ -182,12 +182,9 @@ public:
 	}
 
 	[[nodiscard]] bool request_file_flash(IntercoreStorageMessage::FlashTarget target,
-										  std::string_view filename,
-										  Volume vol,
+										  std::span<uint8_t> buffer,
 										  uint32_t address,
-										  uint32_t length,
 										  uint32_t *bytes_processed) {
-		//TODO
 		return true;
 	}