--- nono/vm/lunafb.h 2026/04/29 17:05:29 1.1.1.6 +++ nono/vm/lunafb.h 2026/04/29 17:06:00 1.1.1.8 @@ -11,7 +11,6 @@ #pragma once #include "planevram.h" -#include "monitor.h" // VRAM の ROP (定数) struct ROP { @@ -84,7 +83,7 @@ class LunafbDevice : public PlaneVRAMDev void WritePlane16(uint, uint32, uint32); void WritePlane32(uint, uint32, uint32); - DECLARE_MONITOR_CALLBACK(MonitorUpdate); + DECLARE_MONITOR_SCREEN(MonitorScreen); // 演算 static uint32 RasterOp(uint rop, uint32 vram, uint32 data); @@ -128,9 +127,9 @@ class LunafbDevice : public PlaneVRAMDev // ウェイト [nsec] busdata wait {}; - Monitor monitor { this }; + Monitor *monitor {}; }; -static inline LunafbDevice *GetLunafbDevice() { +inline LunafbDevice *GetLunafbDevice() { return Object::GetObject(OBJ_PLANEVRAM); }