--- nono/vm/rp5c15.cpp	2026/04/29 17:05:14	1.1.1.11
+++ nono/vm/rp5c15.cpp	2026/04/29 17:05:25	1.1.1.14
@@ -17,18 +17,15 @@
 
 // コンストラクタ
 RP5C15Device::RP5C15Device()
-	: inherited("RTC")
+	: inherited()
 {
-	devaddr = 0xe8a000;
-	devlen  = 0x2000;
-
 	// X68k の RTC epoch は 1980年固定で変更の必要はないので、設定も見ない。
 	year_epoch = 1980;
 	// X68k は通常ローカルタイム (というか JST) で使用する前提
 	use_localtime = true;
 
 	monitor.func = ToMonitorCallback(&RP5C15Device::MonitorUpdate);
-	monitor.SetSize(41, 22);
+	monitor.SetSize(38, 22);
 	monitor.Regist(ID_MONITOR_RTC);
 }
 
@@ -41,22 +38,27 @@ RP5C15Device::~RP5C15Device()
 bool
 RP5C15Device::Init()
 {
+	if (inherited::Init() == false) {
+		return false;
+	}
+
+	mfp = GetMFPDevice();
+	power = dynamic_cast<X68030PowerDevice *>(GetPowerDevice());
+
 	// デフォルトで 24 時間計にしておく
 	reg.sel24 = 0x01;
 	// デフォルトで 1HZ_ON, 16HZ_ON をネゲート(1)しておく
 	reg.reset = RP5C15::RESET_1Hz | RP5C15::RESET_16Hz;
 
-	return inherited::Init();
+	return true;
 }
 
-uint64
+busdata
 RP5C15Device::Read(uint32 offset)
 {
-	uint8 data;
+	busdata data;
 	int n;
 
-	gMPU->AddCycle(29);	// InsideOut p.135
-
 	// バンクを展開する
 	int bank = (reg.mode & RP5C15::MODE_BANK);
 	n = bank * 0x10 + offset;
@@ -74,29 +76,31 @@ RP5C15Device::Read(uint32 offset)
 		data = reg.r[n];
 		break;
 	 default:
-		__unreachable();
+		VMPANIC("corrupted n=$%x", n);
 	}
 
 	// 下位4ビット(RP5C15) の中の未実装ビットは %0 だが
 	// 上位4ビットは %1 になる。
 	data |= 0xf0;
-	putlog(2, "RTC Bank%d $%x -> $%02x", bank, offset, data);
+	putlog(2, "Bank%d $%x -> $%02x", bank, offset, data.Data());
+
+	// InsideOut p.135
+	const busdata read_wait = busdata::Wait(29 * 40_nsec);
+	data |= read_wait;
 
 	return data;
 }
 
-uint64
+busdata
 RP5C15Device::Write(uint32 offset, uint32 data)
 {
 	int n;
 
-	gMPU->AddCycle(38);	// InsideOut p.135
-
 	// バンクを展開する
 	int bank = (reg.mode & RP5C15::MODE_BANK);
 	n = bank * 0x10 + offset;
 
-	putlog(2, "RTC Bank%d $%x <- $%x", bank, offset, (data & 0x0f));
+	putlog(2, "Bank%d $%x <- $%x", bank, offset, (data & 0x0f));
 
 	switch (n) {
 	 case RP5C15::SEC1:
@@ -223,10 +227,14 @@ RP5C15Device::Write(uint32 offset, uint3
 	 default:
 		break;
 	}
-	return 0;
+
+	// InsideOut p.135
+	const busdata write_wait = busdata::Wait(38 * 40_nsec);
+
+	return write_wait;
 }
 
-uint64
+busdata
 RP5C15Device::Peek(uint32 offset)
 {
 	int n;
@@ -247,7 +255,7 @@ RP5C15Device::Peek(uint32 offset)
 		return reg.r[n] | 0xf0;
 
 	 default:
-		__unreachable();
+		return 0xff;
 	}
 }
 
@@ -349,24 +357,22 @@ RP5C15Device::MonitorUpdate(Monitor *, T
 
 	// MODE
 	y = 17;
-	screen.Print(0, y, "$d(MODE):  %x", reg.mode);
-	screen.Puts(13, y, TA::OnOff(reg.mode & RP5C15::MODE_TIMER_EN), "TIMER_EN");
-	screen.Puts(22, y, TA::OnOff(reg.mode & RP5C15::MODE_ALARM_EN), "ALARM_EN");
-	screen.Print(31, y, "BANK=%d", reg.mode & RP5C15::MODE_BANK);
+	screen.Print(0, y, "$d(MODE):   %x", reg.mode);
+	screen.Puts(14, y, TA::OnOff(reg.mode & RP5C15::MODE_TIMER_EN), "TIMER_EN");
+	screen.Puts(23, y, TA::OnOff(reg.mode & RP5C15::MODE_ALARM_EN), "ALARM_EN");
+	screen.Print(32, y, "BANK=%d", reg.mode & RP5C15::MODE_BANK);
 
 	// TEST
 	y++;
-	screen.Print(0, y, "$e(TEST):  %x", reg.test);
+	screen.Print(0, y, "$e(TEST):   %x", reg.test);
 
 	// RESET
 	y++;
-	screen.Print(0, y, "$f(RESET): %x", reg.reset);
-	screen.Print(13, y, "1Hz=%s",
-		(reg.reset & RP5C15::RESET_1Hz) ? "OFF" : "ON");
-	screen.Print(21, y, "16Hz=%s",
-		(reg.reset & RP5C15::RESET_16Hz) ? "OFF" : "ON");
-	screen.Puts(30, y, TA::OnOff(reg.reset & RP5C15::RESET_TIMER), "TIMER");
-	screen.Puts(36, y, TA::OnOff(reg.reset & RP5C15::RESET_ALARM), "ALARM");
+	screen.Print(0, y, "$f(RESET):  %x", reg.reset);
+	screen.Print(14, y, TA::OnOff(reg.reset & RP5C15::RESET_1Hz),  "!1Hz");
+	screen.Print(19, y, TA::OnOff(reg.reset & RP5C15::RESET_16Hz), "!16Hz");
+	screen.Puts(25, y, TA::OnOff(reg.reset & RP5C15::RESET_TIMER), "TIMER");
+	screen.Puts(31, y, TA::OnOff(reg.reset & RP5C15::RESET_ALARM), "ALARM");
 
 	// PIN
 	y++;
@@ -519,8 +525,8 @@ RP5C15Device::ChangeAlarmOut()
 	alarm_out = alarm_16Hz | alarm_1Hz | alarm_on;
 
 	if (old != alarm_out) {
-		gPower->SetAlarmOut(alarm_out);
-		gMFP->SetAlarmOut(alarm_out);
+		power->SetAlarmOut(alarm_out);
+		mfp->SetAlarmOut(alarm_out);
 	}
 }