diff options
Diffstat (limited to 'src/mame/drivers/shangkid.cpp')
-rw-r--r-- | src/mame/drivers/shangkid.cpp | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/src/mame/drivers/shangkid.cpp b/src/mame/drivers/shangkid.cpp index 95ef35bdc6b..36755c29b85 100644 --- a/src/mame/drivers/shangkid.cpp +++ b/src/mame/drivers/shangkid.cpp @@ -378,27 +378,27 @@ void shangkid_state::sound_portmap(address_map &map) MACHINE_CONFIG_START(shangkid_state::chinhero) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(chinhero_main_map) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(chinhero_main_map) - MCFG_CPU_ADD("bbx", Z80, XTAL(18'432'000)/6) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(chinhero_bbx_map) - MCFG_CPU_IO_MAP(chinhero_bbx_portmap) + MCFG_DEVICE_ADD("bbx", Z80, XTAL(18'432'000)/6) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(chinhero_bbx_map) + MCFG_DEVICE_IO_MAP(chinhero_bbx_portmap) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(chinhero_sound_map) - MCFG_CPU_IO_MAP(sound_portmap) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(chinhero_sound_map) + MCFG_DEVICE_IO_MAP(sound_portmap) MCFG_DEVICE_ADD("mainlatch", LS259, 0) MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(INPUTLINE("bbx", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT // RESET2 MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(INPUTLINE("audiocpu", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT // RESET3 - MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(shangkid_state, sound_enable_w)) - MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(shangkid_state, int_enable_1_w)) // INTE1 - MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(shangkid_state, int_enable_2_w)) // INTE2 - MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(shangkid_state, nmi_enable_1_w)) // NMIE1 - MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(shangkid_state, nmi_enable_2_w)) // NMIE2 - MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(shangkid_state, coin_counter_1_w)) - MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(shangkid_state, coin_counter_2_w)) + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, shangkid_state, sound_enable_w)) + MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, shangkid_state, int_enable_1_w)) // INTE1 + MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, shangkid_state, int_enable_2_w)) // INTE2 + MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, shangkid_state, nmi_enable_1_w)) // NMIE1 + MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, shangkid_state, nmi_enable_2_w)) // NMIE2 + MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, shangkid_state, coin_counter_1_w)) + MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, shangkid_state, coin_counter_2_w)) MCFG_QUANTUM_TIME(attotime::from_hz(600)) @@ -410,8 +410,8 @@ MACHINE_CONFIG_START(shangkid_state::chinhero) MCFG_SCREEN_VISIBLE_AREA(16, 319-16, 0, 223) MCFG_SCREEN_UPDATE_DRIVER(shangkid_state, screen_update_shangkid) MCFG_SCREEN_PALETTE("palette") - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(shangkid_state, irq_1_w)) - MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(shangkid_state, irq_2_w)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, shangkid_state, irq_1_w)) + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, shangkid_state, irq_2_w)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", chinhero) MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256) @@ -420,13 +420,13 @@ MACHINE_CONFIG_START(shangkid_state::chinhero) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) - MCFG_SOUND_ADD("aysnd", AY8910, XTAL(18'432'000)/12) /* verified on pcb */ - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(shangkid_state, chinhero_ay8910_porta_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(shangkid_state, ay8910_portb_w)) + MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(18'432'000)/12) /* verified on pcb */ + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, shangkid_state, chinhero_ay8910_porta_w)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, shangkid_state, ay8910_portb_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) MACHINE_CONFIG_END @@ -435,15 +435,15 @@ MACHINE_CONFIG_START(shangkid_state::shangkid) chinhero(config); /* basic machine hardware */ - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(shangkid_main_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(shangkid_main_map) - MCFG_CPU_MODIFY("bbx") - MCFG_CPU_PROGRAM_MAP(shangkid_bbx_map) - MCFG_CPU_IO_MAP(shangkid_bbx_portmap) + MCFG_DEVICE_MODIFY("bbx") + MCFG_DEVICE_PROGRAM_MAP(shangkid_bbx_map) + MCFG_DEVICE_IO_MAP(shangkid_bbx_portmap) - MCFG_CPU_MODIFY("audiocpu") - MCFG_CPU_PROGRAM_MAP(shangkid_sound_map) + MCFG_DEVICE_MODIFY("audiocpu") + MCFG_DEVICE_PROGRAM_MAP(shangkid_sound_map) MCFG_DEVICE_MODIFY("mainlatch") // Q1 should *not* reset the AY-3-8910 here, or else banking writes will be lost! @@ -455,9 +455,9 @@ MACHINE_CONFIG_START(shangkid_state::shangkid) /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", shangkid) - MCFG_SOUND_MODIFY("aysnd") - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(shangkid_state, shangkid_ay8910_porta_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(shangkid_state, ay8910_portb_w)) + MCFG_DEVICE_MODIFY("aysnd") + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, shangkid_state, shangkid_ay8910_porta_w)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, shangkid_state, ay8910_portb_w)) MACHINE_CONFIG_END @@ -487,12 +487,12 @@ void shangkid_state::dynamski_portmap(address_map &map) MACHINE_CONFIG_START(shangkid_state::dynamski) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 3000000) /* ? */ - MCFG_CPU_PROGRAM_MAP(dynamski_map) - MCFG_CPU_IO_MAP(dynamski_portmap) + MCFG_DEVICE_ADD("maincpu", Z80, 3000000) /* ? */ + MCFG_DEVICE_PROGRAM_MAP(dynamski_map) + MCFG_DEVICE_IO_MAP(dynamski_portmap) MCFG_DEVICE_ADD("mainlatch", LS259, 0) - MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(shangkid_state, int_enable_1_w)) + MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, shangkid_state, int_enable_1_w)) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // screen flip? MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // screen flip? @@ -504,7 +504,7 @@ MACHINE_CONFIG_START(shangkid_state::dynamski) MCFG_SCREEN_VISIBLE_AREA(0, 255+32, 16, 255-16) MCFG_SCREEN_UPDATE_DRIVER(shangkid_state, screen_update_dynamski) MCFG_SCREEN_PALETTE("palette") - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(shangkid_state, irq_1_w)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, shangkid_state, irq_1_w)) MCFG_GFXDECODE_ADD("gfxdecode", "palette", dynamski) MCFG_PALETTE_ADD("palette", 16*4+16*4) @@ -514,7 +514,7 @@ MACHINE_CONFIG_START(shangkid_state::dynamski) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("speaker") - MCFG_SOUND_ADD("aysnd", AY8910, 2000000) + MCFG_DEVICE_ADD("aysnd", AY8910, 2000000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) MACHINE_CONFIG_END |