diff options
Diffstat (limited to 'src/mame/drivers/m90.cpp')
-rw-r--r-- | src/mame/drivers/m90.cpp | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp index 69a35eaef30..dbfbdd11db4 100644 --- a/src/mame/drivers/m90.cpp +++ b/src/mame/drivers/m90.cpp @@ -723,16 +723,16 @@ WRITE_LINE_MEMBER(m90_state::bomblord_vblank_int_w) /* Basic hardware -- no decryption table is setup for CPU */ MACHINE_CONFIG_START(m90_state::m90) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", V35, XTAL(32'000'000)/2) - MCFG_CPU_PROGRAM_MAP(m90_main_cpu_map) - MCFG_CPU_IO_MAP(m90_main_cpu_io_map) - - MCFG_CPU_ADD("soundcpu", Z80, XTAL(3'579'545)) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(m90_sound_cpu_map) - MCFG_CPU_IO_MAP(m90_sound_cpu_io_map) - MCFG_CPU_PERIODIC_INT_DRIVER(m90_state, nmi_line_pulse, 128*60) /* clocked by V1? (Vigilante) */ + MCFG_DEVICE_ADD("maincpu", V35, XTAL(32'000'000)/2) + MCFG_DEVICE_PROGRAM_MAP(m90_main_cpu_map) + MCFG_DEVICE_IO_MAP(m90_main_cpu_io_map) + + MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(3'579'545)) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(m90_sound_cpu_map) + MCFG_DEVICE_IO_MAP(m90_sound_cpu_io_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(m90_state, nmi_line_pulse, 128*60) /* clocked by V1? (Vigilante) */ /* IRQs are generated by main Z80 and YM2151 */ - MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -752,20 +752,20 @@ MACHINE_CONFIG_START(m90_state::m90) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst18_w)) + MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundirq", rst_neg_buffer_device, rst18_w)) MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true) MCFG_DEVICE_ADD("soundirq", RST_NEG_BUFFER, 0) MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("soundcpu", 0)) - MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0) + MCFG_DEVICE_ADD("m72", IREM_M72_AUDIO) MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */ - MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst28_w)) + MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", rst_neg_buffer_device, rst28_w)) MCFG_SOUND_ROUTE(0, "speaker", 0.15) MCFG_SOUND_ROUTE(1, "speaker", 0.15) - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // 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) MACHINE_CONFIG_END @@ -773,13 +773,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(m90_state::hasamu) m90(config); - MCFG_CPU_MODIFY("maincpu") + MCFG_DEVICE_MODIFY("maincpu") MCFG_V25_CONFIG(gunforce_decryption_table) MACHINE_CONFIG_END MACHINE_CONFIG_START(m90_state::quizf1) m90(config); - MCFG_CPU_MODIFY("maincpu") + MCFG_DEVICE_MODIFY("maincpu") MCFG_V25_CONFIG(lethalth_decryption_table) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(6*8, 54*8-1, 17*8-8, 47*8-1+8) @@ -787,7 +787,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(m90_state::matchit2) m90(config); - MCFG_CPU_MODIFY("maincpu") + MCFG_DEVICE_MODIFY("maincpu") MCFG_V25_CONFIG(matchit2_decryption_table) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(6*8, 54*8-1, 17*8-8, 47*8-1+8) @@ -795,7 +795,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(m90_state::riskchal) m90(config); - MCFG_CPU_MODIFY("maincpu") + MCFG_DEVICE_MODIFY("maincpu") MCFG_V25_CONFIG(gussun_decryption_table) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1) @@ -803,7 +803,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(m90_state::bombrman) m90(config); - MCFG_CPU_MODIFY("maincpu") + MCFG_DEVICE_MODIFY("maincpu") MCFG_V25_CONFIG(bomberman_decryption_table) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1) @@ -811,7 +811,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(m90_state::bbmanwj) m90(config); - MCFG_CPU_MODIFY("maincpu") + MCFG_DEVICE_MODIFY("maincpu") MCFG_V25_CONFIG(dynablaster_decryption_table) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1) @@ -819,26 +819,26 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(m90_state::bbmanw) bbmanwj(config); - MCFG_CPU_MODIFY("soundcpu") - MCFG_CPU_IO_MAP(m99_sound_cpu_io_map) - MCFG_CPU_PERIODIC_INT_DRIVER(m90_state, fake_nmi, 128*60) + MCFG_DEVICE_MODIFY("soundcpu") + MCFG_DEVICE_IO_MAP(m99_sound_cpu_io_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(m90_state, fake_nmi, 128*60) MACHINE_CONFIG_END MACHINE_CONFIG_START(m90_state::bomblord) m90(config); - MCFG_CPU_REPLACE("maincpu", V30, 32000000/4) - MCFG_CPU_PROGRAM_MAP(bomblord_main_cpu_map) - MCFG_CPU_IO_MAP(m90_main_cpu_io_map) + MCFG_DEVICE_REPLACE("maincpu", V30, 32000000/4) + MCFG_DEVICE_PROGRAM_MAP(bomblord_main_cpu_map) + MCFG_DEVICE_IO_MAP(m90_main_cpu_io_map) - MCFG_CPU_MODIFY("soundcpu") - MCFG_CPU_IO_MAP(m99_sound_cpu_io_map) - MCFG_CPU_PERIODIC_INT_DRIVER(m90_state, bomblord_fake_nmi, 128*60) + MCFG_DEVICE_MODIFY("soundcpu") + MCFG_DEVICE_IO_MAP(m99_sound_cpu_io_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(m90_state, bomblord_fake_nmi, 128*60) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1) MCFG_SCREEN_UPDATE_DRIVER(m90_state, screen_update_bomblord) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(m90_state, bomblord_vblank_int_w)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, m90_state, bomblord_vblank_int_w)) MCFG_VIDEO_START_OVERRIDE(m90_state,bomblord) MACHINE_CONFIG_END @@ -846,20 +846,20 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(m90_state::dynablsb) m90(config); - MCFG_CPU_REPLACE("maincpu", V30, 32000000/4) - MCFG_CPU_PROGRAM_MAP(dynablsb_main_cpu_map) - MCFG_CPU_IO_MAP(dynablsb_main_cpu_io_map) + MCFG_DEVICE_REPLACE("maincpu", V30, 32000000/4) + MCFG_DEVICE_PROGRAM_MAP(dynablsb_main_cpu_map) + MCFG_DEVICE_IO_MAP(dynablsb_main_cpu_io_map) - MCFG_CPU_MODIFY("soundcpu") - MCFG_CPU_IO_MAP(dynablsb_sound_cpu_io_map) - MCFG_CPU_PERIODIC_INT_DRIVER(m90_state, irq0_line_hold, 64*60) /* half the sample rate of the original */ - MCFG_CPU_IRQ_ACKNOWLEDGE_REMOVE() + MCFG_DEVICE_MODIFY("soundcpu") + MCFG_DEVICE_IO_MAP(dynablsb_sound_cpu_io_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(m90_state, irq0_line_hold, 64*60) /* half the sample rate of the original */ + MCFG_DEVICE_IRQ_ACKNOWLEDGE_REMOVE() MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(320, 240) MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239) MCFG_SCREEN_UPDATE_DRIVER(m90_state, screen_update_dynablsb) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(m90_state, dynablsb_vblank_int_w)) + MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, m90_state, dynablsb_vblank_int_w)) MCFG_VIDEO_START_OVERRIDE(m90_state,dynablsb) @@ -870,7 +870,7 @@ MACHINE_CONFIG_START(m90_state::dynablsb) MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI)) MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(false) - MCFG_SOUND_MODIFY("ymsnd") + MCFG_DEVICE_MODIFY("ymsnd") MCFG_YM2151_IRQ_HANDLER(NOOP) /* this bootleg polls the YM2151 instead of taking interrupts from it */ MACHINE_CONFIG_END |