--- nono/vm/scc.cpp	2026/04/29 17:05:50	1.1.1.17
+++ nono/vm/scc.cpp	2026/04/29 17:05:59	1.1.1.18
@@ -41,7 +41,7 @@ SCCDevice::SCCDevice()
 		mpscc.chan[0].dataaddr = 0xe98007;
 
 		// 5MHz
-		pclk_ns = 200_nsec;
+		pclk_tsec = 200_nsec;
 	} else {
 		// NWS-1750
 		mpscc.chan[0].desc = "Serial Port #0";
@@ -53,11 +53,11 @@ SCCDevice::SCCDevice()
 
 		// たぶん 4MHz
 		// http://www.ceres.dti.ne.jp/~tsutsui/netbsd/port-news68k.html#19990727
-		pclk_ns = 250_nsec;
+		pclk_tsec = 250_nsec;
 	}
 
 	monitor = gMonitorManager->Regist(ID_MONITOR_SCC, this);
-	monitor->func = ToMonitorCallback(&SCCDevice::MonitorUpdate);
+	monitor->SetCallback(&SCCDevice::MonitorScreen);
 	monitor->SetSize(70, 35);
 }
 
@@ -749,7 +749,7 @@ SCCDevice::WriteWR15(MPSCCChan& chan, ui
 
 // モニター
 void
-SCCDevice::MonitorUpdate(Monitor *, TextScreen& screen)
+SCCDevice::MonitorScreen(Monitor *, TextScreen& screen)
 {
 	uint wr9;
 	uint rr3a;
@@ -762,7 +762,7 @@ SCCDevice::MonitorUpdate(Monitor *, Text
 	for (int i = 0; i < 2; i++) {
 		int x = 0;
 		y = i * 16;
-		MonitorUpdateCh(screen, i, x, y);
+		MonitorScreenCh(screen, i, x, y);
 	}
 
 	y = 32;
@@ -797,7 +797,7 @@ SCCDevice::MonitorUpdate(Monitor *, Text
 
 // モニター (1チャンネル)
 void
-SCCDevice::MonitorUpdateCh(TextScreen& screen, int ch, int xbase, int ybase)
+SCCDevice::MonitorScreenCh(TextScreen& screen, int ch, int xbase, int ybase)
 {
 	const MPSCCChan& chan = mpscc.chan[ch];
 	uint crc;
@@ -911,7 +911,7 @@ SCCDevice::MonitorUpdateCh(TextScreen& s
 	y++;
 
 	// WR3,WR4,WR5
-	y = MonitorUpdateCR345(screen, x, y, wr3, wr4, wr5);
+	y = MonitorScreenCR345(screen, x, y, wr3, wr4, wr5);
 
 	// WR10
 	screen.Puts(x +  9, y, TA::Disable, (wr10 & 0x80) ? "CRC1" : "CRC0");
@@ -989,7 +989,7 @@ SCCDevice::MonitorUpdateCh(TextScreen& s
 	y++;
 
 	// RR1
-	MonitorUpdateSR1(screen, x, y, rr1);
+	MonitorScreenSR1(screen, x, y, rr1);
 	y++;
 
 	// RR10
@@ -1021,7 +1021,7 @@ SCCDevice::MonitorUpdateCh(TextScreen& s
 void
 SCCDevice::SetXC(MPSCCChan& chan)
 {
-	chan.xc12_ns = (2 * (chan.tc + 2)) * pclk_ns * 12;
+	chan.xc12_tsec = (2 * (chan.tc + 2)) * pclk_tsec * 12;
 	ChangeBaudrate(chan);
 }