--- nono/vm/sysclk.h 2026/04/29 17:05:25 1.1.1.10 +++ nono/vm/sysclk.h 2026/04/29 17:05:33 1.1.1.12 @@ -12,7 +12,6 @@ #include "device.h" #include "event.h" -#include "monitor.h" class InterruptDevice; @@ -26,14 +25,15 @@ class SysClkDevice : public IODevice bool Init() override; void ResetHard(bool poweron) override; - int GetFreq() const { return freq; } + uint GetFreq() const { return freq; } protected: // BusIO インタフェース static const uint32 NPORT = 1; - busdata Read(uint32 offset); - busdata Write(uint32 offset, uint32 data); - busdata Peek(uint32 offset); + busdata ReadPort(uint32 offset); + busdata WritePort(uint32 offset, uint32 data); + busdata PeekPort(uint32 offset); + bool PokePort(uint32 offset, uint32 data); private: // イベントコールバック @@ -67,7 +67,7 @@ class SysClkDevice : public IODevice InterruptDevice *interrupt {}; - Monitor monitor { this }; + Monitor *monitor {}; }; static inline SysClkDevice *GetSysClkDevice() {