diff options
Diffstat (limited to 'src/devices/bus/interpro/sr/edge.cpp')
-rw-r--r-- | src/devices/bus/interpro/sr/edge.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/devices/bus/interpro/sr/edge.cpp b/src/devices/bus/interpro/sr/edge.cpp index 4c6453a5341..b8927438efc 100644 --- a/src/devices/bus/interpro/sr/edge.cpp +++ b/src/devices/bus/interpro/sr/edge.cpp @@ -301,14 +301,14 @@ void edge1_device_base::map(address_map &map) void edge1_device_base::map_dynamic(address_map &map) { // TODO: map using lambdas until mixed-size submaps work - map(0x00000000, 0x0001ffff).lrw8("sram", - [this](address_space &space, offs_t offset, u8 mem_mask) { return m_sram->read(offset); }, - [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_sram->write(offset, data); }); + map(0x00000000, 0x0001ffff).lrw8( + NAME([this](address_space &space, offs_t offset, u8 mem_mask) { return m_sram->read(offset); }), + NAME([this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_sram->write(offset, data); })); - map(0x01000000, 0x013fffff).lrw8("vram", - [this](address_space &space, offs_t offset, u8 mem_mask) { return m_vram->read((offset >> 2) | (offset & 0x3)); }, - [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_vram->write((offset >> 2) | (offset & 0x3), data); }); + map(0x01000000, 0x013fffff).lrw8( + NAME([this](address_space &space, offs_t offset, u8 mem_mask) { return m_vram->read((offset >> 2) | (offset & 0x3)); }), + NAME([this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_vram->write((offset >> 2) | (offset & 0x3), data); })); //map(0x02028200, 0x0202827f).lr32("idprom", // [this](address_space &space, offs_t offset, u8 mem_mask) { return memregion("idprom")->as_u32(offset); }); @@ -350,8 +350,8 @@ void edge2plus_processor_device_base::map(address_map &map) { map(0x000, 0x003).rw(FUNC(edge2plus_processor_device_base::reg0_r), FUNC(edge2plus_processor_device_base::reg0_w)); - map(0x008, 0x008).lr8("mouse_x", []() { return 0; }); - map(0x00c, 0x00c).lr8("mouse_y", []() { return 0; }); + map(0x008, 0x008).lr8([]() { return 0; }, "mouse_x"); + map(0x00c, 0x00c).lr8([]() { return 0; }, "mouse_y"); map(0x010, 0x01f).rw("scc", FUNC(z80scc_device::dc_ab_r), FUNC(z80scc_device::dc_ab_w)).umask32(0x000000ff); @@ -377,18 +377,18 @@ void edge2plus_framebuffer_device_base::map_dynamic(address_map &map) { // TODO: map using lambdas until mixed-size submaps work - map(0x00000000, 0x0003ffff).lrw8("sram", - [this](address_space &space, offs_t offset, u8 mem_mask) { return m_sram->read(offset); }, - [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_sram->write(offset, data); }); + map(0x00000000, 0x0003ffff).lrw8( + NAME([this](address_space &space, offs_t offset, u8 mem_mask) { return m_sram->read(offset); }), + NAME([this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_sram->write(offset, data); })); - map(0x01000000, 0x01ffffff).lrw8("vram", - [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(0x01000000, 0x01ffffff).lrw8( + NAME([this](address_space &space, offs_t offset, u8 mem_mask) { return m_vram->read(offset); }), + NAME([this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_vram->write(offset, data); })); 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(0x02028200, 0x0202827f).lr32( + NAME([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(FUNC(edge2plus_framebuffer_device_base::lut_select_w)); map(0x02028300, 0x02028303).w(FUNC(edge2plus_framebuffer_device_base::unk_300_w)); @@ -832,12 +832,12 @@ WRITE_LINE_MEMBER(edge2plus_processor_device_base::holda) void edge2plus_processor_device_base::dsp1_map(address_map &map) { - map(0x00000, 0x3ffff).lrw8("sram", - [this](address_space &space, offs_t offset, u8 mem_mask) { return m_sram->read(offset); }, - [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_sram->write(offset, data); }); + map(0x00000, 0x3ffff).lrw8( + NAME([this](address_space &space, offs_t offset, u8 mem_mask) { return m_sram->read(offset); }), + NAME([this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_sram->write(offset, data); })); - map(0x40000, 0x7ffff).lr32("prg1", - [this](address_space &space, offs_t offset, u32 mem_mask) { return memregion("prg1")->as_u32(offset); }); + map(0x40000, 0x7ffff).lr32( + NAME([this](address_space &space, offs_t offset, u32 mem_mask) { return memregion("prg1")->as_u32(offset); })); } |