summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/x1.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/x1.h')
-rw-r--r--src/mame/includes/x1.h116
1 files changed, 58 insertions, 58 deletions
diff --git a/src/mame/includes/x1.h b/src/mame/includes/x1.h
index 47d05b9985c..d787fe67bb7 100644
--- a/src/mame/includes/x1.h
+++ b/src/mame/includes/x1.h
@@ -88,45 +88,45 @@ public:
required_device<mc6845_device> m_crtc;
required_device<screen_device> m_screen;
- DECLARE_READ8_MEMBER(x1_mem_r);
- DECLARE_WRITE8_MEMBER(x1_mem_w);
- DECLARE_READ8_MEMBER(x1_sub_io_r);
- DECLARE_WRITE8_MEMBER(x1_sub_io_w);
- DECLARE_READ8_MEMBER(x1_rom_r);
- DECLARE_WRITE8_MEMBER(x1_rom_w);
- DECLARE_WRITE8_MEMBER(x1_rom_bank_0_w);
- DECLARE_WRITE8_MEMBER(x1_rom_bank_1_w);
- DECLARE_READ8_MEMBER(x1_fdc_r);
- DECLARE_WRITE8_MEMBER(x1_fdc_w);
- DECLARE_READ8_MEMBER(x1_pcg_r);
- DECLARE_WRITE8_MEMBER(x1_pcg_w);
- DECLARE_WRITE8_MEMBER(x1_pal_r_w);
- DECLARE_WRITE8_MEMBER(x1_pal_g_w);
- DECLARE_WRITE8_MEMBER(x1_pal_b_w);
- DECLARE_READ8_MEMBER(x1_ex_gfxram_r);
- DECLARE_WRITE8_MEMBER(x1_ex_gfxram_w);
- DECLARE_WRITE8_MEMBER(x1_scrn_w);
- DECLARE_WRITE8_MEMBER(x1_pri_w);
- DECLARE_WRITE8_MEMBER(x1_6845_w);
- DECLARE_READ8_MEMBER(x1_kanji_r);
- DECLARE_WRITE8_MEMBER(x1_kanji_w);
- DECLARE_READ8_MEMBER(x1_emm_r);
- DECLARE_WRITE8_MEMBER(x1_emm_w);
- DECLARE_READ8_MEMBER(x1turbo_pal_r);
- DECLARE_READ8_MEMBER(x1turbo_txpal_r);
- DECLARE_READ8_MEMBER(x1turbo_txdisp_r);
- DECLARE_READ8_MEMBER(x1turbo_gfxpal_r);
- DECLARE_WRITE8_MEMBER(x1turbo_pal_w);
- DECLARE_WRITE8_MEMBER(x1turbo_txpal_w);
- DECLARE_WRITE8_MEMBER(x1turbo_txdisp_w);
- DECLARE_WRITE8_MEMBER(x1turbo_gfxpal_w);
- DECLARE_WRITE8_MEMBER(x1turbo_blackclip_w);
- DECLARE_READ8_MEMBER(x1turbo_mem_r);
- DECLARE_WRITE8_MEMBER(x1turbo_mem_w);
- DECLARE_WRITE8_MEMBER(x1turboz_4096_palette_w);
- DECLARE_READ8_MEMBER(x1turboz_blackclip_r);
- DECLARE_READ8_MEMBER(x1turbo_bank_r);
- DECLARE_WRITE8_MEMBER(x1turbo_bank_w);
+ uint8_t x1_mem_r(offs_t offset);
+ void x1_mem_w(offs_t offset, uint8_t data);
+ uint8_t x1_sub_io_r();
+ void x1_sub_io_w(uint8_t data);
+ uint8_t x1_rom_r();
+ void x1_rom_w(offs_t offset, uint8_t data);
+ void x1_rom_bank_0_w(uint8_t data);
+ void x1_rom_bank_1_w(uint8_t data);
+ uint8_t x1_fdc_r(offs_t offset);
+ void x1_fdc_w(offs_t offset, uint8_t data);
+ uint8_t x1_pcg_r(offs_t offset);
+ void x1_pcg_w(offs_t offset, uint8_t data);
+ void x1_pal_r_w(uint8_t data);
+ void x1_pal_g_w(uint8_t data);
+ void x1_pal_b_w(uint8_t data);
+ uint8_t x1_ex_gfxram_r(offs_t offset);
+ void x1_ex_gfxram_w(offs_t offset, uint8_t data);
+ void x1_scrn_w(uint8_t data);
+ void x1_pri_w(uint8_t data);
+ void x1_6845_w(offs_t offset, uint8_t data);
+ uint8_t x1_kanji_r(offs_t offset);
+ void x1_kanji_w(offs_t offset, uint8_t data);
+ uint8_t x1_emm_r(offs_t offset);
+ void x1_emm_w(offs_t offset, uint8_t data);
+ uint8_t x1turbo_pal_r();
+ uint8_t x1turbo_txpal_r(offs_t offset);
+ uint8_t x1turbo_txdisp_r();
+ uint8_t x1turbo_gfxpal_r();
+ void x1turbo_pal_w(uint8_t data);
+ void x1turbo_txpal_w(offs_t offset, uint8_t data);
+ void x1turbo_txdisp_w(uint8_t data);
+ void x1turbo_gfxpal_w(uint8_t data);
+ void x1turbo_blackclip_w(uint8_t data);
+ uint8_t x1turbo_mem_r(offs_t offset);
+ void x1turbo_mem_w(offs_t offset, uint8_t data);
+ void x1turboz_4096_palette_w(offs_t offset, uint8_t data);
+ uint8_t x1turboz_blackclip_r();
+ uint8_t x1turbo_bank_r();
+ void x1turbo_bank_w(uint8_t data);
uint8_t x1_porta_r();
uint8_t x1_portb_r();
uint8_t x1_portc_r();
@@ -157,25 +157,25 @@ public:
void x1turbo(machine_config &config);
void x1(machine_config &config);
- DECLARE_READ8_MEMBER(ym_r);
- DECLARE_READ8_MEMBER(color_board_r);
- DECLARE_WRITE8_MEMBER(color_board_w);
- DECLARE_READ8_MEMBER(color_board_2_r);
- DECLARE_WRITE8_MEMBER(color_board_2_w);
- DECLARE_READ8_MEMBER(stereo_board_r);
- DECLARE_WRITE8_MEMBER(stereo_board_w);
- DECLARE_READ8_MEMBER(rs232_r);
- DECLARE_WRITE8_MEMBER(rs232_w);
- DECLARE_READ8_MEMBER(sasi_r);
- DECLARE_WRITE8_MEMBER(sasi_w);
- DECLARE_READ8_MEMBER(fdd8_r);
- DECLARE_WRITE8_MEMBER(fdd8_w);
- DECLARE_READ8_MEMBER(ext_sio_ctc_r);
- DECLARE_WRITE8_MEMBER(ext_sio_ctc_w);
- DECLARE_WRITE8_MEMBER(z_img_cap_w);
- DECLARE_WRITE8_MEMBER(z_mosaic_w);
- DECLARE_WRITE8_MEMBER(z_chroma_key_w);
- DECLARE_WRITE8_MEMBER(z_extra_scroll_w);
+ uint8_t ym_r(offs_t offset);
+ uint8_t color_board_r(address_space &space);
+ void color_board_w(uint8_t data);
+ uint8_t color_board_2_r(address_space &space);
+ void color_board_2_w(uint8_t data);
+ uint8_t stereo_board_r(address_space &space, offs_t offset);
+ void stereo_board_w(offs_t offset, uint8_t data);
+ uint8_t rs232_r(offs_t offset);
+ void rs232_w(offs_t offset, uint8_t data);
+ uint8_t sasi_r(address_space &space, offs_t offset);
+ void sasi_w(offs_t offset, uint8_t data);
+ uint8_t fdd8_r(address_space &space, offs_t offset);
+ void fdd8_w(offs_t offset, uint8_t data);
+ uint8_t ext_sio_ctc_r(address_space &space, offs_t offset);
+ void ext_sio_ctc_w(offs_t offset, uint8_t data);
+ void z_img_cap_w(uint8_t data);
+ void z_mosaic_w(uint8_t data);
+ void z_chroma_key_w(uint8_t data);
+ void z_extra_scroll_w(uint8_t data);
uint8_t m_key_irq_flag; /**< Keyboard IRQ pending. */
uint8_t m_key_irq_vector; /**< Keyboard IRQ vector. */