[VM][FMTOWNS][FONTROM] Remove read_memory_mapped_io8w(), integrate to _memory_mapped_...

diff --git a/source/src/vm/fmtowns/fontroms.cpp b/source/src/vm/fmtowns/fontroms.cpp
index 641bc3c..53d2028 100644 (file)
--- a/source/src/vm/fmtowns/fontroms.cpp
+++ b/source/src/vm/fmtowns/fontroms.cpp
@@ -34,27 +34,16 @@ void FONT_ROMS::reset()
 
 uint32_t FONT_ROMS::read_memory_mapped_io8(uint32_t addr)
 {
-       int wait = 0;
-       return read_memory_mapped_io8w(addr, &wait);
-}
-
-uint32_t FONT_ROMS::read_memory_mapped_io8w(uint32_t addr, int *wait)
-{
-       *wait = 6; // Tempo
        __LIKELY_IF((addr & 0xfffc0000) == 0xc2100000) { // 0xc2100000 - c213ffff
-               *wait = 6; // Temporally
                return font_kanji16[addr & 0x3ffff];
        }
        __LIKELY_IF((addr & 0xffffc000) == 0x000c8000) {
                if((addr & 0xfffff800) == 0x000ca000) { // 000ca000 - 000ca7ff
-                       *wait = 6; // Temporally
                        return font_kanji16[0x3d000 + (addr & 0x7ff)];
                } else if((addr & 0xfffff000) == 0x000cb000) { // 000cb000 - 000cbfff
-                       *wait = 6; // Temporally
                        return font_kanji16[0x3d800 + (addr & 0xfff)];
                }
        }
-       *wait = 6; // Temporally
        return 0xff;
 }
 // From MAME 0.216

diff --git a/source/src/vm/fmtowns/fontroms.h b/source/src/vm/fmtowns/fontroms.h
index 4bb3e15..ab3eadc 100644 (file)
--- a/source/src/vm/fmtowns/fontroms.h
+++ b/source/src/vm/fmtowns/fontroms.h
@@ -38,19 +38,18 @@ public:
        }
        ~FONT_ROMS() {}
 
-       void initialize();
-       void reset();
+       void initialize() override;
+       void reset() override;
 
-       uint32_t __FASTCALL read_memory_mapped_io8(uint32_t addr);
-       uint32_t __FASTCALL read_memory_mapped_io8w(uint32_t addr, int *wait);
+       uint32_t __FASTCALL read_memory_mapped_io8(uint32_t addr) override;
 
-       virtual void __FASTCALL write_io8(uint32_t addr, uint32_t data);
-       virtual uint32_t __FASTCALL read_io8(uint32_t addr);
+       virtual void __FASTCALL write_io8(uint32_t addr, uint32_t data) override;
+       virtual uint32_t __FASTCALL read_io8(uint32_t addr) override;
 
-       void __FASTCALL write_signal(int ch, uint32_t data, uint32_t mask);
-       uint32_t __FASTCALL read_signal(int ch);
+       void __FASTCALL write_signal(int ch, uint32_t data, uint32_t mask) override;
+       uint32_t __FASTCALL read_signal(int ch) override;
 
-       bool process_state(FILEIO *state_fio, bool loading);
+       bool process_state(FILEIO *state_fio, bool loading) override;
 
        /* Unique function(s) */
        constexpr uint8_t __FASTCALL read_direct_data8(uint32_t addr);