diff options
Diffstat (limited to 'src/mame/drivers/vigilant.cpp')
-rw-r--r-- | src/mame/drivers/vigilant.cpp | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp index 9e46003850b..85047960c3e 100644 --- a/src/mame/drivers/vigilant.cpp +++ b/src/mame/drivers/vigilant.cpp @@ -483,17 +483,17 @@ GFXDECODE_END MACHINE_CONFIG_START(vigilant_state::vigilant) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */ - MCFG_CPU_PROGRAM_MAP(vigilant_map) - MCFG_CPU_IO_MAP(vigilant_io_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", vigilant_state, irq0_line_hold) - - MCFG_CPU_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */ - MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_IO_MAP(sound_io_map) - MCFG_CPU_PERIODIC_INT_DRIVER(vigilant_state, nmi_line_pulse, 128*55) /* clocked by V1 */ + MCFG_DEVICE_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */ + MCFG_DEVICE_PROGRAM_MAP(vigilant_map) + MCFG_DEVICE_IO_MAP(vigilant_io_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vigilant_state, irq0_line_hold) + + MCFG_DEVICE_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) + MCFG_DEVICE_IO_MAP(sound_io_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(vigilant_state, nmi_line_pulse, 128*55) /* clocked by V1 */ /* 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) @@ -512,20 +512,20 @@ MACHINE_CONFIG_START(vigilant_state::vigilant) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") 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", 3579645) - 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, "lspeaker", 0.55) MCFG_SOUND_ROUTE(1, "rspeaker", 0.55) - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // 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 @@ -533,17 +533,17 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(vigilant_state::buccanrs) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 5688800) /* 5.688800 MHz */ - MCFG_CPU_PROGRAM_MAP(vigilant_map) - MCFG_CPU_IO_MAP(vigilant_io_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", vigilant_state, irq0_line_hold) - - MCFG_CPU_ADD("soundcpu", Z80, 18432000/6) /* 3.072000 MHz */ - MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_IO_MAP(buccanrs_sound_io_map) - MCFG_CPU_PERIODIC_INT_DRIVER(vigilant_state, nmi_line_pulse, 128*55) /* clocked by V1 */ + MCFG_DEVICE_ADD("maincpu", Z80, 5688800) /* 5.688800 MHz */ + MCFG_DEVICE_PROGRAM_MAP(vigilant_map) + MCFG_DEVICE_IO_MAP(vigilant_io_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vigilant_state, irq0_line_hold) + + MCFG_DEVICE_ADD("soundcpu", Z80, 18432000/6) /* 3.072000 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) + MCFG_DEVICE_IO_MAP(buccanrs_sound_io_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(vigilant_state, nmi_line_pulse, 128*55) /* clocked by V1 */ /* 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) @@ -562,16 +562,16 @@ MACHINE_CONFIG_START(vigilant_state::buccanrs) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") 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_SOUND_ADD("ym1", YM2203, 18432000/6) - MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst28_w)) + MCFG_DEVICE_ADD("ym1", YM2203, 18432000/6) + MCFG_YM2203_IRQ_HANDLER(WRITELINE("soundirq", rst_neg_buffer_device, rst28_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.35) MCFG_SOUND_ROUTE(0, "rspeaker", 0.35) MCFG_SOUND_ROUTE(1, "lspeaker", 0.35) @@ -581,7 +581,7 @@ MACHINE_CONFIG_START(vigilant_state::buccanrs) MCFG_SOUND_ROUTE(3, "lspeaker", 0.50) MCFG_SOUND_ROUTE(3, "rspeaker", 0.50) - MCFG_SOUND_ADD("ym2", YM2203, 18432000/6) + MCFG_DEVICE_ADD("ym2", YM2203, 18432000/6) MCFG_SOUND_ROUTE(0, "lspeaker", 0.35) MCFG_SOUND_ROUTE(0, "rspeaker", 0.35) MCFG_SOUND_ROUTE(1, "lspeaker", 0.35) @@ -591,7 +591,7 @@ MACHINE_CONFIG_START(vigilant_state::buccanrs) MCFG_SOUND_ROUTE(3, "lspeaker", 0.50) MCFG_SOUND_ROUTE(3, "rspeaker", 0.50) - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35) // 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 @@ -599,17 +599,17 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(vigilant_state::kikcubic) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */ - MCFG_CPU_PROGRAM_MAP(kikcubic_map) - MCFG_CPU_IO_MAP(kikcubic_io_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", vigilant_state, irq0_line_hold) - - MCFG_CPU_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */ - MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_IO_MAP(sound_io_map) - MCFG_CPU_PERIODIC_INT_DRIVER(vigilant_state, nmi_line_pulse, 128*55) /* clocked by V1 */ + MCFG_DEVICE_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */ + MCFG_DEVICE_PROGRAM_MAP(kikcubic_map) + MCFG_DEVICE_IO_MAP(kikcubic_io_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vigilant_state, irq0_line_hold) + + MCFG_DEVICE_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) + MCFG_DEVICE_IO_MAP(sound_io_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(vigilant_state, nmi_line_pulse, 128*55) /* clocked by V1 */ /* 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) @@ -628,20 +628,20 @@ MACHINE_CONFIG_START(vigilant_state::kikcubic) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") 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", 3579645) - 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, "lspeaker", 0.55) MCFG_SOUND_ROUTE(1, "rspeaker", 0.55) - MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // 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 |