--- nono/vm/lunakbd.cpp	2026/04/29 17:05:18	1.1.1.14
+++ nono/vm/lunakbd.cpp	2026/04/29 17:05:33	1.1.1.16
@@ -16,6 +16,7 @@
 // 同様に高速走行を抑制したいため、キー扱いとしていることに留意。
 
 #include "lunakbd.h"
+#include "monitor.h"
 #include "scheduler.h"
 #include "sio.h"
 #include "uimessage.h"
@@ -25,12 +26,9 @@ LunaKeyboard::LunaKeyboard()
 {
 	led.resize(2);
 
-	event.func = ToEventCallback(&LunaKeyboard::Callback);
-	event.Regist("Keyboard/Mouse");
-
-	monitor.func = ToMonitorCallback(&LunaKeyboard::MonitorUpdate);
-	monitor.SetSize(40, 4);
-	monitor.Regist(ID_MONITOR_KEYBOARD);
+	monitor = gMonitorManager->Regist(ID_MONITOR_KEYBOARD, this);
+	monitor->func = ToMonitorCallback(&LunaKeyboard::MonitorUpdate);
+	monitor->SetSize(40, 4);
 }
 
 // デストラクタ
@@ -48,6 +46,10 @@ LunaKeyboard::Init()
 
 	sio = GetSIODevice();
 
+	event.func = ToEventCallback(&LunaKeyboard::Callback);
+	event.SetName("Keyboard/Mouse");
+	scheduler->RegistEvent(event);
+
 	return true;
 }
 
@@ -433,7 +435,7 @@ LunaKeyboard::Command(uint32 data)
 		uint f = data & 7;
 		buzzer_msec = buzzer_msec_table[t];
 		buzzer_freq = buzzer_freq_table[f];
-		putlog(1, "Command $%02x Buzzer %dmsec, %dHz",
+		putlog(1, "Command $%02x Buzzer %umsec, %uHz",
 			data, buzzer_msec, buzzer_freq);
 
 		uint64 now = scheduler->GetVirtTime();