From 9e95e1e4752dcb3c01335f02d596c9592ffd6af5 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Mon, 10 Feb 2025 02:42:19 -0500
Subject: [PATCH] Move ROM write functions to rom.c

---
 src/floppy/fdc_monster.c | 51 ----------------------------------------
 src/include/86box/rom.h  |  5 ++++
 src/mem/rom.c            | 51 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/src/floppy/fdc_monster.c b/src/floppy/fdc_monster.c
index 1b0e2fbac..b91d4db66 100644
--- a/src/floppy/fdc_monster.c
+++ b/src/floppy/fdc_monster.c
@@ -47,57 +47,6 @@ typedef struct monster_fdc_t {
     char   nvr_path[64];
 } monster_fdc_t;
 
-static void
-rom_write(uint32_t addr, uint8_t val, void *priv)
-{
-    const rom_t *rom = (rom_t *) priv;
-
-#ifdef ROM_TRACE
-    if (rom->mapping.base == ROM_TRACE)
-        rom_log("ROM: read byte from BIOS at %06lX\n", addr);
-#endif
-
-    if (addr < rom->mapping.base)
-        return;
-    if (addr >= (rom->mapping.base + rom->sz))
-        return;
-    rom->rom[(addr - rom->mapping.base) & rom->mask] = val;
-}
-
-static void
-rom_writew(uint32_t addr, uint16_t val, void *priv)
-{
-    rom_t *rom = (rom_t *) priv;
-
-#ifdef ROM_TRACE
-    if (rom->mapping.base == ROM_TRACE)
-        rom_log("ROM: read word from BIOS at %06lX\n", addr);
-#endif
-
-    if (addr < (rom->mapping.base - 1))
-        return;
-    if (addr >= (rom->mapping.base + rom->sz))
-        return;
-    *(uint16_t *) &rom->rom[(addr - rom->mapping.base) & rom->mask] = val;
-}
-
-static void
-rom_writel(uint32_t addr, uint32_t val, void *priv)
-{
-    rom_t *rom = (rom_t *) priv;
-
-#ifdef ROM_TRACE
-    if (rom->mapping.base == ROM_TRACE)
-        rom_log("ROM: read long from BIOS at %06lX\n", addr);
-#endif
-
-    if (addr < (rom->mapping.base - 3))
-        return;
-    if (addr >= (rom->mapping.base + rom->sz))
-        return;
-    *(uint32_t *) &rom->rom[(addr - rom->mapping.base) & rom->mask] = val;
-}
-
 static void
 monster_fdc_close(void *priv)
 {
diff --git a/src/include/86box/rom.h b/src/include/86box/rom.h
index 83fd7cf90..331d78526 100644
--- a/src/include/86box/rom.h
+++ b/src/include/86box/rom.h
@@ -52,7 +52,12 @@ extern uint8_t  rom_read(uint32_t addr, void *priv);
 extern uint16_t rom_readw(uint32_t addr, void *priv);
 extern uint32_t rom_readl(uint32_t addr, void *priv);
 
+extern void rom_write(uint32_t addr, uint8_t val, void *priv);
+extern void rom_writew(uint32_t addr, uint16_t val, void *priv);
+extern void rom_writel(uint32_t addr, uint32_t val, void *priv);
+
 extern void  rom_get_full_path(char *dest, const char *fn);
+
 extern FILE *rom_fopen(const char *fn, char *mode);
 extern int   rom_getfile(char *fn, char *s, int size);
 extern int   rom_present(const char *fn);
diff --git a/src/mem/rom.c b/src/mem/rom.c
index 8b2308402..666652d53 100644
--- a/src/mem/rom.c
+++ b/src/mem/rom.c
@@ -244,6 +244,57 @@ rom_readl(uint32_t addr, void *priv)
     return (*(uint32_t *) &rom->rom[(addr - rom->mapping.base) & rom->mask]);
 }
 
+void
+rom_write(uint32_t addr, uint8_t val, void *priv)
+{
+    const rom_t *rom = (rom_t *) priv;
+
+#ifdef ROM_TRACE
+    if (rom->mapping.base == ROM_TRACE)
+        rom_log("ROM: write byte from BIOS at %06lX\n", addr);
+#endif
+
+    if (addr < rom->mapping.base)
+        return;
+    if (addr >= (rom->mapping.base + rom->sz))
+        return;
+    rom->rom[(addr - rom->mapping.base) & rom->mask] = val;
+}
+
+void
+rom_writew(uint32_t addr, uint16_t val, void *priv)
+{
+    rom_t *rom = (rom_t *) priv;
+
+#ifdef ROM_TRACE
+    if (rom->mapping.base == ROM_TRACE)
+        rom_log("ROM: write word from BIOS at %06lX\n", addr);
+#endif
+
+    if (addr < (rom->mapping.base - 1))
+        return;
+    if (addr >= (rom->mapping.base + rom->sz))
+        return;
+    *(uint16_t *) &rom->rom[(addr - rom->mapping.base) & rom->mask] = val;
+}
+
+void
+rom_writel(uint32_t addr, uint32_t val, void *priv)
+{
+    rom_t *rom = (rom_t *) priv;
+
+#ifdef ROM_TRACE
+    if (rom->mapping.base == ROM_TRACE)
+        rom_log("ROM: write long from BIOS at %06lX\n", addr);
+#endif
+
+    if (addr < (rom->mapping.base - 3))
+        return;
+    if (addr >= (rom->mapping.base + rom->sz))
+        return;
+    *(uint32_t *) &rom->rom[(addr - rom->mapping.base) & rom->mask] = val;
+}
+
 int
 rom_load_linear_oddeven(const char *fn, uint32_t addr, int sz, int off, uint8_t *ptr)
 {