diff options
Diffstat (limited to 'src/mame/drivers/studio2.cpp')
-rw-r--r-- | src/mame/drivers/studio2.cpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp index ab9a8fac273..7991df403a7 100644 --- a/src/mame/drivers/studio2.cpp +++ b/src/mame/drivers/studio2.cpp @@ -514,10 +514,10 @@ WRITE8_MEMBER( mpt02_state::dma_w ) /* Machine Initialization */ // trampolines to cartridge -READ8_MEMBER( studio2_state::cart_400 ) { return m_cart->read_rom(space, offset); } -READ8_MEMBER( studio2_state::cart_a00 ) { return m_cart->read_rom(space, offset + 0x600); } -READ8_MEMBER( studio2_state::cart_e00 ) { return m_cart->read_rom(space, offset + 0xa00); } -READ8_MEMBER( mpt02_state::cart_c00 ) { return m_cart->read_rom(space, offset + 0x800); } +READ8_MEMBER( studio2_state::cart_400 ) { return m_cart->read_rom(offset); } +READ8_MEMBER( studio2_state::cart_a00 ) { return m_cart->read_rom(offset + 0x600); } +READ8_MEMBER( studio2_state::cart_e00 ) { return m_cart->read_rom(offset + 0xa00); } +READ8_MEMBER( mpt02_state::cart_c00 ) { return m_cart->read_rom(offset + 0x800); } void studio2_state::machine_start() { @@ -645,10 +645,11 @@ MACHINE_CONFIG_START(studio2_state::studio2_cartslot) MCFG_GENERIC_LOAD(studio2_state, studio2_cart_load) /* software lists */ - MCFG_SOFTWARE_LIST_ADD("cart_list", "studio2") + SOFTWARE_LIST(config, "cart_list").set_original("studio2"); MACHINE_CONFIG_END -MACHINE_CONFIG_START(studio2_state::studio2) +void studio2_state::studio2(machine_config &config) +{ /* basic machine hardware */ CDP1802(config, m_maincpu, 1760000); /* the real clock is derived from an oscillator circuit */ m_maincpu->set_addrmap(AS_PROGRAM, &studio2_state::studio2_map); @@ -672,9 +673,10 @@ MACHINE_CONFIG_START(studio2_state::studio2) BEEP(config, m_beeper, 300).add_route(ALL_OUTPUTS, "mono", 1.00); studio2_cartslot(config); -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(visicom_state::visicom) +void visicom_state::visicom(machine_config &config) +{ /* basic machine hardware */ CDP1802(config, m_maincpu, XTAL(3'579'545)/2); m_maincpu->set_addrmap(AS_PROGRAM, &visicom_state::visicom_map); @@ -699,14 +701,14 @@ MACHINE_CONFIG_START(visicom_state::visicom) SPEAKER(config, "mono").front_center(); BEEP(config, m_beeper, 300).add_route(ALL_OUTPUTS, "mono", 1.00); - MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "visicom_cart") - MCFG_GENERIC_EXTENSIONS("bin,rom") + GENERIC_CARTSLOT(config, m_cart, generic_plain_slot, "visicom_cart", "bin,rom"); /* software lists */ - MCFG_SOFTWARE_LIST_ADD("cart_list", "visicom") -MACHINE_CONFIG_END + SOFTWARE_LIST(config, "cart_list").set_original("visicom"); +} -MACHINE_CONFIG_START(mpt02_state::mpt02) +void mpt02_state::mpt02(machine_config &config) +{ /* basic machine hardware */ CDP1802(config, m_maincpu, 1.75_MHz_XTAL); m_maincpu->set_addrmap(AS_PROGRAM, &mpt02_state::mpt02_map); @@ -735,7 +737,7 @@ MACHINE_CONFIG_START(mpt02_state::mpt02) m_cti->add_route(ALL_OUTPUTS, "mono", 0.25); studio2_cartslot(config); -MACHINE_CONFIG_END +} /* ROMs */ |