--- nono/vm/partialram.h 2026/04/29 17:05:18 1.1.1.1 +++ nono/vm/partialram.h 2026/04/29 17:06:01 1.1.1.4 @@ -14,25 +14,19 @@ class MainRAMDevice; -class PartialRAMDevice : public IOContainerDevice +class PartialRAMDevice : public IODevice { - using inherited = IOContainerDevice; + using inherited = IODevice; public: PartialRAMDevice(); - virtual ~PartialRAMDevice() override; + ~PartialRAMDevice() override; bool Init() 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; - - protected: - IODevice *GetDevice(uint32 addr) const override; + busdata Read(busaddr addr) override; + busdata Write(busaddr addr, uint32 data) override; + busdata Peek1(uint32 addr) override; + bool Poke1(uint32 addr, uint32 data) override; private: inline IODevice *SearchDevice(uint32 addr) const; @@ -43,6 +37,6 @@ class PartialRAMDevice : public IOContai IODevice *nopdev {}; }; -static inline PartialRAMDevice *GetPartialRAMDevice() { +inline PartialRAMDevice *GetPartialRAMDevice() { return Object::GetObject(OBJ_PARTIAL_RAM); }