--- nono/vm/newsctlr.h 2026/04/29 17:05:43 1.1.1.5 +++ nono/vm/newsctlr.h 2026/04/29 17:06:00 1.1.1.7 @@ -11,7 +11,6 @@ #pragma once #include "device.h" -#include "event.h" #include class DipswDevice; @@ -43,14 +42,14 @@ class NewsCtlrDevice : public IODevice uint GetLED() const { return led; } - void MonitorUpdateNewsCtlr(TextScreen& screen, int y); + void MonitorScreenNewsCtlr(TextScreen& screen, int y); private: uint8 GetIDROM(uint32 addr) const; uint8 GetDIPSW() const; void WriteLED(uint32 data); void WriteTimer(uint32 data); - void TimerCallback(Event&); + void TimerCallback(Event *); void ChangeInterrupt(); // 割り込みコントローラ @@ -72,9 +71,9 @@ class NewsCtlrDevice : public IODevice DipswDevice *dipsw {}; - Event timer_event { this }; + Event *timer_event {}; }; -static inline NewsCtlrDevice *GetNewsCtlrDevice() { +inline NewsCtlrDevice *GetNewsCtlrDevice() { return Object::GetObject(OBJ_NEWSCTLR); }