--- nono/vm/lance.h 2026/04/29 17:05:38 1.1.1.15 +++ nono/vm/lance.h 2026/04/29 17:06:01 1.1.1.17 @@ -11,7 +11,6 @@ #pragma once #include "ethernet.h" -#include "event.h" #include "hostnet.h" #include "message.h" @@ -183,7 +182,7 @@ class LanceDevice : public EthernetDevic busdata PeekPort(uint32 offset); private: - DECLARE_MONITOR_CALLBACK(MonitorUpdate); + DECLARE_MONITOR_SCREEN(MonitorScreen); void MonitorReg(TextScreen&, int x, int y, uint32 data, const char * const * names); uint32 ReadData(); @@ -203,14 +202,14 @@ class LanceDevice : public EthernetDevic // 割り込み信号線の状態を変える void ChangeInterrupt(); - void TXIdle(Event&); + void TXIdle(Event *); void TXCopy(); - void TXSend(Event&); - void TXNext(Event&); + void TXSend(Event *); + void TXNext(Event *); - void RXIdle(Event&); + void RXIdle(Event *); void RXCopy(); - void RXNext(Event&); + void RXNext(Event *); void RXMiss(); // フェーズ遷移 @@ -265,12 +264,12 @@ class LanceDevice : public EthernetDevic SubRAMDevice *subram {}; // 待ち時間用イベント - Event rx_event { this }; - Event tx_event { this }; + Event *rx_event {}; + Event *tx_event {}; Monitor *monitor {}; }; -static inline LanceDevice *GetLanceDevice() { +inline LanceDevice *GetLanceDevice() { return Object::GetObject(OBJ_ETHERNET(0)); }