summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/aquarius.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/aquarius.cpp')
-rw-r--r--src/mame/drivers/aquarius.cpp39
1 files changed, 20 insertions, 19 deletions
diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp
index e7eb7728d4f..de6c264c083 100644
--- a/src/mame/drivers/aquarius.cpp
+++ b/src/mame/drivers/aquarius.cpp
@@ -180,7 +180,7 @@ READ8_MEMBER(aquarius_state::cartridge_r)
{
uint8_t data = 0;
if (m_cart->exists())
- data = m_cart->read_rom(space, offset);
+ data = m_cart->read_rom(offset);
return data ^ m_scrambler;
}
@@ -349,24 +349,25 @@ GFXDECODE_END
MACHINE DRIVERS
***************************************************************************/
-MACHINE_CONFIG_START(aquarius_state::aquarius)
+void aquarius_state::aquarius(machine_config &config)
+{
/* basic machine hardware */
- MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'579'545)) // ???
- MCFG_DEVICE_PROGRAM_MAP(aquarius_mem)
- MCFG_DEVICE_IO_MAP(aquarius_io)
- MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aquarius_state, irq0_line_hold)
+ Z80(config, m_maincpu, XTAL(3'579'545)); // ???
+ m_maincpu->set_addrmap(AS_PROGRAM, &aquarius_state::aquarius_mem);
+ m_maincpu->set_addrmap(AS_IO, &aquarius_state::aquarius_io);
+ m_maincpu->set_vblank_int("screen", FUNC(aquarius_state::irq0_line_hold));
/* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2800))
- MCFG_SCREEN_SIZE(40 * 8, 25 * 8)
- MCFG_SCREEN_VISIBLE_AREA(0, 40 * 8 - 1, 0 * 8, 25 * 8 - 1)
- MCFG_SCREEN_UPDATE_DRIVER(aquarius_state, screen_update_aquarius)
- MCFG_SCREEN_PALETTE(m_palette)
+ SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+ m_screen->set_refresh_hz(60);
+ m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2800));
+ m_screen->set_size(40 * 8, 25 * 8);
+ m_screen->set_visarea(0, 40 * 8 - 1, 0 * 8, 25 * 8 - 1);
+ m_screen->set_screen_update(FUNC(aquarius_state::screen_update_aquarius));
+ m_screen->set_palette(m_palette);
GFXDECODE(config, m_gfxdecode, m_palette, gfx_aquarius);
- MCFG_TEA1002_ADD("encoder", XTAL(8'867'238))
+ TEA1002(config, m_tea1002, XTAL(8'867'238));
PALETTE(config, m_palette, FUNC(aquarius_state::aquarius_palette), 512, 16);
/* sound hardware */
@@ -379,18 +380,18 @@ MACHINE_CONFIG_START(aquarius_state::aquarius)
ay8910.add_route(ALL_OUTPUTS, "mono", 0.25);
/* cassette */
- MCFG_CASSETTE_ADD( "cassette" )
- MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
+ CASSETTE(config, m_cassette);
+ m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED);
/* cartridge */
- MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_linear_slot, "aquarius_cart")
+ GENERIC_CARTSLOT(config, m_cart, generic_linear_slot, "aquarius_cart");
/* internal ram */
RAM(config, RAM_TAG).set_default_size("4K").set_extra_options("8K,20K,36K");
/* software lists */
- MCFG_SOFTWARE_LIST_ADD("cart_list","aquarius")
-MACHINE_CONFIG_END
+ SOFTWARE_LIST(config, "cart_list").set_original("aquarius");
+}
/***************************************************************************