diff options
Diffstat (limited to 'src/mame/drivers/newbrain.cpp')
-rw-r--r-- | src/mame/drivers/newbrain.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp index 24516b7d654..f8ae3adb39d 100644 --- a/src/mame/drivers/newbrain.cpp +++ b/src/mame/drivers/newbrain.cpp @@ -92,7 +92,7 @@ READ8_MEMBER( newbrain_state::mreq_r ) { bool romov = 1, raminh = 0; int exrm = 0; - uint8_t data = m_exp->mreq_r(space, offset, 0xff, romov, exrm, raminh); + uint8_t data = m_exp->mreq_r(offset, 0xff, romov, exrm, raminh); int rom0 = 1, rom1 = 1, rom2 = 1; int a15_14_13 = romov ? (offset >> 13) : exrm; @@ -138,7 +138,7 @@ WRITE8_MEMBER( newbrain_state::mreq_w ) { bool romov = 1, raminh = 0; int exrm = 0; - m_exp->mreq_w(space, offset, data, romov, exrm, raminh); + m_exp->mreq_w(offset, data, romov, exrm, raminh); int a15_14_13 = romov ? (offset >> 13) : exrm; if (!m_pwrup) a15_14_13 = 7; @@ -158,7 +158,7 @@ WRITE8_MEMBER( newbrain_state::mreq_w ) READ8_MEMBER( newbrain_state::iorq_r ) { bool prtov = 0; - uint8_t data = m_exp->iorq_r(space, offset, 0xff, prtov); + uint8_t data = m_exp->iorq_r(offset, 0xff, prtov); if (!prtov) { @@ -201,7 +201,7 @@ READ8_MEMBER( newbrain_state::iorq_r ) WRITE8_MEMBER( newbrain_state::iorq_w ) { bool prtov = 0; - m_exp->iorq_w(space, offset, 0xff, prtov); + m_exp->iorq_w(offset, 0xff, prtov); if (!prtov) { @@ -806,10 +806,11 @@ void newbrain_state::device_timer(emu_timer &timer, device_timer_id id, int para //************************************************************************** //------------------------------------------------- -// MACHINE_CONFIG( newbrain ) +// machine_config( newbrain ) //------------------------------------------------- -MACHINE_CONFIG_START(newbrain_state::newbrain) +void newbrain_state::newbrain(machine_config &config) +{ // basic system hardware Z80(config, m_maincpu, XTAL(16'000'000)/4); m_maincpu->set_addrmap(AS_PROGRAM, &newbrain_state::newbrain_mreq); @@ -829,7 +830,7 @@ MACHINE_CONFIG_START(newbrain_state::newbrain) newbrain_video(config); // devices - MCFG_NEWBRAIN_EXPANSION_SLOT_ADD(NEWBRAIN_EXPANSION_SLOT_TAG, XTAL(16'000'000)/4, newbrain_expansion_cards, "eim") + NEWBRAIN_EXPANSION_SLOT(config, m_exp, XTAL(16'000'000)/4, newbrain_expansion_cards, "eim"); CASSETTE(config, m_cassette1); m_cassette1->set_default_state((cassette_state)(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)); @@ -842,11 +843,11 @@ MACHINE_CONFIG_START(newbrain_state::newbrain) // internal ram RAM(config, RAM_TAG).set_default_size("32K"); -MACHINE_CONFIG_END +} //------------------------------------------------- -// MACHINE_CONFIG( newbrain_ad ) +// machine_config( newbrain_ad ) //------------------------------------------------- void newbrain_state::newbrain_ad(machine_config &config) @@ -857,7 +858,7 @@ void newbrain_state::newbrain_ad(machine_config &config) //------------------------------------------------- -// MACHINE_CONFIG( newbrain_a ) +// machine_config( newbrain_a ) //------------------------------------------------- void newbrain_state::newbrain_a(machine_config &config) @@ -868,7 +869,7 @@ void newbrain_state::newbrain_a(machine_config &config) //------------------------------------------------- -// MACHINE_CONFIG( newbrain_md ) +// machine_config( newbrain_md ) //------------------------------------------------- void newbrain_state::newbrain_md(machine_config &config) |