--- nono/vm/nereid.h 2026/04/29 17:05:25 1.1.1.2 +++ nono/vm/nereid.h 2026/04/29 17:05:29 1.1.1.3 @@ -29,11 +29,9 @@ class NereidDevice : public IODevice bool Create() override; - busdata Read8(uint32 addr) override; - busdata Read16(uint32 addr) override; - busdata Write8(uint32 addr, uint32 data) override; - busdata Write16(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; // Nereid が1枚でもささっていれば true。 bool IsInstalled() const; @@ -59,16 +57,14 @@ class NereidBoardDevice : public IODevic using inherited = IODevice; public: - NereidBoardDevice(int n_); + explicit NereidBoardDevice(int n_); ~NereidBoardDevice() override; bool Create() override; - busdata Read8(uint32 addr) override; - busdata Read16(uint32 addr) override; - busdata Write8(uint32 addr, uint32 data) override; - busdata Write16(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; // ネットワークが有効なら true を返す bool IsNetEnable() const { return (bool)net; }