diff options
Diffstat (limited to 'src/mame/drivers/olyboss.cpp')
-rw-r--r-- | src/mame/drivers/olyboss.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/mame/drivers/olyboss.cpp b/src/mame/drivers/olyboss.cpp index 8fb0f7aff5e..afe04edbf52 100644 --- a/src/mame/drivers/olyboss.cpp +++ b/src/mame/drivers/olyboss.cpp @@ -430,10 +430,10 @@ static void bosscd_floppies(device_slot_interface &device) //************************************************************************** MACHINE_CONFIG_START( olyboss_state::olybossd ) - MCFG_CPU_ADD("maincpu", Z80, 4_MHz_XTAL) - MCFG_CPU_PROGRAM_MAP(olyboss_mem) - MCFG_CPU_IO_MAP(olyboss_io) - MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("uic", am9519_device, iack_cb) + MCFG_DEVICE_ADD("maincpu", Z80, 4_MHz_XTAL) + MCFG_DEVICE_PROGRAM_MAP(olyboss_mem) + MCFG_DEVICE_IO_MAP(olyboss_io) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("uic", am9519_device, iack_cb) /* video hardware */ @@ -449,30 +449,30 @@ MACHINE_CONFIG_START( olyboss_state::olybossd ) MCFG_AM9519_OUT_INT_CB(INPUTLINE("maincpu", 0)) MCFG_UPD765A_ADD("fdc", true, true) - MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("uic", am9519_device, ireq2_w)) MCFG_DEVCB_INVERT - MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, dreq0_w)) + MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("uic", am9519_device, ireq2_w)) MCFG_DEVCB_INVERT + MCFG_UPD765_DRQ_CALLBACK(WRITELINE(I8257_TAG, i8257_device, dreq0_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", bosscd_floppies, "525qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_DEVICE_ADD(I8257_TAG, I8257, XTAL(4'000'000)) - MCFG_I8257_OUT_HRQ_CB(WRITELINE(olyboss_state, hrq_w)) - MCFG_I8257_IN_MEMR_CB(READ8(olyboss_state, dma_mem_r)) - MCFG_I8257_OUT_MEMW_CB(WRITE8(olyboss_state, dma_mem_w)) - MCFG_I8257_IN_IOR_0_CB(READ8(olyboss_state, fdcdma_r)) - MCFG_I8257_OUT_IOW_0_CB(WRITE8(olyboss_state, fdcdma_w)) - MCFG_I8257_OUT_IOW_2_CB(WRITE8(olyboss_state, crtcdma_w)) - MCFG_I8257_OUT_TC_CB(WRITELINE(olyboss_state, tc_w)) + MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, olyboss_state, hrq_w)) + MCFG_I8257_IN_MEMR_CB(READ8(*this, olyboss_state, dma_mem_r)) + MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, olyboss_state, dma_mem_w)) + MCFG_I8257_IN_IOR_0_CB(READ8(*this, olyboss_state, fdcdma_r)) + MCFG_I8257_OUT_IOW_0_CB(WRITE8(*this, olyboss_state, fdcdma_w)) + MCFG_I8257_OUT_IOW_2_CB(WRITE8(*this, olyboss_state, crtcdma_w)) + MCFG_I8257_OUT_TC_CB(WRITELINE(*this, olyboss_state, tc_w)) MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, XTAL(14'318'181)) MCFG_UPD3301_CHARACTER_WIDTH(8) MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(olyboss_state, olyboss_display_pixels) - MCFG_UPD3301_DRQ_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, dreq2_w)) - MCFG_UPD3301_INT_CALLBACK(DEVWRITELINE("uic", am9519_device, ireq0_w)) MCFG_DEVCB_INVERT + MCFG_UPD3301_DRQ_CALLBACK(WRITELINE(I8257_TAG, i8257_device, dreq2_w)) + MCFG_UPD3301_INT_CALLBACK(WRITELINE("uic", am9519_device, ireq0_w)) MCFG_DEVCB_INVERT MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) MCFG_DEVICE_ADD("ppi", I8255, 0) - MCFG_I8255_IN_PORTA_CB(READ8(olyboss_state, keyboard_read)) - MCFG_I8255_OUT_PORTC_CB(WRITE8(olyboss_state, ppic_w)) + MCFG_I8255_IN_PORTA_CB(READ8(*this, olyboss_state, keyboard_read)) + MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, olyboss_state, ppic_w)) /* keyboard */ MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0) @@ -495,11 +495,11 @@ MACHINE_CONFIG_START( olyboss_state::olybossc ) MACHINE_CONFIG_END MACHINE_CONFIG_START( olyboss_state::bossb85 ) - MCFG_CPU_ADD("maincpu", I8085A, 4_MHz_XTAL) - MCFG_CPU_PROGRAM_MAP(olyboss_mem) - MCFG_CPU_IO_MAP(olyboss85_io) - MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(olyboss_state, irq_cb) - MCFG_I8085A_SOD(WRITELINE(olyboss_state, romdis_w)) + MCFG_DEVICE_ADD("maincpu", I8085A, 4_MHz_XTAL) + MCFG_DEVICE_PROGRAM_MAP(olyboss_mem) + MCFG_DEVICE_IO_MAP(olyboss85_io) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(olyboss_state, irq_cb) + MCFG_I8085A_SOD(WRITELINE(*this, olyboss_state, romdis_w)) /* video hardware */ @@ -516,25 +516,25 @@ MACHINE_CONFIG_START( olyboss_state::bossb85 ) MCFG_UPD765A_ADD("fdc", true, true) MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE("maincpu", I8085_RST65_LINE)) - MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, dreq0_w)) + MCFG_UPD765_DRQ_CALLBACK(WRITELINE(I8257_TAG, i8257_device, dreq0_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", bossb_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_FLOPPY_DRIVE_ADD("fdc:1", bossb_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) MCFG_DEVICE_ADD(I8257_TAG, I8257, XTAL(4'000'000)) - MCFG_I8257_OUT_HRQ_CB(WRITELINE(olyboss_state, hrq_w)) - MCFG_I8257_IN_MEMR_CB(READ8(olyboss_state, dma_mem_r)) - MCFG_I8257_OUT_MEMW_CB(WRITE8(olyboss_state, dma_mem_w)) - MCFG_I8257_IN_IOR_0_CB(READ8(olyboss_state, fdcdma_r)) - MCFG_I8257_OUT_IOW_0_CB(WRITE8(olyboss_state, fdcdma_w)) - MCFG_I8257_OUT_IOW_2_CB(WRITE8(olyboss_state, crtcdma_w)) - MCFG_I8257_OUT_TC_CB(WRITELINE(olyboss_state, tc_w)) + MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, olyboss_state, hrq_w)) + MCFG_I8257_IN_MEMR_CB(READ8(*this, olyboss_state, dma_mem_r)) + MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, olyboss_state, dma_mem_w)) + MCFG_I8257_IN_IOR_0_CB(READ8(*this, olyboss_state, fdcdma_r)) + MCFG_I8257_OUT_IOW_0_CB(WRITE8(*this, olyboss_state, fdcdma_w)) + MCFG_I8257_OUT_IOW_2_CB(WRITE8(*this, olyboss_state, crtcdma_w)) + MCFG_I8257_OUT_TC_CB(WRITELINE(*this, olyboss_state, tc_w)) MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, XTAL(14'318'181)) MCFG_UPD3301_CHARACTER_WIDTH(8) MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(olyboss_state, olyboss_display_pixels) - MCFG_UPD3301_DRQ_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, dreq2_w)) + MCFG_UPD3301_DRQ_CALLBACK(WRITELINE(I8257_TAG, i8257_device, dreq2_w)) MCFG_UPD3301_INT_CALLBACK(INPUTLINE("maincpu", I8085_RST75_LINE)) MCFG_VIDEO_SET_SCREEN(SCREEN_TAG) |