summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/x1.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/x1.cpp')
-rw-r--r--src/mame/drivers/x1.cpp86
1 files changed, 43 insertions, 43 deletions
diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp
index afd230a7660..99a55ca3626 100644
--- a/src/mame/drivers/x1.cpp
+++ b/src/mame/drivers/x1.cpp
@@ -1323,22 +1323,22 @@ void x1_state::x1_io_banks_common(address_map &map)
{
map.unmap_value_high();
- map(0x0e00, 0x0e02).w(this, FUNC(x1_state::x1_rom_w));
- map(0x0e03, 0x0e03).r(this, FUNC(x1_state::x1_rom_r));
+ map(0x0e00, 0x0e02).w(FUNC(x1_state::x1_rom_w));
+ map(0x0e03, 0x0e03).r(FUNC(x1_state::x1_rom_r));
- map(0x0ff8, 0x0fff).rw(this, FUNC(x1_state::x1_fdc_r), FUNC(x1_state::x1_fdc_w));
+ map(0x0ff8, 0x0fff).rw(FUNC(x1_state::x1_fdc_r), FUNC(x1_state::x1_fdc_w));
- map(0x1300, 0x1300).mirror(0x00ff).w(this, FUNC(x1_state::x1_pri_w));
- map(0x1400, 0x17ff).rw(this, FUNC(x1_state::x1_pcg_r), FUNC(x1_state::x1_pcg_w));
+ map(0x1300, 0x1300).mirror(0x00ff).w(FUNC(x1_state::x1_pri_w));
+ map(0x1400, 0x17ff).rw(FUNC(x1_state::x1_pcg_r), FUNC(x1_state::x1_pcg_w));
- map(0x1800, 0x1801).w(this, FUNC(x1_state::x1_6845_w));
+ map(0x1800, 0x1801).w(FUNC(x1_state::x1_6845_w));
- map(0x1900, 0x1900).mirror(0x00ff).rw(this, FUNC(x1_state::x1_sub_io_r), FUNC(x1_state::x1_sub_io_w));
+ map(0x1900, 0x1900).mirror(0x00ff).rw(FUNC(x1_state::x1_sub_io_r), FUNC(x1_state::x1_sub_io_w));
map(0x1a00, 0x1a03).mirror(0x00fc).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x1b00, 0x1b00).mirror(0x00ff).rw("ay", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w));
map(0x1c00, 0x1c00).mirror(0x00ff).w("ay", FUNC(ay8910_device::address_w));
- map(0x1d00, 0x1d00).mirror(0x00ff).w(this, FUNC(x1_state::x1_rom_bank_1_w));
- map(0x1e00, 0x1e00).mirror(0x00ff).w(this, FUNC(x1_state::x1_rom_bank_0_w));
+ map(0x1d00, 0x1d00).mirror(0x00ff).w(FUNC(x1_state::x1_rom_bank_1_w));
+ map(0x1e00, 0x1e00).mirror(0x00ff).w(FUNC(x1_state::x1_rom_bank_0_w));
map(0x1fa0, 0x1fa3).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
map(0x1fa8, 0x1fab).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
@@ -1347,7 +1347,7 @@ void x1_state::x1_io_banks_common(address_map &map)
map(0x4000, 0xffff).bankrw("bitmapbank");
- map(0x10000, 0x1ffff).rw(this, FUNC(x1_state::x1_ex_gfxram_r), FUNC(x1_state::x1_ex_gfxram_w));
+ map(0x10000, 0x1ffff).rw(FUNC(x1_state::x1_ex_gfxram_r), FUNC(x1_state::x1_ex_gfxram_w));
}
@@ -1357,9 +1357,9 @@ void x1_state::x1_io_banks(address_map &map)
// AM_RANGE(0x0700, 0x0701) TODO: user could install ym2151 on plain X1 too
- map(0x1000, 0x1000).mirror(0x00ff).w(this, FUNC(x1_state::x1_pal_b_w));
- map(0x1100, 0x1100).mirror(0x00ff).w(this, FUNC(x1_state::x1_pal_r_w));
- map(0x1200, 0x1200).mirror(0x00ff).w(this, FUNC(x1_state::x1_pal_g_w));
+ map(0x1000, 0x1000).mirror(0x00ff).w(FUNC(x1_state::x1_pal_b_w));
+ map(0x1100, 0x1100).mirror(0x00ff).w(FUNC(x1_state::x1_pal_r_w));
+ map(0x1200, 0x1200).mirror(0x00ff).w(FUNC(x1_state::x1_pal_g_w));
map(0x3000, 0x37ff).mirror(0x0800).ram().share("tvram"); // Ys checks if it's a x1/x1turbo machine by checking if this area is a mirror
}
@@ -1371,39 +1371,39 @@ void x1_state::x1turbo_io_banks(address_map &map)
// a * at the end states devices used on plain X1 too
- map(0x0700, 0x0701).r(this, FUNC(x1_state::ym_r)).w("ym", FUNC(ym2151_device::write));
+ map(0x0700, 0x0701).r(FUNC(x1_state::ym_r)).w("ym", FUNC(ym2151_device::write));
// 0x704 is FM sound detection port on X1 turboZ
map(0x0704, 0x0707).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
- map(0x0800, 0x0800).w(this, FUNC(x1_state::color_board_w)); // *
- map(0x0801, 0x0801).r(this, FUNC(x1_state::color_board_r)); // *
- map(0x0802, 0x0802).w(this, FUNC(x1_state::color_board_2_w)); // *
- map(0x0803, 0x0803).r(this, FUNC(x1_state::color_board_2_r)); // *
- map(0x0a00, 0x0a07).rw(this, FUNC(x1_state::stereo_board_r), FUNC(x1_state::stereo_board_w)); // *
- map(0x0b00, 0x0b00).rw(this, FUNC(x1_state::x1turbo_bank_r), FUNC(x1_state::x1turbo_bank_w));
- map(0x0c00, 0x0cff).rw(this, FUNC(x1_state::rs232_r), FUNC(x1_state::rs232_w)); // *
- map(0x0d00, 0x0dff).rw(this, FUNC(x1_state::x1_emm_r), FUNC(x1_state::x1_emm_w)); // *
- map(0x0e80, 0x0e81).r(this, FUNC(x1_state::x1_kanji_r));
- map(0x0e80, 0x0e83).w(this, FUNC(x1_state::x1_kanji_w));
- map(0x0fd0, 0x0fd3).rw(this, FUNC(x1_state::sasi_r), FUNC(x1_state::sasi_w)); // *
- map(0x0fe8, 0x0fef).rw(this, FUNC(x1_state::fdd8_r), FUNC(x1_state::fdd8_w)); // *
-
- map(0x1000, 0x12ff).w(this, FUNC(x1_state::x1turboz_4096_palette_w));
-
- map(0x1f80, 0x1f80).mirror(0x000f).rw(m_dma, FUNC(z80dma_device::read), FUNC(z80dma_device::write));
+ map(0x0800, 0x0800).w(FUNC(x1_state::color_board_w)); // *
+ map(0x0801, 0x0801).r(FUNC(x1_state::color_board_r)); // *
+ map(0x0802, 0x0802).w(FUNC(x1_state::color_board_2_w)); // *
+ map(0x0803, 0x0803).r(FUNC(x1_state::color_board_2_r)); // *
+ map(0x0a00, 0x0a07).rw(FUNC(x1_state::stereo_board_r), FUNC(x1_state::stereo_board_w)); // *
+ map(0x0b00, 0x0b00).rw(FUNC(x1_state::x1turbo_bank_r), FUNC(x1_state::x1turbo_bank_w));
+ map(0x0c00, 0x0cff).rw(FUNC(x1_state::rs232_r), FUNC(x1_state::rs232_w)); // *
+ map(0x0d00, 0x0dff).rw(FUNC(x1_state::x1_emm_r), FUNC(x1_state::x1_emm_w)); // *
+ map(0x0e80, 0x0e81).r(FUNC(x1_state::x1_kanji_r));
+ map(0x0e80, 0x0e83).w(FUNC(x1_state::x1_kanji_w));
+ map(0x0fd0, 0x0fd3).rw(FUNC(x1_state::sasi_r), FUNC(x1_state::sasi_w)); // *
+ map(0x0fe8, 0x0fef).rw(FUNC(x1_state::fdd8_r), FUNC(x1_state::fdd8_w)); // *
+
+ map(0x1000, 0x12ff).w(FUNC(x1_state::x1turboz_4096_palette_w));
+
+ map(0x1f80, 0x1f80).mirror(0x000f).rw(m_dma, FUNC(z80dma_device::bus_r), FUNC(z80dma_device::bus_w));
map(0x1f90, 0x1f93).rw("sio", FUNC(z80sio0_device::ba_cd_r), FUNC(z80sio0_device::ba_cd_w));
- map(0x1f98, 0x1f9f).rw(this, FUNC(x1_state::ext_sio_ctc_r), FUNC(x1_state::ext_sio_ctc_w));
- map(0x1fb0, 0x1fb0).rw(this, FUNC(x1_state::x1turbo_pal_r), FUNC(x1_state::x1turbo_pal_w)); // Z only!
- map(0x1fb8, 0x1fbf).rw(this, FUNC(x1_state::x1turbo_txpal_r), FUNC(x1_state::x1turbo_txpal_w)); // Z only!
- map(0x1fc0, 0x1fc0).rw(this, FUNC(x1_state::x1turbo_txdisp_r), FUNC(x1_state::x1turbo_txdisp_w)); // Z only!
- map(0x1fc1, 0x1fc1).w(this, FUNC(x1_state::z_img_cap_w)); // Z only!
- map(0x1fc2, 0x1fc2).w(this, FUNC(x1_state::z_mosaic_w)); // Z only!
- map(0x1fc3, 0x1fc3).w(this, FUNC(x1_state::z_chroma_key_w)); // Z only!
- map(0x1fc4, 0x1fc4).w(this, FUNC(x1_state::z_extra_scroll_w)); // Z only!
- map(0x1fc5, 0x1fc5).rw(this, FUNC(x1_state::x1turbo_gfxpal_r), FUNC(x1_state::x1turbo_gfxpal_w)); // Z only!
+ map(0x1f98, 0x1f9f).rw(FUNC(x1_state::ext_sio_ctc_r), FUNC(x1_state::ext_sio_ctc_w));
+ map(0x1fb0, 0x1fb0).rw(FUNC(x1_state::x1turbo_pal_r), FUNC(x1_state::x1turbo_pal_w)); // Z only!
+ map(0x1fb8, 0x1fbf).rw(FUNC(x1_state::x1turbo_txpal_r), FUNC(x1_state::x1turbo_txpal_w)); // Z only!
+ map(0x1fc0, 0x1fc0).rw(FUNC(x1_state::x1turbo_txdisp_r), FUNC(x1_state::x1turbo_txdisp_w)); // Z only!
+ map(0x1fc1, 0x1fc1).w(FUNC(x1_state::z_img_cap_w)); // Z only!
+ map(0x1fc2, 0x1fc2).w(FUNC(x1_state::z_mosaic_w)); // Z only!
+ map(0x1fc3, 0x1fc3).w(FUNC(x1_state::z_chroma_key_w)); // Z only!
+ map(0x1fc4, 0x1fc4).w(FUNC(x1_state::z_extra_scroll_w)); // Z only!
+ map(0x1fc5, 0x1fc5).rw(FUNC(x1_state::x1turbo_gfxpal_r), FUNC(x1_state::x1turbo_gfxpal_w)); // Z only!
// AM_RANGE(0x1fd0, 0x1fdf) AM_READ(x1_scrn_r) // Z only!
- map(0x1fd0, 0x1fd0).mirror(0x000f).w(this, FUNC(x1_state::x1_scrn_w));
- map(0x1fe0, 0x1fe0).rw(this, FUNC(x1_state::x1turboz_blackclip_r), FUNC(x1_state::x1turbo_blackclip_w));
+ map(0x1fd0, 0x1fd0).mirror(0x000f).w(FUNC(x1_state::x1_scrn_w));
+ map(0x1fe0, 0x1fe0).rw(FUNC(x1_state::x1turboz_blackclip_r), FUNC(x1_state::x1turbo_blackclip_w));
map(0x1ff0, 0x1ff0).portr("X1TURBO_DSW");
map(0x3000, 0x37ff).ram().share("tvram");
@@ -1413,12 +1413,12 @@ void x1_state::x1turbo_io_banks(address_map &map)
void x1_state::x1_mem(address_map &map)
{
- map(0x0000, 0xffff).rw(this, FUNC(x1_state::x1_mem_r), FUNC(x1_state::x1_mem_w));
+ map(0x0000, 0xffff).rw(FUNC(x1_state::x1_mem_r), FUNC(x1_state::x1_mem_w));
}
void x1_state::x1turbo_mem(address_map &map)
{
- map(0x0000, 0xffff).rw(this, FUNC(x1_state::x1turbo_mem_r), FUNC(x1_state::x1turbo_mem_w));
+ map(0x0000, 0xffff).rw(FUNC(x1_state::x1turbo_mem_r), FUNC(x1_state::x1turbo_mem_w));
}
void x1_state::x1_io(address_map &map)