summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/mazerbla.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/mazerbla.cpp')
-rw-r--r--src/mame/drivers/mazerbla.cpp27
1 files changed, 18 insertions, 9 deletions
diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp
index 8d688222daa..139e083c44d 100644
--- a/src/mame/drivers/mazerbla.cpp
+++ b/src/mame/drivers/mazerbla.cpp
@@ -185,6 +185,15 @@ public:
IRQ_CALLBACK_MEMBER(irq_callback);
void greatgun(machine_config &config);
void mazerbla(machine_config &config);
+ void greatgun_cpu3_io_map(address_map &map);
+ void greatgun_io_map(address_map &map);
+ void greatgun_sound_map(address_map &map);
+ void mazerbla_cpu2_io_map(address_map &map);
+ void mazerbla_cpu2_map(address_map &map);
+ void mazerbla_cpu3_io_map(address_map &map);
+ void mazerbla_cpu3_map(address_map &map);
+ void mazerbla_io_map(address_map &map);
+ void mazerbla_map(address_map &map);
};
@@ -444,14 +453,14 @@ WRITE8_MEMBER(mazerbla_state::sound_int_clear_w)
*
*************************************/
-static ADDRESS_MAP_START( mazerbla_map, AS_PROGRAM, 8, mazerbla_state )
+ADDRESS_MAP_START(mazerbla_state::mazerbla_map)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xd800, 0xd800) AM_READ(cfb_zpu_int_req_clr)
AM_RANGE(0xe000, 0xefff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mazerbla_io_map, AS_IO, 8, mazerbla_state )
+ADDRESS_MAP_START(mazerbla_state::mazerbla_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x4c, 0x4f) AM_READWRITE(ls670_1_r, ls670_0_w)
AM_RANGE(0x60, 0x60) AM_WRITE(zpu_bcd_decoder_w) // AM_READ from protection pal, if populated
@@ -464,21 +473,21 @@ static ADDRESS_MAP_START( mazerbla_io_map, AS_IO, 8, mazerbla_state )
AM_RANGE(0x6e, 0x6f) AM_WRITE(zpu_led_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mazerbla_cpu2_map, AS_PROGRAM, 8, mazerbla_state )
+ADDRESS_MAP_START(mazerbla_state::mazerbla_cpu2_map)
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM /* main RAM (stack) */
AM_RANGE(0x8000, 0x83ff) AM_RAM /* waveform ???*/
AM_RANGE(0xc000, 0xc003) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mazerbla_cpu2_io_map, AS_IO, 8, mazerbla_state )
+ADDRESS_MAP_START(mazerbla_state::mazerbla_cpu2_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(vsb_ls273_audio_control_w)
AM_RANGE(0x40, 0x41) AM_WRITENOP
AM_RANGE(0x80, 0x83) AM_READWRITE(ls670_0_r, ls670_1_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mazerbla_cpu3_map, AS_PROGRAM, 8, mazerbla_state )
+ADDRESS_MAP_START(mazerbla_state::mazerbla_cpu3_map)
AM_RANGE(0x0000, 0x37ff) AM_ROM
AM_RANGE(0x3800, 0x3fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank1") /* GFX roms */
@@ -489,7 +498,7 @@ static ADDRESS_MAP_START( mazerbla_cpu3_map, AS_PROGRAM, 8, mazerbla_state )
AM_RANGE(0xe000, 0xffff) AM_DEVREAD("vcu", mb_vcu_device, load_set_clr)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mazerbla_cpu3_io_map, AS_IO, 8, mazerbla_state )
+ADDRESS_MAP_START(mazerbla_state::mazerbla_cpu3_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01, 0x01) AM_DEVWRITE("vcu", mb_vcu_device, background_color_w)
AM_RANGE(0x02, 0x02) AM_DEVREAD("vcu", mb_vcu_device, status_r) AM_WRITE(cfb_led_w)
@@ -505,7 +514,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( greatgun_io_map, AS_IO, 8, mazerbla_state )
+ADDRESS_MAP_START(mazerbla_state::greatgun_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x4c, 0x4c) AM_DEVWRITE("soundlatch", generic_latch_8_device, write)
AM_RANGE(0x60, 0x60) AM_WRITE(zpu_bcd_decoder_w)
@@ -515,7 +524,7 @@ static ADDRESS_MAP_START( greatgun_io_map, AS_IO, 8, mazerbla_state )
AM_RANGE(0x6e, 0x6f) AM_WRITE(zpu_led_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( greatgun_sound_map, AS_PROGRAM, 8, mazerbla_state )
+ADDRESS_MAP_START(mazerbla_state::greatgun_sound_map)
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_DEVREAD("ay1", ay8910_device, data_r)
@@ -525,7 +534,7 @@ static ADDRESS_MAP_START( greatgun_sound_map, AS_PROGRAM, 8, mazerbla_state )
AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("soundlatch", generic_latch_8_device, acknowledge_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( greatgun_cpu3_io_map, AS_IO, 8, mazerbla_state )
+ADDRESS_MAP_START(mazerbla_state::greatgun_cpu3_io_map)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( mazerbla_cpu3_io_map )
AM_RANGE(0x05, 0x05) AM_DEVWRITE("vcu", mb_vcu_device, vbank_clear_w)