summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/kncljoe.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/kncljoe.cpp')
-rw-r--r--src/mame/drivers/kncljoe.cpp61
1 files changed, 32 insertions, 29 deletions
diff --git a/src/mame/drivers/kncljoe.cpp b/src/mame/drivers/kncljoe.cpp
index cbeac9957b3..dccc835ddc2 100644
--- a/src/mame/drivers/kncljoe.cpp
+++ b/src/mame/drivers/kncljoe.cpp
@@ -45,24 +45,25 @@ WRITE8_MEMBER(kncljoe_state::sound_cmd_w)
}
-ADDRESS_MAP_START(kncljoe_state::main_map)
- AM_RANGE(0x0000, 0xbfff) AM_ROM
- AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(kncljoe_videoram_w) AM_SHARE("videoram")
- AM_RANGE(0xd000, 0xd001) AM_WRITE(kncljoe_scroll_w) AM_SHARE("scrollregs")
- AM_RANGE(0xd800, 0xd800) AM_READ_PORT("SYSTEM")
- AM_RANGE(0xd801, 0xd801) AM_READ_PORT("P1")
- AM_RANGE(0xd802, 0xd802) AM_READ_PORT("P2")
- AM_RANGE(0xd803, 0xd803) AM_READ_PORT("DSWA")
- AM_RANGE(0xd804, 0xd804) AM_READ_PORT("DSWB")
- AM_RANGE(0xd800, 0xd800) AM_WRITE(sound_cmd_w)
- AM_RANGE(0xd801, 0xd801) AM_WRITE(kncljoe_control_w)
- AM_RANGE(0xd802, 0xd802) AM_DEVWRITE("sn1", sn76489_device, write)
- AM_RANGE(0xd803, 0xd803) AM_DEVWRITE("sn2", sn76489_device, write)
- AM_RANGE(0xd807, 0xd807) AM_READNOP /* unknown read */
- AM_RANGE(0xd817, 0xd817) AM_READNOP /* unknown read */
- AM_RANGE(0xe800, 0xefff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xf000, 0xffff) AM_RAM
-ADDRESS_MAP_END
+void kncljoe_state::main_map(address_map &map)
+{
+ map(0x0000, 0xbfff).rom();
+ map(0xc000, 0xcfff).ram().w(this, FUNC(kncljoe_state::kncljoe_videoram_w)).share("videoram");
+ map(0xd000, 0xd001).w(this, FUNC(kncljoe_state::kncljoe_scroll_w)).share("scrollregs");
+ map(0xd800, 0xd800).portr("SYSTEM");
+ map(0xd801, 0xd801).portr("P1");
+ map(0xd802, 0xd802).portr("P2");
+ map(0xd803, 0xd803).portr("DSWA");
+ map(0xd804, 0xd804).portr("DSWB");
+ map(0xd800, 0xd800).w(this, FUNC(kncljoe_state::sound_cmd_w));
+ map(0xd801, 0xd801).w(this, FUNC(kncljoe_state::kncljoe_control_w));
+ map(0xd802, 0xd802).w("sn1", FUNC(sn76489_device::write));
+ map(0xd803, 0xd803).w("sn2", FUNC(sn76489_device::write));
+ map(0xd807, 0xd807).nopr(); /* unknown read */
+ map(0xd817, 0xd817).nopr(); /* unknown read */
+ map(0xe800, 0xefff).ram().share("spriteram");
+ map(0xf000, 0xffff).ram();
+}
WRITE8_MEMBER(kncljoe_state::m6803_port1_w)
{
@@ -103,17 +104,19 @@ WRITE8_MEMBER(kncljoe_state::unused_w)
//unused - no MSM on the pcb
}
-ADDRESS_MAP_START(kncljoe_state::sound_map)
- ADDRESS_MAP_GLOBAL_MASK(0x7fff)
- AM_RANGE(0x0000, 0x0fff) AM_WRITENOP
- AM_RANGE(0x1000, 0x1fff) AM_WRITE(sound_irq_ack_w)
- AM_RANGE(0x2000, 0x7fff) AM_ROM
-ADDRESS_MAP_END
-
-ADDRESS_MAP_START(kncljoe_state::sound_portmap)
- AM_RANGE(M6801_PORT1, M6801_PORT1) AM_READWRITE(m6803_port1_r, m6803_port1_w)
- AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READWRITE(m6803_port2_r, m6803_port2_w)
-ADDRESS_MAP_END
+void kncljoe_state::sound_map(address_map &map)
+{
+ map.global_mask(0x7fff);
+ map(0x0000, 0x0fff).nopw();
+ map(0x1000, 0x1fff).w(this, FUNC(kncljoe_state::sound_irq_ack_w));
+ map(0x2000, 0x7fff).rom();
+}
+
+void kncljoe_state::sound_portmap(address_map &map)
+{
+ map(M6801_PORT1, M6801_PORT1).rw(this, FUNC(kncljoe_state::m6803_port1_r), FUNC(kncljoe_state::m6803_port1_w));
+ map(M6801_PORT2, M6801_PORT2).rw(this, FUNC(kncljoe_state::m6803_port2_r), FUNC(kncljoe_state::m6803_port2_w));
+}
/******************************************************************************/