summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/drivers/aquarius.c
diff options
context:
space:
mode:
author Fabio Priuli <etabeta78@users.noreply.github.com>2014-09-18 20:36:02 +0000
committer Fabio Priuli <etabeta78@users.noreply.github.com>2014-09-18 20:36:02 +0000
commitf7e216c3b95c1e6730881999273ecd317af1372c (patch)
treefe8c14d6cab96a34a3ba7b7dab0a21ab70f1f13f /src/mess/drivers/aquarius.c
parent739cfa61b0a79b39ccb1f034398a269370bddb73 (diff)
(MESS) unified some functions for generic socket / cart and
converted a few more drivers to use the new code instead of old cartslot. nw.
Diffstat (limited to 'src/mess/drivers/aquarius.c')
-rw-r--r--src/mess/drivers/aquarius.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/mess/drivers/aquarius.c b/src/mess/drivers/aquarius.c
index 358337ac8ad..4dd5e1d71f6 100644
--- a/src/mess/drivers/aquarius.c
+++ b/src/mess/drivers/aquarius.c
@@ -171,8 +171,11 @@ WRITE8_MEMBER(aquarius_state::scrambler_w)
READ8_MEMBER(aquarius_state::cartridge_r)
{
- UINT8 *rom = m_rom->base() + 0xc000;
- return rom[offset] ^ m_scrambler;
+ UINT8 data = 0;
+ if (m_cart->cart_mounted())
+ data = m_cart->read_rom(space, offset);
+
+ return data ^ m_scrambler;
}
@@ -373,10 +376,7 @@ static MACHINE_CONFIG_START( aquarius, aquarius_state )
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
/* cartridge */
- MCFG_CARTSLOT_ADD("cart")
- MCFG_CARTSLOT_EXTENSION_LIST("bin")
- MCFG_CARTSLOT_NOT_MANDATORY
- MCFG_CARTSLOT_INTERFACE("aquarius_cart")
+ MCFG_GENERIC_CARTSLOT_ADD("cartslot", GENERIC_ROM8_WIDTH, generic_linear_slot, "aquarius_cart")
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -402,9 +402,6 @@ ROM_START( aquarius )
ROM_SYSTEM_BIOS(1, "rev2", "Revision 2")
ROMX_LOAD("aq2.u2", 0x0000, 0x2000, CRC(a2d15bcf) SHA1(ca6ef55e9ead41453efbf5062d6a60285e9661a6), ROM_BIOS(2))
- /* cartridge */
- ROM_CART_LOAD("cart", 0xc000, 0x4000, ROM_MIRROR)
-
/* charrom */
ROM_REGION(0x800, "gfx1", 0)
ROM_LOAD("aq2.u5", 0x000, 0x800, CRC(e117f57c) SHA1(3588c0267c67dfbbda615bcf8dc3d3a5c5bd815a))