summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--scripts/src/machine.lua36
-rw-r--r--scripts/src/sound.lua16
-rw-r--r--src/mame/amiga/8364_paula.cpp (renamed from src/devices/machine/8364_paula.cpp)0
-rw-r--r--src/mame/amiga/8364_paula.h (renamed from src/devices/machine/8364_paula.h)0
-rw-r--r--src/mame/amiga/akiko.cpp (renamed from src/devices/machine/akiko.cpp)0
-rw-r--r--src/mame/amiga/akiko.h (renamed from src/devices/machine/akiko.h)0
-rw-r--r--src/mame/amiga/alg.cpp1
-rw-r--r--src/mame/amiga/amiga.cpp1
-rw-r--r--src/mame/amiga/amiga.h10
-rw-r--r--src/mame/amiga/amiga_copper.cpp (renamed from src/devices/machine/amiga_copper.cpp)0
-rw-r--r--src/mame/amiga/amiga_copper.h (renamed from src/devices/machine/amiga_copper.h)0
-rw-r--r--src/mame/amiga/amigafdc.cpp (renamed from src/devices/machine/amigafdc.cpp)0
-rw-r--r--src/mame/amiga/amigafdc.h (renamed from src/devices/machine/amigafdc.h)0
-rw-r--r--src/mame/amiga/arsystems.cpp1
-rw-r--r--src/mame/amiga/mquake.cpp1
-rw-r--r--src/mame/amiga/upscope.cpp1
16 files changed, 6 insertions, 61 deletions
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index acbf897cc85..3cc9b40227b 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -142,18 +142,6 @@ end
---------------------------------------------------
--
---@src/devices/machine/akiko.h,MACHINES["AKIKO"] = true
----------------------------------------------------
-
-if (MACHINES["AKIKO"]~=null) then
- files {
- MAME_DIR .. "src/devices/machine/akiko.cpp",
- MAME_DIR .. "src/devices/machine/akiko.h",
- }
-end
-
----------------------------------------------------
---
--@src/devices/machine/am2901b.h,MACHINES["AM2901B"] = true
---------------------------------------------------
@@ -164,18 +152,6 @@ if (MACHINES["AM2901B"]~=null) then
}
end
----------------------------------------------------
---
---@src/devices/machine/amiga_copper.h,MACHINES["AMIGA_COPPER"] = true
----------------------------------------------------
-
-if (MACHINES["AMIGA_COPPER"]~=null) then
- files {
- MAME_DIR .. "src/devices/machine/amiga_copper.cpp",
- MAME_DIR .. "src/devices/machine/amiga_copper.h",
- }
-end
-
--------------------------------------------------
--
--@src/devices/machine/arm_iomd.h,MACHINES["ARM_IOMD"] = true
@@ -836,18 +812,6 @@ end
---------------------------------------------------
--
---@src/devices/machine/amigafdc.h,MACHINES["AMIGAFDC"] = true
----------------------------------------------------
-
-if (MACHINES["AMIGAFDC"]~=null) then
- files {
- MAME_DIR .. "src/devices/machine/amigafdc.cpp",
- MAME_DIR .. "src/devices/machine/amigafdc.h",
- }
-end
-
----------------------------------------------------
---
--@src/devices/machine/applepic.h,MACHINES["APPLEPIC"] = true
---------------------------------------------------
diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua
index df21e945310..e73db74d7e4 100644
--- a/scripts/src/sound.lua
+++ b/scripts/src/sound.lua
@@ -155,22 +155,6 @@ if (SOUNDS["TIA"]~=null) then
}
end
-
-
----------------------------------------------------
--- Amiga audio hardware
---@src/devices/machine/8364_paula.h,SOUNDS["PAULA_8364"] = true
----------------------------------------------------
-
-if (SOUNDS["PAULA_8364"]~=null) then
- files {
- MAME_DIR .. "src/devices/machine/8364_paula.cpp",
- MAME_DIR .. "src/devices/machine/8364_paula.h",
- }
-end
-
-
-
---------------------------------------------------
-- Bally Astrocade sound system
--@src/devices/sound/astrocde.h,SOUNDS["ASTROCADE"] = true
diff --git a/src/devices/machine/8364_paula.cpp b/src/mame/amiga/8364_paula.cpp
index a06eed90ca4..a06eed90ca4 100644
--- a/src/devices/machine/8364_paula.cpp
+++ b/src/mame/amiga/8364_paula.cpp
diff --git a/src/devices/machine/8364_paula.h b/src/mame/amiga/8364_paula.h
index ab90225f385..ab90225f385 100644
--- a/src/devices/machine/8364_paula.h
+++ b/src/mame/amiga/8364_paula.h
diff --git a/src/devices/machine/akiko.cpp b/src/mame/amiga/akiko.cpp
index be5d02c23c2..be5d02c23c2 100644
--- a/src/devices/machine/akiko.cpp
+++ b/src/mame/amiga/akiko.cpp
diff --git a/src/devices/machine/akiko.h b/src/mame/amiga/akiko.h
index 73a3b36b094..73a3b36b094 100644
--- a/src/devices/machine/akiko.h
+++ b/src/mame/amiga/akiko.h
diff --git a/src/mame/amiga/alg.cpp b/src/mame/amiga/alg.cpp
index 321258bfb56..3fedac044f2 100644
--- a/src/mame/amiga/alg.cpp
+++ b/src/mame/amiga/alg.cpp
@@ -51,7 +51,6 @@
#include "cpu/m68000/m68000.h"
#include "machine/ldp1450.h"
#include "machine/nvram.h"
-#include "machine/amigafdc.h"
#include "speaker.h"
diff --git a/src/mame/amiga/amiga.cpp b/src/mame/amiga/amiga.cpp
index d908d262b10..f4f6c8a4eb6 100644
--- a/src/mame/amiga/amiga.cpp
+++ b/src/mame/amiga/amiga.cpp
@@ -27,7 +27,6 @@
#include "machine/dmac.h"
#include "machine/nvram.h"
#include "machine/i2cmem.h"
-#include "machine/amigafdc.h"
#include "machine/cr511b.h"
#include "machine/rp5c01.h"
#include "softlist.h"
diff --git a/src/mame/amiga/amiga.h b/src/mame/amiga/amiga.h
index 5fb3fed8d37..a8d02c131dc 100644
--- a/src/mame/amiga/amiga.h
+++ b/src/mame/amiga/amiga.h
@@ -22,13 +22,15 @@ Ernesto Corvi & Mariusz Wojcieszek
#include "bus/rs232/rs232.h"
#include "bus/centronics/ctronics.h"
#include "machine/mos6526.h"
-#include "machine/amigafdc.h"
-#include "machine/amiga_copper.h"
#include "machine/msm6242.h"
-#include "machine/akiko.h"
#include "machine/i2cmem.h"
-#include "machine/8364_paula.h"
+
+#include "8364_paula.h"
+#include "akiko.h"
#include "amigaaga.h"
+#include "amigafdc.h"
+#include "amiga_copper.h"
+
#include "emupal.h"
#include "screen.h"
diff --git a/src/devices/machine/amiga_copper.cpp b/src/mame/amiga/amiga_copper.cpp
index f110edb3632..f110edb3632 100644
--- a/src/devices/machine/amiga_copper.cpp
+++ b/src/mame/amiga/amiga_copper.cpp
diff --git a/src/devices/machine/amiga_copper.h b/src/mame/amiga/amiga_copper.h
index e4746bccd46..e4746bccd46 100644
--- a/src/devices/machine/amiga_copper.h
+++ b/src/mame/amiga/amiga_copper.h
diff --git a/src/devices/machine/amigafdc.cpp b/src/mame/amiga/amigafdc.cpp
index 5b0fb798b5a..5b0fb798b5a 100644
--- a/src/devices/machine/amigafdc.cpp
+++ b/src/mame/amiga/amigafdc.cpp
diff --git a/src/devices/machine/amigafdc.h b/src/mame/amiga/amigafdc.h
index 508ce1deb17..508ce1deb17 100644
--- a/src/devices/machine/amigafdc.h
+++ b/src/mame/amiga/amigafdc.h
diff --git a/src/mame/amiga/arsystems.cpp b/src/mame/amiga/arsystems.cpp
index 31684ac0c9c..bc53085267a 100644
--- a/src/mame/amiga/arsystems.cpp
+++ b/src/mame/amiga/arsystems.cpp
@@ -55,7 +55,6 @@
#include "cpu/m68000/m68000.h"
#include "machine/nvram.h"
-#include "machine/amigafdc.h"
#include "speaker.h"
diff --git a/src/mame/amiga/mquake.cpp b/src/mame/amiga/mquake.cpp
index 560a1c93d2d..4c2ab3bd727 100644
--- a/src/mame/amiga/mquake.cpp
+++ b/src/mame/amiga/mquake.cpp
@@ -39,7 +39,6 @@
#include "cpu/m68000/m68000.h"
#include "machine/nvram.h"
-#include "machine/amigafdc.h"
#include "sound/es5503.h"
#include "speaker.h"
diff --git a/src/mame/amiga/upscope.cpp b/src/mame/amiga/upscope.cpp
index 76159f14cbd..8f79987d055 100644
--- a/src/mame/amiga/upscope.cpp
+++ b/src/mame/amiga/upscope.cpp
@@ -29,7 +29,6 @@
#include "amiga.h"
#include "cpu/m68000/m68000.h"
-#include "machine/amigafdc.h"
#include "machine/i8255.h"
#include "machine/nvram.h"