--- nono/host/hostcom.cpp 2026/04/29 17:05:51 1.1.1.9 +++ nono/host/hostcom.cpp 2026/04/29 17:06:02 1.1.1.11 @@ -101,7 +101,7 @@ HostCOMDevice::HostCOMDevice(Device *par // モニタは hostcom* のみ必要。 monitor = gMonitorManager->Regist(ID_MONITOR_HOSTCOM(n), this); - monitor->func = ToMonitorCallback(&HostCOMDevice::MonitorUpdate); + monitor->SetCallback(&HostCOMDevice::MonitorScreen); monitor->SetSize(33, 17); } } @@ -131,18 +131,6 @@ HostCOMDevice::Create2() return false; } - // hostcom*-fallback は使わなくなったので、 - // 初期値から変更されていれば警告だけ出す。 - std::string key = GetConfigKey(); - if (key != "debugger") { - const std::string fallback_key = key + "-fallback"; - const ConfigItem& fallback_item = gConfig->Find(fallback_key); - if (fallback_item.GetFrom() != ConfigItem::FromInitial) { - warnx("Warning: option '%s' has been obsoleted.", - fallback_key.c_str()); - } - } - if (SelectDriver(true) == false) { return false; } @@ -422,7 +410,7 @@ HostCOMDevice::Write() } // ドライバ名を返す -const std::string +const std::string& HostCOMDevice::GetDriverName() { RWLockGuard_Read guard(driverlock); @@ -432,16 +420,17 @@ HostCOMDevice::GetDriverName() // モニタ void -HostCOMDevice::MonitorUpdate(Monitor *, TextScreen& screen) +HostCOMDevice::MonitorScreen(Monitor *, TextScreen& screen) { screen.Clear(); screen.Print(0, 0, "Device(Port) : %s", GetPortName().c_str()); { RWLockGuard_Read gurad(driverlock); - screen.Print(0, 1, "HostCOM Driver: %s", driver->GetDriverName()); + screen.Print(0, 1, "HostCOM Driver: %s", + driver->GetDriverName().c_str()); // 次の1行はドライバ依存情報 - driver->MonitorUpdateMD(screen, 2); + driver->MonitorScreenMD(screen, 2); } int y = 4;