summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/jangou.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/jangou.cpp')
-rw-r--r--src/mame/drivers/jangou.cpp36
1 files changed, 24 insertions, 12 deletions
diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp
index 255e0854b17..a60df09a0d3 100644
--- a/src/mame/drivers/jangou.cpp
+++ b/src/mame/drivers/jangou.cpp
@@ -113,6 +113,18 @@ public:
void roylcrdn(machine_config &config);
void cntrygrl(machine_config &config);
void jangou(machine_config &config);
+ void cntrygrl_cpu0_io(address_map &map);
+ void cntrygrl_cpu0_map(address_map &map);
+ void cpu0_io(address_map &map);
+ void cpu0_map(address_map &map);
+ void cpu1_io(address_map &map);
+ void cpu1_map(address_map &map);
+ void jngolady_cpu0_map(address_map &map);
+ void jngolady_cpu1_io(address_map &map);
+ void jngolady_cpu1_map(address_map &map);
+ void nsc_map(address_map &map);
+ void roylcrdn_cpu0_io(address_map &map);
+ void roylcrdn_cpu0_map(address_map &map);
};
@@ -326,12 +338,12 @@ WRITE8_MEMBER(jangou_state::slave_com_w)
*
*************************************/
-static ADDRESS_MAP_START( cpu0_map, AS_PROGRAM, 8, jangou_state )
+ADDRESS_MAP_START(jangou_state::cpu0_map)
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu0_io, AS_IO, 8, jangou_state )
+ADDRESS_MAP_START(jangou_state::cpu0_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01,0x01) AM_DEVREAD("aysnd", ay8910_device, data_r)
AM_RANGE(0x02,0x03) AM_DEVWRITE("aysnd", ay8910_device, data_address_w)
@@ -344,11 +356,11 @@ static ADDRESS_MAP_START( cpu0_io, AS_IO, 8, jangou_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8, jangou_state )
+ADDRESS_MAP_START(jangou_state::cpu1_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu1_io, AS_IO, 8, jangou_state )
+ADDRESS_MAP_START(jangou_state::cpu1_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00,0x00) AM_READ(sound_latch_r)
AM_RANGE(0x01,0x01) AM_WRITE(cvsd_w)
@@ -362,18 +374,18 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( jngolady_cpu0_map, AS_PROGRAM, 8, jangou_state )
+ADDRESS_MAP_START(jangou_state::jngolady_cpu0_map)
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xe000, 0xe000) AM_READWRITE(master_com_r,master_com_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jngolady_cpu1_map, AS_PROGRAM, 8, jangou_state )
+ADDRESS_MAP_START(jangou_state::jngolady_cpu1_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jngolady_cpu1_io, AS_IO, 8, jangou_state )
+ADDRESS_MAP_START(jangou_state::jngolady_cpu1_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00,0x00) AM_READ(sound_latch_r)
AM_RANGE(0x01,0x01) AM_WRITE(adpcm_w)
@@ -381,7 +393,7 @@ static ADDRESS_MAP_START( jngolady_cpu1_io, AS_IO, 8, jangou_state )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nsc_map, AS_PROGRAM, 8, jangou_state )
+ADDRESS_MAP_START(jangou_state::nsc_map)
AM_RANGE(0x0000, 0x007f) AM_RAM //internal ram for irq etc.
AM_RANGE(0x8000, 0x8000) AM_WRITENOP //write-only,irq related?
AM_RANGE(0x9000, 0x9000) AM_READWRITE(slave_com_r,slave_com_w)
@@ -395,13 +407,13 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( cntrygrl_cpu0_map, AS_PROGRAM, 8, jangou_state )
+ADDRESS_MAP_START(jangou_state::cntrygrl_cpu0_map)
AM_RANGE(0x0000, 0x3fff) AM_ROM
// AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cntrygrl_cpu0_io, AS_IO, 8, jangou_state )
+ADDRESS_MAP_START(jangou_state::cntrygrl_cpu0_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01,0x01) AM_DEVREAD("aysnd", ay8910_device, data_r)
AM_RANGE(0x02,0x03) AM_DEVWRITE("aysnd", ay8910_device, data_address_w)
@@ -420,12 +432,12 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( roylcrdn_cpu0_map, AS_PROGRAM, 8, jangou_state )
+ADDRESS_MAP_START(jangou_state::roylcrdn_cpu0_map)
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x7000, 0x77ff) AM_RAM AM_SHARE("nvram") /* MK48Z02B-15 ZEROPOWER RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( roylcrdn_cpu0_io, AS_IO, 8, jangou_state )
+ADDRESS_MAP_START(jangou_state::roylcrdn_cpu0_io)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01,0x01) AM_DEVREAD("aysnd", ay8910_device, data_r)
AM_RANGE(0x02,0x03) AM_DEVWRITE("aysnd", ay8910_device, data_address_w)