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/boot_misc.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/neogeo/boot_misc.cpp')
-rw-r--r-- | src/devices/bus/neogeo/boot_misc.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/devices/bus/neogeo/boot_misc.cpp b/src/devices/bus/neogeo/boot_misc.cpp index b544fa93976..f22a0236ebf 100644 --- a/src/devices/bus/neogeo/boot_misc.cpp +++ b/src/devices/bus/neogeo/boot_misc.cpp @@ -48,10 +48,9 @@ void neogeo_bootleg_cart_device::device_reset() mapper specific handlers -------------------------------------------------*/ -void neogeo_bootleg_cart_device::device_add_mconfig(machine_config &config) -{ - NEOBOOT_PROT(config, m_prot); -} +MACHINE_CONFIG_START(neogeo_bootleg_cart_device::device_add_mconfig) + MCFG_NEOBOOT_PROT_ADD("bootleg_prot") +MACHINE_CONFIG_END /************************************************* @@ -208,11 +207,10 @@ void neogeo_mslug3b6_cart_device::decrypt_all(DECRYPT_ALL_PARAMS) m_cmc_prot->cmc42_gfx_decrypt(spr_region, spr_region_size, MSLUG3_GFX_KEY); } -void neogeo_mslug3b6_cart_device::device_add_mconfig(machine_config &config) -{ - NG_CMC_PROT(config, m_cmc_prot); - NEOBOOT_PROT(config, m_prot); -} +MACHINE_CONFIG_START(neogeo_mslug3b6_cart_device::device_add_mconfig) + MCFG_CMC_PROT_ADD("cmc_prot") + MCFG_NEOBOOT_PROT_ADD("bootleg_prot") +MACHINE_CONFIG_END /************************************************* @@ -236,12 +234,11 @@ void neogeo_ms5plus_cart_device::decrypt_all(DECRYPT_ALL_PARAMS) m_prot->sx_decrypt(fix_region, fix_region_size, 1); } -void neogeo_ms5plus_cart_device::device_add_mconfig(machine_config &config) -{ - NEOBOOT_PROT(config, m_prot); - NG_CMC_PROT(config, m_cmc_prot); - NG_PCM2_PROT(config, m_pcm2_prot); -} +MACHINE_CONFIG_START(neogeo_ms5plus_cart_device::device_add_mconfig) + MCFG_NEOBOOT_PROT_ADD("bootleg_prot") + MCFG_CMC_PROT_ADD("cmc_prot") + MCFG_PCM2_PROT_ADD("pcm2_prot") +MACHINE_CONFIG_END /************************************************* |