diff options
Diffstat (limited to 'src/mame/drivers/nycaptor.cpp')
-rw-r--r-- | src/mame/drivers/nycaptor.cpp | 51 |
1 files changed, 6 insertions, 45 deletions
diff --git a/src/mame/drivers/nycaptor.cpp b/src/mame/drivers/nycaptor.cpp index eaff02007c6..e05984c5a80 100644 --- a/src/mame/drivers/nycaptor.cpp +++ b/src/mame/drivers/nycaptor.cpp @@ -311,7 +311,7 @@ static ADDRESS_MAP_START( nycaptor_master_map, AS_PROGRAM, 8, nycaptor_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(nycaptor_videoram_w) AM_SHARE("videoram") - AM_RANGE(0xd000, 0xd000) AM_READWRITE(nycaptor_mcu_r, nycaptor_mcu_w) + AM_RANGE(0xd000, 0xd000) AM_DEVREADWRITE("bmcu", taito68705_mcu_device, mcu_r, mcu_w) AM_RANGE(0xd001, 0xd001) AM_WRITE(sub_cpu_halt_w) AM_RANGE(0xd002, 0xd002) AM_READWRITE(nycaptor_generic_control_r, nycaptor_generic_control_w) /* bit 3 - memory bank at 0x8000-0xbfff */ AM_RANGE(0xd400, 0xd400) AM_READWRITE(from_snd_r, sound_command_w) @@ -368,18 +368,6 @@ static ADDRESS_MAP_START( nycaptor_sound_map, AS_PROGRAM, 8, nycaptor_state ) AM_RANGE(0xe000, 0xefff) AM_NOP ADDRESS_MAP_END -static ADDRESS_MAP_START( nycaptor_m68705_map, AS_PROGRAM, 8, nycaptor_state ) - ADDRESS_MAP_GLOBAL_MASK(0x7ff) - AM_RANGE(0x0000, 0x0000) AM_READWRITE(nycaptor_68705_port_a_r, nycaptor_68705_port_a_w) - AM_RANGE(0x0001, 0x0001) AM_READWRITE(nycaptor_68705_port_b_r, nycaptor_68705_port_b_w) - AM_RANGE(0x0002, 0x0002) AM_READWRITE(nycaptor_68705_port_c_r, nycaptor_68705_port_c_w) - AM_RANGE(0x0004, 0x0004) AM_WRITE(nycaptor_68705_ddr_a_w) - AM_RANGE(0x0005, 0x0005) AM_WRITE(nycaptor_68705_ddr_b_w) - AM_RANGE(0x0006, 0x0006) AM_WRITE(nycaptor_68705_ddr_c_w) - AM_RANGE(0x0010, 0x007f) AM_RAM - AM_RANGE(0x0080, 0x07ff) AM_ROM -ADDRESS_MAP_END - /* Cycle Shooting */ @@ -755,19 +743,7 @@ void nycaptor_state::machine_start() save_item(NAME(m_palette_bank)); save_item(NAME(m_gfxctrl)); - save_item(NAME(m_port_a_in)); - save_item(NAME(m_port_a_out)); - save_item(NAME(m_ddr_a)); - save_item(NAME(m_port_b_in)); - save_item(NAME(m_port_b_out)); - save_item(NAME(m_ddr_b)); - save_item(NAME(m_port_c_in)); - save_item(NAME(m_port_c_out)); - save_item(NAME(m_ddr_c)); - save_item(NAME(m_mcu_sent)); - save_item(NAME(m_main_sent)); - save_item(NAME(m_from_main)); - save_item(NAME(m_from_mcu)); + } void nycaptor_state::machine_reset() @@ -783,19 +759,6 @@ void nycaptor_state::machine_reset() m_palette_bank = 0; m_gfxctrl = 0; - m_port_a_in = 0; - m_port_a_out = 0; - m_ddr_a = 0; - m_port_b_in = 0; - m_port_b_out = 0; - m_ddr_b = 0; - m_port_c_in = 0; - m_port_c_out = 0; - m_ddr_c = 0; - m_mcu_sent = 0; - m_main_sent = 0; - m_from_main = 0; - m_from_mcu = 0; memset(m_vol_ctrl, 0, sizeof(m_vol_ctrl)); } @@ -815,8 +778,7 @@ static MACHINE_CONFIG_START( nycaptor, nycaptor_state ) MCFG_CPU_PROGRAM_MAP(nycaptor_sound_map) MCFG_CPU_PERIODIC_INT_DRIVER(nycaptor_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */ - MCFG_CPU_ADD("mcu", M68705,2000000) - MCFG_CPU_PROGRAM_MAP(nycaptor_m68705_map) + MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU,2000000) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper synchronization of the CPUs */ @@ -882,8 +844,7 @@ static MACHINE_CONFIG_START( cyclshtg, nycaptor_state ) MCFG_CPU_PERIODIC_INT_DRIVER(nycaptor_state, irq0_line_hold, 2*60) #ifdef USE_MCU - MCFG_CPU_ADD("mcu", M68705,2000000) - MCFG_CPU_PROGRAM_MAP(nycaptor_m68705_map) + MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU,2000000) #endif MCFG_QUANTUM_TIME(attotime::from_hz(60)) @@ -1018,7 +979,7 @@ ROM_START( nycaptor ) ROM_LOAD( "a50_15", 0x0000, 0x4000, CRC(f8a604e5) SHA1(8fae920fd09584b5e5ccd0db8b8934b393a23d50) ) ROM_LOAD( "a50_16", 0x4000, 0x4000, CRC(fc24e11d) SHA1(ce1a1d7b809fa0f5f5e7a462047374b1b3f621c6) ) - ROM_REGION( 0x0800, "mcu", 0 ) + ROM_REGION( 0x0800, "bmcu:mcu", 0 ) ROM_LOAD( "a50_17", 0x0000, 0x0800, CRC(69fe08dc) SHA1(9bdac3e835f63bbb8806892169d89f43d447df21) ) ROM_REGION( 0x20000, "gfx1", ROMREGION_INVERT ) @@ -1048,7 +1009,7 @@ ROM_START( cyclshtg ) ROM_LOAD( "a80_16.i26", 0x0000, 0x4000, CRC(ce171a48) SHA1(e5ae9bb22f58c8857737bc6f5317866819a4e4d1) ) ROM_LOAD( "a80_17.i25", 0x4000, 0x4000, CRC(a90b7bbc) SHA1(bd5c96861a59a1f84bb5032775b1c70efdb7066f) ) - ROM_REGION( 0x0800, "cpu3", 0 ) + ROM_REGION( 0x0800, "bmcu:mcu", 0 ) ROM_LOAD( "a80_18", 0x0000, 0x0800, NO_DUMP ) /* Missing */ ROM_REGION( 0x20000, "gfx1", ROMREGION_INVERT ) |