--- nono/vm/interrupt.h 2026/04/29 17:05:33 1.1.1.9 +++ nono/vm/interrupt.h 2026/04/29 17:05:59 1.1.1.11 @@ -171,7 +171,6 @@ class M680x0Interrupt : public Interrupt ~M680x0Interrupt() override; bool Init() override; - void ResetHard(bool poweron) override; protected: void ChangeInterrupt() override; @@ -218,7 +217,7 @@ class X68030Interrupt : public M680x0Int busdata InterruptAcknowledge(int lv) override; private: - DECLARE_MONITOR_CALLBACK(MonitorUpdate); + DECLARE_MONITOR_SCREEN(MonitorScreen); DMACDevice *dmac {}; MFPDevice *mfp {}; @@ -260,7 +259,7 @@ class LunaInterrupt : public M680x0Inter busdata InterruptAcknowledge(int lv) override; private: - DECLARE_MONITOR_CALLBACK(MonitorUpdate); + DECLARE_MONITOR_SCREEN(MonitorScreen); }; // NEWS 仮想割り込みコントローラ @@ -296,7 +295,7 @@ class NewsInterrupt : public M680x0Inter uint8 PeekStatus() const; private: - DECLARE_MONITOR_CALLBACK(MonitorUpdate); + DECLARE_MONITOR_SCREEN(MonitorScreen); SCCDevice *scc {}; }; @@ -335,13 +334,13 @@ class Virt68kInterrupt : public M680x0In void IncMonitorHeight(); private: - DECLARE_MONITOR_CALLBACK(MonitorUpdate); + DECLARE_MONITOR_SCREEN(MonitorScreen); std::array gfpic {}; }; // LUNA-88K は sysctlr.cpp 参照。 -static inline InterruptDevice *GetInterruptDevice() { +inline InterruptDevice *GetInterruptDevice() { return Object::GetObject(OBJ_INTERRUPT); }