--- nono/vm/goldfish_tty.cpp 2026/04/29 17:05:42 1.1.1.4 +++ nono/vm/goldfish_tty.cpp 2026/04/29 17:05:46 1.1.1.5 @@ -54,7 +54,7 @@ GFTTYDevice::GFTTYDevice() GFTTYDevice::~GFTTYDevice() { if ((bool)hostcom) { - hostcom->SetRxCallback(NULL); + hostcom->ResetRxCallback(); } } @@ -63,13 +63,13 @@ GFTTYDevice::Create() { // 対応するホストドライバを作成 try { - hostcom.reset(new HostCOMDevice(this, "HostCOM")); + hostcom.reset(new HostCOMDevice(this, 0, "GoldfishTTY")); } catch (...) { } if ((bool)hostcom == false) { warnx("Failed to initialize HostCOMDevice at %s", __method__); return false; } - hostcom->SetRxCallback(ToDeviceCallback(&GFTTYDevice::HostRxCallback)); + hostcom->SetRxCallback(ToDeviceCallback(&GFTTYDevice::HostRxCallback), 0); return true; } @@ -93,7 +93,7 @@ GFTTYDevice::Init() gfpic = GetGFPICDevice(1); gfpic->RegistIRQ(32, "GFTTY", this); - scheduler->ConnectMessage(MessageID::HOSTCOM_RX, this, + scheduler->ConnectMessage(MessageID::HOSTCOM0_RX, this, ToMessageCallback(&GFTTYDevice::RxMessage)); return true; } @@ -291,9 +291,9 @@ GFTTYDevice::ChangeInterrupt() // ホストスレッドからの受信通知 // (HostCOM スレッドで呼ばれる) void -GFTTYDevice::HostRxCallback() +GFTTYDevice::HostRxCallback(uint32 dummy) { - scheduler->SendMessage(MessageID::HOSTCOM_RX); + scheduler->SendMessage(MessageID::HOSTCOM0_RX); } // ホストシリアルからの1バイト(以上)受信メッセージ