--- nono/vm/vm_luna.h	2026/04/29 17:04:36	1.1.1.2
+++ nono/vm/vm_luna.h	2026/04/29 17:05:29	1.1.1.13
@@ -4,6 +4,10 @@
 // Licensed under nono-license.txt
 //
 
+//
+// VM (LUNA)
+//
+
 #pragma once
 
 #include "vm.h"
@@ -11,38 +15,33 @@
 class VM_LUNA : public VM
 {
 	using inherited = VM;
+ protected:
+	explicit VM_LUNA(const char *name_);
  public:
-	VM_LUNA();
 	~VM_LUNA() override;
 
-	// 電源ボタンを押す。
-	void PowerButton() override;
+ protected:
+	std::unique_ptr<Device> pDipsw {};
+	std::unique_ptr<Device> pLCD {};
+	std::unique_ptr<Device> pMPU64180 {};
+	std::unique_ptr<Device> pXPbus {};
+};
 
- private:
-	std::unique_ptr<CRTC2Device> crtc2;
-	std::unique_ptr<IODevice> prom;
-	std::unique_ptr<SysClkDevice> sysclk;
-	std::unique_ptr<NullDevice> nulldev;
+class VM_LUNA1 final : public VM_LUNA
+{
+	using inherited = VM_LUNA;
+ public:
+	VM_LUNA1();
+	~VM_LUNA1() override;
 
-	static const uint8 maptable[256];
+ private:
+	std::unique_ptr<Device> pSSG {};
 };
 
-class VM_LUNA88K : public VM
+class VM_LUNA88K final : public VM_LUNA
 {
-	using inherited = VM;
+	using inherited = VM_LUNA;
  public:
 	VM_LUNA88K();
 	~VM_LUNA88K() override;
-
-	// 電源ボタンを押す。
-	void PowerButton() override;
-
- private:
-	std::unique_ptr<CRTC2Device> crtc2;
-	std::unique_ptr<FuseROMDevice> fuserom;
-	std::unique_ptr<IODevice> prom;
-	std::unique_ptr<SysClkDevice> sysclk;
-	std::unique_ptr<NullDevice> nulldev;
-
-	static const uint8 maptable[256];
 };