--- nono/vm/sysport.h 2026/04/29 17:05:18 1.1.1.11 +++ nono/vm/sysport.h 2026/04/29 17:05:33 1.1.1.14 @@ -19,21 +19,21 @@ class MainRAMDevice; class NMIDevice; class ROMDevice; class SRAMDevice; +class VideoCtlrDevice; struct SYSPORT { - static const int CONTRAST = 0; // $E8E001 - static const int SCOPE3D = 1; // $E8E003 - static const int IMAGEUNIT = 2; // $E8E005 - static const int KEY = 3; // $E8E007 - static const int WAIT = 4; // $E8E009 - static const int MPU = 5; // $E8E00B - static const int SRAMWP = 6; // $E8E00D - static const int POWEROFF = 7; // $E8E00F - - int contrast; - int rom_wait; // 設定値。ウェイトにする時には +2 する - int ram_wait; // 設定値。 + static const uint CONTRAST = 0; // $E8E001 + static const uint SCOPE3D = 1; // $E8E003 + static const uint IMAGEUNIT = 2; // $E8E005 + static const uint KEY = 3; // $E8E007 + static const uint WAIT = 4; // $E8E009 + static const uint MPU = 5; // $E8E00B + static const uint SRAMWP = 6; // $E8E00D + static const uint POWEROFF = 7; // $E8E00F + + int rom_wait; // システムポートへの書き込み値ではなく ROM への指示値。 + int ram_wait; // システムポートへの書き込み値ではなく RAM への指示値。 bool key_ctrl; uint pwoff_count; }; @@ -46,7 +46,7 @@ class SysportDevice : public IODevice public: SysportDevice(); - virtual ~SysportDevice() override; + ~SysportDevice() override; bool Init() override; void ResetHard(bool poweron) override; @@ -59,13 +59,18 @@ 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 ReadPort(uint32 offset); + busdata WritePort(uint32 offset, uint32 data); + busdata PeekPort(uint32 offset); + bool PokePort(uint32 offset, uint32 data); private: + DECLARE_MONITOR_CALLBACK(MonitorUpdate); + struct SYSPORT sysport {}; + Monitor *monitor {}; + 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() {