--- nono/vm/rtl8019as.h 2026/04/29 17:05:38 1.1.1.5 +++ nono/vm/rtl8019as.h 2026/04/29 17:06:01 1.1.1.7 @@ -11,7 +11,6 @@ #pragma once #include "ethernet.h" -#include "event.h" #include "hostnet.h" #include "message.h" @@ -340,7 +339,7 @@ class RTL8019ASDevice : public EthernetD uint32 PeekINTR() const; uint32 PeekDMA(uint32 a0) const; - DECLARE_MONITOR_CALLBACK(MonitorUpdate); + DECLARE_MONITOR_SCREEN(MonitorScreen); void MonitorReg(TextScreen&, int, int, uint32, const char * const *names); void Reset(); @@ -361,16 +360,16 @@ class RTL8019ASDevice : public EthernetD // 送信 void Transmit(); - void TXEvent(Event&); + void TXEvent(Event *); // 受信 void RxMessage(MessageID msgid, uint32 arg); - void RXEvent(Event&); + void RXEvent(Event *); void RXHead(); - void RXCopy(Event&, uint remain); - void RXDone(Event&); + void RXCopy(Event *, uint remain); + void RXDone(Event *); - void TXLedEvent(Event&); - void RXLedEvent(Event&); + void TXLedEvent(Event *); + void RXLedEvent(Event *); void IncCounter(int n); @@ -470,16 +469,16 @@ class RTL8019ASDevice : public EthernetD Monitor *monitor {}; - Event tx_event { this }; - Event rx_event { this }; - Event txled_event { this }; - Event rxled_event { this }; + Event *tx_event {}; + Event *rx_event {}; + Event *txled_event {}; + Event *rxled_event {}; InterruptDevice *interrupt {}; static const char * const regnames[]; }; -static inline RTL8019ASDevice *GetRTL8019ASDevice(int n) { +inline RTL8019ASDevice *GetRTL8019ASDevice(int n) { return Object::GetObject(OBJ_ETHERNET(n)); }