--- nono/vm/rtl8019as.h 2026/04/29 17:05:21 1.1 +++ nono/vm/rtl8019as.h 2026/04/29 17:05:25 1.1.1.2 @@ -260,18 +260,18 @@ class RTL8019ASDevice : public EthernetD public: RTL8019ASDevice(int n_, int vector_); - virtual ~RTL8019ASDevice() override; + ~RTL8019ASDevice() override; bool Init() override; void ResetHard(bool poweron) override; - uint64 Read8(uint32 addr) override; - uint64 Read16(uint32 addr) override; - uint64 Write8(uint32 addr, uint32 data) override; - uint64 Write16(uint32 addr, uint32 data) override; - uint64 Peek8(uint32 addr) override; + busdata Read8(uint32 addr) override; + busdata Read16(uint32 addr) override; + busdata Write8(uint32 addr, uint32 data) override; + busdata Write16(uint32 addr, uint32 data) override; + busdata Peek8(uint32 addr) override; - int InterruptAcknowledge(); + busdata InterruptAcknowledge(); private: static inline uint32 Decoder(uint32 addr); @@ -364,7 +364,7 @@ class RTL8019ASDevice : public EthernetD void Transmit(); void TXEvent(Event&); // 受信 - void HostRxCallback(MessageID msgid, uint32 arg); + void RxMessage(MessageID msgid, uint32 arg); void RXEvent(Event&); void RXHead(int remain); void RXCopy(Event&, int remain); @@ -403,7 +403,7 @@ class RTL8019ASDevice : public EthernetD // 割り込みマスク (bit7 は 0 にすること) uint32 intr_mask {}; // 割り込みベクタ (NereidBoardDevice から渡される) - int intr_vector {}; + uint32 intr_vector {}; uint32 tsr {}; uint32 rsr {}; // DIS 以外のビットを保持