summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/magicard.cpp
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2018-02-01 10:04:01 +0100
committer Olivier Galibert <galibert@pobox.com>2018-02-12 10:04:52 +0100
commitc5219643162cb7d2a8688425a09008d28c8e2437 (patch)
treef2775ca3b1770ab0d3fb568f0bdd6d9212c68bf6 /src/mame/drivers/magicard.cpp
parent09b6ce46873b38de9030a3c0378ff327f17af881 (diff)
API change: Memory maps are now methods of the owner class [O. Galibert]
Also, a lot more freedom happened, that's going to be more visible soon.
Diffstat (limited to 'src/mame/drivers/magicard.cpp')
-rw-r--r--src/mame/drivers/magicard.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp
index 3c00afa066a..7a157b57c0a 100644
--- a/src/mame/drivers/magicard.cpp
+++ b/src/mame/drivers/magicard.cpp
@@ -468,6 +468,10 @@ public:
required_device<palette_device> m_palette;
void magicard(machine_config &config);
void hotslots(machine_config &config);
+ void hotslots_mem(address_map &map);
+ void magicard_mem(address_map &map);
+ void ramdac_map(address_map &map);
+ void scc68070_mem(address_map &map);
};
@@ -897,7 +901,7 @@ WRITE16_MEMBER(magicard_state::scc68070_mmu_w)
* Memory Maps *
*************************/
-static ADDRESS_MAP_START( scc68070_mem, AS_PROGRAM, 16, magicard_state )
+ADDRESS_MAP_START(magicard_state::scc68070_mem)
AM_RANGE(0x80001000, 0x8000100f) AM_READWRITE(scc68070_ext_irqc_r,scc68070_ext_irqc_w) AM_SHARE("scc_xirqc_regs") //lir
AM_RANGE(0x80002000, 0x8000200f) AM_READWRITE(scc68070_iic_r,scc68070_iic_w) AM_SHARE("scc_iic_regs") //i2c
AM_RANGE(0x80002010, 0x8000201f) AM_READWRITE(scc68070_uart_r,scc68070_uart_w) AM_SHARE("scc_uart_regs")
@@ -908,7 +912,7 @@ static ADDRESS_MAP_START( scc68070_mem, AS_PROGRAM, 16, magicard_state )
AM_RANGE(0x80008000, 0x8000807f) AM_READWRITE(scc68070_mmu_r,scc68070_mmu_w) AM_SHARE("scc_mmu_regs")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( magicard_mem, AS_PROGRAM, 16, magicard_state )
+ADDRESS_MAP_START(magicard_state::magicard_mem)
// ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
AM_IMPORT_FROM(scc68070_mem)
AM_RANGE(0x00000000, 0x001ffbff) AM_MIRROR(0x00200000) AM_RAM AM_SHARE("magicram")
@@ -926,7 +930,7 @@ static ADDRESS_MAP_START( magicard_mem, AS_PROGRAM, 16, magicard_state )
AM_RANGE(0x001fffe0, 0x001fffff) AM_MIRROR(0x7fe00000) AM_READWRITE(philips_66470_r,philips_66470_w) AM_SHARE("pcab_vregs") //video registers
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hotslots_mem, AS_PROGRAM, 16, magicard_state )
+ADDRESS_MAP_START(magicard_state::hotslots_mem)
// ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
AM_IMPORT_FROM(scc68070_mem)
AM_RANGE(0x00000000, 0x001ffbff) AM_MIRROR(0x00200000) AM_RAM AM_SHARE("magicram")
@@ -980,7 +984,7 @@ INTERRUPT_GEN_MEMBER(magicard_state::magicard_irq)
device.execute().set_input_line_and_vector(1, HOLD_LINE, 0xf0 / 4);
}
-static ADDRESS_MAP_START( ramdac_map, 0, 8, magicard_state )
+ADDRESS_MAP_START(magicard_state::ramdac_map)
AM_RANGE(0x0000, 0x03ff) AM_DEVREADWRITE("ramdac", ramdac_device, ramdac_pal_r, ramdac_rgb666_w)
ADDRESS_MAP_END