--- nono/vm/crtc2.h	2026/04/29 17:04:35	1.1.1.3
+++ nono/vm/crtc2.h	2026/04/29 17:04:55	1.1.1.7
@@ -9,32 +9,33 @@
 #include "device.h"
 #include "scheduler.h"
 
-class CRTC2Device
-	: public IODevice
+class CRTC2Device : public IODevice
 {
 	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 {};
+	Event vdisp_event { this };
 };
+
+extern std::unique_ptr<CRTC2Device> gCRTC2;