diff options
author | Vas Crabb <vas@vastheman.com> | 2018-06-08 01:29:39 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-06-08 01:29:39 +1000 |
commit | 93eaa6a4943ade6513257a740fcde97ca9468559 (patch) | |
tree | 1340f2160a7064a839b7ca649b2257489cdd3d6d /src/devices/bus/interpro/sr/edge.cpp | |
parent | fafafe7050e4d04230656215b840ac53aad081e7 (diff) |
as if millions of this pointers suddenly cried out in terror, and were suddenly silenced
* streamline templates in addrmap.h
* get rid of overloads on read/write member names - this will become even more important in the near future
Diffstat (limited to 'src/devices/bus/interpro/sr/edge.cpp')
-rw-r--r-- | src/devices/bus/interpro/sr/edge.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/devices/bus/interpro/sr/edge.cpp b/src/devices/bus/interpro/sr/edge.cpp index f730560e32b..ec9598bb663 100644 --- a/src/devices/bus/interpro/sr/edge.cpp +++ b/src/devices/bus/interpro/sr/edge.cpp @@ -226,19 +226,19 @@ void edge1_device_base::map(address_map &map) * 110 mapping (W/O) * 114 attention */ - map(0x000, 0x003).rw(this, FUNC(edge1_device_base::reg0_r), FUNC(edge1_device_base::reg0_w)); + map(0x000, 0x003).rw(FUNC(edge1_device_base::reg0_r), FUNC(edge1_device_base::reg0_w)); map(0x010, 0x01f).rw("scc", FUNC(z80scc_device::cd_ab_r), FUNC(z80scc_device::cd_ab_w)).umask32(0x000000ff); - map(0x100, 0x103).rw(this, FUNC(edge1_device_base::control_r), FUNC(edge1_device_base::control_w)); - map(0x104, 0x107).rw(this, FUNC(edge1_device_base::status_r), FUNC(edge1_device_base::status_w)); - map(0x108, 0x10b).rw(this, FUNC(edge1_device_base::fifo_r), FUNC(edge1_device_base::fifo_w)); - map(0x10c, 0x10f).rw(this, FUNC(edge1_device_base::kernel_r), FUNC(edge1_device_base::kernel_w)); + map(0x100, 0x103).rw(FUNC(edge1_device_base::control_r), FUNC(edge1_device_base::control_w)); + map(0x104, 0x107).rw(FUNC(edge1_device_base::status_r), FUNC(edge1_device_base::status_w)); + map(0x108, 0x10b).rw(FUNC(edge1_device_base::fifo_r), FUNC(edge1_device_base::fifo_w)); + map(0x10c, 0x10f).rw(FUNC(edge1_device_base::kernel_r), FUNC(edge1_device_base::kernel_w)); - map(0x114, 0x117).rw(this, FUNC(edge1_device_base::attention_r), FUNC(edge1_device_base::attention_w)); + map(0x114, 0x117).rw(FUNC(edge1_device_base::attention_r), FUNC(edge1_device_base::attention_w)); - map(0x130, 0x133).w(this, FUNC(edge1_device_base::ififo_lwm_w)); - map(0x134, 0x137).w(this, FUNC(edge1_device_base::ififo_hwm_w)); + map(0x130, 0x133).w(FUNC(edge1_device_base::ififo_lwm_w)); + map(0x134, 0x137).w(FUNC(edge1_device_base::ififo_hwm_w)); } void edge1_device_base::map_dynamic(address_map &map) @@ -291,19 +291,19 @@ void edge2plus_processor_device_base::map(address_map &map) { srx_card_device_base::map(map); - map(0x000, 0x003).rw(this, FUNC(edge2plus_processor_device_base::reg0_r), FUNC(edge2plus_processor_device_base::reg0_w)); + map(0x000, 0x003).rw(FUNC(edge2plus_processor_device_base::reg0_r), FUNC(edge2plus_processor_device_base::reg0_w)); map(0x010, 0x01f).rw("scc", FUNC(z80scc_device::cd_ab_r), FUNC(z80scc_device::cd_ab_w)).umask32(0x000000ff); - map(0x100, 0x103).rw(this, FUNC(edge2plus_processor_device_base::control_r), FUNC(edge2plus_processor_device_base::control_w)); - map(0x104, 0x107).rw(this, FUNC(edge2plus_processor_device_base::status_r), FUNC(edge2plus_processor_device_base::status_w)); + map(0x100, 0x103).rw(FUNC(edge2plus_processor_device_base::control_r), FUNC(edge2plus_processor_device_base::control_w)); + map(0x104, 0x107).rw(FUNC(edge2plus_processor_device_base::status_r), FUNC(edge2plus_processor_device_base::status_w)); - map(0x10c, 0x10f).rw(this, FUNC(edge2plus_processor_device_base::kernel_r), FUNC(edge2plus_processor_device_base::kernel_w)); - map(0x110, 0x113).w(this, FUNC(edge2plus_processor_device_base::mapping_w)); - map(0x114, 0x117).rw(this, FUNC(edge2plus_processor_device_base::attention_r), FUNC(edge2plus_processor_device_base::attention_w)); + map(0x10c, 0x10f).rw(FUNC(edge2plus_processor_device_base::kernel_r), FUNC(edge2plus_processor_device_base::kernel_w)); + map(0x110, 0x113).w(FUNC(edge2plus_processor_device_base::mapping_w)); + map(0x114, 0x117).rw(FUNC(edge2plus_processor_device_base::attention_r), FUNC(edge2plus_processor_device_base::attention_w)); - map(0x130, 0x133).w(this, FUNC(edge2plus_processor_device_base::ififo_lwm_w)); - map(0x134, 0x137).w(this, FUNC(edge2plus_processor_device_base::ififo_hwm_w)); + map(0x130, 0x133).w(FUNC(edge2plus_processor_device_base::ififo_lwm_w)); + map(0x134, 0x137).w(FUNC(edge2plus_processor_device_base::ififo_hwm_w)); // 0x300 fifo @@ -325,14 +325,14 @@ void edge2plus_framebuffer_device_base::map_dynamic(address_map &map) [this](address_space &space, offs_t offset, u8 mem_mask) { return m_vram->read(offset); }, [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_vram->write(offset, data); }); - map(0x02028088, 0x0202808b).w(this, FUNC(edge2plus_framebuffer_device_base::select_w)); + map(0x02028088, 0x0202808b).w(FUNC(edge2plus_framebuffer_device_base::select_w)); map(0x02028200, 0x0202827f).lr32("idprom", [this](address_space &space, offs_t offset, u8 mem_mask) { return m_select == 0 ? memregion("idprom")->as_u32(offset) : space.unmap(); }); - map(0x02028290, 0x02028293).w(this, FUNC(edge2plus_framebuffer_device_base::lut_select_w)); - map(0x02028300, 0x02028303).w(this, FUNC(edge2plus_framebuffer_device_base::unk_300_w)); - map(0x02028304, 0x02028307).r(this, FUNC(edge2plus_framebuffer_device_base::unk_304_r)); + map(0x02028290, 0x02028293).w(FUNC(edge2plus_framebuffer_device_base::lut_select_w)); + map(0x02028300, 0x02028303).w(FUNC(edge2plus_framebuffer_device_base::unk_300_w)); + map(0x02028304, 0x02028307).r(FUNC(edge2plus_framebuffer_device_base::unk_304_r)); } void edge2_framebuffer_device_base::map(address_map &map) |