--- nono/vm/rp5c15.h 2026/04/29 17:05:17 1.1.1.13 +++ nono/vm/rp5c15.h 2026/04/29 17:05:24 1.1.1.14 @@ -10,12 +10,11 @@ #pragma once -#include "device.h" -#include "monitor.h" #include "rtc.h" +#include "monitor.h" class MFPDevice; -class PowerDevice; +class X68030PowerDevice; struct RP5C15 { @@ -114,7 +113,7 @@ class RP5C15Device : public RTCDevice using inherited = RTCDevice; public: RP5C15Device(); - virtual ~RP5C15Device() override; + ~RP5C15Device() override; bool Init() override; @@ -130,9 +129,9 @@ class RP5C15Device : public RTCDevice protected: // BusIO インタフェース static const uint32 NPORT = 16; - uint64 Read(uint32 offset); - uint64 Write(uint32 offset, uint32 data); - uint64 Peek(uint32 offset); + busdata Read(uint32 offset); + busdata Write(uint32 offset, uint32 data); + busdata Peek(uint32 offset); // 仮想 RTC からのクロック void Tick32Hz() override; @@ -179,7 +178,7 @@ class RP5C15Device : public RTCDevice bool alarm_on {}; MFPDevice *mfp {}; - PowerDevice *power {}; + X68030PowerDevice *power {}; Monitor monitor { this }; };