--- nono/vm/sysport.cpp 2026/04/29 17:05:32 1.1.1.14 +++ nono/vm/sysport.cpp 2026/04/29 17:05:59 1.1.1.16 @@ -10,9 +10,9 @@ #include "sysport.h" #include "keyboard.h" +#include "mainbus.h" #include "mainram.h" #include "monitor.h" -#include "mpu.h" #include "nmi.h" #include "power.h" #include "romimg_x68k.h" @@ -25,7 +25,7 @@ SysportDevice::SysportDevice() : inherited(OBJ_SYSPORT) { monitor = gMonitorManager->Regist(ID_MONITOR_SYSPORT, this); - monitor->func = ToMonitorCallback(&SysportDevice::MonitorUpdate); + monitor->SetCallback(&SysportDevice::MonitorScreen); monitor->SetSize(56, 8); } @@ -38,10 +38,6 @@ SysportDevice::~SysportDevice() bool SysportDevice::Init() { - if (inherited::Init() == false) { - return false; - } - cgrom = GetCGROMDevice(); iplrom1 = GetIPLROM1Device(); iplrom2 = GetIPLROM2Device(); @@ -71,7 +67,7 @@ SysportDevice::ReadPort(uint32 offset) busdata data; data = PeekPort(offset); - putlog(2, "$%06x -> $%02x", mpu->GetPaddr(), data.Data()); + putlog(2, "$%06x -> $%02x", GetMainbusDevice()->GetPaddr(), data.Data()); data |= BusData::Size1; return data; @@ -219,7 +215,7 @@ SysportDevice::PokePort(uint32 offset, u } void -SysportDevice::MonitorUpdate(Monitor *, TextScreen& screen) +SysportDevice::MonitorScreen(Monitor *, TextScreen& screen) { screen.Clear();