summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2019-09-20 11:12:44 -0400
committer AJR <ajrhacker@users.noreply.github.com>2019-09-20 11:12:44 -0400
commit9afcd9c9b97b6c6cd1528ba1e2fe4cfb0ffc3347 (patch)
treea5cec16a4c13c85769916bc6797e8b5ee9a42df6
parent123c71bc4b8bc3ec579ab0aa9350d332b470ba53 (diff)
acorn_vidc: All right, move this back to src/devices/machine (nw)
-rw-r--r--scripts/src/machine.lua13
-rw-r--r--scripts/src/video.lua12
-rw-r--r--scripts/target/mame/arcade.lua2
-rw-r--r--scripts/target/mame/mess.lua2
-rw-r--r--src/devices/machine/acorn_vidc.cpp (renamed from src/devices/video/acorn_vidc.cpp)0
-rw-r--r--src/devices/machine/acorn_vidc.h (renamed from src/devices/video/acorn_vidc.h)0
-rw-r--r--src/mame/includes/archimds.h2
7 files changed, 16 insertions, 15 deletions
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index fa836f90189..7986a41f2b4 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -68,6 +68,19 @@ files {
}
+--------------------------------------------------
+--
+--@src/devices/machine/acorn_vidc.h,MACHINES["ACORN_VIDC"] = true
+--------------------------------------------------
+
+if (MACHINES["ACORN_VIDC"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/acorn_vidc.cpp",
+ MAME_DIR .. "src/devices/machine/acorn_vidc.h",
+ }
+end
+
+
---------------------------------------------------
--
--@src/devices/machine/akiko.h,MACHINES["AKIKO"] = true
diff --git a/scripts/src/video.lua b/scripts/src/video.lua
index fae7bad2434..d4c4920002a 100644
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@@ -43,18 +43,6 @@ end
--------------------------------------------------
--
---@src/devices/video/acorn_vidc.h,MACHINES["ACORN_VIDC"] = true
---------------------------------------------------
-
-if (VIDEOS["ACORN_VIDC"]~=null) then
- files {
- MAME_DIR .. "src/devices/video/acorn_vidc.cpp",
- MAME_DIR .. "src/devices/video/acorn_vidc.h",
- }
-end
-
---------------------------------------------------
---
--@src/devices/video/am8052.h,VIDEOS["AM8052"] = true
--------------------------------------------------
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 197aa20f8af..571ef1c62e8 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -284,7 +284,6 @@ SOUNDS["LC7535"] = true
VIDEOS["SEGA315_5124"] = true
VIDEOS["SEGA315_5313"] = true
-VIDEOS["ACORN_VIDC"] = true
--VIDEOS["AM8052"] = true
VIDEOS["BUFSPRITE"] = true
--VIDEOS["CDP1861"] = true
@@ -372,6 +371,7 @@ VIDEOS["VRENDER0"] = true
-- specify available machine cores
--------------------------------------------------
+MACHINES["ACORN_VIDC"] = true
MACHINES["AKIKO"] = true
MACHINES["AUTOCONFIG"] = true
MACHINES["BUSMOUSE"] = true
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index b296ebd096d..f60a7dc253e 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -299,7 +299,6 @@ SOUNDS["SWP30"] = true
VIDEOS["SEGA315_5124"] = true
VIDEOS["SEGA315_5313"] = true
-VIDEOS["ACORN_VIDC"] = true
VIDEOS["AM8052"] = true
--VIDEOS["BUFSPRITE"] = true
VIDEOS["BT45X"] = true
@@ -418,6 +417,7 @@ MACHINES["7200FIFO"] = true
MACHINES["8530SCC"] = true
MACHINES["AAKARTDEV"] = true
MACHINES["ACIA6850"] = true
+MACHINES["ACORN_VIDC"] = true
MACHINES["ADC0808"] = true
MACHINES["ADC083X"] = true
MACHINES["ADC1038"] = true
diff --git a/src/devices/video/acorn_vidc.cpp b/src/devices/machine/acorn_vidc.cpp
index 7347688fa53..7347688fa53 100644
--- a/src/devices/video/acorn_vidc.cpp
+++ b/src/devices/machine/acorn_vidc.cpp
diff --git a/src/devices/video/acorn_vidc.h b/src/devices/machine/acorn_vidc.h
index 08bf93dd571..08bf93dd571 100644
--- a/src/devices/video/acorn_vidc.h
+++ b/src/devices/machine/acorn_vidc.h
diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h
index 249967e4f6f..e6080400cfb 100644
--- a/src/mame/includes/archimds.h
+++ b/src/mame/includes/archimds.h
@@ -14,7 +14,7 @@
#include "machine/aakart.h"
#include "machine/i2cmem.h"
#include "machine/wd_fdc.h"
-#include "video/acorn_vidc.h"
+#include "machine/acorn_vidc.h"
// interrupt definitions. these are for the real Archimedes computer - arcade
// and gambling knockoffs likely are a bit different.