From 115bb9936c5cd3faf955d7eb1e251a94e4744b7b Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Tue, 13 Mar 2018 07:36:43 +0100 Subject: Address maps macros removal, pass 1 [O. Galibert] --- src/zexall/zexall.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/zexall') diff --git a/src/zexall/zexall.cpp b/src/zexall/zexall.cpp index dc6977a5acb..826e9336b3f 100644 --- a/src/zexall/zexall.cpp +++ b/src/zexall/zexall.cpp @@ -120,12 +120,13 @@ WRITE8_MEMBER( zexall_state::output_data_w ) Address Maps ******************************************************************************/ -ADDRESS_MAP_START(zexall_state::z80_mem) - AM_RANGE(0x0000, 0xffff) AM_RAM AM_SHARE("main_ram") - AM_RANGE(0xfffd, 0xfffd) AM_READWRITE(output_ack_r, output_ack_w) - AM_RANGE(0xfffe, 0xfffe) AM_READWRITE(output_req_r, output_req_w) - AM_RANGE(0xffff, 0xffff) AM_READWRITE(output_data_r, output_data_w) -ADDRESS_MAP_END +void zexall_state::z80_mem(address_map &map) +{ + map(0x0000, 0xffff).ram().share("main_ram"); + map(0xfffd, 0xfffd).rw(this, FUNC(zexall_state::output_ack_r), FUNC(zexall_state::output_ack_w)); + map(0xfffe, 0xfffe).rw(this, FUNC(zexall_state::output_req_r), FUNC(zexall_state::output_req_w)); + map(0xffff, 0xffff).rw(this, FUNC(zexall_state::output_data_r), FUNC(zexall_state::output_data_w)); +} /****************************************************************************** -- cgit v1.2.3