diff options
Diffstat (limited to 'src/mame/drivers/fm7.cpp')
-rw-r--r-- | src/mame/drivers/fm7.cpp | 146 |
1 files changed, 73 insertions, 73 deletions
diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp index b89fc431093..9840aadbcb3 100644 --- a/src/mame/drivers/fm7.cpp +++ b/src/mame/drivers/fm7.cpp @@ -2068,20 +2068,20 @@ MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000) MACHINE_CONFIG_START(fm7_state::fm7) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", MC6809, XTAL(16'128'000) / 2) - MCFG_CPU_PROGRAM_MAP(fm7_mem) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack) + MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(16'128'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(fm7_mem) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack) MCFG_QUANTUM_PERFECT_CPU("maincpu") - MCFG_CPU_ADD("sub", MC6809, XTAL(16'128'000) / 2) - MCFG_CPU_PROGRAM_MAP(fm7_sub_mem) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack) + MCFG_DEVICE_ADD("sub", MC6809, XTAL(16'128'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(fm7_sub_mem) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack) MCFG_QUANTUM_PERFECT_CPU("sub") MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("psg", AY8910, XTAL(4'915'200) / 4) + MCFG_DEVICE_ADD("psg", AY8910, XTAL(4'915'200) / 4) MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 1.00) - MCFG_SOUND_ADD("beeper", BEEP, 1200) + MCFG_DEVICE_ADD("beeper", BEEP, 1200) MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.50) MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.25) @@ -2103,8 +2103,8 @@ MACHINE_CONFIG_START(fm7_state::fm7) MCFG_SOFTWARE_LIST_ADD("cass_list","fm7_cass") MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8) - MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w)) - MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) @@ -2113,28 +2113,28 @@ MACHINE_CONFIG_START(fm7_state::fm7) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") MCFG_SLOT_OPTION_ADD( "dsjoy", DEMPA_SHINBUNSHA_JOYSTICK ) - MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy)) - MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault)) - MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(fm7_state, write_centronics_ack)) - MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(fm7_state, write_centronics_perror)) + MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy)) + MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault)) + MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, fm7_state, write_centronics_ack)) + MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, fm7_state, write_centronics_perror)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MACHINE_CONFIG_END MACHINE_CONFIG_START(fm7_state::fm8) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'915'200)) // 1.2MHz 68A09 - MCFG_CPU_PROGRAM_MAP(fm8_mem) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack) + MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'915'200)) // 1.2MHz 68A09 + MCFG_DEVICE_PROGRAM_MAP(fm8_mem) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack) MCFG_QUANTUM_PERFECT_CPU("maincpu") - MCFG_CPU_ADD("sub", MC6809, XTAL(16'128'000) / 2) - MCFG_CPU_PROGRAM_MAP(fm7_sub_mem) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack) + MCFG_DEVICE_ADD("sub", MC6809, XTAL(16'128'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(fm7_sub_mem) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack) MCFG_QUANTUM_PERFECT_CPU("sub") MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("beeper", BEEP, 1200) + MCFG_DEVICE_ADD("beeper", BEEP, 1200) MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50) MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25) @@ -2154,40 +2154,40 @@ MACHINE_CONFIG_START(fm7_state::fm8) MCFG_CASSETTE_INTERFACE("fm7_cass") MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8) - MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w)) - MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") - MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy)) - MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault)) - MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(fm7_state, write_centronics_ack)) - MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(fm7_state, write_centronics_perror)) + MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy)) + MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault)) + MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, fm7_state, write_centronics_ack)) + MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, fm7_state, write_centronics_perror)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MACHINE_CONFIG_END MACHINE_CONFIG_START(fm7_state::fm77av) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", MC6809E, XTAL(16'128'000) / 8) - MCFG_CPU_PROGRAM_MAP(fm77av_mem) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack) + MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(16'128'000) / 8) + MCFG_DEVICE_PROGRAM_MAP(fm77av_mem) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack) MCFG_QUANTUM_PERFECT_CPU("maincpu") - MCFG_CPU_ADD("sub", MC6809E, XTAL(16'128'000) / 8) - MCFG_CPU_PROGRAM_MAP(fm77av_sub_mem) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack) + MCFG_DEVICE_ADD("sub", MC6809E, XTAL(16'128'000) / 8) + MCFG_DEVICE_PROGRAM_MAP(fm77av_sub_mem) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack) MCFG_QUANTUM_PERFECT_CPU("sub") MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ym", YM2203, XTAL(4'915'200) / 4) - MCFG_YM2203_IRQ_HANDLER(WRITELINE(fm7_state, fm77av_fmirq)) - MCFG_AY8910_PORT_A_READ_CB(READ8(fm7_state, fm77av_joy_1_r)) - MCFG_AY8910_PORT_B_READ_CB(READ8(fm7_state, fm77av_joy_2_r)) + MCFG_DEVICE_ADD("ym", YM2203, XTAL(4'915'200) / 4) + MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, fm7_state, fm77av_fmirq)) + MCFG_AY8910_PORT_A_READ_CB(READ8(*this, fm7_state, fm77av_joy_1_r)) + MCFG_AY8910_PORT_B_READ_CB(READ8(*this, fm7_state, fm77av_joy_2_r)) MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",1.0) - MCFG_SOUND_ADD("beeper", BEEP, 1200) + MCFG_DEVICE_ADD("beeper", BEEP, 1200) MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50) MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25) @@ -2227,8 +2227,8 @@ MACHINE_CONFIG_START(fm7_state::fm77av) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_list", "fm7_cass") MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8) - MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w)) - MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) @@ -2237,32 +2237,32 @@ MACHINE_CONFIG_START(fm7_state::fm77av) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_list", "fm7_disk") MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") - MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy)) - MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault)) - MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(fm7_state, write_centronics_ack)) - MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(fm7_state, write_centronics_perror)) + MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy)) + MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault)) + MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, fm7_state, write_centronics_ack)) + MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, fm7_state, write_centronics_perror)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MACHINE_CONFIG_END MACHINE_CONFIG_START(fm7_state::fm11) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", MC6809E, 2000000) // 2MHz 68B09E - MCFG_CPU_PROGRAM_MAP(fm11_mem) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack) + MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000) // 2MHz 68B09E + MCFG_DEVICE_PROGRAM_MAP(fm11_mem) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack) MCFG_QUANTUM_PERFECT_CPU("maincpu") - MCFG_CPU_ADD("sub", MC6809, 8000000) // 2MHz 68B09 - MCFG_CPU_PROGRAM_MAP(fm11_sub_mem) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack) + MCFG_DEVICE_ADD("sub", MC6809, 8000000) // 2MHz 68B09 + MCFG_DEVICE_PROGRAM_MAP(fm11_sub_mem) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack) MCFG_QUANTUM_PERFECT_CPU("sub") - MCFG_CPU_ADD("x86", I8088, 8000000) // 8MHz i8088 - MCFG_CPU_PROGRAM_MAP(fm11_x86_mem) - MCFG_CPU_IO_MAP(fm11_x86_io) + MCFG_DEVICE_ADD("x86", I8088, 8000000) // 8MHz i8088 + MCFG_DEVICE_PROGRAM_MAP(fm11_x86_mem) + MCFG_DEVICE_IO_MAP(fm11_x86_io) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("beeper", BEEP, 1200) + MCFG_DEVICE_ADD("beeper", BEEP, 1200) MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50) MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25) @@ -2299,35 +2299,35 @@ MACHINE_CONFIG_START(fm7_state::fm11) MCFG_CASSETTE_INTERFACE("fm7_cass") MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8) - MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w)) - MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") - MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy)) - MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault)) - MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(fm7_state, write_centronics_ack)) - MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(fm7_state, write_centronics_perror)) + MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy)) + MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault)) + MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, fm7_state, write_centronics_ack)) + MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, fm7_state, write_centronics_perror)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MACHINE_CONFIG_END MACHINE_CONFIG_START(fm7_state::fm16beta) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", I8086, 8000000) // 8MHz i8086 - MCFG_CPU_PROGRAM_MAP(fm16_mem) - MCFG_CPU_IO_MAP(fm16_io) + MCFG_DEVICE_ADD("maincpu", I8086, 8000000) // 8MHz i8086 + MCFG_DEVICE_PROGRAM_MAP(fm16_mem) + MCFG_DEVICE_IO_MAP(fm16_io) MCFG_QUANTUM_PERFECT_CPU("maincpu") - MCFG_CPU_ADD("sub", MC6809, 8000000) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack) - MCFG_CPU_PROGRAM_MAP(fm16_sub_mem) + MCFG_DEVICE_ADD("sub", MC6809, 8000000) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack) + MCFG_DEVICE_PROGRAM_MAP(fm16_sub_mem) MCFG_QUANTUM_PERFECT_CPU("sub") MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("beeper", BEEP, 1200) + MCFG_DEVICE_ADD("beeper", BEEP, 1200) MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50) MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25) @@ -2347,17 +2347,17 @@ MACHINE_CONFIG_START(fm7_state::fm16beta) MCFG_CASSETTE_INTERFACE("fm7_cass") MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8) - MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w)) - MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", fm7_floppies, "qd", floppy_image_device::default_floppy_formats) MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer") - MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy)) - MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault)) - MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(fm7_state, write_centronics_ack)) - MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(fm7_state, write_centronics_perror)) + MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy)) + MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault)) + MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, fm7_state, write_centronics_ack)) + MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, fm7_state, write_centronics_perror)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") MACHINE_CONFIG_END |