--- nono/vm/crtc2.h 2026/04/29 17:04:31 1.1.1.2 +++ nono/vm/crtc2.h 2026/04/29 17:04:50 1.1.1.6 @@ -1,6 +1,7 @@ // // nono -// Copyright (C) 2018 isaki@NetBSD.org +// Copyright (C) 2020 nono project +// Licensed under nono-license.txt // #pragma once @@ -11,29 +12,31 @@ class CRTC2Device : public IODevice { - typedef IODevice inherited; + using inherited = IODevice; public: CRTC2Device(); - virtual ~CRTC2Device(); + virtual ~CRTC2Device() override; - virtual void ResetHard(); + 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;