--- nono/vm/crtc2.h 2026/04/29 17:04:35 1.1.1.3 +++ nono/vm/crtc2.h 2026/04/29 17:04:50 1.1.1.6 @@ -15,26 +15,28 @@ class CRTC2Device using inherited = IODevice; public: CRTC2Device(); - ~CRTC2Device() override; + virtual ~CRTC2Device() override; void ResetHard() override; protected: // BusIO インタフェース static const uint32 NPORT = 2; - uint64 Read(uint32 addr); - uint64 Write(uint32 addr, uint32 data); - uint64 Peek(uint32 addr); + uint64 Read(uint32 offset); + uint64 Write(uint32 offset, uint32 data); + uint64 Peek(uint32 offset); private: // 垂直表示期間イベント - void VDispCallback(int arg); + void VDispCallback(Event& ev); // アドレスレジスタ - int ar = 0; + int ar {}; // レジスタ uint8 reg[40] {}; Event vdisp_event {}; }; + +extern std::unique_ptr gCRTC2;