summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/super80.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/super80.cpp')
-rw-r--r--src/mame/drivers/super80.cpp60
1 files changed, 30 insertions, 30 deletions
diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp
index a10638dd482..f869c6e5761 100644
--- a/src/mame/drivers/super80.cpp
+++ b/src/mame/drivers/super80.cpp
@@ -707,16 +707,16 @@ static const char *const relay_sample_names[] =
MACHINE_CONFIG_START(super80_state::super80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 2 MHz */
- MCFG_CPU_PROGRAM_MAP(super80_map)
- MCFG_CPU_IO_MAP(super80_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 2 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(super80_map)
+ MCFG_DEVICE_IO_MAP(super80_io)
MCFG_Z80_DAISY_CHAIN(super80_daisy_chain)
MCFG_MACHINE_RESET_OVERRIDE(super80_state, super80)
MCFG_DEVICE_ADD("z80pio", Z80PIO, MASTER_CLOCK/6)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(super80_state, pio_port_a_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(super80_state,pio_port_b_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, super80_state, pio_port_a_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, super80_state,pio_port_b_r))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(48.8)
@@ -735,16 +735,16 @@ MACHINE_CONFIG_START(super80_state::super80)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(relay_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -775,8 +775,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(super80_state::super80e)
super80(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(super80e_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(super80e_io)
MCFG_GFXDECODE_MODIFY("gfxdecode", super80e)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80e)
@@ -784,35 +784,35 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(super80_state::super80m)
super80(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(super80m_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(super80m_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", super80m)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80m)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(super80_state, screen_vblank_super80m))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, super80_state, screen_vblank_super80m))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(super80_state::super80v)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 2 MHz */
- MCFG_CPU_PROGRAM_MAP(super80v_map)
- MCFG_CPU_IO_MAP(super80v_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 2 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(super80v_map)
+ MCFG_DEVICE_IO_MAP(super80v_io)
MCFG_Z80_DAISY_CHAIN(super80_daisy_chain)
MCFG_MACHINE_RESET_OVERRIDE(super80_state, super80r)
MCFG_DEVICE_ADD("z80pio", Z80PIO, MASTER_CLOCK/6)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(super80_state, pio_port_a_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(super80_state,pio_port_b_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, super80_state, pio_port_a_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, super80_state,pio_port_b_r))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_SIZE(SUPER80V_SCREEN_WIDTH, SUPER80V_SCREEN_HEIGHT)
MCFG_SCREEN_VISIBLE_AREA(0, SUPER80V_SCREEN_WIDTH-1, 0, SUPER80V_SCREEN_HEIGHT-1)
MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80v)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(super80_state, screen_vblank_super80m))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, super80_state, screen_vblank_super80m))
MCFG_PALETTE_ADD("palette", 32)
MCFG_PALETTE_INIT_OWNER(super80_state,super80m)
@@ -829,16 +829,16 @@ MACHINE_CONFIG_START(super80_state::super80v)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(relay_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -857,20 +857,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(super80_state::super80r)
super80v(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(super80r_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(super80r_io)
MCFG_DEVICE_ADD("dma", Z80DMA, MASTER_CLOCK/6)
- MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(super80_state, busreq_w))
+ MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, super80_state, busreq_w))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
//ba0 - not connected
- MCFG_Z80DMA_IN_MREQ_CB(READ8(super80_state, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(super80_state, memory_write_byte))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(super80_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(super80_state, io_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, super80_state, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, super80_state, memory_write_byte))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, super80_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, super80_state, io_write_byte))
MCFG_WD2793_ADD("fdc", XTAL(2'000'000))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("dma", z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", super80_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", super80_floppies, "525dd", floppy_image_device::default_floppy_formats)