summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--scripts/src/sound.lua12
-rw-r--r--scripts/src/video.lua13
-rw-r--r--scripts/target/mame/arcade.lua6
-rw-r--r--scripts/target/mame/mess.lua6
-rw-r--r--src/devices/bus/a2bus/a2alfam2.cpp1
-rw-r--r--src/devices/bus/a2bus/a2applicard.cpp1
-rw-r--r--src/devices/bus/a2bus/a2cffa.cpp1
-rw-r--r--src/devices/bus/a2bus/a2corvus.cpp1
-rw-r--r--src/devices/bus/a2bus/a2diskii.cpp1
-rw-r--r--src/devices/bus/a2bus/a2dx1.cpp1
-rw-r--r--src/devices/bus/a2bus/a2echoii.cpp1
-rw-r--r--src/devices/bus/a2bus/a2eext80col.cpp1
-rw-r--r--src/devices/bus/a2bus/a2eramworks3.cpp1
-rw-r--r--src/devices/bus/a2bus/a2estd80col.cpp1
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.cpp1
-rw-r--r--src/devices/bus/a2bus/a2lang.cpp13
-rw-r--r--src/devices/bus/a2bus/a2mcms.cpp1
-rw-r--r--src/devices/bus/a2bus/a2memexp.cpp1
-rw-r--r--src/devices/bus/a2bus/a2sam.cpp1
-rw-r--r--src/devices/bus/a2bus/a2scsi.cpp1
-rw-r--r--src/devices/bus/a2bus/a2softcard.cpp1
-rw-r--r--src/devices/bus/a2bus/a2swyft.cpp1
-rw-r--r--src/devices/bus/a2bus/a2themill.cpp1
-rw-r--r--src/devices/bus/a2bus/a2ultraterm.cpp1
-rw-r--r--src/devices/bus/a2bus/a2videoterm.cpp1
-rw-r--r--src/devices/bus/a2bus/a2vulcan.cpp1
-rw-r--r--src/devices/bus/a2bus/a2zipdrive.cpp1
-rw-r--r--src/devices/bus/a2bus/laser128.cpp1
-rw-r--r--src/devices/bus/coco/coco_dwsock.cpp1
-rw-r--r--src/devices/bus/coco/coco_fdc.cpp1
-rw-r--r--src/devices/bus/coco/coco_multi.cpp3
-rw-r--r--src/devices/bus/coco/coco_pak.cpp28
-rw-r--r--src/devices/bus/coco/coco_pak.h1
-rw-r--r--src/devices/bus/coco/coco_t4426.cpp27
-rw-r--r--src/devices/bus/coco/coco_t4426.h1
-rw-r--r--src/devices/bus/coco/dragon_fdc.cpp1
-rw-r--r--src/devices/bus/cpc/amdrum.cpp1
-rw-r--r--src/devices/bus/cpc/cpc_pds.cpp1
-rw-r--r--src/devices/bus/cpc/cpc_rom.cpp2
-rw-r--r--src/devices/bus/cpc/cpc_rs232.cpp3
-rw-r--r--src/devices/bus/cpc/cpc_ssa1.cpp2
-rw-r--r--src/devices/bus/cpc/ddi1.cpp2
-rw-r--r--src/devices/bus/cpc/doubler.cpp2
-rw-r--r--src/devices/bus/cpc/hd20.cpp3
-rw-r--r--src/devices/bus/cpc/magicsound.cpp3
-rw-r--r--src/devices/bus/cpc/mface2.cpp2
-rw-r--r--src/devices/bus/cpc/playcity.cpp2
-rw-r--r--src/devices/bus/cpc/smartwatch.cpp3
-rw-r--r--src/devices/bus/cpc/transtape.cpp2
-rw-r--r--src/devices/bus/ep64/exp.h2
-rw-r--r--src/devices/bus/nes/ggenie.cpp3
-rw-r--r--src/devices/sound/dave.cpp (renamed from src/mame/audio/dave.cpp)0
-rw-r--r--src/devices/sound/dave.h (renamed from src/mame/audio/dave.h)0
-rw-r--r--src/devices/video/ppu2c0x.cpp (renamed from src/mame/video/ppu2c0x.cpp)0
-rw-r--r--src/devices/video/ppu2c0x.h (renamed from src/mame/video/ppu2c0x.h)0
-rw-r--r--src/mame/drivers/coco12.cpp14
-rw-r--r--src/mame/drivers/coco3.cpp1
-rw-r--r--src/mame/drivers/ep64.cpp2
-rw-r--r--src/mame/includes/coco.h2
59 files changed, 102 insertions, 86 deletions
diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua
index 91dfe094c50..171ad3f30cc 100644
--- a/scripts/src/sound.lua
+++ b/scripts/src/sound.lua
@@ -1424,3 +1424,15 @@ if (SOUNDS["MM5837"]~=null) then
MAME_DIR .. "src/devices/sound/mm5837.h",
}
end
+
+---------------------------------------------------
+-- Intelligent Designs DAVE
+--@src/devices/sound/dave.h,MACHINES["DAVE"] = true
+---------------------------------------------------
+
+if (SOUNDS["DAVE"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/dave.cpp",
+ MAME_DIR .. "src/devices/sound/dave.h",
+ }
+end
diff --git a/scripts/src/video.lua b/scripts/src/video.lua
index ba52eb78bcd..770de5db893 100644
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@@ -936,3 +936,16 @@ if (VIDEOS["EF9369"]~=null) then
MAME_DIR .. "src/devices/video/ef9369.h",
}
end
+
+--------------------------------------------------
+--
+--@src/devices/video/ppu2c0x.h,VIDEOS["PPU2C0X"] = true
+--------------------------------------------------
+
+if (VIDEOS["PPU2C0X"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/ppu2c0x.cpp",
+ MAME_DIR .. "src/devices/video/ppu2c0x.h",
+ }
+end
+
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 02c5986d6ad..8c7f713f6f9 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -265,6 +265,7 @@ SOUNDS["VOLT_REG"] = true
--SOUNDS["MEA8000"] = true
SOUNDS["DAC76"] = true
SOUNDS["MM5837"] = true
+--SOUNDS["DAVE"] = true
--------------------------------------------------
-- specify available video cores
@@ -339,6 +340,7 @@ VIDEOS["V9938"] = true
VIDEOS["VOODOO"] = true
VIDEOS["VOODOO_PCI"] = true
VIDEOS["ZEUS2"] = true
+VIDEOS["PPU2C0X"] = true
--------------------------------------------------
-- specify available machine cores
@@ -2872,10 +2874,6 @@ files {
MAME_DIR .. "src/mame/includes/vsnes.h",
MAME_DIR .. "src/mame/machine/vsnes.cpp",
MAME_DIR .. "src/mame/video/vsnes.cpp",
- MAME_DIR .. "src/mame/video/ppu2c0x.cpp",
- MAME_DIR .. "src/mame/video/ppu2c0x.h",
-
-
}
createMAMEProjects(_target, _subtarget, "nix")
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index db5099da55a..052a99d2527 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -267,6 +267,7 @@ SOUNDS["VOLT_REG"] = true
SOUNDS["MEA8000"] = true
--SOUNDS["DAC76"] = true
--SOUNDS["MM5837"] = true
+SOUNDS["DAVE"] = true
--------------------------------------------------
-- specify available video cores
@@ -344,6 +345,7 @@ VIDEOS["SCN2674"] = true
VIDEOS["GB_LCD"] = true
VIDEOS["GBA_LCD"] = true
VIDEOS["MGA2064W"] = true
+VIDEOS["PPU2C0X"] = true
--------------------------------------------------
-- specify available machine cores
@@ -1158,8 +1160,6 @@ files {
MAME_DIR .. "src/mame/machine/kabuki.cpp",
MAME_DIR .. "src/mame/machine/kabuki.h",
MAME_DIR .. "src/mame/video/pk8000.cpp",
- MAME_DIR .. "src/mame/video/ppu2c0x.cpp",
- MAME_DIR .. "src/mame/video/ppu2c0x.h",
MAME_DIR .. "src/mame/machine/snes.cpp",
MAME_DIR .. "src/mame/audio/snes_snd.cpp",
MAME_DIR .. "src/mame/audio/snes_snd.h",
@@ -1842,8 +1842,6 @@ files {
createMESSProjects(_target, _subtarget, "enterprise")
files {
MAME_DIR .. "src/mame/drivers/ep64.cpp",
- MAME_DIR .. "src/mame/audio/dave.cpp",
- MAME_DIR .. "src/mame/audio/dave.h",
MAME_DIR .. "src/mame/video/nick.cpp",
MAME_DIR .. "src/mame/video/nick.h",
}
diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp
index 0bee8380532..d4decaeae92 100644
--- a/src/devices/bus/a2bus/a2alfam2.cpp
+++ b/src/devices/bus/a2bus/a2alfam2.cpp
@@ -10,7 +10,6 @@
*********************************************************************/
#include "a2alfam2.h"
-#include "includes/apple2.h"
#include "sound/sn76496.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp
index 1e4f71e3e33..9fe268dbabd 100644
--- a/src/devices/bus/a2bus/a2applicard.cpp
+++ b/src/devices/bus/a2bus/a2applicard.cpp
@@ -12,7 +12,6 @@
*********************************************************************/
#include "a2applicard.h"
-#include "includes/apple2.h"
#include "cpu/z80/z80.h"
#include "machine/z80ctc.h"
diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp
index e046b2e120e..79420fff9d3 100644
--- a/src/devices/bus/a2bus/a2cffa.cpp
+++ b/src/devices/bus/a2bus/a2cffa.cpp
@@ -12,7 +12,6 @@
*********************************************************************/
#include "a2cffa.h"
-#include "includes/apple2.h"
#include "machine/ataintf.h"
#include "imagedev/harddriv.h"
#include "softlist.h"
diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp
index 9ee553b17d8..32d86cdc091 100644
--- a/src/devices/bus/a2bus/a2corvus.cpp
+++ b/src/devices/bus/a2bus/a2corvus.cpp
@@ -41,7 +41,6 @@
*********************************************************************/
#include "a2corvus.h"
-#include "includes/apple2.h"
#include "imagedev/harddriv.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/a2diskii.cpp b/src/devices/bus/a2bus/a2diskii.cpp
index 50243e2f596..fa89dfc228e 100644
--- a/src/devices/bus/a2bus/a2diskii.cpp
+++ b/src/devices/bus/a2bus/a2diskii.cpp
@@ -9,7 +9,6 @@
*********************************************************************/
#include "emu.h"
-#include "includes/apple2.h"
#include "imagedev/flopdrv.h"
#include "formats/ap2_dsk.h"
#include "machine/appldriv.h"
diff --git a/src/devices/bus/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp
index 158403ee10c..71eee7cea0b 100644
--- a/src/devices/bus/a2bus/a2dx1.cpp
+++ b/src/devices/bus/a2bus/a2dx1.cpp
@@ -8,7 +8,6 @@
*********************************************************************/
-#include "includes/apple2.h"
#include "a2dx1.h"
#include "sound/volt_reg.h"
diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp
index ee8e318da31..b309e265a07 100644
--- a/src/devices/bus/a2bus/a2echoii.cpp
+++ b/src/devices/bus/a2bus/a2echoii.cpp
@@ -9,7 +9,6 @@
*********************************************************************/
#include "a2echoii.h"
-#include "includes/apple2.h"
#include "sound/tms5220.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/a2eext80col.cpp b/src/devices/bus/a2bus/a2eext80col.cpp
index 1d2f6ae4e74..bd975354314 100644
--- a/src/devices/bus/a2bus/a2eext80col.cpp
+++ b/src/devices/bus/a2bus/a2eext80col.cpp
@@ -9,7 +9,6 @@
*********************************************************************/
#include "emu.h"
-#include "includes/apple2.h"
#include "a2eext80col.h"
diff --git a/src/devices/bus/a2bus/a2eramworks3.cpp b/src/devices/bus/a2bus/a2eramworks3.cpp
index c0a0e2c016d..e832bb53123 100644
--- a/src/devices/bus/a2bus/a2eramworks3.cpp
+++ b/src/devices/bus/a2bus/a2eramworks3.cpp
@@ -10,7 +10,6 @@
*********************************************************************/
#include "emu.h"
-#include "includes/apple2.h"
#include "a2eramworks3.h"
diff --git a/src/devices/bus/a2bus/a2estd80col.cpp b/src/devices/bus/a2bus/a2estd80col.cpp
index c6982aafa83..28a669ffd20 100644
--- a/src/devices/bus/a2bus/a2estd80col.cpp
+++ b/src/devices/bus/a2bus/a2estd80col.cpp
@@ -9,7 +9,6 @@
*********************************************************************/
#include "emu.h"
-#include "includes/apple2.h"
#include "a2estd80col.h"
diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp
index e8e5f4b98e4..eb36d7cb8cb 100644
--- a/src/devices/bus/a2bus/a2hsscsi.cpp
+++ b/src/devices/bus/a2bus/a2hsscsi.cpp
@@ -39,7 +39,6 @@
*********************************************************************/
#include "a2hsscsi.h"
-#include "includes/apple2.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
diff --git a/src/devices/bus/a2bus/a2lang.cpp b/src/devices/bus/a2bus/a2lang.cpp
index 3c156fd4c90..0bd6af638db 100644
--- a/src/devices/bus/a2bus/a2lang.cpp
+++ b/src/devices/bus/a2bus/a2lang.cpp
@@ -13,7 +13,6 @@
*********************************************************************/
#include "emu.h"
-#include "includes/apple2.h"
#include "a2lang.h"
@@ -70,12 +69,12 @@ void a2bus_lang_device::device_reset()
void a2bus_lang_device::langcard_touch(offs_t offset)
{
- uint32_t val, mask;
+/* uint32_t val, mask;
if (LOG_LANGCARD)
logerror("language card bankswitch read, offset: $c08%0x\n", offset);
- /* determine which flags to change */
+ // determine which flags to change
mask = VAR_LCWRITE | VAR_LCRAM | VAR_LCRAM2;
val = 0;
@@ -93,9 +92,9 @@ void a2bus_lang_device::langcard_touch(offs_t offset)
if ((offset & 0x08) == 0)
val |= VAR_LCRAM2;
- /* change the flags */
+ // change the flags
apple2_state *state = machine().driver_data<apple2_state>();
- state->apple2_setvar(val, mask);
+ state->apple2_setvar(val, mask);*/
}
@@ -106,7 +105,7 @@ void a2bus_lang_device::langcard_touch(offs_t offset)
uint8_t a2bus_lang_device::read_c0nx(address_space &space, uint8_t offset)
{
- apple2_state *state = machine().driver_data<apple2_state>();
+/* apple2_state *state = machine().driver_data<apple2_state>();
// enforce "read twice" for c081/3/9/B
// but only on the II/II+ with a discrete language card.
@@ -128,7 +127,7 @@ uint8_t a2bus_lang_device::read_c0nx(address_space &space, uint8_t offset)
}
langcard_touch(offset);
- last_offset = offset;
+ last_offset = offset;*/
return 0;
}
diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp
index 57abe911fd0..38b8ce36fa8 100644
--- a/src/devices/bus/a2bus/a2mcms.cpp
+++ b/src/devices/bus/a2bus/a2mcms.cpp
@@ -11,7 +11,6 @@
*********************************************************************/
#include "a2mcms.h"
-#include "includes/apple2.h"
// the actual sound device (a slot device can't currently also be a sound device so we keep this private here)
enum
diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp
index f34b71e435d..be1d28cd1bc 100644
--- a/src/devices/bus/a2bus/a2memexp.cpp
+++ b/src/devices/bus/a2bus/a2memexp.cpp
@@ -9,7 +9,6 @@
*********************************************************************/
#include "a2memexp.h"
-#include "includes/apple2.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/a2sam.cpp b/src/devices/bus/a2bus/a2sam.cpp
index e8b6f811754..3abc1820061 100644
--- a/src/devices/bus/a2bus/a2sam.cpp
+++ b/src/devices/bus/a2bus/a2sam.cpp
@@ -8,7 +8,6 @@
*********************************************************************/
-#include "includes/apple2.h"
#include "a2sam.h"
#include "sound/volt_reg.h"
diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp
index f1da850482d..3dba10aa849 100644
--- a/src/devices/bus/a2bus/a2scsi.cpp
+++ b/src/devices/bus/a2bus/a2scsi.cpp
@@ -32,7 +32,6 @@
*********************************************************************/
#include "a2scsi.h"
-#include "includes/apple2.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp
index df509e7e079..8ffb9ba88da 100644
--- a/src/devices/bus/a2bus/a2softcard.cpp
+++ b/src/devices/bus/a2bus/a2softcard.cpp
@@ -9,7 +9,6 @@
*********************************************************************/
#include "a2softcard.h"
-#include "includes/apple2.h"
#include "cpu/z80/z80.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/a2swyft.cpp b/src/devices/bus/a2bus/a2swyft.cpp
index 975974b849b..ec6ef5af5f7 100644
--- a/src/devices/bus/a2bus/a2swyft.cpp
+++ b/src/devices/bus/a2bus/a2swyft.cpp
@@ -9,7 +9,6 @@
*********************************************************************/
#include "emu.h"
-#include "includes/apple2.h"
#include "a2swyft.h"
diff --git a/src/devices/bus/a2bus/a2themill.cpp b/src/devices/bus/a2bus/a2themill.cpp
index 71aed47ace9..ecabb3e085f 100644
--- a/src/devices/bus/a2bus/a2themill.cpp
+++ b/src/devices/bus/a2bus/a2themill.cpp
@@ -23,7 +23,6 @@
*********************************************************************/
#include "a2themill.h"
-#include "includes/apple2.h"
#include "cpu/m6809/m6809.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp
index 5526515ab1d..82a56021e02 100644
--- a/src/devices/bus/a2bus/a2ultraterm.cpp
+++ b/src/devices/bus/a2bus/a2ultraterm.cpp
@@ -28,7 +28,6 @@
*********************************************************************/
#include "a2ultraterm.h"
-#include "includes/apple2.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp
index 53eb6d5d20a..03f1ba1f2f4 100644
--- a/src/devices/bus/a2bus/a2videoterm.cpp
+++ b/src/devices/bus/a2bus/a2videoterm.cpp
@@ -24,7 +24,6 @@
*********************************************************************/
#include "a2videoterm.h"
-#include "includes/apple2.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp
index 216ccc7d043..6cb28536d94 100644
--- a/src/devices/bus/a2bus/a2vulcan.cpp
+++ b/src/devices/bus/a2bus/a2vulcan.cpp
@@ -54,7 +54,6 @@
*********************************************************************/
#include "a2vulcan.h"
-#include "includes/apple2.h"
#include "machine/ataintf.h"
#include "imagedev/harddriv.h"
diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp
index 369aec79a4d..0e57cf691c1 100644
--- a/src/devices/bus/a2bus/a2zipdrive.cpp
+++ b/src/devices/bus/a2bus/a2zipdrive.cpp
@@ -20,7 +20,6 @@
*********************************************************************/
#include "a2zipdrive.h"
-#include "includes/apple2.h"
#include "machine/ataintf.h"
#include "imagedev/harddriv.h"
diff --git a/src/devices/bus/a2bus/laser128.cpp b/src/devices/bus/a2bus/laser128.cpp
index 3ba434abfa4..c7dae25191d 100644
--- a/src/devices/bus/a2bus/laser128.cpp
+++ b/src/devices/bus/a2bus/laser128.cpp
@@ -9,7 +9,6 @@
*********************************************************************/
#include "laser128.h"
-#include "includes/apple2.h"
/***************************************************************************
PARAMETERS
diff --git a/src/devices/bus/coco/coco_dwsock.cpp b/src/devices/bus/coco/coco_dwsock.cpp
index afd8e4dad5f..1d5322e1801 100644
--- a/src/devices/bus/coco/coco_dwsock.cpp
+++ b/src/devices/bus/coco/coco_dwsock.cpp
@@ -10,7 +10,6 @@
#include "emu.h"
#include "osdcore.h"
-#include "includes/coco.h"
#include "coco_dwsock.h"
diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp
index c80ebc61391..fbab4c4c58a 100644
--- a/src/devices/bus/coco/coco_fdc.cpp
+++ b/src/devices/bus/coco/coco_fdc.cpp
@@ -46,7 +46,6 @@
#include "cococart.h"
#include "coco_fdc.h"
#include "imagedev/flopdrv.h"
-#include "includes/coco.h"
#include "machine/msm6242.h"
#include "machine/ds1315.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp
index fcfd764a169..dcfe5f062aa 100644
--- a/src/devices/bus/coco/coco_multi.cpp
+++ b/src/devices/bus/coco/coco_multi.cpp
@@ -52,7 +52,6 @@
***************************************************************************/
#include "emu.h"
-#include "includes/coco.h"
#include "coco_multi.h"
#include "coco_232.h"
#include "coco_orch90.h"
@@ -161,7 +160,7 @@ void coco_multipak_device::device_start()
// install $FF7F handler
write8_delegate wh = write8_delegate(FUNC(coco_multipak_device::ff7f_write), this);
- machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM).install_write_handler(0xFF7F, 0xFF7F, wh);
+ machine().device(":maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xFF7F, 0xFF7F, wh);
// initial state
m_select = 0xFF;
diff --git a/src/devices/bus/coco/coco_pak.cpp b/src/devices/bus/coco/coco_pak.cpp
index 1cc9e4f5e05..e3ba87bbbdb 100644
--- a/src/devices/bus/coco/coco_pak.cpp
+++ b/src/devices/bus/coco/coco_pak.cpp
@@ -10,9 +10,9 @@
#include "emu.h"
#include "coco_pak.h"
-#include "includes/coco.h"
#define CARTSLOT_TAG "cart"
+#define CART_AUTOSTART_TAG "cart_autostart"
/***************************************************************************
IMPLEMENTATION
@@ -26,6 +26,19 @@ ROM_START( coco_pak )
// this region is filled by cococart_slot_device::call_load()
ROM_END
+
+//-------------------------------------------------
+// INPUT_PORTS( coco_cart_autostart )
+//-------------------------------------------------
+
+static INPUT_PORTS_START( coco_cart_autostart )
+ PORT_START(CART_AUTOSTART_TAG)
+ PORT_CONFNAME( 0x01, 0x01, "Cart Auto-Start" )
+ PORT_CONFSETTING( 0x00, DEF_STR( Off ))
+ PORT_CONFSETTING( 0x01, DEF_STR( On ))
+INPUT_PORTS_END
+
+
//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************
@@ -42,14 +55,14 @@ const device_type COCO_PAK = &device_creator<coco_pak_device>;
coco_pak_device::coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
device_cococart_interface( mconfig, *this ), m_cart(nullptr), m_owner(nullptr),
- m_autostart(*this, ":" CART_AUTOSTART_TAG)
+ m_autostart(*this, CART_AUTOSTART_TAG)
{
}
coco_pak_device::coco_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, COCO_PAK, "CoCo Program PAK", tag, owner, clock, "cocopak", __FILE__),
device_cococart_interface( mconfig, *this ), m_cart(nullptr), m_owner(nullptr),
- m_autostart(*this, ":" CART_AUTOSTART_TAG)
+ m_autostart(*this, CART_AUTOSTART_TAG)
{
}
@@ -74,6 +87,15 @@ machine_config_constructor coco_pak_device::device_mconfig_additions() const
}
//-------------------------------------------------
+// input_ports - device-specific input ports
+//-------------------------------------------------
+
+ioport_constructor coco_pak_device::device_input_ports() const
+{
+ return INPUT_PORTS_NAME( coco_cart_autostart );
+}
+
+//-------------------------------------------------
// rom_region - device-specific ROM region
//-------------------------------------------------
diff --git a/src/devices/bus/coco/coco_pak.h b/src/devices/bus/coco/coco_pak.h
index f6a93ec459f..84f8e68f75f 100644
--- a/src/devices/bus/coco/coco_pak.h
+++ b/src/devices/bus/coco/coco_pak.h
@@ -26,6 +26,7 @@ public:
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
+ virtual ioport_constructor device_input_ports() const override;
virtual uint8_t* get_cart_base() override;
protected:
diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp
index b067c5b8d50..1d5c3b3fa2f 100644
--- a/src/devices/bus/coco/coco_t4426.cpp
+++ b/src/devices/bus/coco/coco_t4426.cpp
@@ -41,7 +41,6 @@
#include "emu.h"
#include "coco_t4426.h"
-#include "includes/coco.h"
#define LOG_GENERAL 0x01
#define LOG_SETUP 0x02
@@ -74,6 +73,7 @@
#define UART_TAG "acia"
#define PIA_TAG "pia"
#define CARTSLOT_TAG "t4426"
+#define CART_AUTOSTART_TAG "cart_autostart"
/***************************************************************************
IMPLEMENTATION
@@ -109,6 +109,17 @@ ROM_START( coco_t4426 )
ROM_RELOAD(0x18000,0x1000)
ROM_END
+//-------------------------------------------------
+// INPUT_PORTS( coco_cart_autostart )
+//-------------------------------------------------
+
+static INPUT_PORTS_START( coco_cart_autostart )
+ PORT_START(CART_AUTOSTART_TAG)
+ PORT_CONFNAME( 0x01, 0x01, "Cart Auto-Start" )
+ PORT_CONFSETTING( 0x00, DEF_STR( Off ))
+ PORT_CONFSETTING( 0x01, DEF_STR( On ))
+INPUT_PORTS_END
+
//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************
@@ -129,7 +140,7 @@ coco_t4426_device::coco_t4426_device(const machine_config &mconfig, device_type
,m_cart(nullptr)
,m_owner(nullptr)
,m_select(0)
- ,m_autostart(*this, ":" CART_AUTOSTART_TAG)
+ ,m_autostart(*this, CART_AUTOSTART_TAG)
,m_uart(*this, UART_TAG)
,m_pia(*this, PIA_TAG)
{
@@ -141,7 +152,7 @@ coco_t4426_device::coco_t4426_device(const machine_config &mconfig, const char *
,m_cart(nullptr)
,m_owner(nullptr)
,m_select(0)
- ,m_autostart(*this, ":" CART_AUTOSTART_TAG)
+ ,m_autostart(*this, CART_AUTOSTART_TAG)
,m_uart(*this, UART_TAG)
,m_pia(*this, PIA_TAG)
{
@@ -179,6 +190,16 @@ const tiny_rom_entry *coco_t4426_device::device_rom_region() const
return ROM_NAME( coco_t4426 );
}
+//-------------------------------------------------
+// input_ports - device-specific input ports
+//-------------------------------------------------
+
+ioport_constructor coco_t4426_device::device_input_ports() const
+{
+ return INPUT_PORTS_NAME( coco_cart_autostart );
+}
+
+
/*-------------------------------------------------
device_reset - device-specific startup
-------------------------------------------------*/
diff --git a/src/devices/bus/coco/coco_t4426.h b/src/devices/bus/coco/coco_t4426.h
index a0ec0532142..9fd446c21fb 100644
--- a/src/devices/bus/coco/coco_t4426.h
+++ b/src/devices/bus/coco/coco_t4426.h
@@ -28,6 +28,7 @@ public:
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
+ virtual ioport_constructor device_input_ports() const override;
virtual uint8_t* get_cart_base() override;
DECLARE_WRITE8_MEMBER( pia_A_w );
diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp
index e32bab843e9..f633d465f8c 100644
--- a/src/devices/bus/coco/dragon_fdc.cpp
+++ b/src/devices/bus/coco/dragon_fdc.cpp
@@ -69,7 +69,6 @@
#include "cococart.h"
#include "coco_fdc.h"
#include "imagedev/flopdrv.h"
-#include "includes/coco.h"
#include "machine/wd_fdc.h"
#include "formats/dmk_dsk.h"
#include "formats/jvc_dsk.h"
diff --git a/src/devices/bus/cpc/amdrum.cpp b/src/devices/bus/cpc/amdrum.cpp
index 3ed2f019655..18eea564be0 100644
--- a/src/devices/bus/cpc/amdrum.cpp
+++ b/src/devices/bus/cpc/amdrum.cpp
@@ -7,7 +7,6 @@
*/
#include "emu.h"
-#include "includes/amstrad.h"
#include "amdrum.h"
#include "sound/volt_reg.h"
diff --git a/src/devices/bus/cpc/cpc_pds.cpp b/src/devices/bus/cpc/cpc_pds.cpp
index 311bca693cb..0708cb67f9a 100644
--- a/src/devices/bus/cpc/cpc_pds.cpp
+++ b/src/devices/bus/cpc/cpc_pds.cpp
@@ -8,7 +8,6 @@
#include "emu.h"
#include "cpc_pds.h"
-#include "includes/amstrad.h"
//**************************************************************************
diff --git a/src/devices/bus/cpc/cpc_rom.cpp b/src/devices/bus/cpc/cpc_rom.cpp
index 766c6b8277e..aae1044dc26 100644
--- a/src/devices/bus/cpc/cpc_rom.cpp
+++ b/src/devices/bus/cpc/cpc_rom.cpp
@@ -8,10 +8,10 @@
#include "emu.h"
#include "cpc_rom.h"
-#include "includes/amstrad.h"
const device_type CPC_ROM = &device_creator<cpc_rom_device>;
+SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE CONFIG INTERFACE
diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp
index 00090ace9aa..b00503584f0 100644
--- a/src/devices/bus/cpc/cpc_rs232.cpp
+++ b/src/devices/bus/cpc/cpc_rs232.cpp
@@ -7,7 +7,8 @@
*/
#include "cpc_rs232.h"
-#include "includes/amstrad.h"
+
+SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS
diff --git a/src/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp
index 9779f4b96da..ef21af1e384 100644
--- a/src/devices/bus/cpc/cpc_ssa1.cpp
+++ b/src/devices/bus/cpc/cpc_ssa1.cpp
@@ -10,7 +10,7 @@
#include "emu.h"
#include "cpc_ssa1.h"
-#include "includes/amstrad.h"
+SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS
diff --git a/src/devices/bus/cpc/ddi1.cpp b/src/devices/bus/cpc/ddi1.cpp
index ef21cb9f319..be82f2f05b8 100644
--- a/src/devices/bus/cpc/ddi1.cpp
+++ b/src/devices/bus/cpc/ddi1.cpp
@@ -6,8 +6,8 @@
#include "emu.h"
#include "ddi1.h"
-#include "includes/amstrad.h"
#include "softlist.h"
+SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS
diff --git a/src/devices/bus/cpc/doubler.cpp b/src/devices/bus/cpc/doubler.cpp
index 79d47383b6c..5e5f6587404 100644
--- a/src/devices/bus/cpc/doubler.cpp
+++ b/src/devices/bus/cpc/doubler.cpp
@@ -7,7 +7,7 @@
*/
#include "doubler.h"
-#include "includes/amstrad.h"
+SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS
diff --git a/src/devices/bus/cpc/hd20.cpp b/src/devices/bus/cpc/hd20.cpp
index 163687d41c7..370b3076b8c 100644
--- a/src/devices/bus/cpc/hd20.cpp
+++ b/src/devices/bus/cpc/hd20.cpp
@@ -8,8 +8,7 @@
#include "emu.h"
#include "hd20.h"
-#include "includes/amstrad.h"
-
+SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS
diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp
index b80b9218884..d2bf11d2009 100644
--- a/src/devices/bus/cpc/magicsound.cpp
+++ b/src/devices/bus/cpc/magicsound.cpp
@@ -8,10 +8,9 @@
*/
#include "emu.h"
-#include "includes/amstrad.h"
#include "magicsound.h"
#include "sound/volt_reg.h"
-
+SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS
diff --git a/src/devices/bus/cpc/mface2.cpp b/src/devices/bus/cpc/mface2.cpp
index 7832de1ba7c..90d08716e25 100644
--- a/src/devices/bus/cpc/mface2.cpp
+++ b/src/devices/bus/cpc/mface2.cpp
@@ -8,7 +8,7 @@
#include "emu.h"
#include "mface2.h"
-#include "includes/amstrad.h"
+SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS
diff --git a/src/devices/bus/cpc/playcity.cpp b/src/devices/bus/cpc/playcity.cpp
index eece3a9c2d7..41896009037 100644
--- a/src/devices/bus/cpc/playcity.cpp
+++ b/src/devices/bus/cpc/playcity.cpp
@@ -11,7 +11,7 @@
*/
#include "playcity.h"
-#include "includes/amstrad.h"
+SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS
diff --git a/src/devices/bus/cpc/smartwatch.cpp b/src/devices/bus/cpc/smartwatch.cpp
index f7ae8148037..b6a453d79cd 100644
--- a/src/devices/bus/cpc/smartwatch.cpp
+++ b/src/devices/bus/cpc/smartwatch.cpp
@@ -11,8 +11,7 @@
#include "emu.h"
#include "smartwatch.h"
-#include "includes/amstrad.h"
-
+SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS
diff --git a/src/devices/bus/cpc/transtape.cpp b/src/devices/bus/cpc/transtape.cpp
index 1b3056d12c9..df05e1e491a 100644
--- a/src/devices/bus/cpc/transtape.cpp
+++ b/src/devices/bus/cpc/transtape.cpp
@@ -9,7 +9,7 @@
*/
#include "transtape.h"
-#include "includes/amstrad.h"
+SLOT_INTERFACE_EXTERN(cpc_exp_cards);
//**************************************************************************
// DEVICE DEFINITIONS
diff --git a/src/devices/bus/ep64/exp.h b/src/devices/bus/ep64/exp.h
index 153afb0abc6..cbba96f1efa 100644
--- a/src/devices/bus/ep64/exp.h
+++ b/src/devices/bus/ep64/exp.h
@@ -48,7 +48,7 @@
#define __EP64_EXPANSION_BUS__
#include "emu.h"
-#include "audio/dave.h"
+#include "sound/dave.h"
diff --git a/src/devices/bus/nes/ggenie.cpp b/src/devices/bus/nes/ggenie.cpp
index ec6664bb23d..7831f91b717 100644
--- a/src/devices/bus/nes/ggenie.cpp
+++ b/src/devices/bus/nes/ggenie.cpp
@@ -15,8 +15,7 @@
#include "emu.h"
#include "ggenie.h"
-#include "includes/nes.h"
-
+#include "bus/nes/nes_carts.h"
#ifdef NES_PCB_DEBUG
#define VERBOSE 1
diff --git a/src/mame/audio/dave.cpp b/src/devices/sound/dave.cpp
index 69a7f2aec6f..69a7f2aec6f 100644
--- a/src/mame/audio/dave.cpp
+++ b/src/devices/sound/dave.cpp
diff --git a/src/mame/audio/dave.h b/src/devices/sound/dave.h
index 95bcf38fe92..95bcf38fe92 100644
--- a/src/mame/audio/dave.h
+++ b/src/devices/sound/dave.h
diff --git a/src/mame/video/ppu2c0x.cpp b/src/devices/video/ppu2c0x.cpp
index c86bed6c6fb..c86bed6c6fb 100644
--- a/src/mame/video/ppu2c0x.cpp
+++ b/src/devices/video/ppu2c0x.cpp
diff --git a/src/mame/video/ppu2c0x.h b/src/devices/video/ppu2c0x.h
index d426630eb64..d426630eb64 100644
--- a/src/mame/video/ppu2c0x.h
+++ b/src/devices/video/ppu2c0x.h
diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp
index 35a3d776915..7b4c38df94f 100644
--- a/src/mame/drivers/coco12.cpp
+++ b/src/mame/drivers/coco12.cpp
@@ -107,19 +107,6 @@ INPUT_PORTS_END
//-------------------------------------------------
-// INPUT_PORTS( coco_cart_autostart )
-//-------------------------------------------------
-
-INPUT_PORTS_START( coco_cart_autostart )
- PORT_START(CART_AUTOSTART_TAG)
- PORT_CONFNAME( 0x01, 0x01, "Cart Auto-Start" )
- PORT_CONFSETTING( 0x00, DEF_STR( Off ))
- PORT_CONFSETTING( 0x01, DEF_STR( On ))
-INPUT_PORTS_END
-
-
-
-//-------------------------------------------------
// INPUT_PORTS( coco_beckerport )
//-------------------------------------------------
@@ -238,7 +225,6 @@ static INPUT_PORTS_START( coco )
PORT_INCLUDE( coco_keyboard )
PORT_INCLUDE( coco_joystick )
PORT_INCLUDE( coco_analog_control )
- PORT_INCLUDE( coco_cart_autostart )
PORT_INCLUDE( coco_rtc )
PORT_INCLUDE( coco_beckerport )
INPUT_PORTS_END
diff --git a/src/mame/drivers/coco3.cpp b/src/mame/drivers/coco3.cpp
index cefb1940070..15f41f0f42d 100644
--- a/src/mame/drivers/coco3.cpp
+++ b/src/mame/drivers/coco3.cpp
@@ -221,7 +221,6 @@ static INPUT_PORTS_START( coco3 )
PORT_INCLUDE( coco3_keyboard )
PORT_INCLUDE( coco3_joystick )
PORT_INCLUDE( coco_analog_control )
- PORT_INCLUDE( coco_cart_autostart )
PORT_INCLUDE( coco_rat_mouse )
PORT_INCLUDE( coco_lightgun )
PORT_INCLUDE( coco_rtc )
diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp
index a1b9c94f4c2..f094b9dba0d 100644
--- a/src/mame/drivers/ep64.cpp
+++ b/src/mame/drivers/ep64.cpp
@@ -151,7 +151,7 @@ Notes: (All IC's shown)
#include "emu.h"
#include "softlist.h"
-#include "audio/dave.h"
+#include "sound/dave.h"
#include "bus/rs232/rs232.h"
#include "bus/ep64/exp.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/coco.h b/src/mame/includes/coco.h
index ccc7018b0aa..8853b3155eb 100644
--- a/src/mame/includes/coco.h
+++ b/src/mame/includes/coco.h
@@ -32,7 +32,6 @@
//**************************************************************************
INPUT_PORTS_EXTERN( coco_analog_control );
-INPUT_PORTS_EXTERN( coco_cart_autostart );
INPUT_PORTS_EXTERN( coco_rtc );
INPUT_PORTS_EXTERN( coco_beckerport );
@@ -58,7 +57,6 @@ SLOT_INTERFACE_EXTERN( coco_cart );
// inputs
#define CTRL_SEL_TAG "ctrl_sel"
#define HIRES_INTF_TAG "hires_intf"
-#define CART_AUTOSTART_TAG "cart_autostart"
#define BECKERPORT_TAG "beckerport"
#define JOYSTICK_RX_TAG "joystick_rx"
#define JOYSTICK_RY_TAG "joystick_ry"