summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/battlex.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/battlex.cpp')
-rw-r--r--src/mame/drivers/battlex.cpp55
1 files changed, 29 insertions, 26 deletions
diff --git a/src/mame/drivers/battlex.cpp b/src/mame/drivers/battlex.cpp
index a814510b4f4..15e463747d6 100644
--- a/src/mame/drivers/battlex.cpp
+++ b/src/mame/drivers/battlex.cpp
@@ -115,34 +115,37 @@ CUSTOM_INPUT_MEMBER(battlex_state::battlex_in0_b4_r)
*
*************************************/
-ADDRESS_MAP_START(battlex_state::battlex_map)
- AM_RANGE(0x0000, 0x5fff) AM_ROM
- AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(battlex_videoram_w) AM_SHARE("videoram")
- AM_RANGE(0x9000, 0x91ff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xa000, 0xa3ff) AM_RAM
- AM_RANGE(0xe000, 0xe03f) AM_RAM_WRITE(battlex_palette_w)
-ADDRESS_MAP_END
-
-
-ADDRESS_MAP_START(battlex_state::io_map)
- ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW1")
- AM_RANGE(0x01, 0x01) AM_READ_PORT("SYSTEM")
- AM_RANGE(0x02, 0x02) AM_READ_PORT("INPUTS")
- AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW2")
- AM_RANGE(0x10, 0x10) AM_WRITE(battlex_flipscreen_w)
+void battlex_state::battlex_map(address_map &map)
+{
+ map(0x0000, 0x5fff).rom();
+ map(0x8000, 0x8fff).ram().w(this, FUNC(battlex_state::battlex_videoram_w)).share("videoram");
+ map(0x9000, 0x91ff).ram().share("spriteram");
+ map(0xa000, 0xa3ff).ram();
+ map(0xe000, 0xe03f).ram().w(this, FUNC(battlex_state::battlex_palette_w));
+}
+
+
+void battlex_state::io_map(address_map &map)
+{
+ map.global_mask(0xff);
+ map(0x00, 0x00).portr("DSW1");
+ map(0x01, 0x01).portr("SYSTEM");
+ map(0x02, 0x02).portr("INPUTS");
+ map(0x03, 0x03).portr("DSW2");
+ map(0x10, 0x10).w(this, FUNC(battlex_state::battlex_flipscreen_w));
/* verify all of these */
- AM_RANGE(0x22, 0x23) AM_DEVWRITE("ay1", ay8910_device, data_address_w)
- AM_RANGE(0x30, 0x30) AM_WRITE(battlex_scroll_starfield_w)
- AM_RANGE(0x32, 0x32) AM_WRITE(battlex_scroll_x_lsb_w)
- AM_RANGE(0x33, 0x33) AM_WRITE(battlex_scroll_x_msb_w)
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(battlex_state::dodgeman_io_map)
- AM_IMPORT_FROM(io_map)
- AM_RANGE(0x26, 0x27) AM_DEVWRITE("ay2", ay8910_device, data_address_w)
-ADDRESS_MAP_END
+ map(0x22, 0x23).w("ay1", FUNC(ay8910_device::data_address_w));
+ map(0x30, 0x30).w(this, FUNC(battlex_state::battlex_scroll_starfield_w));
+ map(0x32, 0x32).w(this, FUNC(battlex_state::battlex_scroll_x_lsb_w));
+ map(0x33, 0x33).w(this, FUNC(battlex_state::battlex_scroll_x_msb_w));
+}
+
+void battlex_state::dodgeman_io_map(address_map &map)
+{
+ io_map(map);
+ map(0x26, 0x27).w("ay2", FUNC(ay8910_device::data_address_w));
+}
/*************************************
*