--- nono/vm/romimg_x68k.h 2026/04/29 17:05:18 1.1.1.9 +++ nono/vm/romimg_x68k.h 2026/04/29 17:06:00 1.1.1.12 @@ -19,15 +19,13 @@ class IPLROM0Device : public IODevice using inherited = IODevice; public: IPLROM0Device(); - virtual ~IPLROM0Device() override; + ~IPLROM0Device() override; bool Init() override; void ResetHard(bool poweron) override; - uint64 Read8(uint32 addr) override; - uint64 Read16(uint32 addr) override; - uint64 Read32(uint32 addr) override; - uint64 Peek8(uint32 addr) override; + busdata Read(busaddr addr) override; + busdata Peek1(uint32 addr) override; private: uint32 ReadDecoder(uint32 addr); @@ -40,7 +38,7 @@ class IPLROM1Device : public ROMDevice using inherited = ROMDevice; public: IPLROM1Device(); - virtual ~IPLROM1Device() override; + ~IPLROM1Device() override; bool Init() override; }; @@ -50,7 +48,7 @@ class IPLROM2Device : public ROMDevice using inherited = ROMDevice; public: IPLROM2Device(); - virtual ~IPLROM2Device() override; + ~IPLROM2Device() override; bool Init() override; }; @@ -60,20 +58,20 @@ class CGROMDevice : public ROMDevice using inherited = ROMDevice; public: CGROMDevice(); - virtual ~CGROMDevice() override; + ~CGROMDevice() override; bool Init() override; }; -static inline CGROMDevice *GetCGROMDevice() { +inline CGROMDevice *GetCGROMDevice() { return Object::GetObject(OBJ_CGROM); } -static inline IPLROM0Device *GetIPLROM0Device() { +inline IPLROM0Device *GetIPLROM0Device() { return Object::GetObject(OBJ_IPLROM_BOOT); } -static inline IPLROM1Device *GetIPLROM1Device() { +inline IPLROM1Device *GetIPLROM1Device() { return Object::GetObject(OBJ_IPLROM1); } -static inline ROMDevice *GetIPLROM2Device() { +inline ROMDevice *GetIPLROM2Device() { return Object::GetObject(OBJ_IPLROM2); }