diff options
author | Michaël Banaan Ananas <happppp@users.noreply.github.com> | 2011-09-05 12:26:45 +0000 |
---|---|---|
committer | Michaël Banaan Ananas <happppp@users.noreply.github.com> | 2011-09-05 12:26:45 +0000 |
commit | 10f19cc24a4d9ae4e742c35d87c3c4f41afe7941 (patch) | |
tree | 4f1bdf9871cffa069da6ea96d1a4924ce161cb7e | |
parent | b7345fe4fce4b06bbc48d1a406f9b7253423ab0f (diff) |
prev commit allows timecris and pocketrc speedup hacks again (comment: even tho it's known i'm against speedhacks, best to be consistent here and not exclude specific games)
-rw-r--r-- | src/mame/drivers/namcos11.c | 26 | ||||
-rw-r--r-- | src/mame/drivers/namcos22.c | 15 |
2 files changed, 23 insertions, 18 deletions
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c index d33930cb1c0..19b60c98742 100644 --- a/src/mame/drivers/namcos11.c +++ b/src/mame/drivers/namcos11.c @@ -848,13 +848,13 @@ static WRITE16_HANDLER( c76_speedup_w ) COMBINE_DATA(&state->m_su_83); } -static void namcos11_init_common(running_machine &machine, int n_daughterboard, int c76_speedup) +static void namcos11_init_common(running_machine &machine, int n_daughterboard) { namcos11_state *state = machine.driver_data<namcos11_state>(); psx_driver_init(machine); // C76 idle skipping, large speedboost - if (c76_speedup && C76_SPEEDUP) + if (C76_SPEEDUP) { state->save_item( NAME(state->m_su_83) ); machine.device("c76")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x82, 0x83, FUNC(c76_speedup_r), FUNC(c76_speedup_w)); @@ -902,43 +902,43 @@ static void namcos11_init_common(running_machine &machine, int n_daughterboard, static DRIVER_INIT( tekken ) { - namcos11_init_common(machine, 32, 1); + namcos11_init_common(machine, 32); } static DRIVER_INIT( tekken2 ) { machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler( 0x1fa20000, 0x1fa2ffff, FUNC(keycus_c406_r) ); - namcos11_init_common(machine, 32, 1); + namcos11_init_common(machine, 32); } static DRIVER_INIT( souledge ) { machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler( 0x1fa20000, 0x1fa2ffff, FUNC(keycus_c409_r) ); - namcos11_init_common(machine, 32, 1); + namcos11_init_common(machine, 32); } static DRIVER_INIT( dunkmnia ) { machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler( 0x1fa20000, 0x1fa2ffff, FUNC(keycus_c410_r) ); - namcos11_init_common(machine, 32, 1); + namcos11_init_common(machine, 32); } static DRIVER_INIT( primglex ) { machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler( 0x1fa20000, 0x1fa2ffff, FUNC(keycus_c411_r) ); - namcos11_init_common(machine, 32, 1); + namcos11_init_common(machine, 32); } static DRIVER_INIT( xevi3dg ) { machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler( 0x1fa20000, 0x1fa2ffff, FUNC(keycus_c430_r) ); - namcos11_init_common(machine, 32, 1); + namcos11_init_common(machine, 32); } static DRIVER_INIT( danceyes ) { machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler( 0x1fa20000, 0x1fa2ffff, FUNC(keycus_c431_r) ); - namcos11_init_common(machine, 32, 1); + namcos11_init_common(machine, 32); } static DRIVER_INIT( pocketrc ) @@ -947,25 +947,25 @@ static DRIVER_INIT( pocketrc ) machine.device("c76")->memory().space(AS_IO)->install_legacy_read_handler(M37710_ADC1_L, M37710_ADC1_L, FUNC(pocketrc_gas_r)); machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler( 0x1fa20000, 0x1fa2ffff, FUNC(keycus_c432_r) ); - namcos11_init_common(machine, 32, 0); // (speedup hack breaks testmode and analog steering) + namcos11_init_common(machine, 32); } static DRIVER_INIT( starswep ) { machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler( 0x1fa20000, 0x1fa2ffff, FUNC(keycus_c442_r) ); - namcos11_init_common(machine, 0, 1); + namcos11_init_common(machine, 0); } static DRIVER_INIT( myangel3 ) { machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler( 0x1fa20000, 0x1fa2ffff, FUNC(keycus_c443_r) ); - namcos11_init_common(machine, 64, 1); + namcos11_init_common(machine, 64); } static DRIVER_INIT( ptblank2ua ) { machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler( 0x1fa20000, 0x1fa2ffff, FUNC(keycus_c443_r) ); - namcos11_init_common(machine, 64, 1); + namcos11_init_common(machine, 64); machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x1f788000, 0x1f788003, FUNC(lightgun_w) ); machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler (0x1f780000, 0x1f78000f, FUNC(lightgun_r) ); diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c index 9cc9df3c3c7..b0565cf6f20 100644 --- a/src/mame/drivers/namcos22.c +++ b/src/mame/drivers/namcos22.c @@ -1145,7 +1145,9 @@ #include "cpu/m37710/m37710.h" #include "sound/c352.h" -#define SS22_MASTER_CLOCK (49152000) /* info from Guru */ +#define SS22_MASTER_CLOCK (XTAL_49_152MHz) /* info from Guru */ + +#define MCU_SPEEDUP 1 /* mcu idle skipping */ /** * helper function used to read a byte from a chunk of 32 bit memory @@ -5785,19 +5787,22 @@ static READ16_HANDLER( mcuc74_speedup_r ) static void install_c74_speedup(running_machine &machine) { - machine.device("mcu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x80, 0x81, FUNC(mcuc74_speedup_r), FUNC(mcu_speedup_w)); + if (MCU_SPEEDUP) + machine.device("mcu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x80, 0x81, FUNC(mcuc74_speedup_r), FUNC(mcu_speedup_w)); } static void install_130_speedup(running_machine &machine) { // install speedup cheat for 1.30 MCU BIOS - machine.device("mcu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x82, 0x83, FUNC(mcu130_speedup_r), FUNC(mcu_speedup_w)); + if (MCU_SPEEDUP) + machine.device("mcu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x82, 0x83, FUNC(mcu130_speedup_r), FUNC(mcu_speedup_w)); } static void install_141_speedup(running_machine &machine) { // install speedup cheat for 1.41 MCU BIOS - machine.device("mcu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x82, 0x83, FUNC(mcu141_speedup_r), FUNC(mcu_speedup_w)); + if (MCU_SPEEDUP) + machine.device("mcu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x82, 0x83, FUNC(mcu141_speedup_r), FUNC(mcu_speedup_w)); } static void namcos22_init( running_machine &machine, int game_type ) @@ -5969,7 +5974,7 @@ static DRIVER_INIT( timecris ) { namcos22s_init(machine, NAMCOS22_TIME_CRISIS); - // install_130_speedup(machine); // with speed up the SUBCPU START WAIT test fails + install_130_speedup(machine); } static DRIVER_INIT( tokyowar ) |