--- nono/vm/prom.h 2026/04/29 17:05:17 1.1.1.9 +++ nono/vm/prom.h 2026/04/29 17:05:28 1.1.1.11 @@ -17,25 +17,21 @@ class PROM0Device : public IODevice using inherited = IODevice; public: PROM0Device(); - virtual ~PROM0Device() override; + ~PROM0Device() 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 Write8(uint32 addr, uint32 data) override; - uint64 Write16(uint32 addr, uint32 data) override; - uint64 Write32(uint32 addr, uint32 data) override; - uint64 Peek8(uint32 addr) override; + busdata Read(busaddr addr) override; + busdata Write(busaddr addr, uint32 data) override; + busdata Peek1(uint32 addr) override; private: // アドレスデコーダ static uint32 Decoder(uint32 addr); // 書き込みの共通部分 - uint64 Write(); + busdata Write(); IODevice *prom {}; }; @@ -45,11 +41,11 @@ class PROMDevice : public ROMDevice using inherited = ROMDevice; public: PROMDevice(); - virtual ~PROMDevice() override; + ~PROMDevice() override; 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() {