--- nono/vm/sysport.h 2026/04/29 17:05:18 1.1.1.11 +++ nono/vm/sysport.h 2026/04/29 17:05:25 1.1.1.12 @@ -11,6 +11,7 @@ #pragma once #include "device.h" +#include "monitor.h" class CGROMDevice; class IPLROM1Device; @@ -19,6 +20,7 @@ class MainRAMDevice; class NMIDevice; class ROMDevice; class SRAMDevice; +class VideoCtlrDevice; struct SYSPORT { @@ -31,9 +33,8 @@ struct SYSPORT static const int SRAMWP = 6; // $E8E00D static const int POWEROFF = 7; // $E8E00F - int contrast; - int rom_wait; // 設定値。ウェイトにする時には +2 する - int ram_wait; // 設定値。 + int rom_wait; // システムポートへの書き込み値ではなく ROM への指示値。 + int ram_wait; // システムポートへの書き込み値ではなく RAM への指示値。 bool key_ctrl; uint pwoff_count; }; @@ -46,7 +47,7 @@ class SysportDevice : public IODevice public: SysportDevice(); - virtual ~SysportDevice() override; + ~SysportDevice() override; bool Init() override; void ResetHard(bool poweron) override; @@ -59,13 +60,17 @@ class SysportDevice : public IODevice protected: // BusIO インタフェース static const uint32 NPORT = 8; - 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); private: + DECLARE_MONITOR_CALLBACK(MonitorUpdate); + struct SYSPORT sysport {}; + Monitor monitor { this }; + CGROMDevice *cgrom {}; IPLROM1Device *iplrom1 {}; ROMDevice *iplrom2 {}; @@ -73,6 +78,7 @@ class SysportDevice : public IODevice MainRAMDevice *mainram {}; NMIDevice *nmi {}; SRAMDevice *sram {}; + VideoCtlrDevice *videoctlr {}; }; static inline SysportDevice *GetSysportDevice() {