--- nono/vm/prom.h 2026/04/29 17:05:24 1.1.1.10 +++ nono/vm/prom.h 2026/04/29 17:05:28 1.1.1.11 @@ -22,13 +22,9 @@ class PROM0Device : 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 Write8(uint32 addr, uint32 data) override; - busdata Write16(uint32 addr, uint32 data) override; - busdata Write32(uint32 addr, uint32 data) override; - busdata Peek8(uint32 addr) override; + busdata Read(busaddr addr) override; + busdata Write(busaddr addr, uint32 data) override; + busdata Peek1(uint32 addr) override; private: // アドレスデコーダ @@ -49,7 +45,7 @@ class PROMDevice : public ROMDevice bool Init() override; - int GetROMVer() const { return romver; } + uint GetROMVer() const { return romver; } private: bool InitLuna1(); @@ -57,7 +53,7 @@ class PROMDevice : public ROMDevice // PROM バージョン。 // 100倍した整数形式で持つ。0 ならバージョン不明。 - int romver {}; + uint romver {}; }; static inline PROM0Device *GetPROM0Device() {