summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/embargo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/embargo.cpp')
-rw-r--r--src/mame/drivers/embargo.cpp31
1 files changed, 17 insertions, 14 deletions
diff --git a/src/mame/drivers/embargo.cpp b/src/mame/drivers/embargo.cpp
index 93e0763ae81..34d80938dae 100644
--- a/src/mame/drivers/embargo.cpp
+++ b/src/mame/drivers/embargo.cpp
@@ -162,11 +162,12 @@ WRITE8_MEMBER(embargo_state::input_select_w)
*
*************************************/
-ADDRESS_MAP_START(embargo_state::main_map)
- AM_RANGE(0x0000, 0x0fff) AM_ROM
- AM_RANGE(0x1e00, 0x1fff) AM_RAM
- AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("videoram")
-ADDRESS_MAP_END
+void embargo_state::main_map(address_map &map)
+{
+ map(0x0000, 0x0fff).rom();
+ map(0x1e00, 0x1fff).ram();
+ map(0x2000, 0x3fff).ram().share("videoram");
+}
@@ -176,16 +177,18 @@ ADDRESS_MAP_END
*
*************************************/
-ADDRESS_MAP_START(embargo_state::main_io_map)
- AM_RANGE(0x01, 0x01) AM_READ_PORT("IN0") AM_WRITE(port_1_w)
- AM_RANGE(0x02, 0x02) AM_READWRITE(dial_r, port_2_w)
- AM_RANGE(0x03, 0x03) AM_WRITENOP /* always 0xFE */
-ADDRESS_MAP_END
+void embargo_state::main_io_map(address_map &map)
+{
+ map(0x01, 0x01).portr("IN0").w(this, FUNC(embargo_state::port_1_w));
+ map(0x02, 0x02).rw(this, FUNC(embargo_state::dial_r), FUNC(embargo_state::port_2_w));
+ map(0x03, 0x03).nopw(); /* always 0xFE */
+}
-ADDRESS_MAP_START(embargo_state::main_data_map)
- AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ_PORT("IN2")
- AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_READWRITE(input_port_bit_r, input_select_w)
-ADDRESS_MAP_END
+void embargo_state::main_data_map(address_map &map)
+{
+ map(S2650_DATA_PORT, S2650_DATA_PORT).portr("IN2");
+ map(S2650_CTRL_PORT, S2650_CTRL_PORT).rw(this, FUNC(embargo_state::input_port_bit_r), FUNC(embargo_state::input_select_w));
+}