diff options
Diffstat (limited to 'src/devices/bus/newbrain/eim.cpp')
-rw-r--r-- | src/devices/bus/newbrain/eim.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp index 3f0b7a19ee0..2bafd008eb6 100644 --- a/src/devices/bus/newbrain/eim.cpp +++ b/src/devices/bus/newbrain/eim.cpp @@ -67,15 +67,14 @@ const tiny_rom_entry *newbrain_eim_device::device_rom_region() const // device_add_mconfig - add device configuration //------------------------------------------------- -void newbrain_eim_device::device_add_mconfig(machine_config &config) -{ +MACHINE_CONFIG_START(newbrain_eim_device::device_add_mconfig) // devices Z80CTC(config, m_ctc, XTAL(16'000'000)/8); m_ctc->zc_callback<0>().set(m_acia, FUNC(acia6850_device::write_rxc)); m_ctc->zc_callback<1>().set(m_acia, FUNC(acia6850_device::write_txc)); m_ctc->zc_callback<2>().set(FUNC(newbrain_eim_device::ctc_z2_w)); - TIMER(config, "z80ctc_c2").configure_periodic(FUNC(newbrain_eim_device::ctc_c2_tick), attotime::from_hz(XTAL(16'000'000)/4/13)); + MCFG_TIMER_DRIVER_ADD_PERIODIC("z80ctc_c2", newbrain_eim_device, ctc_c2_tick, attotime::from_hz(XTAL(16'000'000)/4/13)) adc0809_device &adc(ADC0809(config, ADC0809_TAG, 500000)); adc.eoc_callback().set(FUNC(newbrain_eim_device::adc_eoc_w)); @@ -93,11 +92,11 @@ void newbrain_eim_device::device_add_mconfig(machine_config &config) RS232_PORT(config, RS232_TAG, default_rs232_devices, nullptr); - NEWBRAIN_EXPANSION_SLOT(config, m_exp, XTAL(16'000'000)/8, newbrain_expansion_cards, "fdc"); + MCFG_NEWBRAIN_EXPANSION_SLOT_ADD(NEWBRAIN_EXPANSION_SLOT_TAG, XTAL(16'000'000)/8, newbrain_expansion_cards, "fdc") // internal ram RAM(config, RAM_TAG).set_default_size("96K"); -} +MACHINE_CONFIG_END //************************************************************************** @@ -145,9 +144,9 @@ void newbrain_eim_device::device_reset() // mreq_r - memory request read //------------------------------------------------- -uint8_t newbrain_eim_device::mreq_r(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) +uint8_t newbrain_eim_device::mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { - return m_exp->mreq_r(offset, data, romov, exrm, raminh); + return m_exp->mreq_r(space, offset, data, romov, exrm, raminh); } @@ -155,9 +154,9 @@ uint8_t newbrain_eim_device::mreq_r(offs_t offset, uint8_t data, bool &romov, in // mreq_w - memory request write //------------------------------------------------- -void newbrain_eim_device::mreq_w(offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) +void newbrain_eim_device::mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { - m_exp->mreq_w(offset, data, romov, exrm, raminh); + m_exp->mreq_w(space, offset, data, romov, exrm, raminh); } @@ -165,9 +164,9 @@ void newbrain_eim_device::mreq_w(offs_t offset, uint8_t data, bool &romov, int & // iorq_r - I/O request read //------------------------------------------------- -uint8_t newbrain_eim_device::iorq_r(offs_t offset, uint8_t data, bool &prtov) +uint8_t newbrain_eim_device::iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) { - return m_exp->iorq_r(offset, data, prtov); + return m_exp->iorq_r(space, offset, data, prtov); } @@ -175,9 +174,9 @@ uint8_t newbrain_eim_device::iorq_r(offs_t offset, uint8_t data, bool &prtov) // iorq_w - I/O request write //------------------------------------------------- -void newbrain_eim_device::iorq_w(offs_t offset, uint8_t data, bool &prtov) +void newbrain_eim_device::iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) { - m_exp->iorq_w(offset, data, prtov); + m_exp->iorq_w(space, offset, data, prtov); } |