--- nono/vm/nereid.h 2026/04/29 17:05:29 1.1.1.3 +++ nono/vm/nereid.h 2026/04/29 17:06:01 1.1.1.5 @@ -11,7 +11,6 @@ #pragma once #include "device.h" -#include "monitor.h" #include class BankRAMDevice; @@ -41,14 +40,14 @@ class NereidDevice : public IODevice private: inline uint32 Decoder(uint32 addr) const; - DECLARE_MONITOR_CALLBACK(MonitorUpdate); + DECLARE_MONITOR_SCREEN(MonitorScreen); // ボードの有無と配置場所 (有りなら $3 か $b、無しなら -1) std::array loc {}; std::array, 2> boards {}; - Monitor monitor { this }; + Monitor *monitor {}; }; // Nereid ボード1枚分 @@ -92,6 +91,6 @@ class NereidBoardDevice : public IODevic std::unique_ptr net /*{}*/; }; -static inline NereidDevice *GetNereidDevice() { +inline NereidDevice *GetNereidDevice() { return Object::GetObject(OBJ_NEREID); }