summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/astrocde
diff options
context:
space:
mode:
author mooglyguy <therealmogminer@gmail.com>2018-12-18 16:15:29 +0100
committer mooglyguy <therealmogminer@gmail.com>2018-12-18 16:16:05 +0100
commit2e5e818fb943875c83a74010cfdf4417934b58bb (patch)
tree8d984bc8ea028391938f0d34aac97b044e663b02 /src/devices/bus/astrocde
parent4eadb515d1a2ec4d905014e1ff115d2e336e9d0b (diff)
-bus/a7800/a78_slot, bus/astrocde/exp, slot, pc_joy/pc_joy, vcs/vcs_slot, : Removed MCFG macros. [Ryan Holtz]
-bus/a7800/hiscore, xboard, isa/gblaster, sb16, sblaster, ssi2001, stereo_fx, bus/msx_cart/moonsound: Removed MACHINE_CONFIG macros. [Ryan Holtz] -sound/astrocde, es5506, qs1000, saa1099, t6721a, tc8830f, tiaintf, tms3615, upd7752, ymf278b, ymz280b: Removed MCFG macros. [Ryan Holtz] -video/ef9369: Removed MCFG macros. [Ryan Holtz] -drivers/a2600, a7800, astrocde, astrohome, bingor, bishi, eolith, esqasr, esqmr, fuukifg3, ghosteo, guab, jpmsys5, limenko, lordgun, macrossp, mastboy, mpu4vid, psikyo, psikyo4, psikyosh, samcoupe, ssv, timeplt, vamphalf, vegaeo, xorworld: Removed MCFG macros. [Ryan Holtz] -drivers/cave: Removed MCFG macros and moved common config into common functions. [Ryan Holtz] -drivers/tourtabl: Removed MCFG macros and corrected CPU type. [Ryan Holtz]
Diffstat (limited to 'src/devices/bus/astrocde')
-rw-r--r--src/devices/bus/astrocde/exp.h16
-rw-r--r--src/devices/bus/astrocde/slot.h25
2 files changed, 20 insertions, 21 deletions
diff --git a/src/devices/bus/astrocde/exp.h b/src/devices/bus/astrocde/exp.h
index 9be60975ed7..e6c97862224 100644
--- a/src/devices/bus/astrocde/exp.h
+++ b/src/devices/bus/astrocde/exp.h
@@ -26,6 +26,15 @@ class astrocade_exp_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
+ template <typename T>
+ astrocade_exp_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt)
+ : astrocade_exp_device(mconfig, tag, owner, (uint32_t)0)
+ {
+ option_reset();
+ opts(*this);
+ set_default_option(dflt);
+ set_fixed(false);
+ }
astrocade_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~astrocade_exp_device();
@@ -43,14 +52,7 @@ protected:
device_astrocade_card_interface* m_card;
};
-
-
// device type definition
DECLARE_DEVICE_TYPE(ASTROCADE_EXP_SLOT, astrocade_exp_device)
-
-#define MCFG_ASTROCADE_EXPANSION_SLOT_ADD(_tag, _slot_intf, _def_slot) \
- MCFG_DEVICE_ADD(_tag, ASTROCADE_EXP_SLOT, 0) \
- MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)
-
#endif // MAME_BUS_ASTROCADE_EXP_H
diff --git a/src/devices/bus/astrocde/slot.h b/src/devices/bus/astrocde/slot.h
index dc7a2c84ca9..88c34fa0d8e 100644
--- a/src/devices/bus/astrocde/slot.h
+++ b/src/devices/bus/astrocde/slot.h
@@ -12,6 +12,7 @@
TYPE DEFINITIONS
***************************************************************************/
+#define ASTROCADESLOT_ROM_REGION_TAG ":cart:rom"
/* PCB */
enum
@@ -54,7 +55,16 @@ class astrocade_cart_slot_device : public device_t,
{
public:
// construction/destruction
- astrocade_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ template <typename T>
+ astrocade_cart_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt)
+ : astrocade_cart_slot_device(mconfig, tag, owner, (uint32_t)0)
+ {
+ option_reset();
+ opts(*this);
+ set_default_option(dflt);
+ set_fixed(false);
+ }
+ astrocade_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
virtual ~astrocade_cart_slot_device();
// image-level overrides
@@ -87,20 +97,7 @@ protected:
device_astrocade_cart_interface* m_cart;
};
-
-
// device type definition
DECLARE_DEVICE_TYPE(ASTROCADE_CART_SLOT, astrocade_cart_slot_device)
-
-/***************************************************************************
- DEVICE CONFIGURATION MACROS
- ***************************************************************************/
-
-#define ASTROCADESLOT_ROM_REGION_TAG ":cart:rom"
-
-#define MCFG_ASTROCADE_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \
- MCFG_DEVICE_ADD(_tag, ASTROCADE_CART_SLOT, 0) \
- MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)
-
#endif // MAME_BUS_ASTROCADE_SLOT_H