summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/ettrivia.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/ettrivia.cpp')
-rw-r--r--src/mame/drivers/ettrivia.cpp32
1 files changed, 17 insertions, 15 deletions
diff --git a/src/mame/drivers/ettrivia.cpp b/src/mame/drivers/ettrivia.cpp
index 2a4d8a7eaa4..455d530ff98 100644
--- a/src/mame/drivers/ettrivia.cpp
+++ b/src/mame/drivers/ettrivia.cpp
@@ -155,21 +155,23 @@ WRITE8_MEMBER(ettrivia_state::b800_w)
m_b800_prev = data;
}
-ADDRESS_MAP_START(ettrivia_state::cpu_map)
- AM_RANGE(0x0000, 0x7fff) AM_ROM
- AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x9000, 0x9000) AM_WRITE(ettrivia_control_w)
- AM_RANGE(0x9800, 0x9800) AM_WRITENOP
- AM_RANGE(0xa000, 0xa000) AM_WRITENOP
- AM_RANGE(0xb000, 0xb000) AM_READ(b000_r) AM_WRITE(b000_w)
- AM_RANGE(0xb800, 0xb800) AM_WRITE(b800_w)
- AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(ettrivia_fg_w) AM_SHARE("fg_videoram")
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(ettrivia_bg_w) AM_SHARE("bg_videoram")
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(ettrivia_state::io_map)
- AM_RANGE(0x0000, 0xffff) AM_READ(ettrivia_question_r)
-ADDRESS_MAP_END
+void ettrivia_state::cpu_map(address_map &map)
+{
+ map(0x0000, 0x7fff).rom();
+ map(0x8000, 0x87ff).ram().share("nvram");
+ map(0x9000, 0x9000).w(this, FUNC(ettrivia_state::ettrivia_control_w));
+ map(0x9800, 0x9800).nopw();
+ map(0xa000, 0xa000).nopw();
+ map(0xb000, 0xb000).r(this, FUNC(ettrivia_state::b000_r)).w(this, FUNC(ettrivia_state::b000_w));
+ map(0xb800, 0xb800).w(this, FUNC(ettrivia_state::b800_w));
+ map(0xc000, 0xc7ff).ram().w(this, FUNC(ettrivia_state::ettrivia_fg_w)).share("fg_videoram");
+ map(0xe000, 0xe7ff).ram().w(this, FUNC(ettrivia_state::ettrivia_bg_w)).share("bg_videoram");
+}
+
+void ettrivia_state::io_map(address_map &map)
+{
+ map(0x0000, 0xffff).r(this, FUNC(ettrivia_state::ettrivia_question_r));
+}
static INPUT_PORTS_START( ettrivia )
PORT_START("IN0")