diff options
Diffstat (limited to 'src/mame/drivers/flstory.cpp')
-rw-r--r-- | src/mame/drivers/flstory.cpp | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/src/mame/drivers/flstory.cpp b/src/mame/drivers/flstory.cpp index c9301bf93f9..3c133e38157 100644 --- a/src/mame/drivers/flstory.cpp +++ b/src/mame/drivers/flstory.cpp @@ -736,13 +736,13 @@ MACHINE_RESET_MEMBER(flstory_state,flstory) MACHINE_CONFIG_START(flstory_state::flstory) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(10'733'000)/2) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(flstory_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'733'000)/2) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(flstory_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */ + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */ /* NMI generated by the main CPU */ MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(18'432'000)/6) /* verified on pcb */ @@ -772,7 +772,7 @@ MACHINE_CONFIG_START(flstory_state::flstory) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>)) + MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>)) MCFG_INPUT_MERGER_ALL_HIGH("soundnmi") MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI)) @@ -780,12 +780,12 @@ MACHINE_CONFIG_START(flstory_state::flstory) MCFG_GENERIC_LATCH_8_ADD("soundlatch2") MCFG_TA7630_ADD("ta7630") - MCFG_SOUND_ADD("aysnd", YM2149, XTAL(8'000'000)/4) /* verified on pcb */ - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(flstory_state, sound_control_2_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(flstory_state, sound_control_3_w)) + MCFG_DEVICE_ADD("aysnd", YM2149, XTAL(8'000'000)/4) /* verified on pcb */ + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, flstory_state, sound_control_2_w)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, flstory_state, sound_control_3_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) - MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4) /* verified on pcb */ + MCFG_DEVICE_ADD("msm", MSM5232, XTAL(8'000'000)/4) /* verified on pcb */ MCFG_MSM5232_SET_CAPACITORS(1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6) /* 1.0 uF capacitors (verified on real PCB) */ MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1 MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1 @@ -799,7 +799,7 @@ MACHINE_CONFIG_START(flstory_state::flstory) // pin 2 SOLO 16' not mapped // pin 22 Noise Output not mapped - 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 @@ -807,13 +807,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(flstory_state::onna34ro) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(10'733'000)/2) /* ??? */ - MCFG_CPU_PROGRAM_MAP(onna34ro_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'733'000)/2) /* ??? */ + MCFG_DEVICE_PROGRAM_MAP(onna34ro_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */ - MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */ + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */ /* NMI generated by the main CPU */ MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */ @@ -841,7 +841,7 @@ MACHINE_CONFIG_START(flstory_state::onna34ro) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>)) + MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>)) MCFG_INPUT_MERGER_ALL_HIGH("soundnmi") MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI)) @@ -849,12 +849,12 @@ MACHINE_CONFIG_START(flstory_state::onna34ro) MCFG_GENERIC_LATCH_8_ADD("soundlatch2") MCFG_TA7630_ADD("ta7630") - MCFG_SOUND_ADD("aysnd", YM2149, XTAL(8'000'000)/4) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(flstory_state, sound_control_2_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(flstory_state, sound_control_3_w)) + MCFG_DEVICE_ADD("aysnd", YM2149, XTAL(8'000'000)/4) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, flstory_state, sound_control_2_w)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, flstory_state, sound_control_3_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) - MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4) + MCFG_DEVICE_ADD("msm", MSM5232, XTAL(8'000'000)/4) MCFG_MSM5232_SET_CAPACITORS(1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6) /* 1.0 uF capacitors (verified on real PCB) */ MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1 MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1 @@ -868,15 +868,15 @@ MACHINE_CONFIG_START(flstory_state::onna34ro) // pin 2 SOLO 16' not mapped // pin 22 Noise Output not mapped - 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 MACHINE_CONFIG_START(flstory_state::onna34ro_mcu) onna34ro(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(onna34ro_mcu_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(onna34ro_mcu_map) MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(18'432'000)/6) /* ? */ MACHINE_CONFIG_END @@ -884,17 +884,17 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(flstory_state::victnine) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */ - MCFG_CPU_PROGRAM_MAP(victnine_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */ + MCFG_DEVICE_PROGRAM_MAP(victnine_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */ - MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */ + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */ /* NMI generated by the main CPU */ -// MCFG_CPU_ADD("mcu", M68705, XTAL(18'432'000)/6) /* ??? */ -// MCFG_CPU_PROGRAM_MAP(m68705_map) +// MCFG_DEVICE_ADD("mcu", M68705, XTAL(18'432'000)/6) /* ??? */ +// MCFG_DEVICE_PROGRAM_MAP(m68705_map) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */ /* synchronization of the CPUs */ @@ -921,7 +921,7 @@ MACHINE_CONFIG_START(flstory_state::victnine) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>)) + MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>)) MCFG_INPUT_MERGER_ALL_HIGH("soundnmi") MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI)) @@ -929,12 +929,12 @@ MACHINE_CONFIG_START(flstory_state::victnine) MCFG_GENERIC_LATCH_8_ADD("soundlatch2") MCFG_TA7630_ADD("ta7630") - MCFG_SOUND_ADD("aysnd", YM2149, XTAL(8'000'000)/4) - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(flstory_state, sound_control_2_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(flstory_state, sound_control_3_w)) + MCFG_DEVICE_ADD("aysnd", YM2149, XTAL(8'000'000)/4) + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, flstory_state, sound_control_2_w)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, flstory_state, sound_control_3_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) - MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4) + MCFG_DEVICE_ADD("msm", MSM5232, XTAL(8'000'000)/4) MCFG_MSM5232_SET_CAPACITORS(1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6) /* 1.0 uF capacitors (verified on real PCB) */ MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1 MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1 @@ -948,7 +948,7 @@ MACHINE_CONFIG_START(flstory_state::victnine) // pin 2 SOLO 16' not mapped // pin 22 Noise Output not mapped - 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 @@ -957,13 +957,13 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(flstory_state::rumba) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(rumba_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(rumba_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(sound_map) - MCFG_CPU_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */ + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(sound_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */ /* NMI generated by the main CPU */ MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(18'432'000)/6) /* ? */ @@ -994,7 +994,7 @@ MACHINE_CONFIG_START(flstory_state::rumba) MCFG_SPEAKER_STANDARD_MONO("speaker") MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>)) + MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>)) MCFG_INPUT_MERGER_ALL_HIGH("soundnmi") MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI)) @@ -1002,12 +1002,12 @@ MACHINE_CONFIG_START(flstory_state::rumba) MCFG_GENERIC_LATCH_8_ADD("soundlatch2") MCFG_TA7630_ADD("ta7630") - MCFG_SOUND_ADD("aysnd", YM2149, XTAL(8'000'000)/4) /* verified on pcb */ - MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(flstory_state, sound_control_2_w)) - MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(flstory_state, sound_control_3_w)) + MCFG_DEVICE_ADD("aysnd", YM2149, XTAL(8'000'000)/4) /* verified on pcb */ + MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, flstory_state, sound_control_2_w)) + MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, flstory_state, sound_control_3_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) - MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4) /* verified on pcb */ + MCFG_DEVICE_ADD("msm", MSM5232, XTAL(8'000'000)/4) /* verified on pcb */ MCFG_MSM5232_SET_CAPACITORS(1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6) /* 1.0 uF capacitors (verified on real PCB) */ MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1 MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1 @@ -1021,7 +1021,7 @@ MACHINE_CONFIG_START(flstory_state::rumba) // pin 2 SOLO 16' not mapped // pin 22 Noise Output not mapped - 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 |