diff options
Diffstat (limited to 'src/mame/drivers/b2m.cpp')
-rw-r--r-- | src/mame/drivers/b2m.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mame/drivers/b2m.cpp b/src/mame/drivers/b2m.cpp index c7bf2eea000..1fed33c64a6 100644 --- a/src/mame/drivers/b2m.cpp +++ b/src/mame/drivers/b2m.cpp @@ -191,11 +191,11 @@ static void b2m_floppies(device_slot_interface &device) /* Machine driver */ MACHINE_CONFIG_START(b2m_state::b2m) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", I8080, 2000000) - MCFG_CPU_PROGRAM_MAP(b2m_mem) - MCFG_CPU_IO_MAP(b2m_io) - MCFG_CPU_VBLANK_INT_DRIVER("screen", b2m_state, b2m_vblank_interrupt) - MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb) + MCFG_DEVICE_ADD("maincpu", I8080, 2000000) + MCFG_DEVICE_PROGRAM_MAP(b2m_mem) + MCFG_DEVICE_IO_MAP(b2m_io) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", b2m_state, b2m_vblank_interrupt) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -211,39 +211,39 @@ MACHINE_CONFIG_START(b2m_state::b2m) MCFG_DEVICE_ADD("pit8253", PIT8253, 0) MCFG_PIT8253_CLK0(0) - MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir1_w)) + MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259", pic8259_device, ir1_w)) MCFG_PIT8253_CLK1(2000000) - MCFG_PIT8253_OUT1_HANDLER(WRITELINE(b2m_state,bm2_pit_out1)) + MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, b2m_state,bm2_pit_out1)) MCFG_PIT8253_CLK2(2000000) - MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pit8253", pit8253_device, write_clk0)) + MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pit8253", pit8253_device, write_clk0)) MCFG_DEVICE_ADD("ppi8255_1", I8255, 0) - MCFG_I8255_OUT_PORTA_CB(WRITE8(b2m_state, b2m_8255_porta_w)) - MCFG_I8255_IN_PORTB_CB(READ8(b2m_state, b2m_8255_portb_r)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(b2m_state, b2m_8255_portb_w)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(b2m_state, b2m_8255_portc_w)) + MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, b2m_state, b2m_8255_porta_w)) + MCFG_I8255_IN_PORTB_CB(READ8(*this, b2m_state, b2m_8255_portb_r)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, b2m_state, b2m_8255_portb_w)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, b2m_state, b2m_8255_portc_w)) MCFG_DEVICE_ADD("ppi8255_2", I8255, 0) - MCFG_I8255_OUT_PORTC_CB(WRITE8(b2m_state, b2m_ext_8255_portc_w)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, b2m_state, b2m_ext_8255_portc_w)) MCFG_DEVICE_ADD("ppi8255_3", I8255, 0) - MCFG_I8255_IN_PORTA_CB(READ8(b2m_state, b2m_romdisk_porta_r)) - MCFG_I8255_OUT_PORTB_CB(WRITE8(b2m_state, b2m_romdisk_portb_w)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(b2m_state, b2m_romdisk_portc_w)) + MCFG_I8255_IN_PORTA_CB(READ8(*this, b2m_state, b2m_romdisk_porta_r)) + MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, b2m_state, b2m_romdisk_portb_w)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, b2m_state, b2m_romdisk_portc_w)) MCFG_DEVICE_ADD("pic8259", PIC8259, 0) MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0)) /* sound */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) /* uart */ MCFG_DEVICE_ADD("uart", I8251, 0) MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8) - MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(b2m_state, b2m_fdc_drq)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, b2m_state, b2m_fdc_drq)) MCFG_FLOPPY_DRIVE_ADD("fd0", b2m_floppies, "525qd", b2m_state::b2m_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1", b2m_floppies, "525qd", b2m_state::b2m_floppy_formats) @@ -257,8 +257,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(b2m_state::b2mrom) b2m(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_IO_MAP(b2m_rom_io) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_IO_MAP(b2m_rom_io) MACHINE_CONFIG_END /* ROM definition */ |