--- nono/vm/pio.h 2026/04/29 17:05:17 1.1.1.11 +++ nono/vm/pio.h 2026/04/29 17:05:25 1.1.1.12 @@ -29,7 +29,7 @@ class i8255Device : public IODevice public: i8255Device(int objid_); - virtual ~i8255Device() override; + ~i8255Device() override; void ResetHard(bool poweron) override; @@ -75,7 +75,7 @@ class PPIDevice : public i8255Device public: PPIDevice(); - virtual ~PPIDevice() override; + ~PPIDevice() override; // ADPCM のサンプリングレートの 2bit を取得する uint8 GetADPCMRate() const { return adpcm_rate; } @@ -83,9 +83,9 @@ class PPIDevice : public i8255Device protected: // BusIO インタフェース static const uint32 NPORT = 4; - 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: void SetPC(int, int) override; @@ -104,7 +104,7 @@ class PIO0Device : public i8255Device public: PIO0Device(); - virtual ~PIO0Device() override; + ~PIO0Device() override; bool Init() override; void ResetHard(bool poweron) override; @@ -119,9 +119,9 @@ class PIO0Device : public i8255Device protected: // BusIO インタフェース static const uint32 NPORT = 4; - 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: uint32 GetPA() const; @@ -151,14 +151,14 @@ class PIO1Device : public i8255Device using inherited = i8255Device; public: PIO1Device(); - virtual ~PIO1Device() override; + ~PIO1Device() override; bool Init() override; void ResetHard(bool poweron) override; // BusIO インタフェース // (内蔵 ROM からのアクセス用に特別に public にしてある) - uint64 Write(uint32 offset, uint32 data); + busdata Write(uint32 offset, uint32 data); // PIO0 の下請け void MonitorUpdatePIO1(TextScreen& screen, int y); @@ -166,8 +166,8 @@ class PIO1Device : public i8255Device protected: // BusIO インタフェース static const uint32 NPORT = 4; - uint64 Read(uint32 offset); - uint64 Peek(uint32 offset); + busdata Read(uint32 offset); + busdata Peek(uint32 offset); private: uint32 GetPC() const;