diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/megadrive/md_slot.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/megadrive/md_slot.h')
-rw-r--r-- | src/devices/bus/megadrive/md_slot.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/devices/bus/megadrive/md_slot.h b/src/devices/bus/megadrive/md_slot.h index 42fd2503f76..c9372ada7df 100644 --- a/src/devices/bus/megadrive/md_slot.h +++ b/src/devices/bus/megadrive/md_slot.h @@ -211,16 +211,6 @@ class md_cart_slot_device : public base_md_cart_slot_device { public: // construction/destruction - template <typename T> - md_cart_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt) - : md_cart_slot_device(mconfig, tag, owner, (uint32_t)0) - { - option_reset(); - opts(*this); - set_default_option(dflt); - set_fixed(false); - } - md_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual const char *image_interface() const override { return "megadriv_cart"; } virtual const char *file_extensions() const override { return "smd,bin,md,gen"; } @@ -279,4 +269,12 @@ DECLARE_DEVICE_TYPE(COPERA_CART_SLOT, copera_cart_slot_device) #define MDSLOT_ROM_REGION_TAG ":cart:rom" +#define MCFG_MD_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ + MCFG_DEVICE_ADD(_tag, MD_CART_SLOT, 0) \ + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) + +#define MCFG_MD_CARTRIDGE_NOT_MANDATORY \ + static_cast<md_cart_slot_device *>(device)->set_must_be_loaded(false); + + #endif // MAME_BUS_MEGADRIVE_MD_SLOT_H |