summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/studio2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/studio2.cpp')
-rw-r--r--src/mame/drivers/studio2.cpp30
1 files changed, 14 insertions, 16 deletions
diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp
index 7991df403a7..ab9a8fac273 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(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); }
+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); }
void studio2_state::machine_start()
{
@@ -645,11 +645,10 @@ MACHINE_CONFIG_START(studio2_state::studio2_cartslot)
MCFG_GENERIC_LOAD(studio2_state, studio2_cart_load)
/* software lists */
- SOFTWARE_LIST(config, "cart_list").set_original("studio2");
+ MCFG_SOFTWARE_LIST_ADD("cart_list", "studio2")
MACHINE_CONFIG_END
-void studio2_state::studio2(machine_config &config)
-{
+MACHINE_CONFIG_START(studio2_state::studio2)
/* 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);
@@ -673,10 +672,9 @@ void studio2_state::studio2(machine_config &config)
BEEP(config, m_beeper, 300).add_route(ALL_OUTPUTS, "mono", 1.00);
studio2_cartslot(config);
-}
+MACHINE_CONFIG_END
-void visicom_state::visicom(machine_config &config)
-{
+MACHINE_CONFIG_START(visicom_state::visicom)
/* basic machine hardware */
CDP1802(config, m_maincpu, XTAL(3'579'545)/2);
m_maincpu->set_addrmap(AS_PROGRAM, &visicom_state::visicom_map);
@@ -701,14 +699,14 @@ void visicom_state::visicom(machine_config &config)
SPEAKER(config, "mono").front_center();
BEEP(config, m_beeper, 300).add_route(ALL_OUTPUTS, "mono", 1.00);
- GENERIC_CARTSLOT(config, m_cart, generic_plain_slot, "visicom_cart", "bin,rom");
+ MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "visicom_cart")
+ MCFG_GENERIC_EXTENSIONS("bin,rom")
/* software lists */
- SOFTWARE_LIST(config, "cart_list").set_original("visicom");
-}
+ MCFG_SOFTWARE_LIST_ADD("cart_list", "visicom")
+MACHINE_CONFIG_END
-void mpt02_state::mpt02(machine_config &config)
-{
+MACHINE_CONFIG_START(mpt02_state::mpt02)
/* basic machine hardware */
CDP1802(config, m_maincpu, 1.75_MHz_XTAL);
m_maincpu->set_addrmap(AS_PROGRAM, &mpt02_state::mpt02_map);
@@ -737,7 +735,7 @@ void mpt02_state::mpt02(machine_config &config)
m_cti->add_route(ALL_OUTPUTS, "mono", 0.25);
studio2_cartslot(config);
-}
+MACHINE_CONFIG_END
/* ROMs */