summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/galaxy.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/galaxy.cpp')
-rw-r--r--src/mame/drivers/galaxy.cpp74
1 files changed, 36 insertions, 38 deletions
diff --git a/src/mame/drivers/galaxy.cpp b/src/mame/drivers/galaxy.cpp
index 1c81aed7705..22cf4cd0f99 100644
--- a/src/mame/drivers/galaxy.cpp
+++ b/src/mame/drivers/galaxy.cpp
@@ -178,37 +178,36 @@ GFXDECODE_END
MACHINE_CONFIG_START(galaxy_state::galaxy)
/* basic machine hardware */
- MCFG_DEVICE_ADD("maincpu", Z80, XTAL / 2)
- MCFG_DEVICE_PROGRAM_MAP(galaxy_mem)
- MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxy_state, galaxy_interrupt)
- MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(galaxy_state,galaxy_irq_callback)
-
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE(50)
- MCFG_SCREEN_PALETTE("palette")
+ Z80(config, m_maincpu, XTAL / 2);
+ m_maincpu->set_addrmap(AS_PROGRAM, &galaxy_state::galaxy_mem);
+ m_maincpu->set_vblank_int("screen", FUNC(galaxy_state::galaxy_interrupt));
+ m_maincpu->set_irq_acknowledge_callback(FUNC(galaxy_state::galaxy_irq_callback));
MCFG_MACHINE_RESET_OVERRIDE(galaxy_state, galaxy )
/* video hardware */
- MCFG_SCREEN_SIZE(384, 212)
- MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 208-1)
- MCFG_SCREEN_UPDATE_DRIVER(galaxy_state, screen_update_galaxy)
-
- MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_galaxy)
+ SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+ m_screen->set_refresh_hz(50);
+ m_screen->set_palette("palette");
+ m_screen->set_size(384, 212);
+ m_screen->set_visarea(0, 384-1, 0, 208-1);
+ m_screen->set_screen_update(FUNC(galaxy_state::screen_update_galaxy));
+
+ GFXDECODE(config, "gfxdecode", "palette", gfx_galaxy);
PALETTE(config, "palette", palette_device::MONOCHROME);
/* snapshot */
- MCFG_SNAPSHOT_ADD("snapshot", galaxy_state, galaxy, "gal", 0)
+ MCFG_SNAPSHOT_ADD("snapshot", galaxy_state, galaxy, "gal")
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25);
+ WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.25);
- MCFG_CASSETTE_ADD( "cassette" )
- MCFG_CASSETTE_FORMATS(gtp_cassette_formats)
- MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
- MCFG_CASSETTE_INTERFACE("galaxy_cass")
+ CASSETTE(config, m_cassette);
+ m_cassette->set_formats(gtp_cassette_formats);
+ m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->set_interface("galaxy_cass");
- MCFG_SOFTWARE_LIST_ADD("cass_list","galaxy")
+ SOFTWARE_LIST(config, "cass_list").set_original("galaxy");
/* internal ram */
RAM(config, RAM_TAG).set_default_size("6K").set_extra_options("2K,22K,38K,54K");
@@ -216,40 +215,39 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxy_state::galaxyp)
/* basic machine hardware */
- MCFG_DEVICE_ADD("maincpu", Z80, XTAL / 2)
- MCFG_DEVICE_PROGRAM_MAP(galaxyp_mem)
- MCFG_DEVICE_IO_MAP(galaxyp_io)
- MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxy_state, galaxy_interrupt)
- MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(galaxy_state,galaxy_irq_callback)
-
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE(50)
- MCFG_SCREEN_PALETTE("palette")
+ Z80(config, m_maincpu, XTAL / 2);
+ m_maincpu->set_addrmap(AS_PROGRAM, &galaxy_state::galaxyp_mem);
+ m_maincpu->set_addrmap(AS_IO, &galaxy_state::galaxyp_io);
+ m_maincpu->set_vblank_int("screen", FUNC(galaxy_state::galaxy_interrupt));
+ m_maincpu->set_irq_acknowledge_callback(FUNC(galaxy_state::galaxy_irq_callback));
MCFG_MACHINE_RESET_OVERRIDE(galaxy_state, galaxyp )
/* video hardware */
- MCFG_SCREEN_SIZE(384, 208)
- MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 208-1)
- MCFG_SCREEN_UPDATE_DRIVER(galaxy_state, screen_update_galaxy)
+ SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+ m_screen->set_refresh_hz(50);
+ m_screen->set_palette("palette");
+ m_screen->set_size(384, 208);
+ m_screen->set_visarea(0, 384-1, 0, 208-1);
+ m_screen->set_screen_update(FUNC(galaxy_state::screen_update_galaxy));
PALETTE(config, "palette", palette_device::MONOCHROME);
/* snapshot */
- MCFG_SNAPSHOT_ADD("snapshot", galaxy_state, galaxy, "gal", 0)
+ MCFG_SNAPSHOT_ADD("snapshot", galaxy_state, galaxy, "gal")
/* sound hardware */
SPEAKER(config, "mono").front_center();
AY8910(config, "ay8910", XTAL/4); // FIXME: really no output routes for this AY?
WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25);
- MCFG_CASSETTE_ADD( "cassette" )
- MCFG_CASSETTE_FORMATS(gtp_cassette_formats)
- MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
- MCFG_CASSETTE_INTERFACE("galaxy_cass")
+ CASSETTE(config, m_cassette);
+ m_cassette->set_formats(gtp_cassette_formats);
+ m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->set_interface("galaxy_cass");
- MCFG_SOFTWARE_LIST_ADD("cass_list","galaxy")
+ SOFTWARE_LIST(config, "cass_list").set_original("galaxy");
/* internal ram */
RAM(config, RAM_TAG).set_default_size("38K");