--- nono/vm/lcd.h 2026/04/29 17:04:42 1.1.1.5 +++ nono/vm/lcd.h 2026/04/29 17:04:55 1.1.1.7 @@ -7,17 +7,17 @@ #pragma once #include "device.h" +#include "monitor.h" class LCDDevice : public Device { using inherited = Device; public: LCDDevice(); - ~LCDDevice() override; + virtual ~LCDDevice() override; bool PowerOff() override; void ResetHard() override; - void MonitorUpdate(TextScreen&) override; // リセット信号はない @@ -55,6 +55,8 @@ class LCDDevice : public Device uint32 GetCounter() const { return update; } private: + DECLARE_MONITOR_CALLBACK(MonitorUpdate); + bool en {}; // Enable bool rw {}; // R/~W int rs {}; // レジスタセレクト @@ -83,6 +85,8 @@ class LCDDevice : public Device // XXX 電源オフどうするか uint32 update {}; + Monitor monitor { this }; + static const uint8 CGROM[12 * 16 * 8]; };