--- nono/vm/sysport.h 2026/04/29 17:05:29 1.1.1.13 +++ nono/vm/sysport.h 2026/04/29 17:06:01 1.1.1.15 @@ -11,7 +11,6 @@ #pragma once #include "device.h" -#include "monitor.h" class CGROMDevice; class IPLROM1Device; @@ -66,11 +65,11 @@ class SysportDevice : public IODevice bool PokePort(uint32 offset, uint32 data); private: - DECLARE_MONITOR_CALLBACK(MonitorUpdate); + DECLARE_MONITOR_SCREEN(MonitorScreen); struct SYSPORT sysport {}; - Monitor monitor { this }; + Monitor *monitor {}; CGROMDevice *cgrom {}; IPLROM1Device *iplrom1 {}; @@ -82,6 +81,6 @@ class SysportDevice : public IODevice VideoCtlrDevice *videoctlr {}; }; -static inline SysportDevice *GetSysportDevice() { +inline SysportDevice *GetSysportDevice() { return Object::GetObject(OBJ_SYSPORT); }