diff options
Diffstat (limited to 'src/devices/machine/mos6530n.cpp')
-rw-r--r-- | src/devices/machine/mos6530n.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/devices/machine/mos6530n.cpp b/src/devices/machine/mos6530n.cpp index 8e42eb35428..1630c8d6567 100644 --- a/src/devices/machine/mos6530n.cpp +++ b/src/devices/machine/mos6530n.cpp @@ -31,48 +31,48 @@ DEFINE_DEVICE_TYPE(MOS6532_NEW, mos6532_new_device, "mos6532_new", "MOS 6532 (ne void mos6530_new_device::rom_map(address_map &map) { map.global_mask(0x3ff); - map(0x000, 0x3ff).r(this, FUNC(mos6530_new_device::rom_r)); + map(0x000, 0x3ff).r(FUNC(mos6530_new_device::rom_r)); } void mos6530_new_device::ram_map(address_map &map) { map.global_mask(0x3f); - map(0x00, 0x3f).rw(this, FUNC(mos6530_new_device::ram_r), FUNC(mos6530_new_device::ram_w)); + map(0x00, 0x3f).rw(FUNC(mos6530_new_device::ram_r), FUNC(mos6530_new_device::ram_w)); } void mos6530_new_device::io_map(address_map &map) { map.global_mask(0xf); - map(0x00, 0x00).mirror(0x8).rw(this, FUNC(mos6530_new_device::pa_data_r), FUNC(mos6530_new_device::pa_data_w)); - map(0x01, 0x01).mirror(0x8).rw(this, FUNC(mos6530_new_device::pa_ddr_r), FUNC(mos6530_new_device::pa_ddr_w)); - map(0x02, 0x02).mirror(0x8).rw(this, FUNC(mos6530_new_device::pb_data_r), FUNC(mos6530_new_device::pb_data_w)); - map(0x03, 0x03).mirror(0x8).rw(this, FUNC(mos6530_new_device::pb_ddr_r), FUNC(mos6530_new_device::pb_ddr_w)); - map(0x04, 0x07).w(this, FUNC(mos6530_new_device::timer_off_w)); - map(0x0c, 0x0f).w(this, FUNC(mos6530_new_device::timer_on_w)); - map(0x04, 0x04).mirror(0x2).r(this, FUNC(mos6530_new_device::timer_off_r)); - map(0x0c, 0x0c).mirror(0x2).r(this, FUNC(mos6530_new_device::timer_on_r)); - map(0x05, 0x05).mirror(0xa).r(this, FUNC(mos6530_new_device::irq_r)); + map(0x00, 0x00).mirror(0x8).rw(FUNC(mos6530_new_device::pa_data_r), FUNC(mos6530_new_device::pa_data_w)); + map(0x01, 0x01).mirror(0x8).rw(FUNC(mos6530_new_device::pa_ddr_r), FUNC(mos6530_new_device::pa_ddr_w)); + map(0x02, 0x02).mirror(0x8).rw(FUNC(mos6530_new_device::pb_data_r), FUNC(mos6530_new_device::pb_data_w)); + map(0x03, 0x03).mirror(0x8).rw(FUNC(mos6530_new_device::pb_ddr_r), FUNC(mos6530_new_device::pb_ddr_w)); + map(0x04, 0x07).w(FUNC(mos6530_new_device::timer_off_w)); + map(0x0c, 0x0f).w(FUNC(mos6530_new_device::timer_on_w)); + map(0x04, 0x04).mirror(0x2).r(FUNC(mos6530_new_device::timer_off_r)); + map(0x0c, 0x0c).mirror(0x2).r(FUNC(mos6530_new_device::timer_on_r)); + map(0x05, 0x05).mirror(0xa).r(FUNC(mos6530_new_device::irq_r)); } void mos6532_new_device::ram_map(address_map &map) { map.global_mask(0x7f); - map(0x00, 0x7f).rw(this, FUNC(mos6532_new_device::ram_r), FUNC(mos6532_new_device::ram_w)); + map(0x00, 0x7f).rw(FUNC(mos6532_new_device::ram_r), FUNC(mos6532_new_device::ram_w)); } void mos6532_new_device::io_map(address_map &map) { map.global_mask(0x1f); - map(0x00, 0x00).mirror(0x18).rw(this, FUNC(mos6532_new_device::pa_data_r), FUNC(mos6532_new_device::pa_data_w)); // SWCHA - map(0x01, 0x01).mirror(0x18).rw(this, FUNC(mos6532_new_device::pa_ddr_r), FUNC(mos6532_new_device::pa_ddr_w)); // SWACNT - map(0x02, 0x02).mirror(0x18).rw(this, FUNC(mos6532_new_device::pb_data_r), FUNC(mos6532_new_device::pb_data_w)); // SWCHB - map(0x03, 0x03).mirror(0x18).rw(this, FUNC(mos6532_new_device::pb_ddr_r), FUNC(mos6532_new_device::pb_ddr_w)); // SWBCNT - map(0x14, 0x17).w(this, FUNC(mos6532_new_device::timer_off_w)); - map(0x1c, 0x1f).w(this, FUNC(mos6532_new_device::timer_on_w)); - map(0x04, 0x04).mirror(0x12).r(this, FUNC(mos6532_new_device::timer_off_r)); - map(0x0c, 0x0c).mirror(0x12).r(this, FUNC(mos6532_new_device::timer_on_r)); - map(0x05, 0x05).mirror(0x1a).r(this, FUNC(mos6532_new_device::irq_r)); - map(0x04, 0x07).mirror(0x8).w(this, FUNC(mos6532_new_device::edge_w)); + map(0x00, 0x00).mirror(0x18).rw(FUNC(mos6532_new_device::pa_data_r), FUNC(mos6532_new_device::pa_data_w)); // SWCHA + map(0x01, 0x01).mirror(0x18).rw(FUNC(mos6532_new_device::pa_ddr_r), FUNC(mos6532_new_device::pa_ddr_w)); // SWACNT + map(0x02, 0x02).mirror(0x18).rw(FUNC(mos6532_new_device::pb_data_r), FUNC(mos6532_new_device::pb_data_w)); // SWCHB + map(0x03, 0x03).mirror(0x18).rw(FUNC(mos6532_new_device::pb_ddr_r), FUNC(mos6532_new_device::pb_ddr_w)); // SWBCNT + map(0x14, 0x17).w(FUNC(mos6532_new_device::timer_off_w)); + map(0x1c, 0x1f).w(FUNC(mos6532_new_device::timer_on_w)); + map(0x04, 0x04).mirror(0x12).r(FUNC(mos6532_new_device::timer_off_r)); + map(0x0c, 0x0c).mirror(0x12).r(FUNC(mos6532_new_device::timer_on_r)); + map(0x05, 0x05).mirror(0x1a).r(FUNC(mos6532_new_device::irq_r)); + map(0x04, 0x07).mirror(0x8).w(FUNC(mos6532_new_device::edge_w)); } READ8_MEMBER(mos6532_new_device::io_r) |