--- nono/vm/romimg_x68k.h 2026/04/29 17:05:25 1.1.1.10 +++ nono/vm/romimg_x68k.h 2026/04/29 17:06:00 1.1.1.12 @@ -24,10 +24,8 @@ class IPLROM0Device : public IODevice bool Init() override; void ResetHard(bool poweron) override; - busdata Read8(uint32 addr) override; - busdata Read16(uint32 addr) override; - busdata Read32(uint32 addr) override; - busdata Peek8(uint32 addr) override; + busdata Read(busaddr addr) override; + busdata Peek1(uint32 addr) override; private: uint32 ReadDecoder(uint32 addr); @@ -65,15 +63,15 @@ class CGROMDevice : public ROMDevice 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); }