summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/msx.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/msx.cpp')
-rw-r--r--src/mame/drivers/msx.cpp50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp
index 223f9f45f3b..cf6427f2232 100644
--- a/src/mame/drivers/msx.cpp
+++ b/src/mame/drivers/msx.cpp
@@ -541,8 +541,8 @@ PCB Layouts missing
void msx_state::msx_memory_map(address_map &map)
{
- map(0x0000, 0xfffe).rw(this, FUNC(msx_state::msx_mem_read), FUNC(msx_state::msx_mem_write));
- map(0xffff, 0xffff).rw(this, FUNC(msx_state::msx_sec_slot_r), FUNC(msx_state::msx_sec_slot_w));
+ map(0x0000, 0xfffe).rw(FUNC(msx_state::msx_mem_read), FUNC(msx_state::msx_mem_write));
+ map(0xffff, 0xffff).rw(FUNC(msx_state::msx_sec_slot_r), FUNC(msx_state::msx_sec_slot_w));
}
@@ -560,14 +560,14 @@ void msx_state::msx_io_map(address_map &map)
map.unmap_value_high();
map.global_mask(0xff);
// 0x7c - 0x7d : MSX-MUSIC/FM-PAC write port. Handlers will be installed if MSX-MUSIC is present in a system
- map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::read));
- map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::write));
- map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::write));
- map(0xa0, 0xa7).r(m_ay8910, FUNC(ay8910_device::data_r)).w(this, FUNC(msx_state::msx_ay8910_w));
+ map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::bus_r));
+ map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::bus_w));
+ map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0xa0, 0xa7).r(m_ay8910, FUNC(ay8910_device::data_r)).w(FUNC(msx_state::msx_ay8910_w));
map(0xa8, 0xab).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write));
- map(0x98, 0x98).rw("tms9928a", FUNC(tms9928a_device::vram_read), FUNC(tms9928a_device::vram_write));
- map(0x99, 0x99).rw("tms9928a", FUNC(tms9928a_device::register_read), FUNC(tms9928a_device::register_write));
- map(0xd8, 0xd9).rw(this, FUNC(msx_state::msx_kanji_r), FUNC(msx_state::msx_kanji_w));
+ map(0x98, 0x98).rw("tms9928a", FUNC(tms9928a_device::vram_r), FUNC(tms9928a_device::vram_w));
+ map(0x99, 0x99).rw("tms9928a", FUNC(tms9928a_device::register_r), FUNC(tms9928a_device::register_w));
+ map(0xd8, 0xd9).rw(FUNC(msx_state::msx_kanji_r), FUNC(msx_state::msx_kanji_w));
// 0xfc - 0xff : Memory mapper I/O ports. I/O handlers will be installed if a memory mapper is present in a system
}
@@ -576,17 +576,17 @@ void msx_state::msx2_io_map(address_map &map)
{
map.unmap_value_high();
map.global_mask(0xff);
- map(0x40, 0x4f).rw(this, FUNC(msx_state::msx_switched_r), FUNC(msx_state::msx_switched_w));
+ map(0x40, 0x4f).rw(FUNC(msx_state::msx_switched_r), FUNC(msx_state::msx_switched_w));
// 0x7c - 0x7d : MSX-MUSIC/FM-PAC write port. Handlers will be installed if MSX-MUSIC is present in a system
- map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::read));
- map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::write));
- map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::write));
- map(0xa0, 0xa7).r(m_ay8910, FUNC(ay8910_device::data_r)).w(this, FUNC(msx_state::msx_ay8910_w));
+ map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::bus_r));
+ map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::bus_w));
+ map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0xa0, 0xa7).r(m_ay8910, FUNC(ay8910_device::data_r)).w(FUNC(msx_state::msx_ay8910_w));
map(0xa8, 0xab).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x98, 0x9b).rw(m_v9938, FUNC(v9938_device::read), FUNC(v9938_device::write));
- map(0xb4, 0xb4).w(this, FUNC(msx_state::msx_rtc_latch_w));
- map(0xb5, 0xb5).rw(this, FUNC(msx_state::msx_rtc_reg_r), FUNC(msx_state::msx_rtc_reg_w));
- map(0xd8, 0xd9).rw(this, FUNC(msx_state::msx_kanji_r), FUNC(msx_state::msx_kanji_w));
+ map(0xb4, 0xb4).w(FUNC(msx_state::msx_rtc_latch_w));
+ map(0xb5, 0xb5).rw(FUNC(msx_state::msx_rtc_reg_r), FUNC(msx_state::msx_rtc_reg_w));
+ map(0xd8, 0xd9).rw(FUNC(msx_state::msx_kanji_r), FUNC(msx_state::msx_kanji_w));
// 0xfc - 0xff : Memory mapper I/O ports. I/O handlers will be installed if a memory mapper is present in a system
}
@@ -595,17 +595,17 @@ void msx_state::msx2p_io_map(address_map &map)
{
map.unmap_value_high();
map.global_mask(0xff);
- map(0x40, 0x4f).rw(this, FUNC(msx_state::msx_switched_r), FUNC(msx_state::msx_switched_w));
+ map(0x40, 0x4f).rw(FUNC(msx_state::msx_switched_r), FUNC(msx_state::msx_switched_w));
// 0x7c - 0x7d : MSX-MUSIC/FM-PAC write port. Handlers will be installed if MSX-MUSIC is present in a system
- map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::read));
- map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::write));
- map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::write));
- map(0xa0, 0xa7).r(m_ay8910, FUNC(ay8910_device::data_r)).w(this, FUNC(msx_state::msx_ay8910_w));
+ map(0x90, 0x90).r("cent_status_in", FUNC(input_buffer_device::bus_r));
+ map(0x90, 0x90).w("cent_ctrl_out", FUNC(output_latch_device::bus_w));
+ map(0x91, 0x91).w("cent_data_out", FUNC(output_latch_device::bus_w));
+ map(0xa0, 0xa7).r(m_ay8910, FUNC(ay8910_device::data_r)).w(FUNC(msx_state::msx_ay8910_w));
map(0xa8, 0xab).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x98, 0x9b).rw(m_v9958, FUNC(v9958_device::read), FUNC(v9958_device::write));
- map(0xb4, 0xb4).w(this, FUNC(msx_state::msx_rtc_latch_w));
- map(0xb5, 0xb5).rw(this, FUNC(msx_state::msx_rtc_reg_r), FUNC(msx_state::msx_rtc_reg_w));
- map(0xd8, 0xd9).rw(this, FUNC(msx_state::msx_kanji_r), FUNC(msx_state::msx_kanji_w));
+ map(0xb4, 0xb4).w(FUNC(msx_state::msx_rtc_latch_w));
+ map(0xb5, 0xb5).rw(FUNC(msx_state::msx_rtc_reg_r), FUNC(msx_state::msx_rtc_reg_w));
+ map(0xd8, 0xd9).rw(FUNC(msx_state::msx_kanji_r), FUNC(msx_state::msx_kanji_w));
// 0xfc - 0xff : Memory mapper I/O ports. I/O handlers will be installed if a memory mapper is present in a system
}