diff options
Diffstat (limited to 'src/mame/drivers/scobra.cpp')
-rw-r--r-- | src/mame/drivers/scobra.cpp | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/src/mame/drivers/scobra.cpp b/src/mame/drivers/scobra.cpp index ecaadbde27b..9f5f4cdbe46 100644 --- a/src/mame/drivers/scobra.cpp +++ b/src/mame/drivers/scobra.cpp @@ -865,16 +865,16 @@ INPUT_PORTS_END MACHINE_CONFIG_START(scobra_state::type1) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ - MCFG_CPU_PROGRAM_MAP(type1_map) + MCFG_DEVICE_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ + MCFG_DEVICE_PROGRAM_MAP(type1_map) - MCFG_CPU_ADD("audiocpu", Z80,14318000/8) /* 1.78975 MHz */ - MCFG_CPU_PROGRAM_MAP(scobra_sound_map) - MCFG_CPU_IO_MAP(scobra_sound_io_map) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(scramble_state,scramble_sh_irq_callback) + MCFG_DEVICE_ADD("audiocpu", Z80,14318000/8) /* 1.78975 MHz */ + MCFG_DEVICE_PROGRAM_MAP(scobra_sound_map) + MCFG_DEVICE_IO_MAP(scobra_sound_io_map) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(scramble_state,scramble_sh_irq_callback) MCFG_DEVICE_ADD("konami_7474", TTL7474, 0) - MCFG_7474_COMP_OUTPUT_CB(WRITELINE(scobra_state,scramble_sh_7474_q_callback)) + MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, scobra_state,scramble_sh_7474_q_callback)) MCFG_MACHINE_RESET_OVERRIDE(scobra_state,scramble) @@ -884,14 +884,14 @@ MACHINE_CONFIG_START(scobra_state::type1) MCFG_I8255_IN_PORTC_CB(IOPORT("IN2")) MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0) - MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("soundlatch", generic_latch_8_device, write)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(scramble_state, scramble_sh_irqtrigger_w)) + MCFG_I8255_OUT_PORTA_CB(WRITE8("soundlatch", generic_latch_8_device, write)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, scramble_state, scramble_sh_irqtrigger_w)) MCFG_DEVICE_ADD("7474_9m_1", TTL7474, 0) - MCFG_7474_OUTPUT_CB(WRITELINE(scobra_state,galaxold_7474_9m_1_callback)) + MCFG_7474_OUTPUT_CB(WRITELINE(*this, scobra_state,galaxold_7474_9m_1_callback)) MCFG_DEVICE_ADD("7474_9m_2", TTL7474, 0) - MCFG_7474_COMP_OUTPUT_CB(WRITELINE(scobra_state,galaxold_7474_9m_2_q_callback)) + MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, scobra_state,galaxold_7474_9m_2_q_callback)) MCFG_TIMER_DRIVER_ADD("int_timer", scobra_state, galaxold_interrupt_timer) @@ -917,12 +917,12 @@ MACHINE_CONFIG_START(scobra_state::type1) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ay1", AY8910, 14318000/8) + MCFG_DEVICE_ADD("ay1", AY8910, 14318000/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16) - MCFG_SOUND_ADD("ay2", AY8910, 14318000/8) - MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) - MCFG_AY8910_PORT_B_READ_CB(READ8(scramble_state, scramble_portB_r)) + MCFG_DEVICE_ADD("ay2", AY8910, 14318000/8) + MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read)) + MCFG_AY8910_PORT_B_READ_CB(READ8(*this, scramble_state, scramble_portB_r)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16) MACHINE_CONFIG_END @@ -947,14 +947,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(scobra_state::rescuefe) rescue(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(rescuefe_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(rescuefe_map) MACHINE_CONFIG_END MACHINE_CONFIG_START(scobra_state::rescueb) rescue(config); MCFG_DEVICE_MODIFY("ppi8255_1") - MCFG_I8255_IN_PORTC_CB(READ8(scobra_state, rescueb_a002_r)) // protection? must return 0xfc or the game jumps to 0x00 + MCFG_I8255_IN_PORTC_CB(READ8(*this, scobra_state, rescueb_a002_r)) // protection? must return 0xfc or the game jumps to 0x00 MACHINE_CONFIG_END @@ -974,8 +974,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(scobra_state::minefldfe) minefld(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(minefldfe_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(minefldfe_map) MACHINE_CONFIG_END @@ -983,8 +983,8 @@ MACHINE_CONFIG_START(scobra_state::mimonkey) type1(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(mimonkey_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(mimonkey_map) /* video hardware */ MCFG_VIDEO_START_OVERRIDE(scobra_state,mimonkey) @@ -995,16 +995,16 @@ MACHINE_CONFIG_START(scobra_state::type2) type1(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(type2_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(type2_map) MACHINE_CONFIG_END MACHINE_CONFIG_START(scobra_state::tazmani3) type2(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(tazmani3_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(tazmani3_map) MACHINE_CONFIG_END @@ -1015,8 +1015,8 @@ MACHINE_CONFIG_START(scobra_state::stratgyx) MCFG_DEVICE_REMOVE("ppi8255_1") MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0) - MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("soundlatch", generic_latch_8_device, write)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(scramble_state, scramble_sh_irqtrigger_w)) + MCFG_I8255_OUT_PORTA_CB(WRITE8("soundlatch", generic_latch_8_device, write)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, scramble_state, scramble_sh_irqtrigger_w)) MCFG_I8255_IN_PORTC_CB(IOPORT("IN3")) /* video hardware */ @@ -1045,24 +1045,24 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(scobra_state::hustler) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ - MCFG_CPU_PROGRAM_MAP(hustler_map) + MCFG_DEVICE_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */ + MCFG_DEVICE_PROGRAM_MAP(hustler_map) - MCFG_CPU_ADD("audiocpu",Z80,14318000/8) /* 1.78975 MHz */ - MCFG_CPU_PROGRAM_MAP(hustler_sound_map) - MCFG_CPU_IO_MAP(hustler_sound_io_map) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(scramble_state,scramble_sh_irq_callback) + MCFG_DEVICE_ADD("audiocpu",Z80,14318000/8) /* 1.78975 MHz */ + MCFG_DEVICE_PROGRAM_MAP(hustler_sound_map) + MCFG_DEVICE_IO_MAP(hustler_sound_io_map) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(scramble_state,scramble_sh_irq_callback) MCFG_DEVICE_ADD("konami_7474", TTL7474, 0) - MCFG_7474_COMP_OUTPUT_CB(WRITELINE(scobra_state,scramble_sh_7474_q_callback)) + MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, scobra_state,scramble_sh_7474_q_callback)) MCFG_MACHINE_RESET_OVERRIDE(scobra_state,scramble) MCFG_DEVICE_ADD("7474_9m_1", TTL7474, 0) - MCFG_7474_OUTPUT_CB(WRITELINE(scobra_state,galaxold_7474_9m_1_callback)) + MCFG_7474_OUTPUT_CB(WRITELINE(*this, scobra_state,galaxold_7474_9m_1_callback)) MCFG_DEVICE_ADD("7474_9m_2", TTL7474, 0) - MCFG_7474_COMP_OUTPUT_CB(WRITELINE(scobra_state,galaxold_7474_9m_2_q_callback)) + MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, scobra_state,galaxold_7474_9m_2_q_callback)) MCFG_TIMER_DRIVER_ADD("int_timer", scobra_state, galaxold_interrupt_timer) @@ -1074,8 +1074,8 @@ MACHINE_CONFIG_START(scobra_state::hustler) MCFG_I8255_IN_PORTC_CB(IOPORT("IN2")) MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0) - MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("soundlatch", generic_latch_8_device, write)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(scramble_state, scramble_sh_irqtrigger_w)) + MCFG_I8255_OUT_PORTA_CB(WRITE8("soundlatch", generic_latch_8_device, write)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, scramble_state, scramble_sh_irqtrigger_w)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1095,9 +1095,9 @@ MACHINE_CONFIG_START(scobra_state::hustler) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("aysnd", AY8910, 14318000/8) - MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) - MCFG_AY8910_PORT_B_READ_CB(READ8(scramble_state, hustler_portB_r)) + MCFG_DEVICE_ADD("aysnd", AY8910, 14318000/8) + MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read)) + MCFG_AY8910_PORT_B_READ_CB(READ8(*this, scramble_state, hustler_portB_r)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_CONFIG_END @@ -1105,20 +1105,20 @@ MACHINE_CONFIG_START(scobra_state::hustlerb) hustler(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(hustlerb_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(hustlerb_map) - MCFG_CPU_MODIFY("audiocpu") - MCFG_CPU_PROGRAM_MAP(hustlerb_sound_map) - MCFG_CPU_IO_MAP(hustlerb_sound_io_map) + MCFG_DEVICE_MODIFY("audiocpu") + MCFG_DEVICE_PROGRAM_MAP(hustlerb_sound_map) + MCFG_DEVICE_IO_MAP(hustlerb_sound_io_map) MACHINE_CONFIG_END MACHINE_CONFIG_START(scobra_state::hustlerb4) hustler(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(hustlerb_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(hustlerb_map) MACHINE_CONFIG_END |