diff options
Diffstat (limited to 'src/mame/drivers/mpz80.cpp')
-rw-r--r-- | src/mame/drivers/mpz80.cpp | 59 |
1 files changed, 30 insertions, 29 deletions
diff --git a/src/mame/drivers/mpz80.cpp b/src/mame/drivers/mpz80.cpp index 02a247b1ea4..344a1f14e7f 100644 --- a/src/mame/drivers/mpz80.cpp +++ b/src/mame/drivers/mpz80.cpp @@ -219,7 +219,7 @@ READ8_MEMBER( mpz80_state::mmu_r ) } else { - data = m_s100->smemr_r(space, m_addr); + data = m_s100->smemr_r(m_addr); } return data; @@ -267,7 +267,7 @@ WRITE8_MEMBER( mpz80_state::mmu_w ) } else { - m_s100->mwrt_w(space, m_addr, data); + m_s100->mwrt_w(m_addr, data); } } @@ -294,7 +294,7 @@ inline offs_t mpz80_state::get_io_address(offs_t offset) READ8_MEMBER( mpz80_state::mmu_io_r ) { - return m_s100->sinp_r(space, get_io_address(offset)); + return m_s100->sinp_r(get_io_address(offset)); } @@ -304,7 +304,7 @@ READ8_MEMBER( mpz80_state::mmu_io_r ) WRITE8_MEMBER( mpz80_state::mmu_io_w ) { - m_s100->sout_w(space, get_io_address(offset), data); + m_s100->sout_w(get_io_address(offset), data); } @@ -709,41 +709,42 @@ void mpz80_state::machine_reset() //************************************************************************** //------------------------------------------------- -// MACHINE_CONFIG( mpz80 ) +// machine_config( mpz80 ) //------------------------------------------------- -MACHINE_CONFIG_START(mpz80_state::mpz80) +void mpz80_state::mpz80(machine_config &config) +{ // basic machine hardware - MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(4'000'000)) - MCFG_DEVICE_PROGRAM_MAP(mpz80_mem) - MCFG_DEVICE_IO_MAP(mpz80_io) + Z80(config, m_maincpu, XTAL(4'000'000)); + m_maincpu->set_addrmap(AS_PROGRAM, &mpz80_state::mpz80_mem); + m_maincpu->set_addrmap(AS_IO, &mpz80_state::mpz80_io); // S-100 - MCFG_DEVICE_ADD(S100_TAG, S100_BUS, XTAL(4'000'000) / 2) - MCFG_S100_IRQ_CALLBACK(WRITELINE(*this, mpz80_state, s100_pint_w)) - MCFG_S100_NMI_CALLBACK(WRITELINE(*this, mpz80_state, s100_nmi_w)) - MCFG_S100_RDY_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT)) - MCFG_S100_SLOT_ADD(S100_TAG ":1", mpz80_s100_cards, "mm65k16s") - MCFG_S100_SLOT_ADD(S100_TAG ":2", mpz80_s100_cards, "wunderbus") - MCFG_S100_SLOT_ADD(S100_TAG ":3", mpz80_s100_cards, "dj2db") - MCFG_S100_SLOT_ADD(S100_TAG ":4", mpz80_s100_cards, nullptr)//"hdcdma") - MCFG_S100_SLOT_ADD(S100_TAG ":5", mpz80_s100_cards, nullptr) - MCFG_S100_SLOT_ADD(S100_TAG ":6", mpz80_s100_cards, nullptr) - MCFG_S100_SLOT_ADD(S100_TAG ":7", mpz80_s100_cards, nullptr) - MCFG_S100_SLOT_ADD(S100_TAG ":8", mpz80_s100_cards, nullptr) - MCFG_S100_SLOT_ADD(S100_TAG ":9", mpz80_s100_cards, nullptr) - MCFG_S100_SLOT_ADD(S100_TAG ":10", mpz80_s100_cards, nullptr) - MCFG_S100_SLOT_ADD(S100_TAG ":11", mpz80_s100_cards, nullptr) - MCFG_S100_SLOT_ADD(S100_TAG ":12", mpz80_s100_cards, nullptr) - MCFG_S100_SLOT_ADD(S100_TAG ":13", mpz80_s100_cards, nullptr) - MCFG_S100_SLOT_ADD(S100_TAG ":14", mpz80_s100_cards, nullptr) + S100_BUS(config, m_s100, XTAL(4'000'000) / 2); + m_s100->irq().set(FUNC(mpz80_state::s100_pint_w)); + m_s100->nmi().set(FUNC(mpz80_state::s100_nmi_w)); + m_s100->rdy().set_inputline(m_maincpu, Z80_INPUT_LINE_BOGUSWAIT); + S100_SLOT(config, S100_TAG ":1", mpz80_s100_cards, "mm65k16s"); + S100_SLOT(config, S100_TAG ":2", mpz80_s100_cards, "wunderbus"); + S100_SLOT(config, S100_TAG ":3", mpz80_s100_cards, "dj2db"); + S100_SLOT(config, S100_TAG ":4", mpz80_s100_cards, nullptr);//"hdcdma") + S100_SLOT(config, S100_TAG ":5", mpz80_s100_cards, nullptr); + S100_SLOT(config, S100_TAG ":6", mpz80_s100_cards, nullptr); + S100_SLOT(config, S100_TAG ":7", mpz80_s100_cards, nullptr); + S100_SLOT(config, S100_TAG ":8", mpz80_s100_cards, nullptr); + S100_SLOT(config, S100_TAG ":9", mpz80_s100_cards, nullptr); + S100_SLOT(config, S100_TAG ":10", mpz80_s100_cards, nullptr); + S100_SLOT(config, S100_TAG ":11", mpz80_s100_cards, nullptr); + S100_SLOT(config, S100_TAG ":12", mpz80_s100_cards, nullptr); + S100_SLOT(config, S100_TAG ":13", mpz80_s100_cards, nullptr); + S100_SLOT(config, S100_TAG ":14", mpz80_s100_cards, nullptr); // internal ram RAM(config, RAM_TAG).set_default_size("65K"); // 65K??? // software list - MCFG_SOFTWARE_LIST_ADD("flop_list", "mpz80") -MACHINE_CONFIG_END + SOFTWARE_LIST(config, "flop_list").set_original("mpz80"); +} |