diff options
author | 2018-03-13 07:36:43 +0100 | |
---|---|---|
committer | 2018-03-14 14:07:14 +0100 | |
commit | 115bb9936c5cd3faf955d7eb1e251a94e4744b7b (patch) | |
tree | f0230f547f6c750f9974c61479eef28cbe4ad571 /src/mame/drivers/thayers.cpp | |
parent | f155992daab88ad024cec995428a67108218b51d (diff) |
Address maps macros removal, pass 1 [O. Galibert]
Diffstat (limited to 'src/mame/drivers/thayers.cpp')
-rw-r--r-- | src/mame/drivers/thayers.cpp | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp index 712e69bfc9e..d1e6018588f 100644 --- a/src/mame/drivers/thayers.cpp +++ b/src/mame/drivers/thayers.cpp @@ -617,29 +617,31 @@ READ8_MEMBER(thayers_state::ssi263_register_r) /* Memory Maps */ -ADDRESS_MAP_START(thayers_state::thayers_map) - AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_RAM - AM_RANGE(0xc000, 0xdfff) AM_ROM -ADDRESS_MAP_END - -ADDRESS_MAP_START(thayers_state::thayers_io_map) - ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x07) AM_READWRITE(ssi263_register_r, ssi263_register_w) - AM_RANGE(0x20, 0x20) AM_WRITE(control_w) - AM_RANGE(0x40, 0x40) AM_READWRITE(irqstate_r, control2_w) - AM_RANGE(0x80, 0x80) AM_READWRITE(cop_data_r, cop_data_w) - AM_RANGE(0xa0, 0xa0) AM_WRITE(timer_int_ack_w) - AM_RANGE(0xc0, 0xc0) AM_WRITE(data_rdy_int_ack_w) - AM_RANGE(0xf0, 0xf0) AM_READ(laserdsc_data_r) - AM_RANGE(0xf1, 0xf1) AM_READ(dsw_b_r) - AM_RANGE(0xf2, 0xf2) AM_READ_PORT("DSWA") - AM_RANGE(0xf3, 0xf3) AM_WRITE(intrq_w) - AM_RANGE(0xf4, 0xf4) AM_WRITE(laserdsc_data_w) - AM_RANGE(0xf5, 0xf5) AM_WRITE(laserdsc_control_w) - AM_RANGE(0xf6, 0xf6) AM_WRITE(den1_w) - AM_RANGE(0xf7, 0xf7) AM_WRITE(den2_w) -ADDRESS_MAP_END +void thayers_state::thayers_map(address_map &map) +{ + map(0x0000, 0x7fff).rom(); + map(0x8000, 0xbfff).ram(); + map(0xc000, 0xdfff).rom(); +} + +void thayers_state::thayers_io_map(address_map &map) +{ + map.global_mask(0xff); + map(0x00, 0x07).rw(this, FUNC(thayers_state::ssi263_register_r), FUNC(thayers_state::ssi263_register_w)); + map(0x20, 0x20).w(this, FUNC(thayers_state::control_w)); + map(0x40, 0x40).rw(this, FUNC(thayers_state::irqstate_r), FUNC(thayers_state::control2_w)); + map(0x80, 0x80).rw(this, FUNC(thayers_state::cop_data_r), FUNC(thayers_state::cop_data_w)); + map(0xa0, 0xa0).w(this, FUNC(thayers_state::timer_int_ack_w)); + map(0xc0, 0xc0).w(this, FUNC(thayers_state::data_rdy_int_ack_w)); + map(0xf0, 0xf0).r(this, FUNC(thayers_state::laserdsc_data_r)); + map(0xf1, 0xf1).r(this, FUNC(thayers_state::dsw_b_r)); + map(0xf2, 0xf2).portr("DSWA"); + map(0xf3, 0xf3).w(this, FUNC(thayers_state::intrq_w)); + map(0xf4, 0xf4).w(this, FUNC(thayers_state::laserdsc_data_w)); + map(0xf5, 0xf5).w(this, FUNC(thayers_state::laserdsc_control_w)); + map(0xf6, 0xf6).w(this, FUNC(thayers_state::den1_w)); + map(0xf7, 0xf7).w(this, FUNC(thayers_state::den2_w)); +} /* Input Ports */ |