--- nono/vm/rtl8019as.cpp 2026/04/29 17:05:29 1.1.1.3 +++ nono/vm/rtl8019as.cpp 2026/04/29 17:05:33 1.1.1.4 @@ -40,6 +40,7 @@ #include "rtl8019as.h" #include "interrupt.h" +#include "monitor.h" #include "scheduler.h" // コンストラクタ @@ -53,9 +54,9 @@ RTL8019ASDevice::RTL8019ASDevice(uint n, intr_vector = vector_; - monitor.func = ToMonitorCallback(&RTL8019ASDevice::MonitorUpdate); - monitor.SetSize(71, 19); - monitor.Regist(ID_MONITOR_RTL8019AS(n)); + monitor = gMonitorManager->Regist(ID_MONITOR_RTL8019AS(n), this); + monitor->func = ToMonitorCallback(&RTL8019ASDevice::MonitorUpdate); + monitor->SetSize(71, 19); } // デストラクタ @@ -515,9 +516,12 @@ RTL8019ASDevice::MonitorUpdate(Monitor * // y++; screen.Puts(0, y, "LED:"); - screen.Puts(x, y, TA::ReverseOrange, "LED1(LINK)"); - screen.Puts(x + 12, y, tx_led ? TA::ReverseRed : TA::Off, "LED2(TX)"); - screen.Puts(x + 22, y, rx_led ? TA::ReverseGreen : TA::Off, "LED3(RX)"); + screen.Puts(x, y, TA::ReverseOrange, "LED1"); + screen.Puts(x + 4, y, "(LINK)"); + screen.Puts(x + 11, y, tx_led ? TA::ReverseRed : TA::Off, "LED2"); + screen.Puts(x + 15, y, "(TX)"); + screen.Puts(x + 20, y, rx_led ? TA::ReverseGreen : TA::Off, "LED3"); + screen.Puts(x + 24, y, "(RX)"); // 右カラム y = 0;