--- nono/vm/sio.cpp	2026/04/29 17:04:32	1.1.1.3
+++ nono/vm/sio.cpp	2026/04/29 17:05:06	1.1.1.8
@@ -1,10 +1,12 @@
 //
 // nono
-// Copyright (C) 2018 isaki@NetBSD.org
+// Copyright (C) 2020 nono project
+// Licensed under nono-license.txt
 //
 
 #include "sio.h"
-#include "mpu.h"
+#include "interrupt.h"
+#include "keyboard.h"
 
 //          IODevice
 //              |
@@ -19,33 +21,34 @@
 std::unique_ptr<SIODevice> gSIO;
 
 SIODevice::SIODevice()
+	: inherited("SIO")
 {
-	logname = "sio";
-	devname = "SIO";
 	devaddr = 0x51000000;
 
 	cr.chan[0].desc = "Serial Console";
 	cr.chan[1].desc = "Keyboard";
-}
 
-SIODevice::~SIODevice()
-{
+	// 153.6kHz = 6.510416...usec / bit;
+	// 12bit = 78.125usec
+	txc12_ns = 78.125_usec;
+
+	// LUNA では SIO と呼ぶほうが通りがいい。
+	for (int ch = 0; ch < txevent.size(); ch++) {
+		txevent[ch].SetName(string_format("SIO Ch%s TX", cr.chan[ch].name));
+	}
+	monitor.Regist(ID_MONITOR_SIO);
 }
 
-// 本体リセットスイッチによるリセット
-void
-SIODevice::ResetHard()
+SIODevice::~SIODevice()
 {
-	// チップリセット
-	Reset();
 }
 
 uint64
-SIODevice::Read(uint32 addr)
+SIODevice::Read(uint32 offset)
 {
 	uint32 data;
 
-	switch (addr) {
+	switch (offset) {
 	 case 0:
 		data = ReadData(&cr.chan[0]);
 		break;
@@ -65,9 +68,9 @@ SIODevice::Read(uint32 addr)
 }
 
 uint64
-SIODevice::Write(uint32 addr, uint32 data)
+SIODevice::Write(uint32 offset, uint32 data)
 {
-	switch (addr) {
+	switch (offset) {
 	 case 0:
 		WriteData(&cr.chan[0], data);
 		return 0;
@@ -88,9 +91,9 @@ SIODevice::Write(uint32 addr, uint32 dat
 }
 
 uint64
-SIODevice::Peek(uint32 addr)
+SIODevice::Peek(uint32 offset)
 {
-	switch (addr) {
+	switch (offset) {
 	 case 0:
 		return PeekData(&cr.chan[0]);
 
@@ -111,5 +114,20 @@ void
 SIODevice::Interrupt()
 {
 	putlog(2, "Interrupt");
-	gMPU->Interrupt(6);
+	gInterrupt->AssertINT(this);
+}
+
+void
+SIODevice::Tx(int ch, uint32 data)
+{
+	switch (ch) {
+	 case 0:
+		// TODO: シリアル送信処理
+		break;
+	 case 1:
+		gKeyboard->Command(data);
+		break;
+	 default:
+		__unreachable();
+	}
 }