--- nono/vm/rp5c15.h 2026/04/29 17:04:45 1.1.1.6 +++ nono/vm/rp5c15.h 2026/04/29 17:04:55 1.1.1.9 @@ -7,6 +7,7 @@ #pragma once #include "device.h" +#include "monitor.h" #include "rtc.h" struct RP5C15 @@ -108,9 +109,7 @@ class RP5C15Device : public RTCDevice RP5C15Device(); virtual ~RP5C15Device() override; - bool InitRTC() override; - - void MonitorUpdate(TextScreen&) override; + bool Init() override; // 32Hz クロック入力 void ClockIn() override; @@ -118,14 +117,16 @@ class RP5C15Device : public RTCDevice protected: // BusIO インタフェース static const uint32 NPORT = 16; - 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 UpdateReg(uint32); + DECLARE_MONITOR_CALLBACK(MonitorUpdate); + // レジスタ RP5C15 reg {}; @@ -137,4 +138,6 @@ class RP5C15Device : public RTCDevice bool clkout {}; // ALARM 端子の状態 (true なら 'H') bool alarmout {}; + + Monitor monitor { this }; };