--- nono/vm/xiospace.cpp	2026/04/29 17:04:32	1.1.1.2
+++ nono/vm/xiospace.cpp	2026/04/29 17:04:36	1.1.1.3
@@ -1,19 +1,20 @@
 //
 // nono
-// Copyright (C) 2018 isaki@NetBSD.org
+// Copyright (C) 2020 nono project
+// Licensed under nono-license.txt
 //
 
-#include <typeinfo>
+#include "xiospace.h"
 #include "areaset.h"
 #include "busio.h"
 #include "crtc.h"
 #include "dmac.h"
 #include "fdc.h"
 #include "gvram.h"
-#include "iocon.h"
+#include "ioctlr.h"
 #include "mfp.h"
-#include "pluto.h"
 #include "pio.h"
+#include "pluto.h"
 #include "printer.h"
 #include "ram.h"
 #include "romimg_x68k.h"
@@ -24,32 +25,31 @@
 #include "sram.h"
 #include "sysport.h"
 #include "tvram.h"
-#include "vicon.h"
+#include "videoctlr.h"
 #include "vm.h"
-#include "xiospace.h"
+#include <typeinfo>
 
 //
 // X68030 のメイン空間 ($000000-$FFFFFF) 担当。
 //
 
 // デバイス
-std::unique_ptr<AreaSetDevice> areaset;
-std::unique_ptr<CGROMDevice> cgrom;
-std::unique_ptr<CRTCDevice> crtc;
-std::unique_ptr<FDCDevice> fdc;
-std::unique_ptr<IPLROM1Device> iplrom1;
-std::unique_ptr<IPLROM2Device> iplrom2;
-std::unique_ptr<PlutoDevice> pluto;
-std::unique_ptr<PPIDevice> ppi;
-std::unique_ptr<PrinterDevice> printer;
-std::unique_ptr<SpriteDevice> sprite;
-std::unique_ptr<SysportDevice> sysport;
+static std::unique_ptr<AreaSetDevice> areaset;
+static std::unique_ptr<CGROMDevice> cgrom;
+static std::unique_ptr<FDCDevice> fdc;
+static std::unique_ptr<IPLROM1Device> iplrom1;
+static std::unique_ptr<IPLROM2Device> iplrom2;
+static std::unique_ptr<PlutoDevice> pluto;
+static std::unique_ptr<PPIDevice> ppi;
+static std::unique_ptr<PrinterDevice> printer;
+static std::unique_ptr<SpriteDevice> sprite;
+static std::unique_ptr<SysportDevice> sysport;
 
 // 1つの 8KB ブロックを複数のデバイスで共有する場合
 class MuxDevice
 	: public IODevice
 {
-	typedef IODevice inherited;
+	using inherited = IODevice;
  public:
 	MuxDevice();
 	virtual ~MuxDevice();
@@ -76,13 +76,14 @@ MuxDevice::~MuxDevice()
 {
 }
 
-// デバイスを追加します。
-// ここに追加するデバイスは dev->devlen の指定が必須です。
+// デバイスを追加する。
+// ここに追加するデバイスは dev->devlen を指定すること。
 void
 MuxDevice::AddDevice(IODevice *dev)
 {
 	if (dev->devlen == 0) {
-		printf("MuxDevice::AddDevice: '%s' devlen not set!\n", dev->devname);
+		printf("MuxDevice::AddDevice: '%s' devlen not set!\n",
+			dev->devname.c_str());
 		exit(1);
 	}
 	devlist.push_back(dev);
@@ -172,25 +173,25 @@ XIOSpaceDevice::XIOSpaceDevice()
 	// デバイスクラス作成 (順序に注意)
 	ADD_DEVICE(areaset, AreaSetDevice());
 	ADD_DEVICE(cgrom, CGROMDevice());
-	ADD_DEVICE(crtc, CRTCDevice());
-	ADD_DEVICE(gDMAC, DMACDevice());
-	ADD_DEVICE(fdc, FDCDevice());
+	ADD_DEVICE(gCRTC, BusIO_W<CRTCDevice>());
+	ADD_DEVICE(gDMAC, BusIO_B<DMACDevice>());
+	ADD_DEVICE(fdc, BusIO_EB<FDCDevice>());
 	ADD_DEVICE(gGVRAM, GVRAMDevice());
-	ADD_DEVICE(gIOCon, IOConDevice());
+	ADD_DEVICE(gIOCtlr, BusIO_EB<IOCtlrDevice>());
 	ADD_DEVICE(iplrom1, IPLROM1Device());
 	ADD_DEVICE(iplrom2, IPLROM2Device());
-	ADD_DEVICE(gMFP, MFPDevice());
+	ADD_DEVICE(gMFP, BusIO_EB<MFPDevice>());
 	ADD_DEVICE(pluto, PlutoDevice());
 	ADD_DEVICE(ppi, BusIO_EB<PPIDevice>());
 	ADD_DEVICE(printer, PrinterDevice());
-	ADD_DEVICE(gRTC, RP5C15Device());
-	ADD_DEVICE(gSCC, SCCDevice());
+	ADD_DEVICE(gRTC, BusIO_EB<RP5C15Device>());
+	ADD_DEVICE(gSCC, BusIO_EB<SCCDevice>());
 	ADD_DEVICE(gSPC, BusIO_X68kSPC<SPCDevice>());
 	ADD_DEVICE(sprite, SpriteDevice());
 	ADD_DEVICE(gSRAM, SRAMDevice());
-	ADD_DEVICE(sysport, SysportDevice());
+	ADD_DEVICE(sysport, BusIO_FB<SysportDevice>());
 	ADD_DEVICE(gTVRAM, TVRAMDevice());
-	ADD_DEVICE(gVicon, ViconDevice());
+	ADD_DEVICE(gVideoCtlr, BusIO_W<VideoCtlrDevice>());
 
 	// デバッグ表示
 	if (0) {
@@ -201,7 +202,7 @@ XIOSpaceDevice::XIOSpaceDevice()
 			} else if (dynamic_cast<MuxDevice*>(table[i])) {
 				printf("MuxDevice\n");
 			} else if (dynamic_cast<IODevice*>(table[i])) {
-				printf("%s\n", table[i]->devname);
+				printf("%s\n", table[i]->devname.c_str());
 			}
 		}
 	}
@@ -213,16 +214,18 @@ XIOSpaceDevice::~XIOSpaceDevice()
 }
 
 // デバイステーブルに dev を追加する。
-// ここに追加するデバイスは dev->devlen の指定が必須です。
+// ここに追加するデバイスは dev->devlen を指定すること。
 void
 XIOSpaceDevice::AddDevice(IODevice *dev)
 {
 	if (dev->devaddr == 0) {
-		printf("XIOSpaceDevice:AddDevice: '%s' devaddr not set!\n", dev->devname);
+		printf("XIOSpaceDevice:AddDevice: '%s' devaddr not set!\n",
+			dev->devname.c_str());
 		exit(1);
 	}
 	if (dev->devlen == 0) {
-		printf("XIOSpaceDevice:AddDevice: '%s' devlen not set!\n", dev->devname);
+		printf("XIOSpaceDevice:AddDevice: '%s' devlen not set!\n",
+			dev->devname.c_str());
 		exit(1);
 	}