diff options
Diffstat (limited to 'src/mame/drivers/studio2.cpp')
-rw-r--r-- | src/mame/drivers/studio2.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp index 44c3e52292b..4d9195e6d3f 100644 --- a/src/mame/drivers/studio2.cpp +++ b/src/mame/drivers/studio2.cpp @@ -640,15 +640,15 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(studio2_state::studio2) /* basic machine hardware */ - MCFG_CPU_ADD(CDP1802_TAG, CDP1802, 1760000) /* the real clock is derived from an oscillator circuit */ - MCFG_CPU_PROGRAM_MAP(studio2_map) - MCFG_CPU_IO_MAP(studio2_io_map) + MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, 1760000) /* the real clock is derived from an oscillator circuit */ + MCFG_DEVICE_PROGRAM_MAP(studio2_map) + MCFG_DEVICE_IO_MAP(studio2_io_map) MCFG_COSMAC_WAIT_CALLBACK(VCC) - MCFG_COSMAC_CLEAR_CALLBACK(READLINE(studio2_state, clear_r)) - MCFG_COSMAC_EF3_CALLBACK(READLINE(studio2_state, ef3_r)) - MCFG_COSMAC_EF4_CALLBACK(READLINE(studio2_state, ef4_r)) - MCFG_COSMAC_Q_CALLBACK(WRITELINE(studio2_state, q_w)) - MCFG_COSMAC_DMAW_CALLBACK(DEVWRITE8(CDP1861_TAG, cdp1861_device, dma_w)) + MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, studio2_state, clear_r)) + MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, studio2_state, ef3_r)) + MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, studio2_state, ef4_r)) + MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, studio2_state, q_w)) + MCFG_COSMAC_DMAW_CALLBACK(WRITE8(CDP1861_TAG, cdp1861_device, dma_w)) /* video hardware */ MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, 1760000) @@ -659,7 +659,7 @@ MACHINE_CONFIG_START(studio2_state::studio2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("beeper", BEEP, 300) + MCFG_DEVICE_ADD("beeper", BEEP, 300) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) studio2_cartslot(config); @@ -667,15 +667,15 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(visicom_state::visicom) /* basic machine hardware */ - MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(3'579'545)/2) - MCFG_CPU_PROGRAM_MAP(visicom_map) - MCFG_CPU_IO_MAP(visicom_io_map) + MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, XTAL(3'579'545)/2) + MCFG_DEVICE_PROGRAM_MAP(visicom_map) + MCFG_DEVICE_IO_MAP(visicom_io_map) MCFG_COSMAC_WAIT_CALLBACK(VCC) - MCFG_COSMAC_CLEAR_CALLBACK(READLINE(visicom_state, clear_r)) - MCFG_COSMAC_EF3_CALLBACK(READLINE(visicom_state, ef3_r)) - MCFG_COSMAC_EF4_CALLBACK(READLINE(visicom_state, ef4_r)) - MCFG_COSMAC_Q_CALLBACK(WRITELINE(visicom_state, q_w)) - MCFG_COSMAC_DMAW_CALLBACK(WRITE8(visicom_state, dma_w)) + MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, visicom_state, clear_r)) + MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, visicom_state, ef3_r)) + MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, visicom_state, ef4_r)) + MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, visicom_state, q_w)) + MCFG_COSMAC_DMAW_CALLBACK(WRITE8(*this, visicom_state, dma_w)) /* video hardware */ MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL(3'579'545)/2) @@ -687,7 +687,7 @@ MACHINE_CONFIG_START(visicom_state::visicom) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("beeper", BEEP, 300) + MCFG_DEVICE_ADD("beeper", BEEP, 300) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "visicom_cart") @@ -699,15 +699,15 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(mpt02_state::mpt02) /* basic machine hardware */ - MCFG_CPU_ADD(CDP1802_TAG, CDP1802, CDP1864_CLOCK) - MCFG_CPU_PROGRAM_MAP(mpt02_map) - MCFG_CPU_IO_MAP(mpt02_io_map) + MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, CDP1864_CLOCK) + MCFG_DEVICE_PROGRAM_MAP(mpt02_map) + MCFG_DEVICE_IO_MAP(mpt02_io_map) MCFG_COSMAC_WAIT_CALLBACK(VCC) - MCFG_COSMAC_CLEAR_CALLBACK(READLINE(mpt02_state, clear_r)) - MCFG_COSMAC_EF3_CALLBACK(READLINE(mpt02_state, ef3_r)) - MCFG_COSMAC_EF4_CALLBACK(READLINE(mpt02_state, ef4_r)) - MCFG_COSMAC_Q_CALLBACK(WRITELINE(mpt02_state, q_w)) - MCFG_COSMAC_DMAW_CALLBACK(WRITE8(mpt02_state, dma_w)) + MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, mpt02_state, clear_r)) + MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, mpt02_state, ef3_r)) + MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, mpt02_state, ef4_r)) + MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, mpt02_state, q_w)) + MCFG_COSMAC_DMAW_CALLBACK(WRITE8(*this, mpt02_state, dma_w)) /* video hardware */ MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, CDP1864_CLOCK) @@ -715,10 +715,10 @@ MACHINE_CONFIG_START(mpt02_state::mpt02) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("beeper", BEEP, 300) + MCFG_DEVICE_ADD("beeper", BEEP, 300) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) - MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, CDP1864_CLOCK, GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(mpt02_state, rdata_r), READLINE(mpt02_state, bdata_r), READLINE(mpt02_state, gdata_r)) + MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, CDP1864_CLOCK, GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(*this, mpt02_state, rdata_r), READLINE(*this, mpt02_state, bdata_r), READLINE(*this, mpt02_state, gdata_r)) MCFG_CDP1864_CHROMINANCE(RES_K(4.7), RES_K(8.2), RES_K(4.7), RES_K(22)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) |