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/neogeo/cmc.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/neogeo/cmc.cpp')
-rw-r--r-- | src/devices/bus/neogeo/cmc.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/devices/bus/neogeo/cmc.cpp b/src/devices/bus/neogeo/cmc.cpp index d1fb1b699f8..841244c478e 100644 --- a/src/devices/bus/neogeo/cmc.cpp +++ b/src/devices/bus/neogeo/cmc.cpp @@ -44,10 +44,9 @@ void neogeo_cmc_cart_device::device_reset() } -void neogeo_cmc_cart_device::device_add_mconfig(machine_config &config) -{ - NG_CMC_PROT(config, m_prot); -} +MACHINE_CONFIG_START(neogeo_cmc_cart_device::device_add_mconfig) + MCFG_CMC_PROT_ADD("cmc_prot") +MACHINE_CONFIG_END /************************************************* @@ -252,23 +251,19 @@ void neogeo_cmc_kof2000n_cart_device::decrypt_all(DECRYPT_ALL_PARAMS) DEFINE_DEVICE_TYPE(NEOGEO_CMC_JOCKEYGP_CART, neogeo_cmc_jockeygp_cart_device, "neocart_jockeygp", "Neo Geo Jockey GP CMC50 Cart") neogeo_cmc_jockeygp_cart_device::neogeo_cmc_jockeygp_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - neogeo_cmc_cart_device(mconfig, NEOGEO_CMC_JOCKEYGP_CART, tag, owner, clock), - m_nvram(*this, "nvram") + neogeo_cmc_cart_device(mconfig, NEOGEO_CMC_JOCKEYGP_CART, tag, owner, clock) { } void neogeo_cmc_jockeygp_cart_device::device_start() { - m_ram = make_unique_clear<uint16_t[]>(0x2000/2); - m_nvram->set_base(m_ram.get(), 0x2000); - save_pointer(NAME(m_ram), 0x2000/2); + save_item(NAME(m_ram)); } -void neogeo_cmc_jockeygp_cart_device::device_add_mconfig(machine_config &config) +void neogeo_cmc_jockeygp_cart_device::device_reset() { - neogeo_cmc_cart_device::device_add_mconfig(config); - NVRAM(config, m_nvram); + memset(m_ram, 0, 0x2000); } void neogeo_cmc_jockeygp_cart_device::decrypt_all(DECRYPT_ALL_PARAMS) |