summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2017-11-23 10:06:16 -0500
committer AJR <ajrhacker@users.noreply.github.com>2017-11-23 10:09:40 -0500
commitf3236fc081c02794a4da7d684e14dceded8e0793 (patch)
tree76545d594d4668dbec80177dea86f889c494724f
parent310b5866b9bde6d47ea42a3e94f489ed316a19dd (diff)
cococart: Provide a proper header for each device file (nw)
-rw-r--r--src/devices/bus/coco/coco_dcmodem.cpp2
-rw-r--r--src/devices/bus/coco/coco_dcmodem.h12
-rw-r--r--src/devices/bus/coco/coco_fdc.h6
-rw-r--r--src/devices/bus/coco/coco_gmc.cpp2
-rw-r--r--src/devices/bus/coco/coco_gmc.h11
-rw-r--r--src/devices/bus/coco/coco_multi.cpp9
-rw-r--r--src/devices/bus/coco/coco_multi.h12
-rw-r--r--src/devices/bus/coco/coco_orch90.cpp1
-rw-r--r--src/devices/bus/coco/coco_orch90.h12
-rw-r--r--src/devices/bus/coco/coco_pak.h6
-rw-r--r--src/devices/bus/coco/coco_rs232.cpp2
-rw-r--r--src/devices/bus/coco/coco_rs232.h12
-rw-r--r--src/devices/bus/coco/coco_ssc.cpp2
-rw-r--r--src/devices/bus/coco/coco_ssc.h12
-rw-r--r--src/devices/bus/coco/coco_t4426.cpp2
-rw-r--r--src/devices/bus/coco/coco_t4426.h12
-rw-r--r--src/devices/bus/coco/cococart.h45
-rw-r--r--src/devices/bus/coco/dragon_fdc.cpp2
-rw-r--r--src/devices/bus/coco/dragon_fdc.h13
-rw-r--r--src/mame/drivers/coco12.cpp9
-rw-r--r--src/mame/drivers/dragon.cpp5
21 files changed, 144 insertions, 45 deletions
diff --git a/src/devices/bus/coco/coco_dcmodem.cpp b/src/devices/bus/coco/coco_dcmodem.cpp
index 67c6707e53e..77206445bb0 100644
--- a/src/devices/bus/coco/coco_dcmodem.cpp
+++ b/src/devices/bus/coco/coco_dcmodem.cpp
@@ -12,6 +12,8 @@
***************************************************************************/
#include "emu.h"
+#include "coco_dcmodem.h"
+
#include "cococart.h"
#include "machine/mos6551.h"
diff --git a/src/devices/bus/coco/coco_dcmodem.h b/src/devices/bus/coco/coco_dcmodem.h
new file mode 100644
index 00000000000..e80f33be656
--- /dev/null
+++ b/src/devices/bus/coco/coco_dcmodem.h
@@ -0,0 +1,12 @@
+// license:BSD-3-Clause
+// copyright-holders:Nathan Woods
+
+#ifndef MAME_BUS_COCO_COCO_DCMODEM_H
+#define MAME_BUS_COCO_COCO_DCMODEM_H
+
+#pragma once
+
+// device type definition
+extern const device_type COCO_DCMODEM;
+
+#endif // MAME_BUS_COCO_COCO_DCMODEM_H
diff --git a/src/devices/bus/coco/coco_fdc.h b/src/devices/bus/coco/coco_fdc.h
index 4cfc2e5a886..c9525831575 100644
--- a/src/devices/bus/coco/coco_fdc.h
+++ b/src/devices/bus/coco/coco_fdc.h
@@ -60,4 +60,10 @@ private:
bool m_drq;
};
+// device type definitions - CoCo FDC
+extern const device_type COCO_FDC;
+extern const device_type COCO_FDC_V11;
+extern const device_type COCO3_HDB1;
+extern const device_type CP400_FDC;
+
#endif // MAME_BUS_COCO_COCO_FDC_H
diff --git a/src/devices/bus/coco/coco_gmc.cpp b/src/devices/bus/coco/coco_gmc.cpp
index 8e9ac52d4a9..3c257e2b3ef 100644
--- a/src/devices/bus/coco/coco_gmc.cpp
+++ b/src/devices/bus/coco/coco_gmc.cpp
@@ -17,6 +17,8 @@
***************************************************************************/
#include "emu.h"
+#include "coco_gmc.h"
+
#include "coco_pak.h"
#include "sound/sn76496.h"
#include "speaker.h"
diff --git a/src/devices/bus/coco/coco_gmc.h b/src/devices/bus/coco/coco_gmc.h
new file mode 100644
index 00000000000..1f1ec6654c8
--- /dev/null
+++ b/src/devices/bus/coco/coco_gmc.h
@@ -0,0 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Nathan Woods
+#ifndef MAME_BUS_COCO_COCO_GMC_H
+#define MAME_BUS_COCO_COCO_GMC_H
+
+#pragma once
+
+// device type definition
+extern const device_type COCO_PAK_GMC;
+
+#endif // MAME_BUS_COCO_COCO_GMC_H
diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp
index 98c1cb96765..8ac57f25f48 100644
--- a/src/devices/bus/coco/coco_multi.cpp
+++ b/src/devices/bus/coco/coco_multi.cpp
@@ -54,7 +54,16 @@
***************************************************************************/
#include "emu.h"
+#include "coco_multi.h"
+
#include "cococart.h"
+#include "coco_dcmodem.h"
+#include "coco_fdc.h"
+#include "coco_gmc.h"
+#include "coco_orch90.h"
+#include "coco_pak.h"
+#include "coco_rs232.h"
+#include "coco_ssc.h"
#define SLOT1_TAG "slot1"
#define SLOT2_TAG "slot2"
diff --git a/src/devices/bus/coco/coco_multi.h b/src/devices/bus/coco/coco_multi.h
new file mode 100644
index 00000000000..5672c42c8e1
--- /dev/null
+++ b/src/devices/bus/coco/coco_multi.h
@@ -0,0 +1,12 @@
+// license:BSD-3-Clause
+// copyright-holders:Nathan Woods
+
+#ifndef MAME_BUS_COCO_COCO_MULTIPAK_H
+#define MAME_BUS_COCO_COCO_MULTIPAK_H
+
+#pragma once
+
+// device type definition
+extern const device_type COCO_MULTIPAK;
+
+#endif // MAME_BUS_COCO_COCO_MULTIPAK_H
diff --git a/src/devices/bus/coco/coco_orch90.cpp b/src/devices/bus/coco/coco_orch90.cpp
index 0b9342c4a71..1263ea8f8d5 100644
--- a/src/devices/bus/coco/coco_orch90.cpp
+++ b/src/devices/bus/coco/coco_orch90.cpp
@@ -26,6 +26,7 @@
***************************************************************************/
#include "emu.h"
+#include "coco_orch90.h"
#include "cococart.h"
#include "sound/dac.h"
diff --git a/src/devices/bus/coco/coco_orch90.h b/src/devices/bus/coco/coco_orch90.h
new file mode 100644
index 00000000000..97cf476d35d
--- /dev/null
+++ b/src/devices/bus/coco/coco_orch90.h
@@ -0,0 +1,12 @@
+// license:BSD-3-Clause
+// copyright-holders:Nathan Woods
+
+#ifndef MAME_BUS_COCO_COCO_ORCH90_H
+#define MAME_BUS_COCO_COCO_ORCH90_H
+
+#pragma once
+
+// device type definition
+extern const device_type COCO_ORCH90;
+
+#endif // MAME_BUS_COCO_COCO_ORCH90_H
diff --git a/src/devices/bus/coco/coco_pak.h b/src/devices/bus/coco/coco_pak.h
index a9b46957ca3..6ddfbc6b97e 100644
--- a/src/devices/bus/coco/coco_pak.h
+++ b/src/devices/bus/coco/coco_pak.h
@@ -64,4 +64,10 @@ private:
uint8_t m_pos;
};
+
+// device type definitions
+extern const device_type COCO_PAK;
+extern const device_type COCO_PAK_BANKED;
+extern const device_type COCO_PAK_GMC;
+
#endif // MAME_BUS_COCO_COCO_PAK_H
diff --git a/src/devices/bus/coco/coco_rs232.cpp b/src/devices/bus/coco/coco_rs232.cpp
index bee862b3a5f..fa6344f05b9 100644
--- a/src/devices/bus/coco/coco_rs232.cpp
+++ b/src/devices/bus/coco/coco_rs232.cpp
@@ -9,6 +9,8 @@
***************************************************************************/
#include "emu.h"
+#include "coco_rs232.h"
+
#include "cococart.h"
#include "machine/mos6551.h"
diff --git a/src/devices/bus/coco/coco_rs232.h b/src/devices/bus/coco/coco_rs232.h
new file mode 100644
index 00000000000..2076a2c8a4c
--- /dev/null
+++ b/src/devices/bus/coco/coco_rs232.h
@@ -0,0 +1,12 @@
+// license:BSD-3-Clause
+// copyright-holders:Nathan Woods
+
+#ifndef MAME_BUS_COCO_COCO_RS232_H
+#define MAME_BUS_COCO_COCO_RS232_H
+
+#pragma once
+
+// device type definition
+extern const device_type COCO_RS232;
+
+#endif // MAME_BUS_COCO_COCO_RS232_H
diff --git a/src/devices/bus/coco/coco_ssc.cpp b/src/devices/bus/coco/coco_ssc.cpp
index 1eccdd45c03..16adf923aeb 100644
--- a/src/devices/bus/coco/coco_ssc.cpp
+++ b/src/devices/bus/coco/coco_ssc.cpp
@@ -31,6 +31,8 @@
***************************************************************************/
#include "emu.h"
+#include "coco_ssc.h"
+
#include "sound/ay8910.h"
#include "sound/sp0256.h"
#include "machine/netlist.h"
diff --git a/src/devices/bus/coco/coco_ssc.h b/src/devices/bus/coco/coco_ssc.h
new file mode 100644
index 00000000000..ce9b3d5e26c
--- /dev/null
+++ b/src/devices/bus/coco/coco_ssc.h
@@ -0,0 +1,12 @@
+// license:BSD-3-Clause
+// copyright-holders:Nathan Woods
+
+#ifndef MAME_BUS_COCO_COCO_SSC_H
+#define MAME_BUS_COCO_COCO_SSC_H
+
+#pragma once
+
+// device type definition
+extern const device_type COCO_SSC;
+
+#endif // MAME_BUS_COCO_COCO_SSC_H
diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp
index 895df9a5515..5adc451d18a 100644
--- a/src/devices/bus/coco/coco_t4426.cpp
+++ b/src/devices/bus/coco/coco_t4426.cpp
@@ -43,6 +43,8 @@
***************************************************************************/
#include "emu.h"
+#include "coco_t4426.h"
+
#include "cococart.h"
#include "machine/6850acia.h"
#include "bus/rs232/rs232.h"
diff --git a/src/devices/bus/coco/coco_t4426.h b/src/devices/bus/coco/coco_t4426.h
new file mode 100644
index 00000000000..415b16f50de
--- /dev/null
+++ b/src/devices/bus/coco/coco_t4426.h
@@ -0,0 +1,12 @@
+// license:BSD-3-Clause
+// copyright-holders:Nathan Woods
+
+#ifndef MAME_BUS_COCO_COCO_T4426_H
+#define MAME_BUS_COCO_COCO_T4426_H
+
+#pragma once
+
+// device type definition
+extern const device_type COCO_T4426;
+
+#endif // MAME_BUS_COCO_COCO_T4426_H
diff --git a/src/devices/bus/coco/cococart.h b/src/devices/bus/coco/cococart.h
index 299aa6ed778..38e4e21d3d7 100644
--- a/src/devices/bus/coco/cococart.h
+++ b/src/devices/bus/coco/cococart.h
@@ -15,25 +15,6 @@
#include "softlist_dev.h"
-// The following are modules included by the various CoCo cartridge
-// devices. For some reason, the build system will not necessarily
-// identify them as dependencies. Adding these #include's here seems
-// to rectify the problem
-#include "cpu/tms7000/tms7000.h"
-#include "machine/mos6551.h"
-#include "machine/6850acia.h"
-#include "machine/mc14411.h"
-#include "machine/msm6242.h"
-#include "machine/ds1315.h"
-#include "machine/wd_fdc.h"
-#include "sound/ay8910.h"
-#include "sound/sp0256.h"
-#include "sound/sn76496.h"
-#include "formats/dmk_dsk.h"
-#include "formats/sdf_dsk.h"
-#include "formats/jvc_dsk.h"
-#include "formats/vdk_dsk.h"
-
/***************************************************************************
TYPE DEFINITIONS
@@ -235,30 +216,4 @@ private:
MCFG_DEVICE_REMOVE(_tag)
-/***************************************************************************
- COCO CARTRIDGE DEVICES
-***************************************************************************/
-
-// device type definitions - CoCo FDC
-extern const device_type COCO_FDC;
-extern const device_type COCO_FDC_V11;
-extern const device_type COCO3_HDB1;
-extern const device_type CP400_FDC;
-
-// device type definitions - Dragon FDC
-extern const device_type DRAGON_FDC;
-extern const device_type SDTANDY_FDC;
-
-// device type definitions - other
-extern const device_type COCO_ORCH90;
-extern const device_type COCO_MULTIPAK;
-extern const device_type COCO_RS232;
-extern const device_type COCO_DCMODEM;
-extern const device_type COCO_SSC;
-extern const device_type COCO_PAK;
-extern const device_type COCO_PAK_BANKED;
-extern const device_type COCO_PAK_GMC;
-extern const device_type COCO_T4426;
-extern const device_type DRAGON_JCBSND;
-
#endif // MAME_BUS_COCO_COCOCART_H
diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp
index 42e1ee7a13b..97f4cb325ac 100644
--- a/src/devices/bus/coco/dragon_fdc.cpp
+++ b/src/devices/bus/coco/dragon_fdc.cpp
@@ -66,6 +66,8 @@
*********************************************************************/
#include "emu.h"
+#include "dragon_fdc.h"
+
#include "cococart.h"
#include "coco_fdc.h"
#include "imagedev/flopdrv.h"
diff --git a/src/devices/bus/coco/dragon_fdc.h b/src/devices/bus/coco/dragon_fdc.h
new file mode 100644
index 00000000000..6377e867003
--- /dev/null
+++ b/src/devices/bus/coco/dragon_fdc.h
@@ -0,0 +1,13 @@
+// license:BSD-3-Clause
+// copyright-holders:Nathan Woods
+
+#ifndef MAME_BUS_COCO_DRAGON_FDC_H
+#define MAME_BUS_COCO_DRAGON_FDC_H
+
+#pragma once
+
+// device type definitions - Dragon FDC
+extern const device_type DRAGON_FDC;
+extern const device_type SDTANDY_FDC;
+
+#endif // MAME_BUS_COCO_DRAGON_FDC_H
diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp
index 0a1cee38e71..8b320f1607c 100644
--- a/src/mame/drivers/coco12.cpp
+++ b/src/mame/drivers/coco12.cpp
@@ -26,7 +26,16 @@
#include "emu.h"
#include "includes/coco12.h"
+#include "bus/coco/coco_dcmodem.h"
#include "bus/coco/coco_dwsock.h"
+#include "bus/coco/coco_fdc.h"
+#include "bus/coco/coco_gmc.h"
+#include "bus/coco/coco_multi.h"
+#include "bus/coco/coco_orch90.h"
+#include "bus/coco/coco_pak.h"
+#include "bus/coco/coco_rs232.h"
+#include "bus/coco/coco_ssc.h"
+#include "bus/coco/coco_t4426.h"
#include "cpu/m6809/m6809.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/drivers/dragon.cpp b/src/mame/drivers/dragon.cpp
index 1a8846133ac..ae9c8552187 100644
--- a/src/mame/drivers/dragon.cpp
+++ b/src/mame/drivers/dragon.cpp
@@ -19,6 +19,11 @@
#include "formats/sdf_dsk.h"
#include "imagedev/flopdrv.h"
+#include "bus/coco/dragon_fdc.h"
+#include "bus/coco/dragon_jcbsnd.h"
+#include "bus/coco/coco_pak.h"
+#include "bus/coco/coco_ssc.h"
+
//**************************************************************************
// ADDRESS MAPS