diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/cgenie/parallel/parallel.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/cgenie/parallel/parallel.h')
-rw-r--r-- | src/devices/bus/cgenie/parallel/parallel.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/devices/bus/cgenie/parallel/parallel.h b/src/devices/bus/cgenie/parallel/parallel.h index b31f8c749f4..9bc8d5665c4 100644 --- a/src/devices/bus/cgenie/parallel/parallel.h +++ b/src/devices/bus/cgenie/parallel/parallel.h @@ -24,8 +24,16 @@ #pragma once -// include here so drivers don't need to -#include "carts.h" + + +//************************************************************************** +// INTERFACE CONFIGURATION MACROS +//************************************************************************** + +#define MCFG_CG_PARALLEL_SLOT_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, CG_PARALLEL_SLOT, 0) \ + MCFG_DEVICE_SLOT_INTERFACE(cg_parallel_slot_carts, nullptr, false) + //************************************************************************** // TYPE DEFINITIONS @@ -37,14 +45,6 @@ class cg_parallel_slot_device : public device_t, public device_slot_interface { public: // construction/destruction - cg_parallel_slot_device(machine_config const &mconfig, char const *tag, device_t *owner) - : cg_parallel_slot_device(mconfig, tag, owner, (uint32_t)0) - { - option_reset(); - cg_parallel_slot_carts(*this); - set_default_option(nullptr); - set_fixed(false); - } cg_parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~cg_parallel_slot_device(); @@ -86,4 +86,7 @@ protected: // device type definition DECLARE_DEVICE_TYPE(CG_PARALLEL_SLOT, cg_parallel_slot_device) +// include here so drivers don't need to +#include "carts.h" + #endif // MAME_BUS_CGENIE_PARALLEL_PARALLEL_H |