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/odyssey2/slot.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/odyssey2/slot.h')
-rw-r--r-- | src/devices/bus/odyssey2/slot.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/devices/bus/odyssey2/slot.h b/src/devices/bus/odyssey2/slot.h index bfb10c025bd..28192aa3457 100644 --- a/src/devices/bus/odyssey2/slot.h +++ b/src/devices/bus/odyssey2/slot.h @@ -65,17 +65,7 @@ class o2_cart_slot_device : public device_t, { public: // construction/destruction - template <typename T> - o2_cart_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt) - : o2_cart_slot_device(mconfig, tag, owner, 0) - { - option_reset(); - opts(*this); - set_default_option(dflt); - set_fixed(false); - } - - o2_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + o2_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~o2_cart_slot_device(); // device-level overrides @@ -124,6 +114,10 @@ DECLARE_DEVICE_TYPE(O2_CART_SLOT, o2_cart_slot_device) #define O2SLOT_ROM_REGION_TAG ":cart:rom" +#define MCFG_O2_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ + MCFG_DEVICE_ADD(_tag, O2_CART_SLOT, 0) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) + void o2_cart(device_slot_interface &device); #endif // MAME_BUS_ODYSSEY2_SLOT_H |