diff options
Diffstat (limited to 'src/emu/bus/neogeo')
24 files changed, 26 insertions, 66 deletions
diff --git a/src/emu/bus/neogeo/banked_cart.c b/src/emu/bus/neogeo/banked_cart.c index 4728b7352e9..7908a2df418 100644 --- a/src/emu/bus/neogeo/banked_cart.c +++ b/src/emu/bus/neogeo/banked_cart.c @@ -47,14 +47,14 @@ void neogeo_banked_cart_device::_set_main_cpu_bank_address(void) if (!m_bank_cartridge) printf("bank_cartridge is null\n"); - + if (m_region && m_bank_cartridge) m_bank_cartridge->set_base(m_region + m_main_cpu_bank_address); } void neogeo_banked_cart_device::neogeo_set_main_cpu_bank_address( UINT32 bank_address ) { -// if (LOG_MAIN_CPU_BANKING) logerror("MAIN CPU PC %06x: neogeo_set_main_cpu_bank_address %06x\n", m_maincpu->pc(), bank_address); +// if (LOG_MAIN_CPU_BANKING) logerror("MAIN CPU PC %06x: neogeo_set_main_cpu_bank_address %06x\n", m_maincpu->pc(), bank_address); m_main_cpu_bank_address = bank_address; @@ -96,11 +96,10 @@ void neogeo_banked_cart_device::install_banks(running_machine& machine, cpu_devi { maincpu->space(AS_PROGRAM).install_read_bank(0x200000, 0x2fffff, 0, 0, "cartridge"); maincpu->space(AS_PROGRAM).install_write_handler(0x2ffff0, 0x2fffff, write16_delegate(FUNC(neogeo_banked_cart_device::main_cpu_bank_select_w),this)); - + m_bank_cartridge = machine.root_device().membank("cartridge"); m_region = region; m_region_size = region_size; init_banks(); } - diff --git a/src/emu/bus/neogeo/bootleg_cart.c b/src/emu/bus/neogeo/bootleg_cart.c index 1481bee5a9f..c1bdb055543 100644 --- a/src/emu/bus/neogeo/bootleg_cart.c +++ b/src/emu/bus/neogeo/bootleg_cart.c @@ -361,5 +361,3 @@ void neogeo_bootleg_kog_cart::decrypt_all(DECRYPT_ALL_PARAMS) m_bootleg_prot->neogeo_bootleg_sx_decrypt(fix_region, fix_region_size,1); m_bootleg_prot->neogeo_bootleg_cx_decrypt(spr_region, spr_region_size); } - - diff --git a/src/emu/bus/neogeo/bootleg_prot.c b/src/emu/bus/neogeo/bootleg_prot.c index 2650e74d153..648d0f9acbc 100644 --- a/src/emu/bus/neogeo/bootleg_prot.c +++ b/src/emu/bus/neogeo/bootleg_prot.c @@ -192,7 +192,7 @@ READ16_MEMBER( ngbootleg_prot_device::kof10th_RAMB_r ) READ16_MEMBER(ngbootleg_prot_device::kof10th_RAM2_r) { -// printf("kof10th_RAM2_r\n"); +// printf("kof10th_RAM2_r\n"); return m_cartridge_ram2[offset]; } @@ -1128,4 +1128,3 @@ void ngbootleg_prot_device::matrimbl_decrypt(UINT8* sprrom, UINT32 sprrom_size, /* decrypt gfx */ cthd2003_c(sprrom,sprrom_size, 0 ); } - diff --git a/src/emu/bus/neogeo/cmc_cart.c b/src/emu/bus/neogeo/cmc_cart.c index 4d152550f90..43042474546 100644 --- a/src/emu/bus/neogeo/cmc_cart.c +++ b/src/emu/bus/neogeo/cmc_cart.c @@ -219,4 +219,3 @@ void neogeo_cmc_kof2000n_cart::decrypt_all(DECRYPT_ALL_PARAMS) m_cmc_prot->neogeo_cmc50_m1_decrypt(audiocrypt_region, audiocrypt_region_size, audiocpu_region, audio_region_size); m_cmc_prot->kof2000_neogeo_gfx_decrypt(spr_region, spr_region_size, fix_region, fix_region_size, KOF2000_GFX_KEY); } - diff --git a/src/emu/bus/neogeo/cmc_prot.c b/src/emu/bus/neogeo/cmc_prot.c index 6b4491954a1..e07c894e983 100644 --- a/src/emu/bus/neogeo/cmc_prot.c +++ b/src/emu/bus/neogeo/cmc_prot.c @@ -15,7 +15,6 @@ cmc_prot_device::cmc_prot_device(const machine_config &mconfig, const char *tag, void cmc_prot_device::device_start() { - } void cmc_prot_device::device_reset() @@ -786,4 +785,3 @@ void cmc_prot_device::neogeo_cmc50_m1_decrypt(UINT8* romcrypt, UINT32 romcrypt_s } #endif } - diff --git a/src/emu/bus/neogeo/fatfury2_cart.c b/src/emu/bus/neogeo/fatfury2_cart.c index 8fe63a05c90..4bb865281c4 100644 --- a/src/emu/bus/neogeo/fatfury2_cart.c +++ b/src/emu/bus/neogeo/fatfury2_cart.c @@ -70,4 +70,4 @@ void neogeo_fatfury2_cart::activate_cart(ACTIVATE_CART_PARAMS) { m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size); m_fatfury2_prot->fatfury2_install_protection(maincpu, m_banked_cart); -}
\ No newline at end of file +} diff --git a/src/emu/bus/neogeo/fatfury2_prot.c b/src/emu/bus/neogeo/fatfury2_prot.c index ce00e1d27e3..83ddf17aa43 100644 --- a/src/emu/bus/neogeo/fatfury2_prot.c +++ b/src/emu/bus/neogeo/fatfury2_prot.c @@ -106,4 +106,3 @@ void fatfury2_prot_device::fatfury2_install_protection(cpu_device* maincpu, neog m_fatfury2_prot_data = 0; } - diff --git a/src/emu/bus/neogeo/kof2002_cart.c b/src/emu/bus/neogeo/kof2002_cart.c index 896bad5e45c..cb19f938ef8 100644 --- a/src/emu/bus/neogeo/kof2002_cart.c +++ b/src/emu/bus/neogeo/kof2002_cart.c @@ -153,4 +153,3 @@ void neogeo_kof2002_samsho5sp_cart::decrypt_all(DECRYPT_ALL_PARAMS) m_cmc_prot->kof2000_neogeo_gfx_decrypt(spr_region, spr_region_size, fix_region, fix_region_size, SAMSHO5SP_GFX_KEY); m_pcm2_prot->neo_pcm2_swap(ym_region, ym_region_size, 6); } - diff --git a/src/emu/bus/neogeo/kof2002_prot.c b/src/emu/bus/neogeo/kof2002_prot.c index 2e3b0e314c7..6e4b05eb834 100644 --- a/src/emu/bus/neogeo/kof2002_prot.c +++ b/src/emu/bus/neogeo/kof2002_prot.c @@ -15,7 +15,6 @@ kof2002_prot_device::kof2002_prot_device(const machine_config &mconfig, const ch void kof2002_prot_device::device_start() { - } void kof2002_prot_device::device_reset() @@ -80,5 +79,3 @@ void kof2002_prot_device::samsh5sp_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size memcpy( src+i*0x80000, dst+sec[i], 0x80000 ); } } - - diff --git a/src/emu/bus/neogeo/kof98_cart.c b/src/emu/bus/neogeo/kof98_cart.c index 9c37fc3e64e..5af4977a000 100644 --- a/src/emu/bus/neogeo/kof98_cart.c +++ b/src/emu/bus/neogeo/kof98_cart.c @@ -75,4 +75,4 @@ void neogeo_kof98_cart::activate_cart(ACTIVATE_CART_PARAMS) { m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size); m_kof98_prot->install_kof98_protection(maincpu); -}
\ No newline at end of file +} diff --git a/src/emu/bus/neogeo/kof98_prot.c b/src/emu/bus/neogeo/kof98_prot.c index 453abeadb07..8ccabc75721 100644 --- a/src/emu/bus/neogeo/kof98_prot.c +++ b/src/emu/bus/neogeo/kof98_prot.c @@ -16,7 +16,6 @@ kof98_prot_device::kof98_prot_device(const machine_config &mconfig, const char * void kof98_prot_device::device_start() { - } void kof98_prot_device::device_reset() @@ -137,5 +136,3 @@ void kof98_prot_device::install_kof98_protection(cpu_device* maincpu) maincpu->space(AS_PROGRAM).install_write_handler(0x20aaaa, 0x20aaab, write16_delegate(FUNC(kof98_prot_device::kof98_prot_w),this)); } - - diff --git a/src/emu/bus/neogeo/mslugx_cart.c b/src/emu/bus/neogeo/mslugx_cart.c index 99467ca0d9c..bd9d7a2a9d1 100644 --- a/src/emu/bus/neogeo/mslugx_cart.c +++ b/src/emu/bus/neogeo/mslugx_cart.c @@ -70,4 +70,4 @@ void neogeo_mslugx_cart::activate_cart(ACTIVATE_CART_PARAMS) { m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size); m_mslugx_prot->mslugx_install_protection(maincpu); -}
\ No newline at end of file +} diff --git a/src/emu/bus/neogeo/mslugx_prot.c b/src/emu/bus/neogeo/mslugx_prot.c index 3db2f85e2c4..7263c8f988e 100644 --- a/src/emu/bus/neogeo/mslugx_prot.c +++ b/src/emu/bus/neogeo/mslugx_prot.c @@ -91,8 +91,3 @@ void mslugx_prot_device::mslugx_install_protection(cpu_device* maincpu) maincpu->space(AS_PROGRAM).install_readwrite_handler(0x2fffe0, 0x2fffef, read16_delegate(FUNC(mslugx_prot_device::mslugx_protection_16_r),this), write16_delegate(FUNC(mslugx_prot_device::mslugx_protection_16_w),this)); } - - - - - diff --git a/src/emu/bus/neogeo/neogeo_carts.c b/src/emu/bus/neogeo/neogeo_carts.c index 3d75a6eb55e..1a9cdbb402f 100644 --- a/src/emu/bus/neogeo/neogeo_carts.c +++ b/src/emu/bus/neogeo/neogeo_carts.c @@ -36,25 +36,25 @@ SLOT_INTERFACE_START(neogeo_cart) /* only CMC50 for gfx (& audiocpu) */ SLOT_INTERFACE_INTERNAL("r_cmc_kof2001", NEOGEO_CMC_KOF2001_CART) SLOT_INTERFACE_INTERNAL("r_cmc_kof2000n", NEOGEO_CMC_KOF2000N_CART) - /* CMC50 for gfx (& audiocpu) + NEOPCM2 for YM scramble */ + /* CMC50 for gfx (& audiocpu) + NEOPCM2 for YM scramble */ SLOT_INTERFACE_INTERNAL("r_pc2_mslug4", NEOGEO_PCM2_MSLUG4_CART) SLOT_INTERFACE_INTERNAL("r_pc2_rotd", NEOGEO_PCM2_ROTD_CART) SLOT_INTERFACE_INTERNAL("r_pc2_pnyaa", NEOGEO_PCM2_PNYAA_CART) SLOT_INTERFACE_INTERNAL("r_ms4plus", NEOGEO_PCM2_MS4PLUS_CART) // regular encryption but external S1 rom - /* CMC50 for gfx (& audiocpu) + NEOPCM2 for YM scramble + additonal prg scramble */ + /* CMC50 for gfx (& audiocpu) + NEOPCM2 for YM scramble + additonal prg scramble */ SLOT_INTERFACE_INTERNAL("r_k2_kof2002", NEOGEO_KOF2002_KOF2002_CART) SLOT_INTERFACE_INTERNAL("r_k2_matrim", NEOGEO_KOF2002_MATRIM_CART) SLOT_INTERFACE_INTERNAL("r_k2_samsh5", NEOGEO_KOF2002_SAMSHO5_CART) SLOT_INTERFACE_INTERNAL("r_k2_sams5s", NEOGEO_KOF2002_SAMSHO5SP_CART) SLOT_INTERFACE_INTERNAL("r_kf2k2pls", NEOGEO_KOF2002_KF2K2PLS_CART) // regular encryption but external S1 rom - /* CMC50 for gfx (& audiocpu) + NEOPCM2 for YM scramble + PVC protection/encryption */ + /* CMC50 for gfx (& audiocpu) + NEOPCM2 for YM scramble + PVC protection/encryption */ SLOT_INTERFACE_INTERNAL("r_pv_mslug5", NEOGEO_PVC_MSLUG5_CART) SLOT_INTERFACE_INTERNAL("r_pv_svc", NEOGEO_PVC_SVC_CART) SLOT_INTERFACE_INTERNAL("r_pv_kf2k3", NEOGEO_PVC_KOF2003_CART) SLOT_INTERFACE_INTERNAL("r_pv_kf2k3h", NEOGEO_PVC_KOF2003H_CART) - + /* 100% bootleg logic */ SLOT_INTERFACE_INTERNAL("r_garoubl", NEOGEO_BOOTLEG_GAROUBL_CART) SLOT_INTERFACE_INTERNAL("r_cthd2003", NEOGEO_BOOTLEG_CTHD2003_CART) @@ -85,11 +85,11 @@ SLOT_INTERFACE_START(neogeo_cart) SLOT_INTERFACE_INTERNAL("r_kf2k3bl", NEOGEO_BOOTLEG_HYBRID_KF2K3BL_CART) SLOT_INTERFACE_INTERNAL("r_kf2k3pl", NEOGEO_BOOTLEG_HYBRID_KF2K3PL_CART) SLOT_INTERFACE_INTERNAL("r_kf2k3upl", NEOGEO_BOOTLEG_HYBRID_KF2K3UPL_CART) - - - - - - + + + + + + SLOT_INTERFACE_END diff --git a/src/emu/bus/neogeo/neogeo_intf.c b/src/emu/bus/neogeo/neogeo_intf.c index cd8e0a29c88..223158242d0 100644 --- a/src/emu/bus/neogeo/neogeo_intf.c +++ b/src/emu/bus/neogeo/neogeo_intf.c @@ -29,4 +29,3 @@ device_neogeo_cart_interface::device_neogeo_cart_interface(const machine_config device_neogeo_cart_interface::~device_neogeo_cart_interface() { } - diff --git a/src/emu/bus/neogeo/neogeo_slot.c b/src/emu/bus/neogeo/neogeo_slot.c index 6b6624b750c..9b771b68205 100644 --- a/src/emu/bus/neogeo/neogeo_slot.c +++ b/src/emu/bus/neogeo/neogeo_slot.c @@ -78,29 +78,29 @@ bool neogeo_cart_slot_device::call_load() { // create memory regions len = get_software_region_length("maincpu"); - m_cart->rom_alloc(len); ROM = m_cart->get_rom_base(); + m_cart->rom_alloc(len); ROM = m_cart->get_rom_base(); memcpy(ROM, get_software_region("maincpu"), len); len = get_software_region_length("fixed"); - m_cart->fixed_alloc(len); ROM8 = m_cart->get_fixed_base(); + m_cart->fixed_alloc(len); ROM8 = m_cart->get_fixed_base(); memcpy(ROM8, get_software_region("fixed"), len); if (get_software_region("audiocpu") != NULL) { len = get_software_region_length("audiocpu"); - m_cart->audio_alloc(len + 0x10000); ROM8 = m_cart->get_audio_base(); + m_cart->audio_alloc(len + 0x10000); ROM8 = m_cart->get_audio_base(); memcpy(ROM8, get_software_region("audiocpu"), len); memcpy(ROM8 + 0x10000, get_software_region("audiocpu"), len); // avoid reloading in XML, should just improve banking instead tho? } len = get_software_region_length("ymsnd"); - m_cart->ym_alloc(len); ROM8 = m_cart->get_ym_base(); + m_cart->ym_alloc(len); ROM8 = m_cart->get_ym_base(); memcpy(ROM8, get_software_region("ymsnd"), len); if (get_software_region("ymsnd.deltat") != NULL) { len = get_software_region_length("ymsnd.deltat"); - m_cart->ymdelta_alloc(len); ROM8 = m_cart->get_ymdelta_base(); + m_cart->ymdelta_alloc(len); ROM8 = m_cart->get_ymdelta_base(); memcpy(ROM8, get_software_region("ymsnd.deltat"), len); } else @@ -110,13 +110,13 @@ bool neogeo_cart_slot_device::call_load() len = get_software_region_length("sprites"); - m_cart->sprites_alloc(len); ROM8 = m_cart->get_sprites_base(); + m_cart->sprites_alloc(len); ROM8 = m_cart->get_sprites_base(); memcpy(ROM8, get_software_region("sprites"), len); if (get_software_region("audiocrypt") != NULL) // encrypted Z80 code { len = get_software_region_length("audiocrypt"); - m_cart->audiocrypt_alloc(len); ROM8 = m_cart->get_audiocrypt_base(); + m_cart->audiocrypt_alloc(len); ROM8 = m_cart->get_audiocrypt_base(); memcpy(ROM8, get_software_region("audiocrypt"), len); // allocate the audiocpu region to decrypt data into m_cart->audio_alloc(len + 0x10000); diff --git a/src/emu/bus/neogeo/pcm2_cart.c b/src/emu/bus/neogeo/pcm2_cart.c index fc5e8ae84c7..cb24de2ce71 100644 --- a/src/emu/bus/neogeo/pcm2_cart.c +++ b/src/emu/bus/neogeo/pcm2_cart.c @@ -131,5 +131,3 @@ void neogeo_pcm2_pnyaa_cart::decrypt_all(DECRYPT_ALL_PARAMS) m_cmc_prot->kof2000_neogeo_gfx_decrypt(spr_region, spr_region_size, fix_region, fix_region_size, PNYAA_GFX_KEY); m_pcm2_prot->neo_pcm2_snk_1999(ym_region, ym_region_size, 4); } - - diff --git a/src/emu/bus/neogeo/pcm2_prot.c b/src/emu/bus/neogeo/pcm2_prot.c index 6528102d630..bcf8a853e41 100644 --- a/src/emu/bus/neogeo/pcm2_prot.c +++ b/src/emu/bus/neogeo/pcm2_prot.c @@ -84,4 +84,3 @@ void pcm2_prot_device::neo_pcm2_swap(UINT8* ymrom, UINT32 ymsize, int value) src[j]=buf[d]^xordata[value][j&0x7]; } } - diff --git a/src/emu/bus/neogeo/pvc_cart.c b/src/emu/bus/neogeo/pvc_cart.c index 7b119989fec..9ff5b8f2874 100644 --- a/src/emu/bus/neogeo/pvc_cart.c +++ b/src/emu/bus/neogeo/pvc_cart.c @@ -135,10 +135,3 @@ void neogeo_pvc_kof2003h_cart::decrypt_all(DECRYPT_ALL_PARAMS) m_cmc_prot->neogeo_cmc50_m1_decrypt(audiocrypt_region, audiocrypt_region_size, audiocpu_region, audio_region_size); m_cmc_prot->kof2000_neogeo_gfx_decrypt(spr_region, spr_region_size, fix_region, fix_region_size, KOF2003_GFX_KEY); } - - - - - - - diff --git a/src/emu/bus/neogeo/pvc_prot.c b/src/emu/bus/neogeo/pvc_prot.c index 674a74c7633..fdeb4316e86 100644 --- a/src/emu/bus/neogeo/pvc_prot.c +++ b/src/emu/bus/neogeo/pvc_prot.c @@ -312,6 +312,3 @@ void pvc_prot_device::kof2003h_decrypt_68k(UINT8* rom, UINT32 size) memcpy (&rom[0x100000], &buf[0x800000], 0x100000); memcpy (&rom[0x200000], &buf[0x100000], 0x700000); } - - - diff --git a/src/emu/bus/neogeo/rom.c b/src/emu/bus/neogeo/rom.c index 58989b8cb26..c63686c8a50 100644 --- a/src/emu/bus/neogeo/rom.c +++ b/src/emu/bus/neogeo/rom.c @@ -65,4 +65,4 @@ machine_config_constructor neogeo_rom_device::device_mconfig_additions() const void neogeo_rom_device::activate_cart(ACTIVATE_CART_PARAMS) { m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size); -}
\ No newline at end of file +} diff --git a/src/emu/bus/neogeo/sbp_prot.c b/src/emu/bus/neogeo/sbp_prot.c index 4777fdf057a..a5479f761e6 100644 --- a/src/emu/bus/neogeo/sbp_prot.c +++ b/src/emu/bus/neogeo/sbp_prot.c @@ -16,7 +16,6 @@ sbp_prot_device::sbp_prot_device(const machine_config &mconfig, const char *tag, void sbp_prot_device::device_start() { - } void sbp_prot_device::device_reset() @@ -82,4 +81,4 @@ void sbp_prot_device::sbp_install_protection(cpu_device* maincpu, UINT8* cpurom, rom[0x2a6fa / 2] = 0x4e71; rom[0x2a6fc / 2] = 0x4e71; } -}
\ No newline at end of file +} diff --git a/src/emu/bus/neogeo/sma_cart.c b/src/emu/bus/neogeo/sma_cart.c index 3a61124463f..a8b46c2994d 100644 --- a/src/emu/bus/neogeo/sma_cart.c +++ b/src/emu/bus/neogeo/sma_cart.c @@ -173,5 +173,3 @@ void neogeo_sma_kof2000_cart::activate_cart(ACTIVATE_CART_PARAMS) m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size); m_sma_prot->kof2000_install_protection(maincpu, m_banked_cart); } - - diff --git a/src/emu/bus/neogeo/sma_prot.c b/src/emu/bus/neogeo/sma_prot.c index 5780bd8f2b8..8a6c5beef1f 100644 --- a/src/emu/bus/neogeo/sma_prot.c +++ b/src/emu/bus/neogeo/sma_prot.c @@ -236,7 +236,6 @@ void sma_prot_device::reset_sma_rng() void sma_prot_device::sma_install_random_read_handler(cpu_device* maincpu, int addr1, int addr2 ) { - maincpu->space(AS_PROGRAM).install_read_handler(addr1, addr1 + 1, read16_delegate(FUNC(sma_prot_device::sma_random_r),this)); maincpu->space(AS_PROGRAM).install_read_handler(addr2, addr2 + 1, read16_delegate(FUNC(sma_prot_device::sma_random_r),this)); } @@ -459,5 +458,3 @@ void sma_prot_device::kof2000_decrypt_68k(UINT8* base) rom[i] = rom[0x73a000/2 + BITSWAP24(i,23,22,21,20,19,18,8,4,15,13,3,14,16,2,6,17,7,12,10,0,5,11,1,9)]; } } - - |