--- nono/vm/lance.h 2026/04/29 17:05:18 1.1.1.10 +++ nono/vm/lance.h 2026/04/29 17:05:25 1.1.1.12 @@ -168,7 +168,7 @@ class LanceDevice : public EthernetDevic public: LanceDevice(); - virtual ~LanceDevice() override; + ~LanceDevice() override; bool Init() override; void ResetHard(bool poweron) override; @@ -176,9 +176,9 @@ class LanceDevice : public EthernetDevic protected: // BusIO インタフェース static const uint32 NPORT = 2; - 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); @@ -215,8 +215,8 @@ class LanceDevice : public EthernetDevic void ChangePhase(TXPhase new_phase, uint64 time = 100_nsec); void ChangePhase(RXPhase new_phase, uint64 time = 100_nsec); - // パケット受信通知 (HostNet から) - void HostRxCallback(MessageID, uint32); + // パケット受信通知 (HostNet から EthernetDevice 経由で呼ばれる) + void RxMessage(MessageID, uint32); const std::string BitToString(const char * const name[], uint16 bits); const std::string CSR0ToString(uint16 bits); @@ -268,5 +268,5 @@ class LanceDevice : public EthernetDevic }; static inline LanceDevice *GetLanceDevice() { - return Object::GetObject(OBJ_ETHERNET); + return Object::GetObject(OBJ_ETHERNET(0)); }