--- nono/vm/mainbus_x68k.h 2026/04/29 17:05:29 1.1.1.2 +++ nono/vm/mainbus_x68k.h 2026/04/29 17:06:00 1.1.1.5 @@ -26,7 +26,6 @@ class X68kMainbus final : public Mainbus bool Init() override; bool InitMainbus() override; void ResetByMPU() override; - void ResetHard(bool poweron) override; busdata Read(busaddr addr) override; busdata Write(busaddr addr, uint32 data) override; @@ -34,8 +33,8 @@ class X68kMainbus final : public Mainbus bool Poke1(uint32 addr, uint32 data) override; private: - DECLARE_MONITOR_CALLBACK(MonitorUpdate); - DECLARE_MONITOR_CALLBACK(MonitorUpdateAccStat); + DECLARE_MONITOR_SCREEN(MonitorScreen); + DECLARE_MONITOR_SCREEN(MonitorScreenAccStat); inline bool IsIntio(uint32) const; @@ -49,7 +48,7 @@ class X68kMainbus final : public Mainbus std::array is_intio {}; - Monitor monitor { this }; + Monitor *monitor {}; std::array bankram /*{}*/; };