From 58650bd6812a92dfcfd8fa5bc6e225b34d4aa479 Mon Sep 17 00:00:00 2001
From: Olivier Galibert <galibert@pobox.com>
Date: Mon, 13 Jun 2022 22:08:22 +0200
Subject: [PATCH] at, cammu: kick upstairs too

---
 scripts/src/machine.lua                 | 22 ++++++++++++++++++++++
 scripts/target/mame/arcade.lua          |  3 +--
 scripts/target/mame/mess.lua            |  6 ++----
 src/{mame => devices}/machine/at.cpp    |  0
 src/{mame => devices}/machine/at.h      |  0
 src/{mame => devices}/machine/cammu.cpp |  0
 src/{mame => devices}/machine/cammu.h   |  0
 7 files changed, 25 insertions(+), 6 deletions(-)
 rename src/{mame => devices}/machine/at.cpp (100%)
 rename src/{mame => devices}/machine/at.h (100%)
 rename src/{mame => devices}/machine/cammu.cpp (100%)
 rename src/{mame => devices}/machine/cammu.h (100%)

diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 1c5adeb8507..344d06b9ecc 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -4995,3 +4995,25 @@ if (MACHINES["ARCHIMEDES_KEYB"]~=null) then
 		MAME_DIR .. "src/devices/machine/archimedes_keyb.h",
 	}
 end
+
+---------------------------------------------------
+--
+--@src/devices/machine/cammu.h,MACHINES["CAMMU"] = true
+---------------------------------------------------
+if (MACHINES["CAMMU"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/cammu.cpp",
+		MAME_DIR .. "src/devices/machine/cammu.h",
+	}
+end
+
+---------------------------------------------------
+--
+--@src/devices/machine/at.h,MACHINES["AT_MB"] = true
+---------------------------------------------------
+if (MACHINES["AT_MB"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/at.cpp",
+		MAME_DIR .. "src/devices/machine/at.h",
+	}
+end
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 4b00d42849e..bbbbc34fe9b 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -750,6 +750,7 @@ MACHINES["AIC565"] = true
 MACHINES["AIC580"] = true
 MACHINES["AIC6250"] = true
 MACHINES["VRENDER0"] = true
+MACHINES["AT_MB"] = true
 
 --------------------------------------------------
 -- specify available bus cores
@@ -2747,8 +2748,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/meritsdx.cpp",
 	MAME_DIR .. "src/mame/drivers/mtouchxl.cpp",
 	MAME_DIR .. "src/mame/drivers/pubtimed.cpp",
-	MAME_DIR .. "src/mame/machine/at.h",
-	MAME_DIR .. "src/mame/machine/at.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "metro")
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index b7895f68a9b..d55f3b8928e 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -838,6 +838,8 @@ MACHINES["BITMAP_PRINTER"] = true
 MACHINES["NS32382"] = true
 MACHINES["FM_SCSI"] = true
 MACHINES["ARCHIMEDES_KEYB"] = true
+MACHINES["CAMMU"] = true
+MACHINES["AT_MB"] = true
 
 --------------------------------------------------
 -- specify available bus cores
@@ -1661,8 +1663,6 @@ files {
 	MAME_DIR .. "src/mame/machine/apple2common.h",
 	MAME_DIR .. "src/mame/drivers/amiga.cpp",
 	MAME_DIR .. "src/mame/includes/amiga.h",
-	MAME_DIR .. "src/mame/machine/at.h",
-	MAME_DIR .. "src/mame/machine/at.cpp",
 	MAME_DIR .. "src/mame/drivers/sis630.cpp",
 	MAME_DIR .. "src/mame/machine/gdrom.cpp",
 	MAME_DIR .. "src/mame/machine/gdrom.h",
@@ -2820,8 +2820,6 @@ files {
 createMESSProjects(_target, _subtarget, "interpro")
 files {
 	MAME_DIR .. "src/mame/drivers/interpro.cpp",
-	MAME_DIR .. "src/mame/machine/cammu.h",
-	MAME_DIR .. "src/mame/machine/cammu.cpp",
 	MAME_DIR .. "src/mame/machine/interpro_ioga.h",
 	MAME_DIR .. "src/mame/machine/interpro_ioga.cpp",
 	MAME_DIR .. "src/mame/machine/interpro_mcga.h",
diff --git a/src/mame/machine/at.cpp b/src/devices/machine/at.cpp
similarity index 100%
rename from src/mame/machine/at.cpp
rename to src/devices/machine/at.cpp
diff --git a/src/mame/machine/at.h b/src/devices/machine/at.h
similarity index 100%
rename from src/mame/machine/at.h
rename to src/devices/machine/at.h
diff --git a/src/mame/machine/cammu.cpp b/src/devices/machine/cammu.cpp
similarity index 100%
rename from src/mame/machine/cammu.cpp
rename to src/devices/machine/cammu.cpp
diff --git a/src/mame/machine/cammu.h b/src/devices/machine/cammu.h
similarity index 100%
rename from src/mame/machine/cammu.h
rename to src/devices/machine/cammu.h