diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2012-04-06 14:29:31 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2012-04-06 14:29:31 +0000 |
commit | 3541b5c3513664684e43577fb9c5a4ae6177d600 (patch) | |
tree | ff0676de43d473f4ba5b5ecd7b3f92a84d70f448 /src/mame/includes | |
parent | 7818ba99ea894304b5c6e804c3e1f87327f21fcd (diff) |
MAME going modern part 7 (no whatsnew)
Diffstat (limited to 'src/mame/includes')
527 files changed, 3550 insertions, 3401 deletions
diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index 9b2ba5d45cb..f311f28d93c 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -25,17 +25,17 @@ public: /* devices */ device_t *m_audiocpu; DECLARE_WRITE8_MEMBER(c1942_bankswitch_w); + DECLARE_WRITE8_MEMBER(c1942_fgvideoram_w); + DECLARE_WRITE8_MEMBER(c1942_bgvideoram_w); + DECLARE_WRITE8_MEMBER(c1942_palette_bank_w); + DECLARE_WRITE8_MEMBER(c1942_scroll_w); + DECLARE_WRITE8_MEMBER(c1942_c804_w); }; /*----------- defined in video/1942.c -----------*/ -extern WRITE8_HANDLER( c1942_fgvideoram_w ); -extern WRITE8_HANDLER( c1942_bgvideoram_w ); -extern WRITE8_HANDLER( c1942_scroll_w ); -extern WRITE8_HANDLER( c1942_c804_w ); -extern WRITE8_HANDLER( c1942_palette_bank_w ); extern PALETTE_INIT( 1942 ); extern VIDEO_START( 1942 ); diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index ab75f48bcad..2ade3f7438f 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -29,16 +29,16 @@ public: int m_bg2_on; DECLARE_READ8_MEMBER(c1943_protection_r); DECLARE_READ8_MEMBER(_1943b_c007_r); + DECLARE_WRITE8_MEMBER(c1943_videoram_w); + DECLARE_WRITE8_MEMBER(c1943_colorram_w); + DECLARE_WRITE8_MEMBER(c1943_c804_w); + DECLARE_WRITE8_MEMBER(c1943_d806_w); }; /*----------- defined in video/1943.c -----------*/ -extern WRITE8_HANDLER( c1943_c804_w ); -extern WRITE8_HANDLER( c1943_d806_w ); -extern WRITE8_HANDLER( c1943_videoram_w ); -extern WRITE8_HANDLER( c1943_colorram_w ); extern PALETTE_INIT( 1943 ); extern VIDEO_START( 1943 ); diff --git a/src/mame/includes/3do.h b/src/mame/includes/3do.h index 1a08ddd0b8f..d3d9f78b3e0 100644 --- a/src/mame/includes/3do.h +++ b/src/mame/includes/3do.h @@ -173,26 +173,26 @@ public: CLIO m_clio; SVF m_svf; UINT8 m_video_bits[512]; + DECLARE_READ32_MEMBER(_3do_nvarea_r); + DECLARE_WRITE32_MEMBER(_3do_nvarea_w); + DECLARE_READ32_MEMBER(_3do_slow2_r); + DECLARE_WRITE32_MEMBER(_3do_slow2_w); + DECLARE_READ32_MEMBER(_3do_svf_r); + DECLARE_WRITE32_MEMBER(_3do_svf_w); + DECLARE_READ32_MEMBER(_3do_madam_r); + DECLARE_WRITE32_MEMBER(_3do_madam_w); + DECLARE_READ32_MEMBER(_3do_clio_r); + DECLARE_WRITE32_MEMBER(_3do_clio_w); }; /*----------- defined in machine/3do.c -----------*/ -READ32_HANDLER( _3do_nvarea_r ); -WRITE32_HANDLER( _3do_nvarea_w ); -READ32_HANDLER( _3do_slow2_r ); -WRITE32_HANDLER( _3do_slow2_w ); void _3do_slow2_init( running_machine &machine ); -READ32_HANDLER( _3do_svf_r ); -WRITE32_HANDLER( _3do_svf_w ); -READ32_HANDLER( _3do_madam_r ); -WRITE32_HANDLER( _3do_madam_w ); void _3do_madam_init( running_machine &machine ); -READ32_HANDLER( _3do_clio_r ); -WRITE32_HANDLER( _3do_clio_w ); void _3do_clio_init( running_machine &machine, screen_device *screen ); diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h index ba4e8a465e1..e695c01aca7 100644 --- a/src/mame/includes/40love.h +++ b/src/mame/includes/40love.h @@ -68,18 +68,18 @@ public: DECLARE_READ8_MEMBER(from_snd_r); DECLARE_READ8_MEMBER(snd_flag_r); DECLARE_WRITE8_MEMBER(to_main_w); + DECLARE_WRITE8_MEMBER(fortyl_pixram_sel_w); + DECLARE_READ8_MEMBER(fortyl_pixram_r); + DECLARE_WRITE8_MEMBER(fortyl_pixram_w); + DECLARE_WRITE8_MEMBER(fortyl_bg_videoram_w); + DECLARE_READ8_MEMBER(fortyl_bg_videoram_r); + DECLARE_WRITE8_MEMBER(fortyl_bg_colorram_w); + DECLARE_READ8_MEMBER(fortyl_bg_colorram_r); }; /*----------- defined in video/40love.c -----------*/ -WRITE8_HANDLER( fortyl_bg_videoram_w ); -WRITE8_HANDLER( fortyl_bg_colorram_w ); -READ8_HANDLER ( fortyl_bg_videoram_r ); -READ8_HANDLER ( fortyl_bg_colorram_r ); -WRITE8_HANDLER( fortyl_pixram_sel_w ); -READ8_HANDLER( fortyl_pixram_r ); -WRITE8_HANDLER( fortyl_pixram_w ); VIDEO_START( fortyl ); SCREEN_UPDATE_IND16( fortyl ); diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h index 669a9130a52..6eb948bab90 100644 --- a/src/mame/includes/4enraya.h +++ b/src/mame/includes/4enraya.h @@ -26,12 +26,12 @@ public: DECLARE_WRITE8_MEMBER(sound_data_w); DECLARE_READ8_MEMBER(fenraya_custom_map_r); DECLARE_WRITE8_MEMBER(fenraya_custom_map_w); + DECLARE_WRITE8_MEMBER(fenraya_videoram_w); }; /*----------- defined in video/4enraya.c -----------*/ -WRITE8_HANDLER( fenraya_videoram_w ); VIDEO_START( 4enraya ); SCREEN_UPDATE_IND16( 4enraya ); diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index 9aa63892b25..6c59a2e33c9 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -42,6 +42,10 @@ public: DECLARE_READ8_MEMBER(aeroboto_irq_ack_r); DECLARE_READ8_MEMBER(aeroboto_2973_r); DECLARE_WRITE8_MEMBER(aeroboto_1a2_w); + DECLARE_READ8_MEMBER(aeroboto_in0_r); + DECLARE_WRITE8_MEMBER(aeroboto_3000_w); + DECLARE_WRITE8_MEMBER(aeroboto_videoram_w); + DECLARE_WRITE8_MEMBER(aeroboto_tilecolor_w); }; @@ -50,7 +54,3 @@ public: VIDEO_START( aeroboto ); SCREEN_UPDATE_IND16( aeroboto ); -READ8_HANDLER( aeroboto_in0_r ); -WRITE8_HANDLER( aeroboto_3000_w ); -WRITE8_HANDLER( aeroboto_videoram_w ); -WRITE8_HANDLER( aeroboto_tilecolor_w ); diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index 561851f786f..1eaa2161d99 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -46,27 +46,27 @@ public: DECLARE_WRITE8_MEMBER(pending_command_clear_w); DECLARE_WRITE8_MEMBER(aerofgt_sh_bankswitch_w); DECLARE_WRITE8_MEMBER(aerfboot_okim6295_banking_w); + DECLARE_WRITE16_MEMBER(aerofgt_bg1videoram_w); + DECLARE_WRITE16_MEMBER(aerofgt_bg2videoram_w); + DECLARE_WRITE16_MEMBER(pspikes_gfxbank_w); + DECLARE_WRITE16_MEMBER(pspikesb_gfxbank_w); + DECLARE_WRITE16_MEMBER(spikes91_lookup_w); + DECLARE_WRITE16_MEMBER(karatblz_gfxbank_w); + DECLARE_WRITE16_MEMBER(spinlbrk_gfxbank_w); + DECLARE_WRITE16_MEMBER(turbofrc_gfxbank_w); + DECLARE_WRITE16_MEMBER(aerofgt_gfxbank_w); + DECLARE_WRITE16_MEMBER(aerofgt_bg1scrollx_w); + DECLARE_WRITE16_MEMBER(aerofgt_bg1scrolly_w); + DECLARE_WRITE16_MEMBER(aerofgt_bg2scrollx_w); + DECLARE_WRITE16_MEMBER(aerofgt_bg2scrolly_w); + DECLARE_WRITE16_MEMBER(pspikes_palette_bank_w); + DECLARE_WRITE16_MEMBER(wbbc97_bitmap_enable_w); }; /*----------- defined in video/aerofgt.c -----------*/ -WRITE16_HANDLER( aerofgt_bg1videoram_w ); -WRITE16_HANDLER( aerofgt_bg2videoram_w ); -WRITE16_HANDLER( pspikes_gfxbank_w ); -WRITE16_HANDLER( pspikesb_gfxbank_w ); -WRITE16_HANDLER( spikes91_lookup_w ); -WRITE16_HANDLER( karatblz_gfxbank_w ); -WRITE16_HANDLER( spinlbrk_gfxbank_w ); -WRITE16_HANDLER( turbofrc_gfxbank_w ); -WRITE16_HANDLER( aerofgt_gfxbank_w ); -WRITE16_HANDLER( aerofgt_bg1scrollx_w ); -WRITE16_HANDLER( aerofgt_bg1scrolly_w ); -WRITE16_HANDLER( aerofgt_bg2scrollx_w ); -WRITE16_HANDLER( aerofgt_bg2scrolly_w ); -WRITE16_HANDLER( pspikes_palette_bank_w ); -WRITE16_HANDLER( wbbc97_bitmap_enable_w ); VIDEO_START( pspikes ); VIDEO_START( karatblz ); diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index 60013078310..1b3320cb236 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -49,16 +49,16 @@ public: DECLARE_WRITE8_MEMBER(soundcommand2_w); DECLARE_WRITE8_MEMBER(airbustr_paletteram_w); DECLARE_WRITE8_MEMBER(airbustr_coin_counter_w); + DECLARE_WRITE8_MEMBER(airbustr_videoram_w); + DECLARE_WRITE8_MEMBER(airbustr_colorram_w); + DECLARE_WRITE8_MEMBER(airbustr_videoram2_w); + DECLARE_WRITE8_MEMBER(airbustr_colorram2_w); + DECLARE_WRITE8_MEMBER(airbustr_scrollregs_w); }; /*----------- defined in video/airbustr.c -----------*/ -WRITE8_HANDLER( airbustr_videoram_w ); -WRITE8_HANDLER( airbustr_colorram_w ); -WRITE8_HANDLER( airbustr_videoram2_w ); -WRITE8_HANDLER( airbustr_colorram2_w ); -WRITE8_HANDLER( airbustr_scrollregs_w ); VIDEO_START( airbustr ); SCREEN_UPDATE_IND16( airbustr ); diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h index c55238c5e68..1cbcab0b0a6 100644 --- a/src/mame/includes/ajax.h +++ b/src/mame/includes/ajax.h @@ -27,14 +27,16 @@ public: device_t *m_k051960; device_t *m_k051316; DECLARE_WRITE8_MEMBER(sound_bank_w); + DECLARE_READ8_MEMBER(ajax_ls138_f10_r); + DECLARE_WRITE8_MEMBER(ajax_ls138_f10_w); + DECLARE_WRITE8_MEMBER(ajax_bankswitch_2_w); + DECLARE_WRITE8_MEMBER(ajax_bankswitch_w); + DECLARE_WRITE8_MEMBER(ajax_lamps_w); }; /*----------- defined in machine/ajax.c -----------*/ -WRITE8_HANDLER( ajax_bankswitch_2_w ); -READ8_HANDLER( ajax_ls138_f10_r ); -WRITE8_HANDLER( ajax_ls138_f10_w ); MACHINE_START( ajax ); MACHINE_RESET( ajax ); INTERRUPT_GEN( ajax_interrupt ); diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index 6b8c15e3880..2e5eeed6e62 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -63,6 +63,10 @@ public: DECLARE_READ16_MEMBER(sound_cpu_r); DECLARE_WRITE8_MEMBER(sound_bank_w); DECLARE_WRITE8_MEMBER(porta_w); + DECLARE_WRITE16_MEMBER(alpha68k_paletteram_w); + DECLARE_WRITE16_MEMBER(alpha68k_videoram_w); + DECLARE_WRITE16_MEMBER(alpha68k_II_video_bank_w); + DECLARE_WRITE16_MEMBER(alpha68k_V_video_control_w); }; /* game_id - used to deal with a few game specific situations */ @@ -91,7 +95,3 @@ SCREEN_UPDATE_IND16( alpha68k_V_sb ); void alpha68k_V_video_bank_w(running_machine &machine, int bank); void alpha68k_flipscreen_w(running_machine &machine, int flip); -WRITE16_HANDLER( alpha68k_paletteram_w ); -WRITE16_HANDLER( alpha68k_videoram_w ); -WRITE16_HANDLER( alpha68k_II_video_bank_w ); -WRITE16_HANDLER( alpha68k_V_video_control_w ); diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h index e94d1b8d2d2..83c2858ca05 100644 --- a/src/mame/includes/ampoker2.h +++ b/src/mame/includes/ampoker2.h @@ -14,12 +14,12 @@ public: DECLARE_WRITE8_MEMBER(ampoker2_port35_w); DECLARE_WRITE8_MEMBER(ampoker2_port36_w); DECLARE_WRITE8_MEMBER(ampoker2_watchdog_reset_w); + DECLARE_WRITE8_MEMBER(ampoker2_videoram_w); }; /*----------- defined in video/ampoker2.c -----------*/ -WRITE8_HANDLER( ampoker2_videoram_w ); PALETTE_INIT( ampoker2 ); VIDEO_START( ampoker2 ); VIDEO_START( sigma2k ); diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index ded31c74e29..345244e3182 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -31,15 +31,15 @@ public: DECLARE_READ8_MEMBER(amspdwy_wheel_1_r); DECLARE_WRITE8_MEMBER(amspdwy_sound_w); DECLARE_READ8_MEMBER(amspdwy_port_r); + DECLARE_WRITE8_MEMBER(amspdwy_paletteram_w); + DECLARE_WRITE8_MEMBER(amspdwy_flipscreen_w); + DECLARE_WRITE8_MEMBER(amspdwy_videoram_w); + DECLARE_WRITE8_MEMBER(amspdwy_colorram_w); }; /*----------- defined in video/amspdwy.c -----------*/ -WRITE8_HANDLER( amspdwy_videoram_w ); -WRITE8_HANDLER( amspdwy_colorram_w ); -WRITE8_HANDLER( amspdwy_paletteram_w ); -WRITE8_HANDLER( amspdwy_flipscreen_w ); VIDEO_START( amspdwy ); SCREEN_UPDATE_IND16( amspdwy ); diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index a6b1b852ed3..c2ed8405c30 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -36,23 +36,23 @@ public: DECLARE_READ8_MEMBER(angelkds_main_sound_r); DECLARE_WRITE8_MEMBER(angelkds_sub_sound_w); DECLARE_READ8_MEMBER(angelkds_sub_sound_r); + DECLARE_WRITE8_MEMBER(angelkds_txvideoram_w); + DECLARE_WRITE8_MEMBER(angelkds_txbank_write); + DECLARE_WRITE8_MEMBER(angelkds_bgtopvideoram_w); + DECLARE_WRITE8_MEMBER(angelkds_bgtopbank_write); + DECLARE_WRITE8_MEMBER(angelkds_bgtopscroll_write); + DECLARE_WRITE8_MEMBER(angelkds_bgbotvideoram_w); + DECLARE_WRITE8_MEMBER(angelkds_bgbotbank_write); + DECLARE_WRITE8_MEMBER(angelkds_bgbotscroll_write); + DECLARE_WRITE8_MEMBER(angelkds_layer_ctrl_write); + DECLARE_WRITE8_MEMBER(angelkds_paletteram_w); }; /*----------- defined in video/angelkds.c -----------*/ -WRITE8_HANDLER( angelkds_bgtopvideoram_w ); -WRITE8_HANDLER( angelkds_bgbotvideoram_w ); -WRITE8_HANDLER( angelkds_txvideoram_w ); -WRITE8_HANDLER( angelkds_bgtopbank_write ); -WRITE8_HANDLER( angelkds_bgtopscroll_write ); -WRITE8_HANDLER( angelkds_bgbotbank_write ); -WRITE8_HANDLER( angelkds_bgbotscroll_write ); -WRITE8_HANDLER( angelkds_txbank_write ); -WRITE8_HANDLER( angelkds_paletteram_w ); -WRITE8_HANDLER( angelkds_layer_ctrl_write ); VIDEO_START( angelkds ); SCREEN_UPDATE_IND16( angelkds ); diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h index 77ec3818349..c73ccad6fab 100644 --- a/src/mame/includes/appoooh.h +++ b/src/mame/includes/appoooh.h @@ -29,6 +29,12 @@ public: UINT8 m_nmi_mask; DECLARE_WRITE8_MEMBER(appoooh_adpcm_w); + DECLARE_WRITE8_MEMBER(appoooh_scroll_w); + DECLARE_WRITE8_MEMBER(appoooh_fg_videoram_w); + DECLARE_WRITE8_MEMBER(appoooh_fg_colorram_w); + DECLARE_WRITE8_MEMBER(appoooh_bg_videoram_w); + DECLARE_WRITE8_MEMBER(appoooh_bg_colorram_w); + DECLARE_WRITE8_MEMBER(appoooh_out_w); }; #define CHR1_OFST 0x00 /* palette page of char set #1 */ @@ -37,14 +43,8 @@ public: /* ----------- defined in video/appoooh.c -----------*/ -WRITE8_HANDLER( appoooh_fg_videoram_w ); -WRITE8_HANDLER( appoooh_fg_colorram_w ); -WRITE8_HANDLER( appoooh_bg_videoram_w ); -WRITE8_HANDLER( appoooh_bg_colorram_w ); PALETTE_INIT( appoooh ); PALETTE_INIT( robowres ); -WRITE8_HANDLER( appoooh_scroll_w ); -WRITE8_HANDLER( appoooh_out_w ); VIDEO_START( appoooh ); SCREEN_UPDATE_IND16( appoooh ); SCREEN_UPDATE_IND16( robowres ); diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index ec492c3d5ea..3c4c3567240 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -32,14 +32,14 @@ public: DECLARE_WRITE8_MEMBER(aquarium_z80_bank_w); DECLARE_READ8_MEMBER(aquarium_oki_r); DECLARE_WRITE8_MEMBER(aquarium_oki_w); + DECLARE_WRITE16_MEMBER(aquarium_txt_videoram_w); + DECLARE_WRITE16_MEMBER(aquarium_mid_videoram_w); + DECLARE_WRITE16_MEMBER(aquarium_bak_videoram_w); }; /*----------- defined in video/aquarium.c -----------*/ -WRITE16_HANDLER( aquarium_txt_videoram_w ); -WRITE16_HANDLER( aquarium_mid_videoram_w ); -WRITE16_HANDLER( aquarium_bak_videoram_w ); VIDEO_START(aquarium); SCREEN_UPDATE_IND16(aquarium); diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h index 61ce101d8f8..f9266a1e743 100644 --- a/src/mame/includes/arabian.h +++ b/src/mame/includes/arabian.h @@ -32,13 +32,13 @@ public: DECLARE_READ8_MEMBER(mcu_portk_r); DECLARE_WRITE8_MEMBER(mcu_port_o_w); DECLARE_WRITE8_MEMBER(mcu_port_p_w); + DECLARE_WRITE8_MEMBER(arabian_blitter_w); + DECLARE_WRITE8_MEMBER(arabian_videoram_w); }; /*----------- defined in video/arabian.c -----------*/ -WRITE8_HANDLER( arabian_blitter_w ); -WRITE8_HANDLER( arabian_videoram_w ); PALETTE_INIT( arabian ); VIDEO_START( arabian ); diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h index a8dfdbc2fdd..f1038bf5b86 100644 --- a/src/mame/includes/argus.h +++ b/src/mame/includes/argus.h @@ -36,6 +36,27 @@ public: UINT8 *m_spriteram; size_t m_spriteram_size; DECLARE_WRITE8_MEMBER(argus_bankselect_w); + DECLARE_WRITE8_MEMBER(valtric_mosaic_w); + DECLARE_READ8_MEMBER(argus_txram_r); + DECLARE_WRITE8_MEMBER(argus_txram_w); + DECLARE_READ8_MEMBER(argus_bg1ram_r); + DECLARE_WRITE8_MEMBER(argus_bg1ram_w); + DECLARE_WRITE8_MEMBER(argus_bg_status_w); + DECLARE_WRITE8_MEMBER(valtric_bg_status_w); + DECLARE_WRITE8_MEMBER(butasan_bg0_status_w); + DECLARE_WRITE8_MEMBER(butasan_bg1_status_w); + DECLARE_WRITE8_MEMBER(argus_flipscreen_w); + DECLARE_READ8_MEMBER(argus_paletteram_r); + DECLARE_WRITE8_MEMBER(argus_paletteram_w); + DECLARE_WRITE8_MEMBER(valtric_paletteram_w); + DECLARE_WRITE8_MEMBER(butasan_paletteram_w); + DECLARE_READ8_MEMBER(butasan_bg1ram_r); + DECLARE_WRITE8_MEMBER(butasan_bg1ram_w); + DECLARE_WRITE8_MEMBER(butasan_pageselect_w); + DECLARE_READ8_MEMBER(butasan_pagedram_r); + DECLARE_WRITE8_MEMBER(butasan_pagedram_w); + DECLARE_WRITE8_MEMBER(valtric_unknown_w); + DECLARE_WRITE8_MEMBER(butasan_unknown_w); }; @@ -51,27 +72,6 @@ SCREEN_UPDATE_RGB32( argus ); SCREEN_UPDATE_RGB32( valtric ); SCREEN_UPDATE_RGB32( butasan ); -READ8_HANDLER( argus_txram_r ); -READ8_HANDLER( argus_bg1ram_r ); -READ8_HANDLER( argus_paletteram_r ); -WRITE8_HANDLER( argus_txram_w ); -WRITE8_HANDLER( argus_bg1ram_w ); -WRITE8_HANDLER( argus_bg_status_w ); -WRITE8_HANDLER( argus_flipscreen_w ); -WRITE8_HANDLER( argus_paletteram_w ); -WRITE8_HANDLER( valtric_bg_status_w ); -WRITE8_HANDLER( valtric_paletteram_w ); -WRITE8_HANDLER( valtric_mosaic_w ); -WRITE8_HANDLER( valtric_unknown_w ); -READ8_HANDLER( butasan_pagedram_r ); -READ8_HANDLER( butasan_bg1ram_r ); -WRITE8_HANDLER( butasan_pageselect_w ); -WRITE8_HANDLER( butasan_pagedram_w ); -WRITE8_HANDLER( butasan_bg1ram_w ); -WRITE8_HANDLER( butasan_bg0_status_w ); -WRITE8_HANDLER( butasan_paletteram_w ); -WRITE8_HANDLER( butasan_bg1_status_w ); -WRITE8_HANDLER( butasan_unknown_w ); diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index 1380e0c0f25..1ebf8fd59ee 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -45,17 +45,30 @@ public: /* devices */ device_t *m_mcu; + DECLARE_READ8_MEMBER(arkanoid_Z80_mcu_r); + DECLARE_WRITE8_MEMBER(arkanoid_Z80_mcu_w); + DECLARE_READ8_MEMBER(arkanoid_68705_port_a_r); + DECLARE_WRITE8_MEMBER(arkanoid_68705_port_a_w); + DECLARE_WRITE8_MEMBER(arkanoid_68705_ddr_a_w); + DECLARE_READ8_MEMBER(arkanoid_68705_port_c_r); + DECLARE_WRITE8_MEMBER(arkanoid_68705_port_c_w); + DECLARE_WRITE8_MEMBER(arkanoid_68705_ddr_c_w); + DECLARE_READ8_MEMBER(arkanoid_bootleg_f000_r); + DECLARE_READ8_MEMBER(arkanoid_bootleg_f002_r); + DECLARE_WRITE8_MEMBER(arkanoid_bootleg_d018_w); + DECLARE_READ8_MEMBER(block2_bootleg_f000_r); + DECLARE_READ8_MEMBER(arkanoid_bootleg_d008_r); + DECLARE_WRITE8_MEMBER(arkanoid_videoram_w); + DECLARE_WRITE8_MEMBER(arkanoid_d008_w); + DECLARE_WRITE8_MEMBER(tetrsark_d008_w); + DECLARE_WRITE8_MEMBER(hexa_d008_w); }; /*----------- defined in video/arkanoid.c -----------*/ -extern WRITE8_HANDLER( arkanoid_videoram_w ); -extern WRITE8_HANDLER( arkanoid_d008_w ); -extern WRITE8_HANDLER( tetrsark_d008_w ); -extern WRITE8_HANDLER( hexa_d008_w ); extern VIDEO_START( arkanoid ); extern SCREEN_UPDATE_IND16( arkanoid ); @@ -64,21 +77,9 @@ extern SCREEN_UPDATE_IND16( hexa ); /*----------- defined in machine/arkanoid.c -----------*/ -extern READ8_HANDLER( arkanoid_Z80_mcu_r ); -extern WRITE8_HANDLER( arkanoid_Z80_mcu_w ); -extern READ8_HANDLER( arkanoid_68705_port_a_r ); -extern WRITE8_HANDLER( arkanoid_68705_port_a_w ); -extern WRITE8_HANDLER( arkanoid_68705_ddr_a_w ); -extern READ8_HANDLER( arkanoid_68705_port_c_r ); -extern WRITE8_HANDLER( arkanoid_68705_port_c_w ); -extern WRITE8_HANDLER( arkanoid_68705_ddr_c_w ); extern CUSTOM_INPUT( arkanoid_68705_input_r ); extern CUSTOM_INPUT( arkanoid_input_mux ); -extern READ8_HANDLER( arkanoid_bootleg_f000_r ); -extern READ8_HANDLER( arkanoid_bootleg_f002_r ); -extern WRITE8_HANDLER( arkanoid_bootleg_d018_w ); -extern READ8_HANDLER( arkanoid_bootleg_d008_r ); diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index ebe838a405e..c0156439c24 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -44,6 +44,19 @@ public: DECLARE_WRITE8_MEMBER(fg_scrollx_w); DECLARE_WRITE8_MEMBER(fg_scrolly_w); DECLARE_WRITE8_MEMBER(fg_scroll_msb_w); + DECLARE_READ8_MEMBER(nb1414m4_text_videoram_r); + DECLARE_WRITE8_MEMBER(nb1414m4_text_videoram_w); + DECLARE_READ8_MEMBER(armedf_text_videoram_r); + DECLARE_WRITE8_MEMBER(armedf_text_videoram_w); + DECLARE_WRITE16_MEMBER(armedf_fg_videoram_w); + DECLARE_WRITE16_MEMBER(armedf_bg_videoram_w); + DECLARE_WRITE16_MEMBER(terraf_fg_scrolly_w); + DECLARE_WRITE16_MEMBER(terraf_fg_scrollx_w); + DECLARE_WRITE16_MEMBER(terraf_fg_scroll_msb_arm_w); + DECLARE_WRITE16_MEMBER(armedf_fg_scrollx_w); + DECLARE_WRITE16_MEMBER(armedf_fg_scrolly_w); + DECLARE_WRITE16_MEMBER(armedf_bg_scrollx_w); + DECLARE_WRITE16_MEMBER(armedf_bg_scrolly_w); }; class bigfghtr_state : public armedf_state @@ -70,16 +83,3 @@ SCREEN_UPDATE_IND16( armedf ); VIDEO_START( armedf ); VIDEO_START( terraf ); -WRITE16_HANDLER( armedf_bg_videoram_w ); -WRITE16_HANDLER( armedf_fg_videoram_w ); -READ8_HANDLER( armedf_text_videoram_r ); -WRITE8_HANDLER( armedf_text_videoram_w ); -READ8_HANDLER( nb1414m4_text_videoram_r ); -WRITE8_HANDLER( nb1414m4_text_videoram_w ); -WRITE16_HANDLER( terraf_fg_scrollx_w ); -WRITE16_HANDLER( terraf_fg_scrolly_w ); -WRITE16_HANDLER( terraf_fg_scroll_msb_arm_w ); -WRITE16_HANDLER( armedf_fg_scrollx_w ); -WRITE16_HANDLER( armedf_fg_scrolly_w ); -WRITE16_HANDLER( armedf_bg_scrollx_w ); -WRITE16_HANDLER( armedf_bg_scrolly_w ); diff --git a/src/mame/includes/artmagic.h b/src/mame/includes/artmagic.h index db7e28b90b2..6dbc95225a8 100644 --- a/src/mame/includes/artmagic.h +++ b/src/mame/includes/artmagic.h @@ -36,6 +36,8 @@ public: DECLARE_READ16_MEMBER(ultennis_hack_r); DECLARE_WRITE16_MEMBER(protection_bit_w); DECLARE_READ16_MEMBER(unk_r); + DECLARE_READ16_MEMBER(artmagic_blitter_r); + DECLARE_WRITE16_MEMBER(artmagic_blitter_w); }; @@ -46,7 +48,5 @@ VIDEO_START( artmagic ); void artmagic_to_shiftreg(address_space *space, offs_t address, UINT16 *data); void artmagic_from_shiftreg(address_space *space, offs_t address, UINT16 *data); -READ16_HANDLER( artmagic_blitter_r ); -WRITE16_HANDLER( artmagic_blitter_w ); void artmagic_scanline(screen_device &screen, bitmap_rgb32 &bitmap, int scanline, const tms34010_display_params *params); diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h index 1926847cd89..734c2d16aed 100644 --- a/src/mame/includes/ashnojoe.h +++ b/src/mame/includes/ashnojoe.h @@ -43,20 +43,20 @@ public: DECLARE_WRITE8_MEMBER(adpcm_w); DECLARE_READ8_MEMBER(sound_latch_r); DECLARE_READ8_MEMBER(sound_latch_status_r); + DECLARE_WRITE16_MEMBER(ashnojoe_tileram_w); + DECLARE_WRITE16_MEMBER(ashnojoe_tileram2_w); + DECLARE_WRITE16_MEMBER(ashnojoe_tileram3_w); + DECLARE_WRITE16_MEMBER(ashnojoe_tileram4_w); + DECLARE_WRITE16_MEMBER(ashnojoe_tileram5_w); + DECLARE_WRITE16_MEMBER(ashnojoe_tileram6_w); + DECLARE_WRITE16_MEMBER(ashnojoe_tileram7_w); + DECLARE_WRITE16_MEMBER(joe_tilemaps_xscroll_w); + DECLARE_WRITE16_MEMBER(joe_tilemaps_yscroll_w); }; /*----------- defined in video/ashnojoe.c -----------*/ -WRITE16_HANDLER( ashnojoe_tileram_w ); -WRITE16_HANDLER( ashnojoe_tileram2_w ); -WRITE16_HANDLER( ashnojoe_tileram3_w ); -WRITE16_HANDLER( ashnojoe_tileram4_w ); -WRITE16_HANDLER( ashnojoe_tileram5_w ); -WRITE16_HANDLER( ashnojoe_tileram6_w ); -WRITE16_HANDLER( ashnojoe_tileram7_w ); -WRITE16_HANDLER( joe_tilemaps_xscroll_w ); -WRITE16_HANDLER( joe_tilemaps_yscroll_w ); VIDEO_START( ashnojoe ); SCREEN_UPDATE_IND16( ashnojoe ); diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h index cdc6768970c..6d29a4633b0 100644 --- a/src/mame/includes/asterix.h +++ b/src/mame/includes/asterix.h @@ -37,6 +37,7 @@ public: DECLARE_WRITE8_MEMBER(sound_arm_nmi_w); DECLARE_WRITE16_MEMBER(sound_irq_w); DECLARE_WRITE16_MEMBER(protection_w); + DECLARE_WRITE16_MEMBER(asterix_spritebank_w); }; @@ -44,7 +45,6 @@ public: /*----------- defined in video/asterix.c -----------*/ SCREEN_UPDATE_IND16( asterix ); -WRITE16_HANDLER( asterix_spritebank_w ); extern void asterix_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); extern void asterix_sprite_callback(running_machine &machine, int *code, int *color, int *priority_mask); diff --git a/src/mame/includes/asteroid.h b/src/mame/includes/asteroid.h index df4e2c38f69..b2a005b02e6 100644 --- a/src/mame/includes/asteroid.h +++ b/src/mame/includes/asteroid.h @@ -16,6 +16,13 @@ public: UINT8 *m_ram2; DECLARE_WRITE8_MEMBER(astdelux_coin_counter_w); DECLARE_WRITE8_MEMBER(llander_led_w); + DECLARE_READ8_MEMBER(asteroid_IN0_r); + DECLARE_READ8_MEMBER(asterock_IN0_r); + DECLARE_READ8_MEMBER(asteroid_IN1_r); + DECLARE_READ8_MEMBER(asteroid_DSW1_r); + DECLARE_WRITE8_MEMBER(asteroid_bank_switch_w); + DECLARE_WRITE8_MEMBER(astdelux_bank_switch_w); + DECLARE_WRITE8_MEMBER(astdelux_led_w); }; @@ -25,14 +32,7 @@ INTERRUPT_GEN( asteroid_interrupt ); INTERRUPT_GEN( asterock_interrupt ); INTERRUPT_GEN( llander_interrupt ); -READ8_HANDLER( asteroid_IN0_r ); -READ8_HANDLER( asterock_IN0_r ); -READ8_HANDLER( asteroid_IN1_r ); -READ8_HANDLER( asteroid_DSW1_r ); -WRITE8_HANDLER( asteroid_bank_switch_w ); -WRITE8_HANDLER( astdelux_bank_switch_w ); -WRITE8_HANDLER( astdelux_led_w ); MACHINE_RESET( asteroid ); diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index ec62a36a9ce..655f0eadafd 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -91,6 +91,15 @@ public: DECLARE_WRITE8_MEMBER(tenpindx_lamp_w); DECLARE_WRITE8_MEMBER(tenpindx_counter_w); DECLARE_WRITE8_MEMBER(tenpindx_lights_w); + DECLARE_READ8_MEMBER(astrocade_data_chip_register_r); + DECLARE_WRITE8_MEMBER(astrocade_data_chip_register_w); + DECLARE_WRITE8_MEMBER(astrocade_funcgen_w); + DECLARE_WRITE8_MEMBER(astrocade_pattern_board_w); + DECLARE_WRITE8_MEMBER(profpac_page_select_w); + DECLARE_READ8_MEMBER(profpac_intercept_r); + DECLARE_WRITE8_MEMBER(profpac_screenram_ctrl_w); + DECLARE_READ8_MEMBER(profpac_videoram_r); + DECLARE_WRITE8_MEMBER(profpac_videoram_w); }; @@ -105,16 +114,7 @@ VIDEO_START( profpac ); SCREEN_UPDATE_IND16( astrocde ); SCREEN_UPDATE_IND16( profpac ); -WRITE8_HANDLER( astrocade_pattern_board_w ); -READ8_HANDLER( astrocade_data_chip_register_r ); -WRITE8_HANDLER( astrocade_data_chip_register_w ); -WRITE8_HANDLER( astrocade_funcgen_w ); -READ8_HANDLER( profpac_videoram_r ); -WRITE8_HANDLER( profpac_videoram_w ); -READ8_HANDLER( profpac_intercept_r ); -WRITE8_HANDLER( profpac_page_select_w ); -WRITE8_HANDLER( profpac_screenram_ctrl_w ); /*----------- defined in audio/wow.c -----------*/ diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h index e6eaca7494d..ef5f3cd9b84 100644 --- a/src/mame/includes/asuka.h +++ b/src/mame/includes/asuka.h @@ -38,6 +38,7 @@ public: DECLARE_WRITE8_MEMBER(asuka_msm5205_address_w); DECLARE_READ16_MEMBER(cadash_share_r); DECLARE_WRITE16_MEMBER(cadash_share_w); + DECLARE_WRITE16_MEMBER(asuka_spritectrl_w); }; @@ -53,7 +54,6 @@ WRITE16_HANDLER( bonzeadv_cchip_ram_w ); /*----------- defined in video/asuka.c -----------*/ -WRITE16_HANDLER( asuka_spritectrl_w ); SCREEN_UPDATE_IND16( asuka ); SCREEN_UPDATE_IND16( bonzeadv ); diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index b26cf9d16a3..8f49e866085 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -54,25 +54,28 @@ public: /* devices */ device_t *m_maincpu; + DECLARE_WRITE8_MEMBER(atarifb_out1_w); + DECLARE_WRITE8_MEMBER(atarifb4_out1_w); + DECLARE_WRITE8_MEMBER(abaseb_out1_w); + DECLARE_WRITE8_MEMBER(soccer_out1_w); + DECLARE_WRITE8_MEMBER(atarifb_out2_w); + DECLARE_WRITE8_MEMBER(soccer_out2_w); + DECLARE_WRITE8_MEMBER(atarifb_out3_w); + DECLARE_READ8_MEMBER(atarifb_in0_r); + DECLARE_READ8_MEMBER(atarifb_in2_r); + DECLARE_READ8_MEMBER(atarifb4_in0_r); + DECLARE_READ8_MEMBER(atarifb4_in2_r); + DECLARE_WRITE8_MEMBER(atarifb_alpha1_videoram_w); + DECLARE_WRITE8_MEMBER(atarifb_alpha2_videoram_w); + DECLARE_WRITE8_MEMBER(atarifb_field_videoram_w); }; /*----------- defined in machine/atarifb.c -----------*/ -WRITE8_HANDLER( atarifb_out1_w ); -WRITE8_HANDLER( atarifb4_out1_w ); -WRITE8_HANDLER( abaseb_out1_w ); -WRITE8_HANDLER( soccer_out1_w ); -WRITE8_HANDLER( atarifb_out2_w ); -WRITE8_HANDLER( soccer_out2_w ); -WRITE8_HANDLER( atarifb_out3_w ); -READ8_HANDLER( atarifb_in0_r ); -READ8_HANDLER( atarifb_in2_r ); -READ8_HANDLER( atarifb4_in0_r ); -READ8_HANDLER( atarifb4_in2_r ); /*----------- defined in audio/atarifb.c -----------*/ @@ -88,6 +91,3 @@ SCREEN_UPDATE_IND16( atarifb ); SCREEN_UPDATE_IND16( abaseb ); SCREEN_UPDATE_IND16( soccer ); -WRITE8_HANDLER( atarifb_alpha1_videoram_w ); -WRITE8_HANDLER( atarifb_alpha2_videoram_w ); -WRITE8_HANDLER( atarifb_field_videoram_w ); diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h index 4474bffe9d6..0efd85ff306 100644 --- a/src/mame/includes/atetris.h +++ b/src/mame/includes/atetris.h @@ -24,6 +24,7 @@ public: DECLARE_WRITE8_MEMBER(coincount_w); DECLARE_WRITE8_MEMBER(nvram_w); DECLARE_WRITE8_MEMBER(nvram_enable_w); + DECLARE_WRITE8_MEMBER(atetris_videoram_w); }; /*----------- defined in video/atetris.c -----------*/ @@ -31,4 +32,3 @@ public: VIDEO_START( atetris ); SCREEN_UPDATE_IND16( atetris ); -WRITE8_HANDLER( atetris_videoram_w ); diff --git a/src/mame/includes/aztarac.h b/src/mame/includes/aztarac.h index 910361b5858..a0a9b2371aa 100644 --- a/src/mame/includes/aztarac.h +++ b/src/mame/includes/aztarac.h @@ -18,6 +18,7 @@ public: int m_ycenter; DECLARE_READ16_MEMBER(nvram_r); DECLARE_READ16_MEMBER(joystick_r); + DECLARE_WRITE16_MEMBER(aztarac_ubr_w); }; /*----------- defined in audio/aztarac.c -----------*/ @@ -34,7 +35,6 @@ INTERRUPT_GEN( aztarac_snd_timed_irq ); /*----------- defined in video/aztarac.c -----------*/ -WRITE16_HANDLER( aztarac_ubr_w ); VIDEO_START( aztarac ); diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h index 53012c4acbc..153a091b6b4 100644 --- a/src/mame/includes/bagman.h +++ b/src/mame/includes/bagman.h @@ -30,6 +30,12 @@ public: UINT8 m_irq_mask; DECLARE_WRITE8_MEMBER(bagman_coin_counter_w); DECLARE_WRITE8_MEMBER(irq_mask_w); + DECLARE_WRITE8_MEMBER(bagman_pal16r6_w); + DECLARE_READ8_MEMBER(bagman_pal16r6_r); + void update_pal(); + DECLARE_WRITE8_MEMBER(bagman_videoram_w); + DECLARE_WRITE8_MEMBER(bagman_colorram_w); + DECLARE_WRITE8_MEMBER(bagman_flipscreen_w); }; @@ -55,16 +61,11 @@ public: /*----------- defined in machine/bagman.c -----------*/ -READ8_HANDLER( bagman_pal16r6_r ); MACHINE_RESET( bagman ); -WRITE8_HANDLER( bagman_pal16r6_w ); /*----------- defined in video/bagman.c -----------*/ -WRITE8_HANDLER( bagman_videoram_w ); -WRITE8_HANDLER( bagman_colorram_w ); -WRITE8_HANDLER( bagman_flipscreen_w ); PALETTE_INIT( bagman ); VIDEO_START( bagman ); diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index c19fcf0cb57..71019a48fb7 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -123,6 +123,41 @@ public: UINT8 m_palettebank_vis; UINT8 *m_spriteram; + DECLARE_WRITE8_MEMBER(balsente_random_reset_w); + DECLARE_READ8_MEMBER(balsente_random_num_r); + DECLARE_WRITE8_MEMBER(balsente_rombank_select_w); + DECLARE_WRITE8_MEMBER(balsente_rombank2_select_w); + DECLARE_WRITE8_MEMBER(balsente_misc_output_w); + DECLARE_READ8_MEMBER(balsente_m6850_r); + DECLARE_WRITE8_MEMBER(balsente_m6850_w); + DECLARE_READ8_MEMBER(balsente_m6850_sound_r); + DECLARE_WRITE8_MEMBER(balsente_m6850_sound_w); + DECLARE_READ8_MEMBER(balsente_adc_data_r); + DECLARE_WRITE8_MEMBER(balsente_adc_select_w); + DECLARE_READ8_MEMBER(balsente_counter_8253_r); + DECLARE_WRITE8_MEMBER(balsente_counter_8253_w); + DECLARE_READ8_MEMBER(balsente_counter_state_r); + DECLARE_WRITE8_MEMBER(balsente_counter_control_w); + DECLARE_WRITE8_MEMBER(balsente_chip_select_w); + DECLARE_WRITE8_MEMBER(balsente_dac_data_w); + DECLARE_WRITE8_MEMBER(balsente_register_addr_w); + DECLARE_WRITE8_MEMBER(spiker_expand_w); + DECLARE_READ8_MEMBER(spiker_expand_r); + DECLARE_READ8_MEMBER(grudge_steering_r); + DECLARE_READ8_MEMBER(shrike_shared_6809_r); + DECLARE_WRITE8_MEMBER(shrike_shared_6809_w); + DECLARE_WRITE16_MEMBER(shrike_io_68k_w); + DECLARE_READ16_MEMBER(shrike_io_68k_r); + void counter_set_out(int which, int out); + void counter_start(int which); + void counter_stop( int which); + void counter_update_count(int which); + void counter_set_gate(int which, int gate); + void update_counter_0_timer(); + DECLARE_WRITE8_MEMBER(balsente_videoram_w); + DECLARE_WRITE8_MEMBER(balsente_palette_select_w); + DECLARE_WRITE8_MEMBER(balsente_paletteram_w); + DECLARE_WRITE8_MEMBER(shrike_sprite_select_w); }; @@ -135,48 +170,23 @@ MACHINE_RESET( balsente ); void balsente_noise_gen(device_t *device, int count, short *buffer); -WRITE8_HANDLER( balsente_random_reset_w ); -READ8_HANDLER( balsente_random_num_r ); -WRITE8_HANDLER( balsente_rombank_select_w ); -WRITE8_HANDLER( balsente_rombank2_select_w ); -WRITE8_HANDLER( balsente_misc_output_w ); -READ8_HANDLER( balsente_m6850_r ); -WRITE8_HANDLER( balsente_m6850_w ); -READ8_HANDLER( balsente_m6850_sound_r ); -WRITE8_HANDLER( balsente_m6850_sound_w ); INTERRUPT_GEN( balsente_update_analog_inputs ); -READ8_HANDLER( balsente_adc_data_r ); -WRITE8_HANDLER( balsente_adc_select_w ); TIMER_DEVICE_CALLBACK( balsente_counter_callback ); -READ8_HANDLER( balsente_counter_8253_r ); -WRITE8_HANDLER( balsente_counter_8253_w ); TIMER_DEVICE_CALLBACK( balsente_clock_counter_0_ff ); -READ8_HANDLER( balsente_counter_state_r ); -WRITE8_HANDLER( balsente_counter_control_w ); -WRITE8_HANDLER( balsente_chip_select_w ); -WRITE8_HANDLER( balsente_dac_data_w ); -WRITE8_HANDLER( balsente_register_addr_w ); CUSTOM_INPUT( nstocker_bits_r ); -WRITE8_HANDLER( spiker_expand_w ); -READ8_HANDLER( spiker_expand_r ); -READ8_HANDLER( grudge_steering_r ); -READ8_HANDLER( shrike_shared_6809_r ); -WRITE8_HANDLER( shrike_shared_6809_w ); -READ16_HANDLER( shrike_io_68k_r ); -WRITE16_HANDLER( shrike_io_68k_w ); /*----------- defined in video/balsente.c -----------*/ @@ -184,7 +194,3 @@ WRITE16_HANDLER( shrike_io_68k_w ); VIDEO_START( balsente ); SCREEN_UPDATE_IND16( balsente ); -WRITE8_HANDLER( balsente_videoram_w ); -WRITE8_HANDLER( balsente_paletteram_w ); -WRITE8_HANDLER( balsente_palette_select_w ); -WRITE8_HANDLER( shrike_sprite_select_w ); diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index 0f5ccf842bd..9699c8ca0da 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -28,17 +28,17 @@ public: int m_priority; UINT8 m_nmi_mask; + DECLARE_WRITE8_MEMBER(bankp_scroll_w); + DECLARE_WRITE8_MEMBER(bankp_videoram_w); + DECLARE_WRITE8_MEMBER(bankp_colorram_w); + DECLARE_WRITE8_MEMBER(bankp_videoram2_w); + DECLARE_WRITE8_MEMBER(bankp_colorram2_w); + DECLARE_WRITE8_MEMBER(bankp_out_w); }; /*----------- defined in video/bankp.c -----------*/ -WRITE8_HANDLER( bankp_videoram_w ); -WRITE8_HANDLER( bankp_colorram_w ); -WRITE8_HANDLER( bankp_videoram2_w ); -WRITE8_HANDLER( bankp_colorram2_w ); -WRITE8_HANDLER( bankp_scroll_w ); -WRITE8_HANDLER( bankp_out_w ); PALETTE_INIT( bankp ); VIDEO_START( bankp ); diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h index f4a50af14d7..ef952277e04 100644 --- a/src/mame/includes/baraduke.h +++ b/src/mame/includes/baraduke.h @@ -20,6 +20,14 @@ public: DECLARE_WRITE8_MEMBER(baraduke_irq_ack_w); DECLARE_READ8_MEMBER(soundkludge_r); DECLARE_READ8_MEMBER(readFF); + DECLARE_READ8_MEMBER(baraduke_videoram_r); + DECLARE_WRITE8_MEMBER(baraduke_videoram_w); + DECLARE_READ8_MEMBER(baraduke_textram_r); + DECLARE_WRITE8_MEMBER(baraduke_textram_w); + DECLARE_WRITE8_MEMBER(baraduke_scroll0_w); + DECLARE_WRITE8_MEMBER(baraduke_scroll1_w); + DECLARE_READ8_MEMBER(baraduke_spriteram_r); + DECLARE_WRITE8_MEMBER(baraduke_spriteram_w); }; @@ -28,12 +36,4 @@ public: VIDEO_START( baraduke ); SCREEN_UPDATE_IND16( baraduke ); SCREEN_VBLANK( baraduke ); -READ8_HANDLER( baraduke_videoram_r ); -WRITE8_HANDLER( baraduke_videoram_w ); -READ8_HANDLER( baraduke_textram_r ); -WRITE8_HANDLER( baraduke_textram_w ); -WRITE8_HANDLER( baraduke_scroll0_w ); -WRITE8_HANDLER( baraduke_scroll1_w ); -READ8_HANDLER( baraduke_spriteram_r ); -WRITE8_HANDLER( baraduke_spriteram_w ); PALETTE_INIT( baraduke ); diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h index c42e72d598b..8c109df2598 100644 --- a/src/mame/includes/battlane.h +++ b/src/mame/includes/battlane.h @@ -24,18 +24,18 @@ public: device_t *m_maincpu; device_t *m_subcpu; DECLARE_WRITE8_MEMBER(battlane_cpu_command_w); + DECLARE_WRITE8_MEMBER(battlane_palette_w); + DECLARE_WRITE8_MEMBER(battlane_scrollx_w); + DECLARE_WRITE8_MEMBER(battlane_scrolly_w); + DECLARE_WRITE8_MEMBER(battlane_tileram_w); + DECLARE_WRITE8_MEMBER(battlane_spriteram_w); + DECLARE_WRITE8_MEMBER(battlane_bitmap_w); + DECLARE_WRITE8_MEMBER(battlane_video_ctrl_w); }; /*----------- defined in video/battlane.c -----------*/ -WRITE8_HANDLER( battlane_palette_w ); -WRITE8_HANDLER( battlane_scrollx_w ); -WRITE8_HANDLER( battlane_scrolly_w ); -WRITE8_HANDLER( battlane_tileram_w ); -WRITE8_HANDLER( battlane_spriteram_w ); -WRITE8_HANDLER( battlane_bitmap_w ); -WRITE8_HANDLER( battlane_video_ctrl_w ); VIDEO_START( battlane ); SCREEN_UPDATE_IND16( battlane ); diff --git a/src/mame/includes/battlera.h b/src/mame/includes/battlera.h index bf24dc57839..b6ff36ba161 100644 --- a/src/mame/includes/battlera.h +++ b/src/mame/includes/battlera.h @@ -31,6 +31,13 @@ public: DECLARE_WRITE8_MEMBER(control_data_w); DECLARE_READ8_MEMBER(control_data_r); DECLARE_WRITE8_MEMBER(battlera_adpcm_data_w); + DECLARE_WRITE8_MEMBER(battlera_palette_w); + DECLARE_READ8_MEMBER(HuC6270_debug_r); + DECLARE_WRITE8_MEMBER(HuC6270_debug_w); + DECLARE_READ8_MEMBER(HuC6270_register_r); + DECLARE_WRITE8_MEMBER(HuC6270_register_w); + DECLARE_READ8_MEMBER(HuC6270_data_r); + DECLARE_WRITE8_MEMBER(HuC6270_data_w); }; @@ -40,11 +47,4 @@ SCREEN_UPDATE_IND16( battlera ); VIDEO_START( battlera ); TIMER_DEVICE_CALLBACK( battlera_irq ); -READ8_HANDLER( HuC6270_register_r ); -WRITE8_HANDLER( HuC6270_register_w ); -//READ8_HANDLER( HuC6270_data_r ); -WRITE8_HANDLER( HuC6270_data_w ); -WRITE8_HANDLER( battlera_palette_w ); -READ8_HANDLER( HuC6270_debug_r ); -WRITE8_HANDLER( HuC6270_debug_w ); diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index c81c9471d55..7d2a60af252 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -21,17 +21,17 @@ public: UINT8 m_scroll_lsb; UINT8 m_scroll_msb; UINT8 m_starfield_enabled; + DECLARE_WRITE8_MEMBER(battlex_palette_w); + DECLARE_WRITE8_MEMBER(battlex_scroll_x_lsb_w); + DECLARE_WRITE8_MEMBER(battlex_scroll_x_msb_w); + DECLARE_WRITE8_MEMBER(battlex_scroll_starfield_w); + DECLARE_WRITE8_MEMBER(battlex_videoram_w); + DECLARE_WRITE8_MEMBER(battlex_flipscreen_w); }; /*----------- defined in video/battlex.c -----------*/ -extern WRITE8_HANDLER( battlex_palette_w ); -extern WRITE8_HANDLER( battlex_videoram_w ); -extern WRITE8_HANDLER( battlex_scroll_x_lsb_w ); -extern WRITE8_HANDLER( battlex_scroll_x_msb_w ); -extern WRITE8_HANDLER( battlex_scroll_starfield_w ); -extern WRITE8_HANDLER( battlex_flipscreen_w ); extern VIDEO_START( battlex ); extern SCREEN_UPDATE_IND16( battlex ); diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h index 5f00d210842..fa8d28e38ef 100644 --- a/src/mame/includes/battlnts.h +++ b/src/mame/includes/battlnts.h @@ -24,11 +24,11 @@ public: device_t *m_k007420; DECLARE_WRITE8_MEMBER(battlnts_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(battlnts_bankswitch_w); + DECLARE_WRITE8_MEMBER(battlnts_spritebank_w); }; /*----------- defined in video/battlnts.c -----------*/ -WRITE8_HANDLER( battlnts_spritebank_w ); SCREEN_UPDATE_IND16( battlnts ); diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h index 503cfee1165..660f1b20c4e 100644 --- a/src/mame/includes/bbusters.h +++ b/src/mame/includes/bbusters.h @@ -38,6 +38,9 @@ public: DECLARE_WRITE16_MEMBER(three_gun_output_w); DECLARE_READ16_MEMBER(kludge_r); DECLARE_READ16_MEMBER(mechatt_gun_r); + DECLARE_WRITE16_MEMBER(bbusters_video_w); + DECLARE_WRITE16_MEMBER(bbusters_pf1_w); + DECLARE_WRITE16_MEMBER(bbusters_pf2_w); }; @@ -48,6 +51,3 @@ VIDEO_START( mechatt ); SCREEN_UPDATE_IND16( bbuster ); SCREEN_UPDATE_IND16( mechatt ); -WRITE16_HANDLER( bbusters_pf1_w ); -WRITE16_HANDLER( bbusters_pf2_w ); -WRITE16_HANDLER( bbusters_video_w ); diff --git a/src/mame/includes/beezer.h b/src/mame/includes/beezer.h index 531d1c96bb9..e823dad61ea 100644 --- a/src/mame/includes/beezer.h +++ b/src/mame/includes/beezer.h @@ -11,6 +11,9 @@ public: int m_banklatch; device_t *m_maincpu; + DECLARE_WRITE8_MEMBER(beezer_bankswitch_w); + DECLARE_WRITE8_MEMBER(beezer_map_w); + DECLARE_READ8_MEMBER(beezer_line_r); }; @@ -20,7 +23,6 @@ extern const via6522_interface b_via_0_interface; extern const via6522_interface b_via_1_interface; DRIVER_INIT( beezer ); -WRITE8_HANDLER( beezer_bankswitch_w ); /*----------- defined in audio/beezer.c -----------*/ @@ -36,5 +38,3 @@ READ8_DEVICE_HANDLER( beezer_noise_r ); TIMER_DEVICE_CALLBACK( beezer_interrupt ); SCREEN_UPDATE_IND16( beezer ); -WRITE8_HANDLER( beezer_map_w ); -READ8_HANDLER( beezer_line_r ); diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index e4a7fefe1be..7561a7f6cbd 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -65,24 +65,29 @@ public: DECLARE_READ8_MEMBER(beg_trackball_y_r); DECLARE_WRITE8_MEMBER(beg_port08_w); DECLARE_READ8_MEMBER(sub_cpu_mcu_coin_port_r); + DECLARE_READ8_MEMBER(bigevglf_68705_port_a_r); + DECLARE_WRITE8_MEMBER(bigevglf_68705_port_a_w); + DECLARE_WRITE8_MEMBER(bigevglf_68705_ddr_a_w); + DECLARE_READ8_MEMBER(bigevglf_68705_port_b_r); + DECLARE_WRITE8_MEMBER(bigevglf_68705_port_b_w); + DECLARE_WRITE8_MEMBER(bigevglf_68705_ddr_b_w); + DECLARE_READ8_MEMBER(bigevglf_68705_port_c_r); + DECLARE_WRITE8_MEMBER(bigevglf_68705_port_c_w); + DECLARE_WRITE8_MEMBER(bigevglf_68705_ddr_c_w); + DECLARE_WRITE8_MEMBER(bigevglf_mcu_w); + DECLARE_READ8_MEMBER(bigevglf_mcu_r); + DECLARE_READ8_MEMBER(bigevglf_mcu_status_r); + DECLARE_WRITE8_MEMBER(bigevglf_palette_w); + DECLARE_WRITE8_MEMBER(bigevglf_gfxcontrol_w); + DECLARE_WRITE8_MEMBER(bigevglf_vidram_addr_w); + DECLARE_WRITE8_MEMBER(bigevglf_vidram_w); + DECLARE_READ8_MEMBER(bigevglf_vidram_r); }; /*----------- defined in machine/bigevglf.c -----------*/ -READ8_HANDLER( bigevglf_68705_port_a_r ); -WRITE8_HANDLER( bigevglf_68705_port_a_w ); -READ8_HANDLER( bigevglf_68705_port_b_r ); -WRITE8_HANDLER( bigevglf_68705_port_b_w ); -READ8_HANDLER( bigevglf_68705_port_c_r ); -WRITE8_HANDLER( bigevglf_68705_port_c_w ); -WRITE8_HANDLER( bigevglf_68705_ddr_a_w ); -WRITE8_HANDLER( bigevglf_68705_ddr_b_w ); -WRITE8_HANDLER( bigevglf_68705_ddr_c_w ); -WRITE8_HANDLER( bigevglf_mcu_w ); -READ8_HANDLER( bigevglf_mcu_r ); -READ8_HANDLER( bigevglf_mcu_status_r ); /*----------- defined in video/bigevglf.c -----------*/ @@ -90,9 +95,4 @@ READ8_HANDLER( bigevglf_mcu_status_r ); VIDEO_START( bigevglf ); SCREEN_UPDATE_IND16( bigevglf ); -READ8_HANDLER( bigevglf_vidram_r ); -WRITE8_HANDLER( bigevglf_vidram_w ); -WRITE8_HANDLER( bigevglf_vidram_addr_w ); -WRITE8_HANDLER( bigevglf_gfxcontrol_w ); -WRITE8_HANDLER( bigevglf_palette_w ); diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h index 29b3e132c41..24b517d9c42 100644 --- a/src/mame/includes/bigstrkb.h +++ b/src/mame/includes/bigstrkb.h @@ -15,13 +15,13 @@ public: UINT16 *m_vidreg1; UINT16 *m_vidreg2; UINT16 *m_spriteram; + DECLARE_WRITE16_MEMBER(bsb_videoram_w); + DECLARE_WRITE16_MEMBER(bsb_videoram2_w); + DECLARE_WRITE16_MEMBER(bsb_videoram3_w); }; /*----------- defined in video/bigstrkb.c -----------*/ -WRITE16_HANDLER( bsb_videoram_w ); -WRITE16_HANDLER( bsb_videoram2_w ); -WRITE16_HANDLER( bsb_videoram3_w ); VIDEO_START(bigstrkb); SCREEN_UPDATE_IND16(bigstrkb); diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h index 68681463b51..1ca94f11958 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -34,17 +34,17 @@ public: DECLARE_WRITE16_MEMBER(bionicc_mpu_trigger_w); DECLARE_WRITE16_MEMBER(hacked_soundcommand_w); DECLARE_READ16_MEMBER(hacked_soundcommand_r); + DECLARE_WRITE16_MEMBER(bionicc_bgvideoram_w); + DECLARE_WRITE16_MEMBER(bionicc_fgvideoram_w); + DECLARE_WRITE16_MEMBER(bionicc_txvideoram_w); + DECLARE_WRITE16_MEMBER(bionicc_paletteram_w); + DECLARE_WRITE16_MEMBER(bionicc_scroll_w); + DECLARE_WRITE16_MEMBER(bionicc_gfxctrl_w); }; /*----------- defined in video/bionicc.c -----------*/ -WRITE16_HANDLER( bionicc_fgvideoram_w ); -WRITE16_HANDLER( bionicc_bgvideoram_w ); -WRITE16_HANDLER( bionicc_txvideoram_w ); -WRITE16_HANDLER( bionicc_paletteram_w ); -WRITE16_HANDLER( bionicc_scroll_w ); -WRITE16_HANDLER( bionicc_gfxctrl_w ); VIDEO_START( bionicc ); SCREEN_UPDATE_IND16( bionicc ); diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h index b9704424aac..4fc954b16c7 100644 --- a/src/mame/includes/bking.h +++ b/src/mame/includes/bking.h @@ -61,27 +61,27 @@ public: DECLARE_WRITE8_MEMBER(bking3_68705_port_b_w); DECLARE_WRITE8_MEMBER(bking3_68705_ddr_b_w); DECLARE_READ8_MEMBER(bking3_68705_port_c_r); + DECLARE_WRITE8_MEMBER(bking_xld1_w); + DECLARE_WRITE8_MEMBER(bking_yld1_w); + DECLARE_WRITE8_MEMBER(bking_xld2_w); + DECLARE_WRITE8_MEMBER(bking_yld2_w); + DECLARE_WRITE8_MEMBER(bking_xld3_w); + DECLARE_WRITE8_MEMBER(bking_yld3_w); + DECLARE_WRITE8_MEMBER(bking_cont1_w); + DECLARE_WRITE8_MEMBER(bking_cont2_w); + DECLARE_WRITE8_MEMBER(bking_cont3_w); + DECLARE_WRITE8_MEMBER(bking_msk_w); + DECLARE_WRITE8_MEMBER(bking_hitclr_w); + DECLARE_WRITE8_MEMBER(bking_playfield_w); + DECLARE_READ8_MEMBER(bking_input_port_5_r); + DECLARE_READ8_MEMBER(bking_input_port_6_r); + DECLARE_READ8_MEMBER(bking_pos_r); }; /*----------- defined in video/bking.c -----------*/ -WRITE8_HANDLER( bking_xld1_w ); -WRITE8_HANDLER( bking_yld1_w ); -WRITE8_HANDLER( bking_xld2_w ); -WRITE8_HANDLER( bking_yld2_w ); -WRITE8_HANDLER( bking_xld3_w ); -WRITE8_HANDLER( bking_yld3_w ); -WRITE8_HANDLER( bking_msk_w ); -WRITE8_HANDLER( bking_cont1_w ); -WRITE8_HANDLER( bking_cont2_w ); -WRITE8_HANDLER( bking_cont3_w ); -WRITE8_HANDLER( bking_hitclr_w ); -WRITE8_HANDLER( bking_playfield_w ); -READ8_HANDLER( bking_input_port_5_r ); -READ8_HANDLER( bking_input_port_6_r ); -READ8_HANDLER( bking_pos_r ); PALETTE_INIT( bking ); VIDEO_START( bking ); diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index b8804e938f8..4c54c114133 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -45,21 +45,21 @@ public: DECLARE_WRITE8_MEMBER(blktiger_to_main_w); DECLARE_WRITE8_MEMBER(blktiger_bankswitch_w); DECLARE_WRITE8_MEMBER(blktiger_coinlockout_w); + DECLARE_WRITE8_MEMBER(blktiger_txvideoram_w); + DECLARE_READ8_MEMBER(blktiger_bgvideoram_r); + DECLARE_WRITE8_MEMBER(blktiger_bgvideoram_w); + DECLARE_WRITE8_MEMBER(blktiger_bgvideoram_bank_w); + DECLARE_WRITE8_MEMBER(blktiger_scrolly_w); + DECLARE_WRITE8_MEMBER(blktiger_scrollx_w); + DECLARE_WRITE8_MEMBER(blktiger_video_control_w); + DECLARE_WRITE8_MEMBER(blktiger_video_enable_w); + DECLARE_WRITE8_MEMBER(blktiger_screen_layout_w); }; /*----------- defined in video/blktiger.c -----------*/ -WRITE8_HANDLER( blktiger_screen_layout_w ); -READ8_HANDLER( blktiger_bgvideoram_r ); -WRITE8_HANDLER( blktiger_bgvideoram_w ); -WRITE8_HANDLER( blktiger_txvideoram_w ); -WRITE8_HANDLER( blktiger_video_control_w ); -WRITE8_HANDLER( blktiger_video_enable_w ); -WRITE8_HANDLER( blktiger_bgvideoram_bank_w ); -WRITE8_HANDLER( blktiger_scrollx_w ); -WRITE8_HANDLER( blktiger_scrolly_w ); VIDEO_START( blktiger ); SCREEN_UPDATE_IND16( blktiger ); diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index 9a92ac297f3..643ca3b7680 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -33,15 +33,15 @@ public: DECLARE_READ16_MEMBER(blmbycar_pot_wheel_r); DECLARE_READ16_MEMBER(blmbycar_opt_wheel_r); DECLARE_READ16_MEMBER(waterball_unk_r); + DECLARE_WRITE16_MEMBER(blmbycar_palette_w); + DECLARE_WRITE16_MEMBER(blmbycar_vram_0_w); + DECLARE_WRITE16_MEMBER(blmbycar_vram_1_w); }; /*----------- defined in video/blmbycar.c -----------*/ -WRITE16_HANDLER( blmbycar_palette_w ); -WRITE16_HANDLER( blmbycar_vram_0_w ); -WRITE16_HANDLER( blmbycar_vram_1_w ); VIDEO_START( blmbycar ); SCREEN_UPDATE_IND16( blmbycar ); diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h index f06a2ea03ae..8d1951ceac7 100644 --- a/src/mame/includes/blockade.h +++ b/src/mame/includes/blockade.h @@ -17,12 +17,12 @@ public: UINT8 m_just_been_reset; DECLARE_READ8_MEMBER(blockade_input_port_0_r); DECLARE_WRITE8_MEMBER(blockade_coin_latch_w); + DECLARE_WRITE8_MEMBER(blockade_videoram_w); }; /*----------- defined in video/blockade.c -----------*/ -WRITE8_HANDLER( blockade_videoram_w ); VIDEO_START( blockade ); SCREEN_UPDATE_IND16( blockade ); diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h index 336ecc33a22..2e15eaffc03 100644 --- a/src/mame/includes/blockout.h +++ b/src/mame/includes/blockout.h @@ -25,14 +25,14 @@ public: DECLARE_WRITE16_MEMBER(blockout_sound_command_w); DECLARE_WRITE16_MEMBER(blockout_irq6_ack_w); DECLARE_WRITE16_MEMBER(blockout_irq5_ack_w); + DECLARE_WRITE16_MEMBER(blockout_paletteram_w); + DECLARE_WRITE16_MEMBER(blockout_frontcolor_w); + DECLARE_WRITE16_MEMBER(blockout_videoram_w); }; /*----------- defined in video/blockout.c -----------*/ -WRITE16_HANDLER( blockout_videoram_w ); -WRITE16_HANDLER( blockout_paletteram_w ); -WRITE16_HANDLER( blockout_frontcolor_w ); VIDEO_START( blockout ); SCREEN_UPDATE_IND16( blockout ); diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h index eb2d5ee7bc8..0cb268a94ee 100644 --- a/src/mame/includes/bloodbro.h +++ b/src/mame/includes/bloodbro.h @@ -13,14 +13,14 @@ public: tilemap_t *m_tx_tilemap; UINT16 *m_spriteram; size_t m_spriteram_size; + DECLARE_WRITE16_MEMBER(bloodbro_bgvideoram_w); + DECLARE_WRITE16_MEMBER(bloodbro_fgvideoram_w); + DECLARE_WRITE16_MEMBER(bloodbro_txvideoram_w); }; /*----------- defined in video/bloodbro.c -----------*/ -WRITE16_HANDLER( bloodbro_bgvideoram_w ); -WRITE16_HANDLER( bloodbro_fgvideoram_w ); -WRITE16_HANDLER( bloodbro_txvideoram_w ); SCREEN_UPDATE_IND16( bloodbro ); SCREEN_UPDATE_IND16( weststry ); diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index 3ee80b325a8..5847cb31300 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -29,14 +29,14 @@ public: DECLARE_READ8_MEMBER(blueprnt_sh_dipsw_r); DECLARE_WRITE8_MEMBER(blueprnt_sound_command_w); DECLARE_WRITE8_MEMBER(blueprnt_coin_counter_w); + DECLARE_WRITE8_MEMBER(blueprnt_videoram_w); + DECLARE_WRITE8_MEMBER(blueprnt_colorram_w); + DECLARE_WRITE8_MEMBER(blueprnt_flipscreen_w); }; /*----------- defined in video/blueprnt.c -----------*/ -WRITE8_HANDLER( blueprnt_videoram_w ); -WRITE8_HANDLER( blueprnt_colorram_w ); -WRITE8_HANDLER( blueprnt_flipscreen_w ); PALETTE_INIT( blueprnt ); VIDEO_START( blueprnt ); diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h index e42c5e517ce..2e047117588 100644 --- a/src/mame/includes/bogeyman.h +++ b/src/mame/includes/bogeyman.h @@ -29,16 +29,16 @@ public: int m_colbank; DECLARE_WRITE8_MEMBER(bogeyman_8910_latch_w); DECLARE_WRITE8_MEMBER(bogeyman_8910_control_w); + DECLARE_WRITE8_MEMBER(bogeyman_videoram_w); + DECLARE_WRITE8_MEMBER(bogeyman_colorram_w); + DECLARE_WRITE8_MEMBER(bogeyman_videoram2_w); + DECLARE_WRITE8_MEMBER(bogeyman_colorram2_w); + DECLARE_WRITE8_MEMBER(bogeyman_paletteram_w); }; /*----------- defined in video/bogeyman.c -----------*/ -WRITE8_HANDLER( bogeyman_videoram_w ); -WRITE8_HANDLER( bogeyman_colorram_w ); -WRITE8_HANDLER( bogeyman_videoram2_w ); -WRITE8_HANDLER( bogeyman_colorram2_w ); -WRITE8_HANDLER( bogeyman_paletteram_w ); PALETTE_INIT( bogeyman ); VIDEO_START( bogeyman ); diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h index c15b51222e0..c0580c41638 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -29,15 +29,15 @@ public: DECLARE_WRITE8_MEMBER(bombjack_soundlatch_w); DECLARE_READ8_MEMBER(bombjack_soundlatch_r); DECLARE_WRITE8_MEMBER(irq_mask_w); + DECLARE_WRITE8_MEMBER(bombjack_videoram_w); + DECLARE_WRITE8_MEMBER(bombjack_colorram_w); + DECLARE_WRITE8_MEMBER(bombjack_background_w); + DECLARE_WRITE8_MEMBER(bombjack_flipscreen_w); }; /*----------- defined in video/bombjack.c -----------*/ -WRITE8_HANDLER( bombjack_videoram_w ); -WRITE8_HANDLER( bombjack_colorram_w ); -WRITE8_HANDLER( bombjack_background_w ); -WRITE8_HANDLER( bombjack_flipscreen_w ); VIDEO_START( bombjack ); SCREEN_UPDATE_IND16( bombjack ); diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index 31e3b49d6ac..baff9965d7e 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -34,14 +34,14 @@ public: DECLARE_WRITE8_MEMBER(brkthru_1803_w); DECLARE_WRITE8_MEMBER(darwin_0803_w); DECLARE_WRITE8_MEMBER(brkthru_soundlatch_w); + DECLARE_WRITE8_MEMBER(brkthru_bgram_w); + DECLARE_WRITE8_MEMBER(brkthru_fgram_w); + DECLARE_WRITE8_MEMBER(brkthru_1800_w); }; /*----------- defined in video/brkthru.c -----------*/ -WRITE8_HANDLER( brkthru_1800_w ); -WRITE8_HANDLER( brkthru_bgram_w ); -WRITE8_HANDLER( brkthru_fgram_w ); VIDEO_START( brkthru ); PALETTE_INIT( brkthru ); SCREEN_UPDATE_IND16( brkthru ); diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h index c64fe3a0096..78ccc021e92 100644 --- a/src/mame/includes/bsktball.h +++ b/src/mame/includes/bsktball.h @@ -41,19 +41,20 @@ public: int m_last_p1_vert; int m_last_p2_horiz; int m_last_p2_vert; + DECLARE_WRITE8_MEMBER(bsktball_nmion_w); + DECLARE_WRITE8_MEMBER(bsktball_ld1_w); + DECLARE_WRITE8_MEMBER(bsktball_ld2_w); + DECLARE_READ8_MEMBER(bsktball_in0_r); + DECLARE_WRITE8_MEMBER(bsktball_led1_w); + DECLARE_WRITE8_MEMBER(bsktball_led2_w); + DECLARE_WRITE8_MEMBER(bsktball_videoram_w); }; /*----------- defined in machine/bsktball.c -----------*/ -WRITE8_HANDLER( bsktball_nmion_w ); TIMER_DEVICE_CALLBACK( bsktball_scanline ); -WRITE8_HANDLER( bsktball_ld1_w ); -WRITE8_HANDLER( bsktball_ld2_w ); -READ8_HANDLER( bsktball_in0_r ); -WRITE8_HANDLER( bsktball_led1_w ); -WRITE8_HANDLER( bsktball_led2_w ); /*----------- defined in audio/bsktball.c -----------*/ @@ -68,5 +69,4 @@ DISCRETE_SOUND_EXTERN( bsktball ); VIDEO_START( bsktball ); SCREEN_UPDATE_IND16( bsktball ); -WRITE8_HANDLER( bsktball_videoram_w ); diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index 6fb179a02e0..49957dc8f2c 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -53,13 +53,28 @@ public: DECLARE_READ8_MEMBER(audio_command_r); DECLARE_READ8_MEMBER(zoar_dsw1_read); DECLARE_READ8_MEMBER(wtennis_reset_hack_r); + DECLARE_READ8_MEMBER(mmonkey_protection_r); + DECLARE_WRITE8_MEMBER(mmonkey_protection_w); + DECLARE_WRITE8_MEMBER(btime_paletteram_w); + DECLARE_WRITE8_MEMBER(lnc_videoram_w); + DECLARE_READ8_MEMBER(btime_mirrorvideoram_r); + DECLARE_READ8_MEMBER(btime_mirrorcolorram_r); + DECLARE_WRITE8_MEMBER(btime_mirrorvideoram_w); + DECLARE_WRITE8_MEMBER(lnc_mirrorvideoram_w); + DECLARE_WRITE8_MEMBER(btime_mirrorcolorram_w); + DECLARE_WRITE8_MEMBER(deco_charram_w); + DECLARE_WRITE8_MEMBER(bnj_background_w); + DECLARE_WRITE8_MEMBER(bnj_scroll1_w); + DECLARE_WRITE8_MEMBER(bnj_scroll2_w); + DECLARE_WRITE8_MEMBER(btime_video_control_w); + DECLARE_WRITE8_MEMBER(bnj_video_control_w); + DECLARE_WRITE8_MEMBER(zoar_video_control_w); + DECLARE_WRITE8_MEMBER(disco_video_control_w); }; /*----------- defined in machine/btime.c -----------*/ -READ8_HANDLER( mmonkey_protection_r ); -WRITE8_HANDLER( mmonkey_protection_w ); /*----------- defined in video/btime.c -----------*/ @@ -78,19 +93,4 @@ SCREEN_UPDATE_IND16( zoar ); SCREEN_UPDATE_IND16( disco ); SCREEN_UPDATE_IND16( eggs ); -WRITE8_HANDLER( btime_paletteram_w ); -WRITE8_HANDLER( bnj_background_w ); -WRITE8_HANDLER( bnj_scroll1_w ); -WRITE8_HANDLER( bnj_scroll2_w ); -READ8_HANDLER( btime_mirrorvideoram_r ); -WRITE8_HANDLER( btime_mirrorvideoram_w ); -READ8_HANDLER( btime_mirrorcolorram_r ); -WRITE8_HANDLER( btime_mirrorcolorram_w ); -WRITE8_HANDLER( lnc_videoram_w ); -WRITE8_HANDLER( lnc_mirrorvideoram_w ); -WRITE8_HANDLER( deco_charram_w ); - -WRITE8_HANDLER( zoar_video_control_w ); -WRITE8_HANDLER( btime_video_control_w ); -WRITE8_HANDLER( bnj_video_control_w ); -WRITE8_HANDLER( disco_video_control_w ); + diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h index cec0a6db771..1429a7e5763 100644 --- a/src/mame/includes/bublbobl.h +++ b/src/mame/includes/bublbobl.h @@ -55,54 +55,54 @@ public: device_t *m_mcu; device_t *m_audiocpu; device_t *m_slave; + DECLARE_WRITE8_MEMBER(bublbobl_bankswitch_w); + DECLARE_WRITE8_MEMBER(tokio_bankswitch_w); + DECLARE_WRITE8_MEMBER(tokio_videoctrl_w); + DECLARE_WRITE8_MEMBER(bublbobl_nmitrigger_w); + DECLARE_READ8_MEMBER(tokio_mcu_r); + DECLARE_READ8_MEMBER(tokiob_mcu_r); + DECLARE_WRITE8_MEMBER(bublbobl_sound_command_w); + DECLARE_WRITE8_MEMBER(bublbobl_sh_nmi_disable_w); + DECLARE_WRITE8_MEMBER(bublbobl_sh_nmi_enable_w); + DECLARE_WRITE8_MEMBER(bublbobl_soundcpu_reset_w); + DECLARE_READ8_MEMBER(bublbobl_sound_status_r); + DECLARE_WRITE8_MEMBER(bublbobl_sound_status_w); + DECLARE_READ8_MEMBER(bublbobl_mcu_ddr1_r); + DECLARE_WRITE8_MEMBER(bublbobl_mcu_ddr1_w); + DECLARE_READ8_MEMBER(bublbobl_mcu_ddr2_r); + DECLARE_WRITE8_MEMBER(bublbobl_mcu_ddr2_w); + DECLARE_READ8_MEMBER(bublbobl_mcu_ddr3_r); + DECLARE_WRITE8_MEMBER(bublbobl_mcu_ddr3_w); + DECLARE_READ8_MEMBER(bublbobl_mcu_ddr4_r); + DECLARE_WRITE8_MEMBER(bublbobl_mcu_ddr4_w); + DECLARE_READ8_MEMBER(bublbobl_mcu_port1_r); + DECLARE_WRITE8_MEMBER(bublbobl_mcu_port1_w); + DECLARE_READ8_MEMBER(bublbobl_mcu_port2_r); + DECLARE_WRITE8_MEMBER(bublbobl_mcu_port2_w); + DECLARE_READ8_MEMBER(bublbobl_mcu_port3_r); + DECLARE_WRITE8_MEMBER(bublbobl_mcu_port3_w); + DECLARE_READ8_MEMBER(bublbobl_mcu_port4_r); + DECLARE_WRITE8_MEMBER(bublbobl_mcu_port4_w); + DECLARE_READ8_MEMBER(boblbobl_ic43_a_r); + DECLARE_WRITE8_MEMBER(boblbobl_ic43_a_w); + DECLARE_WRITE8_MEMBER(boblbobl_ic43_b_w); + DECLARE_READ8_MEMBER(boblbobl_ic43_b_r); + DECLARE_READ8_MEMBER(bublbobl_68705_port_a_r); + DECLARE_WRITE8_MEMBER(bublbobl_68705_port_a_w); + DECLARE_WRITE8_MEMBER(bublbobl_68705_ddr_a_w); + DECLARE_READ8_MEMBER(bublbobl_68705_port_b_r); + DECLARE_WRITE8_MEMBER(bublbobl_68705_port_b_w); + DECLARE_WRITE8_MEMBER(bublbobl_68705_ddr_b_w); }; /*----------- defined in machine/bublbobl.c -----------*/ -WRITE8_HANDLER( bublbobl_bankswitch_w ); -WRITE8_HANDLER( tokio_bankswitch_w ); -WRITE8_HANDLER( tokio_videoctrl_w ); -WRITE8_HANDLER( bublbobl_nmitrigger_w ); -READ8_HANDLER( tokio_mcu_r ); -READ8_HANDLER( tokiob_mcu_r ); -WRITE8_HANDLER( bublbobl_sound_command_w ); -WRITE8_HANDLER( bublbobl_sh_nmi_disable_w ); -WRITE8_HANDLER( bublbobl_sh_nmi_enable_w ); -WRITE8_HANDLER( bublbobl_soundcpu_reset_w ); -WRITE8_HANDLER( bublbobl_sound_status_w ); -READ8_HANDLER( bublbobl_sound_status_r ); -READ8_HANDLER( boblbobl_ic43_a_r ); -WRITE8_HANDLER( boblbobl_ic43_a_w ); -READ8_HANDLER( boblbobl_ic43_b_r ); -WRITE8_HANDLER( boblbobl_ic43_b_w ); -READ8_HANDLER( bublbobl_mcu_ddr1_r ); -WRITE8_HANDLER( bublbobl_mcu_ddr1_w ); -READ8_HANDLER( bublbobl_mcu_ddr2_r ); -WRITE8_HANDLER( bublbobl_mcu_ddr2_w ); -READ8_HANDLER( bublbobl_mcu_ddr3_r ); -WRITE8_HANDLER( bublbobl_mcu_ddr3_w ); -READ8_HANDLER( bublbobl_mcu_ddr4_r ); -WRITE8_HANDLER( bublbobl_mcu_ddr4_w ); -READ8_HANDLER( bublbobl_mcu_port1_r ); -WRITE8_HANDLER( bublbobl_mcu_port1_w ); -READ8_HANDLER( bublbobl_mcu_port2_r ); -WRITE8_HANDLER( bublbobl_mcu_port2_w ); -READ8_HANDLER( bublbobl_mcu_port3_r ); -WRITE8_HANDLER( bublbobl_mcu_port3_w ); -READ8_HANDLER( bublbobl_mcu_port4_r ); -WRITE8_HANDLER( bublbobl_mcu_port4_w ); // for 68705 bootleg INTERRUPT_GEN( bublbobl_m68705_interrupt ); -READ8_HANDLER( bublbobl_68705_port_a_r ); -WRITE8_HANDLER( bublbobl_68705_port_a_w ); -WRITE8_HANDLER( bublbobl_68705_ddr_a_w ); -READ8_HANDLER( bublbobl_68705_port_b_r ); -WRITE8_HANDLER( bublbobl_68705_port_b_w ); -WRITE8_HANDLER( bublbobl_68705_ddr_b_w ); /*----------- defined in video/bublbobl.c -----------*/ diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index 625f4153b4d..ba6563877f7 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -39,16 +39,16 @@ public: DECLARE_WRITE8_MEMBER(nmi_disable_w); DECLARE_WRITE8_MEMBER(nmi_enable_w); DECLARE_WRITE8_MEMBER(sound_enable_w); + DECLARE_WRITE8_MEMBER(buggychl_chargen_w); + DECLARE_WRITE8_MEMBER(buggychl_sprite_lookup_bank_w); + DECLARE_WRITE8_MEMBER(buggychl_sprite_lookup_w); + DECLARE_WRITE8_MEMBER(buggychl_ctrl_w); + DECLARE_WRITE8_MEMBER(buggychl_bg_scrollx_w); }; /*----------- defined in video/buggychl.c -----------*/ -WRITE8_HANDLER( buggychl_chargen_w ); -WRITE8_HANDLER( buggychl_sprite_lookup_bank_w ); -WRITE8_HANDLER( buggychl_sprite_lookup_w ); -WRITE8_HANDLER( buggychl_ctrl_w ); -WRITE8_HANDLER( buggychl_bg_scrollx_w ); PALETTE_INIT( buggychl ); VIDEO_START( buggychl ); diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h index f1bd989cbd0..3d0ea2d7d06 100644 --- a/src/mame/includes/bwing.h +++ b/src/mame/includes/bwing.h @@ -53,6 +53,12 @@ public: DECLARE_READ8_MEMBER(bwp1_io_r); DECLARE_WRITE8_MEMBER(bwp1_ctrl_w); DECLARE_WRITE8_MEMBER(bwp2_ctrl_w); + DECLARE_WRITE8_MEMBER(bwing_spriteram_w); + DECLARE_WRITE8_MEMBER(bwing_videoram_w); + DECLARE_READ8_MEMBER(bwing_scrollram_r); + DECLARE_WRITE8_MEMBER(bwing_scrollram_w); + DECLARE_WRITE8_MEMBER(bwing_scrollreg_w); + DECLARE_WRITE8_MEMBER(bwing_paletteram_w); }; @@ -60,12 +66,6 @@ public: extern const gfx_layout bwing_tilelayout; -WRITE8_HANDLER( bwing_paletteram_w ); -WRITE8_HANDLER( bwing_videoram_w ); -WRITE8_HANDLER( bwing_spriteram_w ); -WRITE8_HANDLER( bwing_scrollreg_w ); -WRITE8_HANDLER( bwing_scrollram_w ); -READ8_HANDLER( bwing_scrollram_r ); VIDEO_START( bwing ); SCREEN_UPDATE_IND16( bwing ); diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index 2ed7485a131..d1e71d490e6 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -21,6 +21,9 @@ public: DECLARE_READ8_MEMBER(cabalbl_snd2_r); DECLARE_READ8_MEMBER(cabalbl_snd1_r); DECLARE_WRITE8_MEMBER(cabalbl_coin_w); + DECLARE_WRITE16_MEMBER(cabal_flipscreen_w); + DECLARE_WRITE16_MEMBER(cabal_background_videoram16_w); + DECLARE_WRITE16_MEMBER(cabal_text_videoram16_w); }; @@ -28,6 +31,3 @@ public: extern VIDEO_START( cabal ); extern SCREEN_UPDATE_IND16( cabal ); -WRITE16_HANDLER( cabal_flipscreen_w ); -WRITE16_HANDLER( cabal_background_videoram16_w ); -WRITE16_HANDLER( cabal_text_videoram16_w ); diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h index d36028aea3e..faf774dbd0d 100644 --- a/src/mame/includes/calomega.h +++ b/src/mame/includes/calomega.h @@ -11,13 +11,13 @@ public: UINT8 *m_videoram; UINT8 *m_colorram; tilemap_t *m_bg_tilemap; + DECLARE_WRITE8_MEMBER(calomega_videoram_w); + DECLARE_WRITE8_MEMBER(calomega_colorram_w); }; /*----------- defined in video/calomega.c -----------*/ -WRITE8_HANDLER( calomega_videoram_w ); -WRITE8_HANDLER( calomega_colorram_w ); PALETTE_INIT( calomega ); VIDEO_START( calomega ); SCREEN_UPDATE_IND16( calomega ); diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index 3654a80128a..884777df7f9 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -31,6 +31,7 @@ public: DECLARE_READ8_MEMBER(canyon_switches_r); DECLARE_READ8_MEMBER(canyon_options_r); DECLARE_WRITE8_MEMBER(canyon_led_w); + DECLARE_WRITE8_MEMBER(canyon_videoram_w); }; @@ -49,4 +50,3 @@ DISCRETE_SOUND_EXTERN( canyon ); VIDEO_START( canyon ); SCREEN_UPDATE_IND16( canyon ); -WRITE8_HANDLER( canyon_videoram_w ); diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h index 672ad2b560a..84923892bd4 100644 --- a/src/mame/includes/capbowl.h +++ b/src/mame/includes/capbowl.h @@ -31,6 +31,10 @@ public: DECLARE_READ8_MEMBER(track_1_r); DECLARE_WRITE8_MEMBER(track_reset_w); DECLARE_WRITE8_MEMBER(capbowl_sndcmd_w); + DECLARE_WRITE8_MEMBER(capbowl_tms34061_w); + DECLARE_READ8_MEMBER(capbowl_tms34061_r); + DECLARE_WRITE8_MEMBER(bowlrama_blitter_w); + DECLARE_READ8_MEMBER(bowlrama_blitter_r); }; /*----------- defined in video/capbowl.c -----------*/ @@ -38,8 +42,4 @@ public: VIDEO_START( capbowl ); SCREEN_UPDATE_RGB32( capbowl ); -WRITE8_HANDLER( bowlrama_blitter_w ); -READ8_HANDLER( bowlrama_blitter_r ); -WRITE8_HANDLER( capbowl_tms34061_w ); -READ8_HANDLER( capbowl_tms34061_r ); diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h index 4c2d325f18e..b594967f035 100644 --- a/src/mame/includes/carjmbre.h +++ b/src/mame/includes/carjmbre.h @@ -22,16 +22,16 @@ public: UINT8 m_nmi_mask; DECLARE_WRITE8_MEMBER(nmi_mask_w); + DECLARE_WRITE8_MEMBER(carjmbre_flipscreen_w); + DECLARE_WRITE8_MEMBER(carjmbre_bgcolor_w); + DECLARE_WRITE8_MEMBER(carjmbre_8806_w); + DECLARE_WRITE8_MEMBER(carjmbre_videoram_w); }; /*----------- defined in video/carjmbre.c -----------*/ -WRITE8_HANDLER( carjmbre_flipscreen_w ); -WRITE8_HANDLER( carjmbre_bgcolor_w ); -WRITE8_HANDLER( carjmbre_8806_w ); -WRITE8_HANDLER( carjmbre_videoram_w ); PALETTE_INIT( carjmbre ); VIDEO_START( carjmbre ); diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h index 6afc52fc318..a24048ef55e 100644 --- a/src/mame/includes/carpolo.h +++ b/src/mame/includes/carpolo.h @@ -45,6 +45,20 @@ public: bitmap_ind16 *m_sprite_goal_collision_bitmap1; bitmap_ind16 *m_sprite_goal_collision_bitmap2; bitmap_ind16 *m_sprite_border_collision_bitmap; + DECLARE_READ8_MEMBER(carpolo_ball_screen_collision_cause_r); + DECLARE_READ8_MEMBER(carpolo_car_ball_collision_x_r); + DECLARE_READ8_MEMBER(carpolo_car_ball_collision_y_r); + DECLARE_READ8_MEMBER(carpolo_car_car_collision_cause_r); + DECLARE_READ8_MEMBER(carpolo_car_goal_collision_cause_r); + DECLARE_READ8_MEMBER(carpolo_car_ball_collision_cause_r); + DECLARE_READ8_MEMBER(carpolo_car_border_collision_cause_r); + DECLARE_READ8_MEMBER(carpolo_interrupt_cause_r); + DECLARE_WRITE8_MEMBER(carpolo_ball_screen_interrupt_clear_w); + DECLARE_WRITE8_MEMBER(carpolo_car_car_interrupt_clear_w); + DECLARE_WRITE8_MEMBER(carpolo_car_goal_interrupt_clear_w); + DECLARE_WRITE8_MEMBER(carpolo_car_ball_interrupt_clear_w); + DECLARE_WRITE8_MEMBER(carpolo_car_border_interrupt_clear_w); + DECLARE_WRITE8_MEMBER(carpolo_timer_interrupt_clear_w); }; @@ -63,24 +77,10 @@ WRITE_LINE_DEVICE_HANDLER( carpolo_7474_2u_2_q_cb ); MACHINE_START( carpolo ); MACHINE_RESET( carpolo ); -READ8_HANDLER( carpolo_interrupt_cause_r ); -READ8_HANDLER( carpolo_ball_screen_collision_cause_r ); -READ8_HANDLER( carpolo_car_ball_collision_x_r ); -READ8_HANDLER( carpolo_car_ball_collision_y_r ); -READ8_HANDLER( carpolo_car_car_collision_cause_r ); -READ8_HANDLER( carpolo_car_goal_collision_cause_r ); -READ8_HANDLER( carpolo_car_ball_collision_cause_r ); -READ8_HANDLER( carpolo_car_border_collision_cause_r ); INTERRUPT_GEN( carpolo_timer_interrupt ); -WRITE8_HANDLER( carpolo_ball_screen_interrupt_clear_w ); -WRITE8_HANDLER( carpolo_car_car_interrupt_clear_w ); -WRITE8_HANDLER( carpolo_car_goal_interrupt_clear_w ); -WRITE8_HANDLER( carpolo_car_ball_interrupt_clear_w ); -WRITE8_HANDLER( carpolo_car_border_interrupt_clear_w ); -WRITE8_HANDLER( carpolo_timer_interrupt_clear_w ); void carpolo_generate_car_car_interrupt(running_machine &machine, int car1, int car2); void carpolo_generate_ball_screen_interrupt(running_machine &machine, UINT8 cause); diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index 52f56f66196..718090a3d99 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -140,19 +140,19 @@ public: DECLARE_WRITE8_MEMBER(sailormn_okibank0_w); DECLARE_WRITE8_MEMBER(sailormn_okibank1_w); DECLARE_WRITE16_MEMBER(donpachi_videoregs_w); + DECLARE_WRITE16_MEMBER(cave_vram_0_w); + DECLARE_WRITE16_MEMBER(cave_vram_1_w); + DECLARE_WRITE16_MEMBER(cave_vram_2_w); + DECLARE_WRITE16_MEMBER(cave_vram_3_w); + DECLARE_WRITE16_MEMBER(cave_vram_0_8x8_w); + DECLARE_WRITE16_MEMBER(cave_vram_1_8x8_w); + DECLARE_WRITE16_MEMBER(cave_vram_2_8x8_w); + DECLARE_WRITE16_MEMBER(cave_vram_3_8x8_w); }; /*----------- defined in video/cave.c -----------*/ -WRITE16_HANDLER( cave_vram_0_w ); -WRITE16_HANDLER( cave_vram_1_w ); -WRITE16_HANDLER( cave_vram_2_w ); -WRITE16_HANDLER( cave_vram_3_w ); -WRITE16_HANDLER( cave_vram_0_8x8_w ); -WRITE16_HANDLER( cave_vram_1_8x8_w ); -WRITE16_HANDLER( cave_vram_2_8x8_w ); -WRITE16_HANDLER( cave_vram_3_8x8_w ); PALETTE_INIT( cave ); PALETTE_INIT( ddonpach ); diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index 79426c910eb..38cda8f6d57 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -35,17 +35,17 @@ public: DECLARE_READ8_MEMBER(bankedram_r); DECLARE_WRITE8_MEMBER(bankedram_w); DECLARE_WRITE8_MEMBER(cbasebal_coinctrl_w); + DECLARE_WRITE8_MEMBER(cbasebal_textram_w); + DECLARE_READ8_MEMBER(cbasebal_textram_r); + DECLARE_WRITE8_MEMBER(cbasebal_scrollram_w); + DECLARE_READ8_MEMBER(cbasebal_scrollram_r); + DECLARE_WRITE8_MEMBER(cbasebal_gfxctrl_w); + DECLARE_WRITE8_MEMBER(cbasebal_scrollx_w); + DECLARE_WRITE8_MEMBER(cbasebal_scrolly_w); }; /*----------- defined in video/cbasebal.c -----------*/ -WRITE8_HANDLER( cbasebal_textram_w ); -READ8_HANDLER( cbasebal_textram_r ); -WRITE8_HANDLER( cbasebal_scrollram_w ); -READ8_HANDLER( cbasebal_scrollram_r ); -WRITE8_HANDLER( cbasebal_gfxctrl_w ); -WRITE8_HANDLER( cbasebal_scrollx_w ); -WRITE8_HANDLER( cbasebal_scrolly_w ); VIDEO_START( cbasebal ); SCREEN_UPDATE_IND16( cbasebal ); diff --git a/src/mame/includes/cbuster.h b/src/mame/includes/cbuster.h index cd6a3b62a72..8f1f2b0f56a 100644 --- a/src/mame/includes/cbuster.h +++ b/src/mame/includes/cbuster.h @@ -30,14 +30,14 @@ public: device_t *m_deco_tilegen2; DECLARE_WRITE16_MEMBER(twocrude_control_w); DECLARE_READ16_MEMBER(twocrude_control_r); + DECLARE_WRITE16_MEMBER(twocrude_palette_24bit_rg_w); + DECLARE_WRITE16_MEMBER(twocrude_palette_24bit_b_w); }; /*----------- defined in video/cbuster.c -----------*/ -WRITE16_HANDLER( twocrude_palette_24bit_rg_w ); -WRITE16_HANDLER( twocrude_palette_24bit_b_w ); VIDEO_START( twocrude ); SCREEN_UPDATE_RGB32( twocrude ); diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index 29a7e259684..9c8c301b3dd 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -53,6 +53,14 @@ public: DECLARE_WRITE8_MEMBER(nvram_store_w); DECLARE_READ8_MEMBER(nvram_r); DECLARE_WRITE8_MEMBER(nvram_w); + DECLARE_WRITE8_MEMBER(ccastles_hscroll_w); + DECLARE_WRITE8_MEMBER(ccastles_vscroll_w); + DECLARE_WRITE8_MEMBER(ccastles_video_control_w); + DECLARE_WRITE8_MEMBER(ccastles_paletteram_w); + DECLARE_WRITE8_MEMBER(ccastles_videoram_w); + DECLARE_READ8_MEMBER(ccastles_bitmode_r); + DECLARE_WRITE8_MEMBER(ccastles_bitmode_w); + DECLARE_WRITE8_MEMBER(ccastles_bitmode_addr_w); }; @@ -62,13 +70,5 @@ public: VIDEO_START( ccastles ); SCREEN_UPDATE_IND16( ccastles ); -WRITE8_HANDLER( ccastles_hscroll_w ); -WRITE8_HANDLER( ccastles_vscroll_w ); -WRITE8_HANDLER( ccastles_video_control_w ); -WRITE8_HANDLER( ccastles_paletteram_w ); -WRITE8_HANDLER( ccastles_videoram_w ); -READ8_HANDLER( ccastles_bitmode_r ); -WRITE8_HANDLER( ccastles_bitmode_w ); -WRITE8_HANDLER( ccastles_bitmode_addr_w ); diff --git a/src/mame/includes/cchasm.h b/src/mame/includes/cchasm.h index dd6b48234f5..591e626753c 100644 --- a/src/mame/includes/cchasm.h +++ b/src/mame/includes/cchasm.h @@ -20,12 +20,13 @@ public: UINT16 *m_ram; int m_xcenter; int m_ycenter; + DECLARE_WRITE16_MEMBER(cchasm_led_w); + DECLARE_WRITE16_MEMBER(cchasm_refresh_control_w); }; /*----------- defined in machine/cchasm.c -----------*/ -WRITE16_HANDLER( cchasm_led_w ); /*----------- defined in audio/cchasm.c -----------*/ @@ -45,6 +46,5 @@ SOUND_START( cchasm ); /*----------- defined in video/cchasm.c -----------*/ -WRITE16_HANDLER( cchasm_refresh_control_w ); VIDEO_START( cchasm ); diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h index 3fcf7cf3dff..82db24a59a0 100644 --- a/src/mame/includes/cclimber.h +++ b/src/mame/includes/cclimber.h @@ -30,6 +30,8 @@ public: DECLARE_READ8_MEMBER(yamato_p1_r); DECLARE_WRITE8_MEMBER(toprollr_rombank_w); DECLARE_WRITE8_MEMBER(nmi_mask_w); + DECLARE_WRITE8_MEMBER(cclimber_colorram_w); + DECLARE_WRITE8_MEMBER(cannonb_flip_screen_w); }; @@ -43,8 +45,6 @@ DRIVER_INIT( ckongb ); /*----------- defined in video/cclimber.c -----------*/ -WRITE8_HANDLER( cclimber_colorram_w ); -WRITE8_HANDLER( cannonb_flip_screen_w ); PALETTE_INIT( cclimber ); VIDEO_START( cclimber ); diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index bc860a5c74d..59fd2b9b718 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -35,6 +35,13 @@ public: DECLARE_WRITE8_MEMBER(led_w); DECLARE_WRITE8_MEMBER(coin_count_w); DECLARE_WRITE8_MEMBER(bullsdrt_coin_count_w); + DECLARE_WRITE8_MEMBER(centiped_videoram_w); + DECLARE_WRITE8_MEMBER(centiped_flip_screen_w); + DECLARE_WRITE8_MEMBER(bullsdrt_tilesbank_w); + DECLARE_WRITE8_MEMBER(bullsdrt_sprites_bank_w); + DECLARE_WRITE8_MEMBER(centiped_paletteram_w); + DECLARE_WRITE8_MEMBER(milliped_paletteram_w); + DECLARE_WRITE8_MEMBER(mazeinv_paletteram_w); }; @@ -52,12 +59,5 @@ SCREEN_UPDATE_IND16( milliped ); SCREEN_UPDATE_IND16( warlords ); SCREEN_UPDATE_IND16( bullsdrt ); -WRITE8_HANDLER( centiped_paletteram_w ); -WRITE8_HANDLER( milliped_paletteram_w ); -WRITE8_HANDLER( centiped_videoram_w ); -WRITE8_HANDLER( centiped_flip_screen_w ); -WRITE8_HANDLER( bullsdrt_tilesbank_w ); -WRITE8_HANDLER( bullsdrt_sprites_bank_w ); -WRITE8_HANDLER( mazeinv_paletteram_w ); diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index bbe5d60c95b..ff5d47e165b 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -32,18 +32,22 @@ public: UINT8 m_flip_x; UINT8 m_flip_y; DECLARE_WRITE8_MEMBER(coinlock_w); + DECLARE_READ8_MEMBER(chaknpop_mcu_port_a_r); + DECLARE_READ8_MEMBER(chaknpop_mcu_port_b_r); + DECLARE_READ8_MEMBER(chaknpop_mcu_port_c_r); + DECLARE_WRITE8_MEMBER(chaknpop_mcu_port_a_w); + DECLARE_WRITE8_MEMBER(chaknpop_mcu_port_b_w); + DECLARE_WRITE8_MEMBER(chaknpop_mcu_port_c_w); + DECLARE_READ8_MEMBER(chaknpop_gfxmode_r); + DECLARE_WRITE8_MEMBER(chaknpop_gfxmode_w); + DECLARE_WRITE8_MEMBER(chaknpop_txram_w); + DECLARE_WRITE8_MEMBER(chaknpop_attrram_w); }; /*----------- defined in machine/chaknpop.c -----------*/ -READ8_HANDLER( chaknpop_mcu_port_a_r ); -READ8_HANDLER( chaknpop_mcu_port_b_r ); -READ8_HANDLER( chaknpop_mcu_port_c_r ); -WRITE8_HANDLER( chaknpop_mcu_port_a_w ); -WRITE8_HANDLER( chaknpop_mcu_port_b_w ); -WRITE8_HANDLER( chaknpop_mcu_port_c_w ); /*----------- defined in video/chaknpop.c -----------*/ @@ -52,7 +56,3 @@ PALETTE_INIT( chaknpop ); VIDEO_START( chaknpop ); SCREEN_UPDATE_IND16( chaknpop ); -READ8_HANDLER( chaknpop_gfxmode_r ); -WRITE8_HANDLER( chaknpop_gfxmode_w ); -WRITE8_HANDLER( chaknpop_txram_w ); -WRITE8_HANDLER( chaknpop_attrram_w ); diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index 903f2dbb617..1eba0c44051 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -39,15 +39,15 @@ public: DECLARE_WRITE8_MEMBER(champbas_mcu_switch_w); DECLARE_WRITE8_MEMBER(champbas_mcu_halt_w); DECLARE_READ8_MEMBER(champbja_alt_protection_r); + DECLARE_WRITE8_MEMBER(champbas_bg_videoram_w); + DECLARE_WRITE8_MEMBER(champbas_gfxbank_w); + DECLARE_WRITE8_MEMBER(champbas_palette_bank_w); + DECLARE_WRITE8_MEMBER(champbas_flipscreen_w); }; /*----------- defined in video/champbas.c -----------*/ -WRITE8_HANDLER( champbas_bg_videoram_w ); -WRITE8_HANDLER( champbas_gfxbank_w ); -WRITE8_HANDLER( champbas_palette_bank_w ); -WRITE8_HANDLER( champbas_flipscreen_w ); PALETTE_INIT( champbas ); PALETTE_INIT( exctsccr ); diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index ee801777d84..d0a8bb92a96 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -76,6 +76,12 @@ public: DECLARE_WRITE8_MEMBER(changela_collision_reset_0); DECLARE_WRITE8_MEMBER(changela_collision_reset_1); DECLARE_WRITE8_MEMBER(changela_coin_counter_w); + DECLARE_WRITE8_MEMBER(changela_colors_w); + DECLARE_WRITE8_MEMBER(changela_mem_device_select_w); + DECLARE_WRITE8_MEMBER(changela_mem_device_w); + DECLARE_READ8_MEMBER(changela_mem_device_r); + DECLARE_WRITE8_MEMBER(changela_slope_rom_addr_hi_w); + DECLARE_WRITE8_MEMBER(changela_slope_rom_addr_lo_w); }; /*----------- defined in video/changela.c -----------*/ @@ -83,9 +89,3 @@ public: VIDEO_START( changela ); SCREEN_UPDATE_IND16( changela ); -WRITE8_HANDLER( changela_colors_w ); -WRITE8_HANDLER( changela_mem_device_select_w ); -WRITE8_HANDLER( changela_mem_device_w ); -READ8_HANDLER( changela_mem_device_r ); -WRITE8_HANDLER( changela_slope_rom_addr_hi_w ); -WRITE8_HANDLER( changela_slope_rom_addr_lo_w ); diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index b6e290daaf7..08dea9e7f74 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -25,6 +25,8 @@ public: device_t *m_dac; UINT8 m_irq_mask; + DECLARE_WRITE8_MEMBER(cheekyms_port_40_w); + DECLARE_WRITE8_MEMBER(cheekyms_port_80_w); }; @@ -33,5 +35,3 @@ public: PALETTE_INIT( cheekyms ); VIDEO_START( cheekyms ); SCREEN_UPDATE_IND16( cheekyms ); -WRITE8_HANDLER( cheekyms_port_40_w ); -WRITE8_HANDLER( cheekyms_port_80_w ); diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h index 6350e694761..c5efd1ad65d 100644 --- a/src/mame/includes/cinemat.h +++ b/src/mame/includes/cinemat.h @@ -47,6 +47,7 @@ public: DECLARE_READ8_MEMBER(boxingb_dial_r); DECLARE_READ8_MEMBER(qb3_frame_r); DECLARE_WRITE8_MEMBER(qb3_ram_bank_w); + DECLARE_WRITE8_MEMBER(cinemat_vector_control_w); }; @@ -80,7 +81,6 @@ MACHINE_CONFIG_EXTERN( qb3_sound ); /*----------- defined in video/cinemat.c -----------*/ void cinemat_vector_callback(device_t *device, INT16 sx, INT16 sy, INT16 ex, INT16 ey, UINT8 shift); -WRITE8_HANDLER( cinemat_vector_control_w ); VIDEO_START( cinemat_bilevel ); VIDEO_START( cinemat_16level ); diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index c6f96bc6110..698d98d702c 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -23,6 +23,9 @@ public: /* game id */ int m_game_id; DECLARE_READ8_MEMBER(circus_paddle_r); + DECLARE_WRITE8_MEMBER(circus_videoram_w); + DECLARE_WRITE8_MEMBER(circus_clown_x_w); + DECLARE_WRITE8_MEMBER(circus_clown_y_w); }; @@ -41,10 +44,7 @@ extern const samples_interface robotbwl_samples_interface; /*----------- defined in video/circus.c -----------*/ -extern WRITE8_HANDLER( circus_clown_x_w ); -extern WRITE8_HANDLER( circus_clown_y_w ); -extern WRITE8_HANDLER( circus_videoram_w ); extern VIDEO_START( circus ); extern SCREEN_UPDATE_IND16( crash ); diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index c332f403ccb..71876d51e37 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -38,15 +38,15 @@ public: DECLARE_WRITE8_MEMBER(circusc_coin_counter_w); DECLARE_WRITE8_MEMBER(circusc_sound_w); DECLARE_WRITE8_MEMBER(irq_mask_w); + DECLARE_WRITE8_MEMBER(circusc_videoram_w); + DECLARE_WRITE8_MEMBER(circusc_colorram_w); + DECLARE_WRITE8_MEMBER(circusc_flipscreen_w); }; /*----------- defined in video/circusc.c -----------*/ -WRITE8_HANDLER( circusc_videoram_w ); -WRITE8_HANDLER( circusc_colorram_w ); VIDEO_START( circusc ); -WRITE8_HANDLER( circusc_flipscreen_w ); PALETTE_INIT( circusc ); SCREEN_UPDATE_IND16( circusc ); diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h index f575ff18ed9..5412c9958fd 100644 --- a/src/mame/includes/cischeat.h +++ b/src/mame/includes/cischeat.h @@ -47,26 +47,27 @@ public: DECLARE_READ16_MEMBER(scudhamm_motor_status_r); DECLARE_READ16_MEMBER(scudhamm_motor_pos_r); DECLARE_READ16_MEMBER(scudhamm_analog_r); + DECLARE_WRITE16_MEMBER(cischeat_scrollram_0_w); + DECLARE_WRITE16_MEMBER(cischeat_scrollram_1_w); + DECLARE_WRITE16_MEMBER(cischeat_scrollram_2_w); + DECLARE_READ16_MEMBER(bigrun_vregs_r); + DECLARE_WRITE16_MEMBER(bigrun_vregs_w); + DECLARE_READ16_MEMBER(cischeat_vregs_r); + DECLARE_WRITE16_MEMBER(cischeat_vregs_w); + DECLARE_READ16_MEMBER(f1gpstar_vregs_r); + DECLARE_READ16_MEMBER(f1gpstr2_vregs_r); + DECLARE_READ16_MEMBER(wildplt_vregs_r); + DECLARE_WRITE16_MEMBER(f1gpstar_vregs_w); + DECLARE_WRITE16_MEMBER(f1gpstr2_vregs_w); + DECLARE_WRITE16_MEMBER(scudhamm_vregs_w); + void cischeat_set_vreg_flag(int which, int data); }; /*----------- defined in video/cischeat.c -----------*/ -WRITE16_HANDLER( cischeat_scrollram_0_w ); -WRITE16_HANDLER( cischeat_scrollram_1_w ); -WRITE16_HANDLER( cischeat_scrollram_2_w ); -READ16_HANDLER( bigrun_vregs_r ); -READ16_HANDLER( cischeat_vregs_r ); -READ16_HANDLER( f1gpstar_vregs_r ); -READ16_HANDLER( f1gpstr2_vregs_r ); -READ16_HANDLER( wildplt_vregs_r ); -WRITE16_HANDLER( bigrun_vregs_w ); -WRITE16_HANDLER( cischeat_vregs_w ); -WRITE16_HANDLER( f1gpstar_vregs_w ); -WRITE16_HANDLER( f1gpstr2_vregs_w ); -WRITE16_HANDLER( scudhamm_vregs_w ); VIDEO_START( bigrun ); VIDEO_START( cischeat ); diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index 8e65fddf196..b1e94f1a19e 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -27,14 +27,14 @@ public: device_t *m_maincpu; DECLARE_READ8_MEMBER(citycon_in_r); DECLARE_READ8_MEMBER(citycon_irq_ack_r); + DECLARE_WRITE8_MEMBER(citycon_videoram_w); + DECLARE_WRITE8_MEMBER(citycon_linecolor_w); + DECLARE_WRITE8_MEMBER(citycon_background_w); }; /*----------- defined in video/citycon.c -----------*/ -WRITE8_HANDLER( citycon_videoram_w ); -WRITE8_HANDLER( citycon_linecolor_w ); -WRITE8_HANDLER( citycon_background_w ); SCREEN_UPDATE_IND16( citycon ); VIDEO_START( citycon ); diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h index aef57dd325f..579aab178bd 100644 --- a/src/mame/includes/cloak.h +++ b/src/mame/includes/cloak.h @@ -28,18 +28,20 @@ public: DECLARE_WRITE8_MEMBER(cloak_irq_reset_0_w); DECLARE_WRITE8_MEMBER(cloak_irq_reset_1_w); DECLARE_WRITE8_MEMBER(cloak_nvram_enable_w); + DECLARE_WRITE8_MEMBER(cloak_paletteram_w); + DECLARE_WRITE8_MEMBER(cloak_clearbmp_w); + DECLARE_READ8_MEMBER(graph_processor_r); + DECLARE_WRITE8_MEMBER(graph_processor_w); + DECLARE_WRITE8_MEMBER(cloak_videoram_w); + DECLARE_WRITE8_MEMBER(cloak_flipscreen_w); + void set_current_bitmap_videoram_pointer(); + void adjust_xy(int offset); }; /*----------- defined in video/cloak.c -----------*/ -WRITE8_HANDLER( cloak_videoram_w ); -WRITE8_HANDLER( cloak_flipscreen_w ); -WRITE8_HANDLER( cloak_paletteram_w ); -READ8_HANDLER( graph_processor_r ); -WRITE8_HANDLER( graph_processor_w ); -WRITE8_HANDLER( cloak_clearbmp_w ); VIDEO_START( cloak ); SCREEN_UPDATE_IND16( cloak ); diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h index 834d1052805..b30cccf806f 100644 --- a/src/mame/includes/cloud9.h +++ b/src/mame/includes/cloud9.h @@ -46,6 +46,12 @@ public: DECLARE_READ8_MEMBER(leta_r); DECLARE_WRITE8_MEMBER(nvram_recall_w); DECLARE_WRITE8_MEMBER(nvram_store_w); + DECLARE_WRITE8_MEMBER(cloud9_video_control_w); + DECLARE_WRITE8_MEMBER(cloud9_paletteram_w); + DECLARE_WRITE8_MEMBER(cloud9_videoram_w); + DECLARE_READ8_MEMBER(cloud9_bitmode_r); + DECLARE_WRITE8_MEMBER(cloud9_bitmode_w); + DECLARE_WRITE8_MEMBER(cloud9_bitmode_addr_w); }; @@ -54,11 +60,5 @@ public: VIDEO_START( cloud9 ); SCREEN_UPDATE_IND16( cloud9 ); -WRITE8_HANDLER( cloud9_video_control_w ); -WRITE8_HANDLER( cloud9_paletteram_w ); -WRITE8_HANDLER( cloud9_videoram_w ); -READ8_HANDLER( cloud9_bitmode_r ); -WRITE8_HANDLER( cloud9_bitmode_w ); -WRITE8_HANDLER( cloud9_bitmode_addr_w ); diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h index 136682fa7da..5b8f76b30e9 100644 --- a/src/mame/includes/clshroad.h +++ b/src/mame/includes/clshroad.h @@ -13,14 +13,14 @@ public: UINT8 *m_spriteram; size_t m_spriteram_size; DECLARE_READ8_MEMBER(clshroad_input_r); + DECLARE_WRITE8_MEMBER(clshroad_flipscreen_w); + DECLARE_WRITE8_MEMBER(clshroad_vram_0_w); + DECLARE_WRITE8_MEMBER(clshroad_vram_1_w); }; /*----------- defined in video/clshroad.c -----------*/ -WRITE8_HANDLER( clshroad_vram_0_w ); -WRITE8_HANDLER( clshroad_vram_1_w ); -WRITE8_HANDLER( clshroad_flipscreen_w ); PALETTE_INIT( firebatl ); PALETTE_INIT( clshroad ); diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index bf1308e497d..7807b167dd3 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -54,17 +54,17 @@ public: DECLARE_READ8_MEMBER(protection_r); DECLARE_WRITE8_MEMBER(protection_clock_w); DECLARE_WRITE8_MEMBER(combatsc_sh_irqtrigger_w); + DECLARE_READ8_MEMBER(combatsc_video_r); + DECLARE_WRITE8_MEMBER(combatsc_video_w); + DECLARE_WRITE8_MEMBER(combatsc_pf_control_w); + DECLARE_READ8_MEMBER(combatsc_scrollram_r); + DECLARE_WRITE8_MEMBER(combatsc_scrollram_w); }; /*----------- defined in video/combatsc.c -----------*/ -READ8_HANDLER( combatsc_video_r ); -WRITE8_HANDLER( combatsc_video_w ); -WRITE8_HANDLER( combatsc_pf_control_w ); -READ8_HANDLER( combatsc_scrollram_r ); -WRITE8_HANDLER( combatsc_scrollram_w ); PALETTE_INIT( combatsc ); PALETTE_INIT( combatscb ); diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index eb5bb02e78d..f82e7dc32fb 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -28,19 +28,19 @@ public: /* devices */ device_t *m_audiocpu; required_device<buffered_spriteram8_device> m_spriteram; + DECLARE_WRITE8_MEMBER(commando_videoram_w); + DECLARE_WRITE8_MEMBER(commando_colorram_w); + DECLARE_WRITE8_MEMBER(commando_videoram2_w); + DECLARE_WRITE8_MEMBER(commando_colorram2_w); + DECLARE_WRITE8_MEMBER(commando_scrollx_w); + DECLARE_WRITE8_MEMBER(commando_scrolly_w); + DECLARE_WRITE8_MEMBER(commando_c804_w); }; /*----------- defined in video/commando.c -----------*/ -WRITE8_HANDLER( commando_videoram_w ); -WRITE8_HANDLER( commando_colorram_w ); -WRITE8_HANDLER( commando_videoram2_w ); -WRITE8_HANDLER( commando_colorram2_w ); -WRITE8_HANDLER( commando_scrollx_w ); -WRITE8_HANDLER( commando_scrolly_w ); -WRITE8_HANDLER( commando_c804_w ); VIDEO_START( commando ); SCREEN_UPDATE_IND16( commando ); diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index af9cdbb892a..d69ba41a641 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -26,13 +26,13 @@ public: /* misc */ int m_bank; DECLARE_WRITE8_MEMBER(compgolf_ctrl_w); + DECLARE_WRITE8_MEMBER(compgolf_video_w); + DECLARE_WRITE8_MEMBER(compgolf_back_w); }; /*----------- defined in video/compgolf.c -----------*/ -WRITE8_HANDLER( compgolf_video_w ); -WRITE8_HANDLER( compgolf_back_w ); PALETTE_INIT ( compgolf ); VIDEO_START ( compgolf ); SCREEN_UPDATE_IND16( compgolf ); diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index b5b5f4e22ec..96ec1ff2ce9 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -38,6 +38,14 @@ public: DECLARE_WRITE8_MEMBER(contra_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(contra_coin_counter_w); DECLARE_WRITE8_MEMBER(cpu_sound_command_w); + DECLARE_WRITE8_MEMBER(contra_fg_vram_w); + DECLARE_WRITE8_MEMBER(contra_fg_cram_w); + DECLARE_WRITE8_MEMBER(contra_bg_vram_w); + DECLARE_WRITE8_MEMBER(contra_bg_cram_w); + DECLARE_WRITE8_MEMBER(contra_text_vram_w); + DECLARE_WRITE8_MEMBER(contra_text_cram_w); + DECLARE_WRITE8_MEMBER(contra_K007121_ctrl_0_w); + DECLARE_WRITE8_MEMBER(contra_K007121_ctrl_1_w); }; @@ -45,15 +53,7 @@ public: PALETTE_INIT( contra ); -WRITE8_HANDLER( contra_fg_vram_w ); -WRITE8_HANDLER( contra_fg_cram_w ); -WRITE8_HANDLER( contra_bg_vram_w ); -WRITE8_HANDLER( contra_bg_cram_w ); -WRITE8_HANDLER( contra_text_vram_w ); -WRITE8_HANDLER( contra_text_cram_w ); -WRITE8_HANDLER( contra_K007121_ctrl_0_w ); -WRITE8_HANDLER( contra_K007121_ctrl_1_w ); SCREEN_UPDATE_IND16( contra ); VIDEO_START( contra ); diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index 8ec32c49678..b07beae6701 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -33,6 +33,9 @@ public: DECLARE_WRITE8_MEMBER(cop01_irq_ack_w); DECLARE_READ8_MEMBER(cop01_sound_irq_ack_w); DECLARE_READ8_MEMBER(kludge); + DECLARE_WRITE8_MEMBER(cop01_background_w); + DECLARE_WRITE8_MEMBER(cop01_foreground_w); + DECLARE_WRITE8_MEMBER(cop01_vreg_w); }; @@ -44,6 +47,3 @@ PALETTE_INIT( cop01 ); VIDEO_START( cop01 ); SCREEN_UPDATE_IND16( cop01 ); -WRITE8_HANDLER( cop01_background_w ); -WRITE8_HANDLER( cop01_foreground_w ); -WRITE8_HANDLER( cop01_vreg_w ); diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index 17ccbee0dcc..a0b1fc5d00a 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -49,13 +49,13 @@ public: DECLARE_READ8_MEMBER(magspot_coinage_dip_r); DECLARE_READ8_MEMBER(nomnlnd_port_0_1_r); DECLARE_WRITE8_MEMBER(flip_screen_w); + DECLARE_WRITE8_MEMBER(cosmic_color_register_w); + DECLARE_WRITE8_MEMBER(cosmic_background_enable_w); }; /*----------- defined in video/cosmic.c -----------*/ -WRITE8_HANDLER( cosmic_color_register_w ); -WRITE8_HANDLER( cosmic_background_enable_w ); PALETTE_INIT( panic ); PALETTE_INIT( cosmica ); diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 1dee180fc08..7f1d864e53b 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -157,6 +157,15 @@ public: DECLARE_WRITE16_MEMBER(cps1_coinctrl_w); DECLARE_READ16_MEMBER(qsound_sharedram1_r); DECLARE_WRITE16_MEMBER(qsound_sharedram1_w); + DECLARE_WRITE16_MEMBER(cps1_cps_a_w); + DECLARE_READ16_MEMBER(cps1_cps_b_r); + DECLARE_WRITE16_MEMBER(cps1_cps_b_w); + DECLARE_WRITE16_MEMBER(cps1_gfxram_w); + DECLARE_WRITE16_MEMBER(cps2_objram_bank_w); + DECLARE_READ16_MEMBER(cps2_objram1_r); + DECLARE_READ16_MEMBER(cps2_objram2_r); + DECLARE_WRITE16_MEMBER(cps2_objram1_w); + DECLARE_WRITE16_MEMBER(cps2_objram2_w); }; /*----------- defined in drivers/cps1.c -----------*/ @@ -170,19 +179,10 @@ GFXDECODE_EXTERN( cps1 ); /*----------- defined in video/cps1.c -----------*/ -WRITE16_HANDLER( cps1_cps_a_w ); -WRITE16_HANDLER( cps1_cps_b_w ); -READ16_HANDLER( cps1_cps_b_r ); -WRITE16_HANDLER( cps1_gfxram_w ); DRIVER_INIT( cps1 ); DRIVER_INIT( cps2_video ); -WRITE16_HANDLER( cps2_objram_bank_w ); -READ16_HANDLER( cps2_objram1_r ); -READ16_HANDLER( cps2_objram2_r ); -WRITE16_HANDLER( cps2_objram1_w ); -WRITE16_HANDLER( cps2_objram2_w ); VIDEO_START( cps1 ); VIDEO_START( cps2 ); diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h index 9896bb17995..ea88221d073 100644 --- a/src/mame/includes/crbaloon.h +++ b/src/mame/includes/crbaloon.h @@ -25,6 +25,8 @@ public: DECLARE_WRITE8_MEMBER(pc3092_w); DECLARE_READ8_MEMBER(pc3259_r); DECLARE_WRITE8_MEMBER(port_sound_w); + DECLARE_WRITE8_MEMBER(crbaloon_videoram_w); + DECLARE_WRITE8_MEMBER(crbaloon_colorram_w); }; @@ -46,8 +48,6 @@ PALETTE_INIT( crbaloon ); VIDEO_START( crbaloon ); SCREEN_UPDATE_IND16( crbaloon ); -WRITE8_HANDLER( crbaloon_videoram_w ); -WRITE8_HANDLER( crbaloon_colorram_w ); UINT16 crbaloon_get_collision_address(running_machine &machine); void crbaloon_set_clear_collision_address(running_machine &machine, int _crbaloon_collision_address_clear); diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h index 760d64c0d07..22c0311710b 100644 --- a/src/mame/includes/crgolf.h +++ b/src/mame/includes/crgolf.h @@ -41,11 +41,11 @@ public: DECLARE_READ8_MEMBER(main_to_sound_r); DECLARE_WRITE8_MEMBER(sound_to_main_w); DECLARE_READ8_MEMBER(sound_to_main_r); + DECLARE_WRITE8_MEMBER(crgolf_videoram_w); + DECLARE_READ8_MEMBER(crgolf_videoram_r); }; /*----------- defined in video/crgolf.c -----------*/ -WRITE8_HANDLER( crgolf_videoram_w ); -READ8_HANDLER( crgolf_videoram_r ); MACHINE_CONFIG_EXTERN( crgolf_video ); diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index 5e6324d14d0..bda6dbaba49 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -25,6 +25,17 @@ public: /* devices */ device_t *m_audiocpu; DECLARE_WRITE16_MEMBER(crospang_soundlatch_w); + DECLARE_WRITE16_MEMBER(bestri_tilebank_w); + DECLARE_WRITE16_MEMBER(bestri_bg_scrolly_w); + DECLARE_WRITE16_MEMBER(bestri_fg_scrolly_w); + DECLARE_WRITE16_MEMBER(bestri_fg_scrollx_w); + DECLARE_WRITE16_MEMBER(bestri_bg_scrollx_w); + DECLARE_WRITE16_MEMBER(crospang_fg_scrolly_w); + DECLARE_WRITE16_MEMBER(crospang_bg_scrolly_w); + DECLARE_WRITE16_MEMBER(crospang_fg_scrollx_w); + DECLARE_WRITE16_MEMBER(crospang_bg_scrollx_w); + DECLARE_WRITE16_MEMBER(crospang_fg_videoram_w); + DECLARE_WRITE16_MEMBER(crospang_bg_videoram_w); }; @@ -33,16 +44,5 @@ public: VIDEO_START( crospang ); SCREEN_UPDATE_IND16( crospang ); -WRITE16_HANDLER ( crospang_fg_scrolly_w ); -WRITE16_HANDLER ( crospang_bg_scrolly_w ); -WRITE16_HANDLER ( crospang_fg_scrollx_w ); -WRITE16_HANDLER ( crospang_bg_scrollx_w ); -WRITE16_HANDLER ( bestri_fg_scrolly_w ); -WRITE16_HANDLER ( bestri_bg_scrolly_w ); -WRITE16_HANDLER ( bestri_fg_scrollx_w ); -WRITE16_HANDLER ( bestri_bg_scrollx_w ); -WRITE16_HANDLER ( crospang_fg_videoram_w ); -WRITE16_HANDLER ( crospang_bg_videoram_w ); -WRITE16_HANDLER ( bestri_tilebank_w ); diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index fc27503a0a9..5b5e3e6bfe7 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -36,14 +36,14 @@ public: DECLARE_WRITE8_MEMBER(crshrace_sh_bankswitch_w); DECLARE_WRITE16_MEMBER(sound_command_w); DECLARE_WRITE8_MEMBER(pending_command_clear_w); + DECLARE_WRITE16_MEMBER(crshrace_videoram1_w); + DECLARE_WRITE16_MEMBER(crshrace_videoram2_w); + DECLARE_WRITE16_MEMBER(crshrace_roz_bank_w); + DECLARE_WRITE16_MEMBER(crshrace_gfxctrl_w); }; /*----------- defined in video/crshrace.c -----------*/ -WRITE16_HANDLER( crshrace_videoram1_w ); -WRITE16_HANDLER( crshrace_videoram2_w ); -WRITE16_HANDLER( crshrace_roz_bank_w ); -WRITE16_HANDLER( crshrace_gfxctrl_w ); VIDEO_START( crshrace ); SCREEN_VBLANK( crshrace ); diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index d817fd46732..17bb9ccd472 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -79,6 +79,10 @@ public: DECLARE_WRITE8_MEMBER(cvs_s2636_1_or_character_ram_w); DECLARE_READ8_MEMBER(cvs_s2636_2_or_character_ram_r); DECLARE_WRITE8_MEMBER(cvs_s2636_2_or_character_ram_w); + DECLARE_WRITE8_MEMBER(cvs_video_fx_w); + DECLARE_READ8_MEMBER(cvs_collision_r); + DECLARE_READ8_MEMBER(cvs_collision_clear); + DECLARE_WRITE8_MEMBER(cvs_scroll_w); }; @@ -89,11 +93,7 @@ MACHINE_RESET( cvs ); /*----------- defined in video/cvs.c -----------*/ -WRITE8_HANDLER( cvs_scroll_w ); -WRITE8_HANDLER( cvs_video_fx_w ); -READ8_HANDLER( cvs_collision_r ); -READ8_HANDLER( cvs_collision_clear ); void cvs_init_stars( running_machine &machine ); void cvs_scroll_stars( running_machine &machine ); diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h index 8844307b713..de6c300f7af 100644 --- a/src/mame/includes/darius.h +++ b/src/mame/includes/darius.h @@ -78,12 +78,12 @@ public: DECLARE_READ8_MEMBER(readport3); DECLARE_WRITE8_MEMBER(adpcm_nmi_disable); DECLARE_WRITE8_MEMBER(adpcm_nmi_enable); + DECLARE_WRITE16_MEMBER(darius_fg_layer_w); }; /*----------- defined in video/darius.c -----------*/ -WRITE16_HANDLER( darius_fg_layer_w ); VIDEO_START( darius ); SCREEN_UPDATE_IND16( darius_left ); diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h index 9dcee8ec321..cdc35cacf19 100644 --- a/src/mame/includes/darkseal.h +++ b/src/mame/includes/darkseal.h @@ -23,6 +23,8 @@ public: int m_flipscreen; DECLARE_WRITE16_MEMBER(darkseal_control_w); DECLARE_READ16_MEMBER(darkseal_control_r); + DECLARE_WRITE16_MEMBER(darkseal_palette_24bit_rg_w); + DECLARE_WRITE16_MEMBER(darkseal_palette_24bit_b_w); }; @@ -31,5 +33,3 @@ public: VIDEO_START( darkseal ); SCREEN_UPDATE_IND16( darkseal ); -WRITE16_HANDLER( darkseal_palette_24bit_rg_w ); -WRITE16_HANDLER( darkseal_palette_24bit_b_w ); diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h index 7a2a990bf63..cb65cb790f1 100644 --- a/src/mame/includes/dbz.h +++ b/src/mame/includes/dbz.h @@ -37,6 +37,8 @@ public: DECLARE_WRITE16_MEMBER(dbzcontrol_w); DECLARE_WRITE16_MEMBER(dbz_sound_command_w); DECLARE_WRITE16_MEMBER(dbz_sound_cause_nmi); + DECLARE_WRITE16_MEMBER(dbz_bg2_videoram_w); + DECLARE_WRITE16_MEMBER(dbz_bg1_videoram_w); }; @@ -45,8 +47,6 @@ public: extern void dbz_sprite_callback(running_machine &machine, int *code, int *color, int *priority_mask); extern void dbz_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); -WRITE16_HANDLER(dbz_bg1_videoram_w); -WRITE16_HANDLER(dbz_bg2_videoram_w); VIDEO_START(dbz); SCREEN_UPDATE_IND16(dbz); diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index af013133dbc..ea3c8e67f1d 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -36,6 +36,12 @@ public: DECLARE_READ8_MEMBER(sound_status_r); DECLARE_WRITE8_MEMBER(sound_control_w); DECLARE_WRITE8_MEMBER(bsmt_data_w); + DECLARE_WRITE16_MEMBER(madmax_blitter_color_w); + DECLARE_WRITE16_MEMBER(madmax_blitter_xparam_w); + DECLARE_WRITE16_MEMBER(madmax_blitter_yparam_w); + DECLARE_WRITE16_MEMBER(madmax_blitter_vidparam_w); + DECLARE_WRITE16_MEMBER(madmax_blitter_unknown_w); + DECLARE_READ16_MEMBER(madmax_blitter_vidparam_r); }; @@ -50,10 +56,4 @@ PALETTE_INIT( dcheese ); VIDEO_START( dcheese ); SCREEN_UPDATE_IND16( dcheese ); -WRITE16_HANDLER( madmax_blitter_color_w ); -WRITE16_HANDLER( madmax_blitter_xparam_w ); -WRITE16_HANDLER( madmax_blitter_yparam_w ); -WRITE16_HANDLER( madmax_blitter_vidparam_w ); -WRITE16_HANDLER( madmax_blitter_unknown_w ); -READ16_HANDLER( madmax_blitter_vidparam_r ); diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h index e4b6d7f30ef..e1b7bd35900 100644 --- a/src/mame/includes/dcon.h +++ b/src/mame/includes/dcon.h @@ -18,18 +18,18 @@ public: int m_last_gfx_bank; UINT16 *m_spriteram; size_t m_spriteram_size; + DECLARE_READ16_MEMBER(dcon_control_r); + DECLARE_WRITE16_MEMBER(dcon_control_w); + DECLARE_WRITE16_MEMBER(dcon_gfxbank_w); + DECLARE_WRITE16_MEMBER(dcon_background_w); + DECLARE_WRITE16_MEMBER(dcon_foreground_w); + DECLARE_WRITE16_MEMBER(dcon_midground_w); + DECLARE_WRITE16_MEMBER(dcon_text_w); }; /*----------- defined in video/dcon.c -----------*/ -WRITE16_HANDLER( dcon_gfxbank_w ); -WRITE16_HANDLER( dcon_background_w ); -WRITE16_HANDLER( dcon_foreground_w ); -WRITE16_HANDLER( dcon_midground_w ); -WRITE16_HANDLER( dcon_text_w ); -WRITE16_HANDLER( dcon_control_w ); -READ16_HANDLER( dcon_control_r ); VIDEO_START( dcon ); SCREEN_UPDATE_IND16( dcon ); diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index ba392a0fbfc..866b76d72fd 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -30,6 +30,14 @@ public: /* devices */ device_t *m_ay1; + DECLARE_READ8_MEMBER(dday_countdown_timer_r); + DECLARE_WRITE8_MEMBER(dday_bgvideoram_w); + DECLARE_WRITE8_MEMBER(dday_fgvideoram_w); + DECLARE_WRITE8_MEMBER(dday_textvideoram_w); + DECLARE_WRITE8_MEMBER(dday_colorram_w); + DECLARE_READ8_MEMBER(dday_colorram_r); + DECLARE_WRITE8_MEMBER(dday_sl_control_w); + DECLARE_WRITE8_MEMBER(dday_control_w); }; @@ -39,11 +47,3 @@ PALETTE_INIT( dday ); VIDEO_START( dday ); SCREEN_UPDATE_IND16( dday ); -WRITE8_HANDLER( dday_bgvideoram_w ); -WRITE8_HANDLER( dday_fgvideoram_w ); -WRITE8_HANDLER( dday_textvideoram_w ); -WRITE8_HANDLER( dday_colorram_w ); -READ8_HANDLER( dday_colorram_r ); -WRITE8_HANDLER( dday_control_w ); -WRITE8_HANDLER( dday_sl_control_w ); -READ8_HANDLER( dday_countdown_timer_r ); diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index 1480cdaa19f..f51e2dc68c1 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -58,13 +58,13 @@ public: device_t *m_sub_cpu; device_t *m_adpcm_1; device_t *m_adpcm_2; + DECLARE_WRITE8_MEMBER(ddragon_bgvideoram_w); + DECLARE_WRITE8_MEMBER(ddragon_fgvideoram_w); }; /*----------- defined in video/ddragon.c -----------*/ -WRITE8_HANDLER( ddragon_bgvideoram_w ); -WRITE8_HANDLER( ddragon_fgvideoram_w ); VIDEO_START( chinagat ); VIDEO_START( ddragon ); diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index 08917feabf6..a8df233089a 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -34,15 +34,15 @@ public: device_t *m_maincpu; device_t *m_audiocpu; DECLARE_WRITE16_MEMBER(ddragon3_io_w); + DECLARE_WRITE16_MEMBER(ddragon3_scroll_w); + DECLARE_READ16_MEMBER(ddragon3_scroll_r); + DECLARE_WRITE16_MEMBER(ddragon3_bg_videoram_w); + DECLARE_WRITE16_MEMBER(ddragon3_fg_videoram_w); }; /*----------- defined in video/ddragon3.c -----------*/ -extern WRITE16_HANDLER( ddragon3_bg_videoram_w ); -extern WRITE16_HANDLER( ddragon3_fg_videoram_w ); -extern WRITE16_HANDLER( ddragon3_scroll_w ); -extern READ16_HANDLER( ddragon3_scroll_r ); extern VIDEO_START( ddragon3 ); extern SCREEN_UPDATE_IND16( ddragon3 ); diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index 504ef3d47a5..dbe05a1194b 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -39,14 +39,14 @@ public: DECLARE_READ8_MEMBER(ddribble_snd_sharedram_r); DECLARE_WRITE8_MEMBER(ddribble_snd_sharedram_w); DECLARE_WRITE8_MEMBER(ddribble_coin_counter_w); + DECLARE_WRITE8_MEMBER(K005885_0_w); + DECLARE_WRITE8_MEMBER(K005885_1_w); + DECLARE_WRITE8_MEMBER(ddribble_fg_videoram_w); + DECLARE_WRITE8_MEMBER(ddribble_bg_videoram_w); }; /*----------- defined in video/ddribble.c -----------*/ -WRITE8_HANDLER( ddribble_fg_videoram_w ); -WRITE8_HANDLER( ddribble_bg_videoram_w ); -WRITE8_HANDLER( K005885_0_w ); -WRITE8_HANDLER( K005885_1_w ); PALETTE_INIT( ddribble ); VIDEO_START( ddribble ); diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index b787074cbfc..5a1bbf71e8d 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -16,14 +16,14 @@ public: UINT16 *m_spriteram; DECLARE_READ16_MEMBER(ghunter_trackball_low_r); DECLARE_READ16_MEMBER(ghunter_trackball_high_r); + DECLARE_WRITE16_MEMBER(deadang_foreground_w); + DECLARE_WRITE16_MEMBER(deadang_text_w); + DECLARE_WRITE16_MEMBER(deadang_bank_w); }; /*----------- defined in video/deadang.c -----------*/ -WRITE16_HANDLER( deadang_foreground_w ); -WRITE16_HANDLER( deadang_text_w ); -WRITE16_HANDLER( deadang_bank_w ); VIDEO_START( deadang ); SCREEN_UPDATE_IND16( deadang ); diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index 81e0bcb7e7d..c7ed5172731 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -31,6 +31,24 @@ public: DECLARE_READ16_MEMBER(slyspy_protection_r); DECLARE_WRITE16_MEMBER(slyspy_state_w); DECLARE_READ16_MEMBER(slyspy_state_r); + DECLARE_READ16_MEMBER(dec0_controls_r); + DECLARE_READ16_MEMBER(dec0_rotary_r); + DECLARE_READ16_MEMBER(midres_controls_r); + DECLARE_READ8_MEMBER(hippodrm_prot_r); + DECLARE_WRITE8_MEMBER(hippodrm_prot_w); + DECLARE_READ8_MEMBER(hippodrm_shared_r); + DECLARE_WRITE8_MEMBER(hippodrm_shared_w); + DECLARE_READ8_MEMBER(dec0_mcu_port_r); + DECLARE_WRITE8_MEMBER(dec0_mcu_port_w); + DECLARE_READ16_MEMBER(hippodrm_68000_share_r); + DECLARE_WRITE16_MEMBER(hippodrm_68000_share_w); + DECLARE_WRITE16_MEMBER(sprite_mirror_w); + DECLARE_READ16_MEMBER(robocop_68000_share_r); + DECLARE_WRITE16_MEMBER(robocop_68000_share_w); + DECLARE_WRITE16_MEMBER(dec0_update_sprites_w); + DECLARE_WRITE16_MEMBER(dec0_paletteram_rg_w); + DECLARE_WRITE16_MEMBER(dec0_paletteram_b_w); + DECLARE_WRITE16_MEMBER(dec0_priority_w); }; @@ -47,11 +65,7 @@ SCREEN_UPDATE_IND16( hippodrm ); SCREEN_UPDATE_IND16( slyspy ); SCREEN_UPDATE_IND16( midres ); -WRITE16_HANDLER( dec0_priority_w ); -WRITE16_HANDLER( dec0_update_sprites_w ); -WRITE16_HANDLER( dec0_paletteram_rg_w ); -WRITE16_HANDLER( dec0_paletteram_b_w ); READ8_HANDLER( dec0_pf3_data_8bit_r ); WRITE8_HANDLER( dec0_pf3_data_8bit_w ); @@ -59,9 +73,6 @@ WRITE8_HANDLER( dec0_pf3_control_8bit_w ); /*----------- defined in machine/dec0.c -----------*/ -READ16_HANDLER( dec0_controls_r ); -READ16_HANDLER( dec0_rotary_r ); -READ16_HANDLER( midres_controls_r ); READ16_HANDLER( slyspy_controls_r ); DRIVER_INIT( slyspy ); @@ -73,10 +84,4 @@ DRIVER_INIT( birdtry ); extern void dec0_i8751_write(running_machine &machine, int data); extern void dec0_i8751_reset(running_machine &machine); -READ8_HANDLER( hippodrm_prot_r ); -WRITE8_HANDLER( dec0_mcu_port_w ); -READ8_HANDLER( dec0_mcu_port_r ); -WRITE8_HANDLER( hippodrm_prot_w ); -READ8_HANDLER( hippodrm_shared_r ); -WRITE8_HANDLER( hippodrm_shared_w ); diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index 6f23f910caa..ee1491331be 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -74,6 +74,17 @@ public: DECLARE_WRITE8_MEMBER(flip_screen_w); DECLARE_READ8_MEMBER(dec8_mcu_from_main_r); DECLARE_WRITE8_MEMBER(dec8_mcu_to_main_w); + DECLARE_WRITE8_MEMBER(dec8_bg_data_w); + DECLARE_READ8_MEMBER(dec8_bg_data_r); + DECLARE_WRITE8_MEMBER(dec8_videoram_w); + DECLARE_WRITE8_MEMBER(srdarwin_videoram_w); + DECLARE_WRITE8_MEMBER(dec8_scroll2_w); + DECLARE_WRITE8_MEMBER(srdarwin_control_w); + DECLARE_WRITE8_MEMBER(lastmisn_control_w); + DECLARE_WRITE8_MEMBER(shackled_control_w); + DECLARE_WRITE8_MEMBER(lastmisn_scrollx_w); + DECLARE_WRITE8_MEMBER(lastmisn_scrolly_w); + DECLARE_WRITE8_MEMBER(gondo_scroll_w); }; /*----------- defined in video/dec8.c -----------*/ @@ -99,16 +110,5 @@ VIDEO_START( garyoret ); WRITE8_HANDLER( dec8_bac06_0_w ); WRITE8_HANDLER( dec8_bac06_1_w ); -WRITE8_HANDLER( dec8_bg_data_w ); WRITE8_HANDLER( dec8_pf1_data_w ); -READ8_HANDLER( dec8_bg_data_r ); READ8_HANDLER( dec8_pf1_data_r ); -WRITE8_HANDLER( srdarwin_videoram_w ); -WRITE8_HANDLER( dec8_scroll2_w ); -WRITE8_HANDLER( srdarwin_control_w ); -WRITE8_HANDLER( gondo_scroll_w ); -WRITE8_HANDLER( shackled_control_w ); -WRITE8_HANDLER( lastmisn_control_w ); -WRITE8_HANDLER( lastmisn_scrollx_w ); -WRITE8_HANDLER( lastmisn_scrolly_w ); -WRITE8_HANDLER( dec8_videoram_w ); diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index 304f8e9b14f..d04bac29877 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -83,6 +83,11 @@ public: DECLARE_WRITE32_MEMBER(deco32_pf3_rowscroll_w); DECLARE_WRITE32_MEMBER(deco32_pf4_rowscroll_w); DECLARE_READ8_MEMBER(latch_r); + DECLARE_WRITE32_MEMBER(deco32_pri_w); + DECLARE_WRITE32_MEMBER(deco32_ace_ram_w); + DECLARE_WRITE32_MEMBER(deco32_nonbuffered_palette_w); + DECLARE_WRITE32_MEMBER(deco32_buffered_palette_w); + DECLARE_WRITE32_MEMBER(deco32_palette_dma_w); }; class dragngun_state : public deco32_state @@ -99,6 +104,8 @@ public: int m_dragngun_lightgun_port; DECLARE_READ32_MEMBER(dragngun_lightgun_r); DECLARE_WRITE32_MEMBER(dragngun_lightgun_w); + DECLARE_WRITE32_MEMBER(dragngun_sprite_control_w); + DECLARE_WRITE32_MEMBER(dragngun_spriteram_dma_w); }; @@ -125,11 +132,4 @@ WRITE32_HANDLER( deco32_pf2_data_w ); WRITE32_HANDLER( deco32_pf3_data_w ); WRITE32_HANDLER( deco32_pf4_data_w ); -WRITE32_HANDLER( deco32_nonbuffered_palette_w ); -WRITE32_HANDLER( deco32_buffered_palette_w ); -WRITE32_HANDLER( deco32_palette_dma_w ); -WRITE32_HANDLER( deco32_pri_w ); -WRITE32_HANDLER( dragngun_sprite_control_w ); -WRITE32_HANDLER( dragngun_spriteram_dma_w ); -WRITE32_HANDLER( deco32_ace_ram_w ); diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index c66d9410bf2..b44b9af208e 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -41,16 +41,16 @@ public: device_t *m_audio_cpu; // system 16c does not have sound CPU DECLARE_WRITE16_MEMBER(sound_command_w); DECLARE_WRITE16_MEMBER(deniam_irq_ack_w); + DECLARE_WRITE16_MEMBER(deniam_videoram_w); + DECLARE_WRITE16_MEMBER(deniam_textram_w); + DECLARE_WRITE16_MEMBER(deniam_palette_w); + DECLARE_READ16_MEMBER(deniam_coinctrl_r); + DECLARE_WRITE16_MEMBER(deniam_coinctrl_w); }; /*----------- defined in video/deniam.c -----------*/ -WRITE16_HANDLER( deniam_videoram_w ); -WRITE16_HANDLER( deniam_textram_w ); -WRITE16_HANDLER( deniam_palette_w ); -READ16_HANDLER( deniam_coinctrl_r ); -WRITE16_HANDLER( deniam_coinctrl_w ); VIDEO_START( deniam ); SCREEN_UPDATE_IND16( deniam ); diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index 6e5db4adb98..7784c6df693 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -59,15 +59,15 @@ public: DECLARE_WRITE8_MEMBER(beast_p2_w); DECLARE_READ8_MEMBER(beast_p3_r); DECLARE_WRITE8_MEMBER(beast_p3_w); + DECLARE_WRITE8_MEMBER(djboy_scrollx_w); + DECLARE_WRITE8_MEMBER(djboy_scrolly_w); + DECLARE_WRITE8_MEMBER(djboy_videoram_w); + DECLARE_WRITE8_MEMBER(djboy_paletteram_w); }; /*----------- defined in video/djboy.c -----------*/ -WRITE8_HANDLER( djboy_scrollx_w ); -WRITE8_HANDLER( djboy_scrolly_w ); -WRITE8_HANDLER( djboy_videoram_w ); -WRITE8_HANDLER( djboy_paletteram_w ); VIDEO_START( djboy ); SCREEN_UPDATE_IND16( djboy ); diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 358d63b5ae1..6a8d4ce3b5d 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -215,19 +215,19 @@ public: DECLARE_READ8_MEMBER(strtheat_inputport_1_r); DECLARE_WRITE8_MEMBER(nmi_mask_w); DECLARE_WRITE8_MEMBER(braze_a15_w); + DECLARE_WRITE8_MEMBER(dkong_videoram_w); + DECLARE_WRITE8_MEMBER(dkongjr_gfxbank_w); + DECLARE_WRITE8_MEMBER(dkong3_gfxbank_w); + DECLARE_WRITE8_MEMBER(dkong_palettebank_w); + DECLARE_WRITE8_MEMBER(radarscp_grid_enable_w); + DECLARE_WRITE8_MEMBER(radarscp_grid_color_w); + DECLARE_WRITE8_MEMBER(dkong_flipscreen_w); + DECLARE_WRITE8_MEMBER(dkong_spritebank_w); }; /*----------- defined in video/dkong.c -----------*/ -WRITE8_HANDLER( radarscp_grid_enable_w ); -WRITE8_HANDLER( radarscp_grid_color_w ); -WRITE8_HANDLER( dkong_flipscreen_w ); -WRITE8_HANDLER( dkongjr_gfxbank_w ); -WRITE8_HANDLER( dkong3_gfxbank_w ); -WRITE8_HANDLER( dkong_spritebank_w ); -WRITE8_HANDLER( dkong_palettebank_w ); -WRITE8_HANDLER( dkong_videoram_w ); PALETTE_INIT( dkong2b ); PALETTE_INIT( radarscp ); diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index c7c00bf3610..1a3705af600 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -26,25 +26,25 @@ public: /* devices */ cpu_device *m_maincpu; cpu_device *m_slave; + DECLARE_READ8_MEMBER(docastle_shared0_r); + DECLARE_READ8_MEMBER(docastle_shared1_r); + DECLARE_WRITE8_MEMBER(docastle_shared0_w); + DECLARE_WRITE8_MEMBER(docastle_shared1_w); + DECLARE_WRITE8_MEMBER(docastle_nmitrigger_w); + DECLARE_WRITE8_MEMBER(docastle_videoram_w); + DECLARE_WRITE8_MEMBER(docastle_colorram_w); + DECLARE_READ8_MEMBER(docastle_flipscreen_off_r); + DECLARE_READ8_MEMBER(docastle_flipscreen_on_r); + DECLARE_WRITE8_MEMBER(docastle_flipscreen_off_w); + DECLARE_WRITE8_MEMBER(docastle_flipscreen_on_w); }; /*----------- defined in machine/docastle.c -----------*/ -READ8_HANDLER( docastle_shared0_r ); -READ8_HANDLER( docastle_shared1_r ); -WRITE8_HANDLER( docastle_shared0_w ); -WRITE8_HANDLER( docastle_shared1_w ); -WRITE8_HANDLER( docastle_nmitrigger_w ); /*----------- defined in video/docastle.c -----------*/ -WRITE8_HANDLER( docastle_videoram_w ); -WRITE8_HANDLER( docastle_colorram_w ); -READ8_HANDLER( docastle_flipscreen_off_r ); -READ8_HANDLER( docastle_flipscreen_on_r ); -WRITE8_HANDLER( docastle_flipscreen_off_w ); -WRITE8_HANDLER( docastle_flipscreen_on_w ); PALETTE_INIT( docastle ); VIDEO_START( docastle ); diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index 807a0857216..dd49a6a3d6e 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -38,17 +38,18 @@ public: DECLARE_WRITE8_MEMBER(sub_irqack_w); DECLARE_WRITE8_MEMBER(dogfgt_soundlatch_w); DECLARE_WRITE8_MEMBER(dogfgt_soundcontrol_w); + DECLARE_WRITE8_MEMBER(dogfgt_plane_select_w); + DECLARE_READ8_MEMBER(dogfgt_bitmapram_r); + DECLARE_WRITE8_MEMBER(internal_bitmapram_w); + DECLARE_WRITE8_MEMBER(dogfgt_bitmapram_w); + DECLARE_WRITE8_MEMBER(dogfgt_bgvideoram_w); + DECLARE_WRITE8_MEMBER(dogfgt_scroll_w); + DECLARE_WRITE8_MEMBER(dogfgt_1800_w); }; /*----------- defined in video/dogfgt.c -----------*/ -WRITE8_HANDLER( dogfgt_plane_select_w ); -READ8_HANDLER( dogfgt_bitmapram_r ); -WRITE8_HANDLER( dogfgt_bitmapram_w ); -WRITE8_HANDLER( dogfgt_bgvideoram_w ); -WRITE8_HANDLER( dogfgt_scroll_w ); -WRITE8_HANDLER( dogfgt_1800_w ); PALETTE_INIT( dogfgt ); VIDEO_START( dogfgt ); diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h index 1a2cedefcea..4ec2eb91db9 100644 --- a/src/mame/includes/dooyong.h +++ b/src/mame/includes/dooyong.h @@ -44,28 +44,29 @@ public: optional_device<buffered_spriteram16_device> m_spriteram16; DECLARE_WRITE8_MEMBER(lastday_bankswitch_w); DECLARE_WRITE8_MEMBER(flip_screen_w); + DECLARE_WRITE8_MEMBER(dooyong_bgscroll8_w); + DECLARE_WRITE8_MEMBER(dooyong_bg2scroll8_w); + DECLARE_WRITE8_MEMBER(dooyong_fgscroll8_w); + DECLARE_WRITE8_MEMBER(dooyong_fg2scroll8_w); + DECLARE_WRITE16_MEMBER(dooyong_bgscroll16_w); + DECLARE_WRITE16_MEMBER(dooyong_bg2scroll16_w); + DECLARE_WRITE16_MEMBER(dooyong_fgscroll16_w); + DECLARE_WRITE16_MEMBER(dooyong_fg2scroll16_w); + DECLARE_WRITE8_MEMBER(dooyong_txvideoram8_w); + DECLARE_WRITE8_MEMBER(lastday_ctrl_w); + DECLARE_WRITE8_MEMBER(pollux_ctrl_w); + DECLARE_WRITE8_MEMBER(primella_ctrl_w); + DECLARE_WRITE8_MEMBER(paletteram_flytiger_w); + DECLARE_WRITE8_MEMBER(flytiger_ctrl_w); + DECLARE_WRITE16_MEMBER(rshark_ctrl_w); }; /*----------- defined in video/dooyong.c -----------*/ -WRITE8_HANDLER( dooyong_bgscroll8_w ); -WRITE8_HANDLER( dooyong_fgscroll8_w ); -WRITE8_HANDLER( dooyong_fg2scroll8_w ); -WRITE16_HANDLER( dooyong_bgscroll16_w ); -WRITE16_HANDLER( dooyong_bg2scroll16_w ); -WRITE16_HANDLER( dooyong_fgscroll16_w ); -WRITE16_HANDLER( dooyong_fg2scroll16_w ); -WRITE8_HANDLER( dooyong_txvideoram8_w ); -WRITE8_HANDLER( lastday_ctrl_w ); -WRITE8_HANDLER( pollux_ctrl_w ); -WRITE8_HANDLER( primella_ctrl_w ); -WRITE8_HANDLER( paletteram_flytiger_w ); -WRITE8_HANDLER( flytiger_ctrl_w ); -WRITE16_HANDLER( rshark_ctrl_w ); SCREEN_UPDATE_IND16( lastday ); SCREEN_UPDATE_IND16( gulfstrm ); diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index 1ea3506c315..e102026569b 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -47,14 +47,14 @@ public: DECLARE_WRITE8_MEMBER(drgnmst_oki_w); DECLARE_WRITE8_MEMBER(drgnmst_snd_control_w); DECLARE_READ8_MEMBER(PIC16C5X_T0_clk_r); + DECLARE_WRITE16_MEMBER(drgnmst_fg_videoram_w); + DECLARE_WRITE16_MEMBER(drgnmst_bg_videoram_w); + DECLARE_WRITE16_MEMBER(drgnmst_md_videoram_w); }; /*----------- defined in video/drgnmst.c -----------*/ -WRITE16_HANDLER( drgnmst_fg_videoram_w ); -WRITE16_HANDLER( drgnmst_bg_videoram_w ); -WRITE16_HANDLER( drgnmst_md_videoram_w ); VIDEO_START(drgnmst); SCREEN_UPDATE_IND16(drgnmst); diff --git a/src/mame/includes/dribling.h b/src/mame/includes/dribling.h index 880035f2b92..cbfc75c7569 100644 --- a/src/mame/includes/dribling.h +++ b/src/mame/includes/dribling.h @@ -30,11 +30,11 @@ public: device_t *m_ppi_1; DECLARE_READ8_MEMBER(ioread); DECLARE_WRITE8_MEMBER(iowrite); + DECLARE_WRITE8_MEMBER(dribling_colorram_w); }; /*----------- defined in video/dribling.c -----------*/ PALETTE_INIT( dribling ); -WRITE8_HANDLER( dribling_colorram_w ); SCREEN_UPDATE_IND16( dribling ); diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index 7cb8c719bfc..1e9408ddf4a 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -27,6 +27,7 @@ public: device_t *m_msm; DECLARE_WRITE8_MEMBER(nmi_enable_w); DECLARE_WRITE8_MEMBER(pcm_set_w); + DECLARE_WRITE8_MEMBER(drmicro_videoram_w); }; @@ -36,4 +37,3 @@ PALETTE_INIT( drmicro ); VIDEO_START( drmicro ); SCREEN_UPDATE_IND16( drmicro ); -WRITE8_HANDLER( drmicro_videoram_w ); diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index 1b6d3cf217c..8945caf6474 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -232,6 +232,40 @@ public: DECLARE_WRITE8_MEMBER(gekisha_p4_w); DECLARE_READ8_MEMBER(gekisha_8000_r); DECLARE_WRITE8_MEMBER(gekisha_8000_w); + DECLARE_WRITE8_MEMBER(dynax_extra_scrollx_w); + DECLARE_WRITE8_MEMBER(dynax_extra_scrolly_w); + DECLARE_WRITE8_MEMBER(dynax_blit_pen_w); + DECLARE_WRITE8_MEMBER(dynax_blit2_pen_w); + DECLARE_WRITE8_MEMBER(dynax_blit_dest_w); + DECLARE_WRITE8_MEMBER(dynax_blit2_dest_w); + DECLARE_WRITE8_MEMBER(tenkai_blit_dest_w); + DECLARE_WRITE8_MEMBER(dynax_blit_backpen_w); + DECLARE_WRITE8_MEMBER(dynax_blit_palette01_w); + DECLARE_WRITE8_MEMBER(tenkai_blit_palette01_w); + DECLARE_WRITE8_MEMBER(dynax_blit_palette45_w); + DECLARE_WRITE8_MEMBER(dynax_blit_palette23_w); + DECLARE_WRITE8_MEMBER(tenkai_blit_palette23_w); + DECLARE_WRITE8_MEMBER(dynax_blit_palette67_w); + DECLARE_WRITE8_MEMBER(dynax_blit_palbank_w); + DECLARE_WRITE8_MEMBER(dynax_blit2_palbank_w); + DECLARE_WRITE8_MEMBER(hanamai_layer_half_w); + DECLARE_WRITE8_MEMBER(hnoridur_layer_half2_w); + DECLARE_WRITE8_MEMBER(mjdialq2_blit_dest_w); + DECLARE_WRITE8_MEMBER(dynax_layer_enable_w); + DECLARE_WRITE8_MEMBER(jantouki_layer_enable_w); + DECLARE_WRITE8_MEMBER(mjdialq2_layer_enable_w); + DECLARE_WRITE8_MEMBER(dynax_flipscreen_w); + DECLARE_WRITE8_MEMBER(dynax_blit_romregion_w); + DECLARE_WRITE8_MEMBER(dynax_blit2_romregion_w); + DECLARE_WRITE8_MEMBER(dynax_blit_scroll_w); + DECLARE_WRITE8_MEMBER(tenkai_blit_scroll_w); + DECLARE_WRITE8_MEMBER(dynax_blit2_scroll_w); + DECLARE_WRITE8_MEMBER(dynax_blitter_rev2_w); + DECLARE_WRITE8_MEMBER(tenkai_blitter_rev2_w); + DECLARE_WRITE8_MEMBER(jantouki_blitter_rev2_w); + DECLARE_WRITE8_MEMBER(jantouki_blitter2_rev2_w); + DECLARE_WRITE8_MEMBER(hanamai_priority_w); + DECLARE_WRITE8_MEMBER(tenkai_priority_w); }; //----------- defined in drivers/dynax.c ----------- @@ -243,43 +277,12 @@ void neruton_update_irq(running_machine &machine); //----------- defined in video/dynax.c ----------- -WRITE8_HANDLER( dynax_blitter_rev2_w ); -WRITE8_HANDLER( jantouki_blitter_rev2_w ); -WRITE8_HANDLER( jantouki_blitter2_rev2_w ); -WRITE8_HANDLER( tenkai_blitter_rev2_w ); - -WRITE8_HANDLER( dynax_blit_pen_w ); -WRITE8_HANDLER( dynax_blit2_pen_w ); -WRITE8_HANDLER( dynax_blit_backpen_w ); -WRITE8_HANDLER( dynax_blit_dest_w ); -WRITE8_HANDLER( dynax_blit2_dest_w ); -WRITE8_HANDLER( dynax_blit_palbank_w ); -WRITE8_HANDLER( dynax_blit2_palbank_w ); -WRITE8_HANDLER( dynax_blit_palette01_w ); -WRITE8_HANDLER( dynax_blit_palette23_w ); -WRITE8_HANDLER( dynax_blit_palette45_w ); -WRITE8_HANDLER( dynax_blit_palette67_w ); -WRITE8_HANDLER( dynax_layer_enable_w ); -WRITE8_HANDLER( jantouki_layer_enable_w ); -WRITE8_HANDLER( dynax_flipscreen_w ); -WRITE8_HANDLER( dynax_extra_scrollx_w ); -WRITE8_HANDLER( dynax_extra_scrolly_w ); -WRITE8_HANDLER( dynax_blit_romregion_w ); -WRITE8_HANDLER( dynax_blit2_romregion_w ); - -WRITE8_HANDLER( hanamai_layer_half_w ); -WRITE8_HANDLER( hnoridur_layer_half2_w ); - -WRITE8_HANDLER( hanamai_priority_w ); -WRITE8_HANDLER( tenkai_priority_w ); - -WRITE8_HANDLER( mjdialq2_blit_dest_w ); -WRITE8_HANDLER( tenkai_blit_dest_w ); - -WRITE8_HANDLER( mjdialq2_layer_enable_w ); - -WRITE8_HANDLER( tenkai_blit_palette01_w ); -WRITE8_HANDLER( tenkai_blit_palette23_w ); + + + + + + VIDEO_START( hanamai ); VIDEO_START( hnoridur ); diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h index 4e4e56253e8..91f13b9b744 100644 --- a/src/mame/includes/dynduke.h +++ b/src/mame/includes/dynduke.h @@ -23,16 +23,16 @@ public: int m_old_back; int m_old_fore; required_device<buffered_spriteram16_device> m_spriteram; + DECLARE_WRITE16_MEMBER(dynduke_paletteram_w); + DECLARE_WRITE16_MEMBER(dynduke_background_w); + DECLARE_WRITE16_MEMBER(dynduke_foreground_w); + DECLARE_WRITE16_MEMBER(dynduke_text_w); + DECLARE_WRITE16_MEMBER(dynduke_gfxbank_w); + DECLARE_WRITE16_MEMBER(dynduke_control_w); }; /*----------- defined in video/dynduke.c -----------*/ -WRITE16_HANDLER( dynduke_background_w ); -WRITE16_HANDLER( dynduke_foreground_w ); -WRITE16_HANDLER( dynduke_text_w ); -WRITE16_HANDLER( dynduke_gfxbank_w ); -WRITE16_HANDLER( dynduke_control_w ); -WRITE16_HANDLER( dynduke_paletteram_w ); VIDEO_START( dynduke ); SCREEN_UPDATE_IND16( dynduke ); diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h index 101b78d2428..8ec49bc85ab 100644 --- a/src/mame/includes/eolith.h +++ b/src/mame/includes/eolith.h @@ -15,12 +15,12 @@ public: DECLARE_WRITE32_MEMBER(systemcontrol_w); DECLARE_READ32_MEMBER(hidctch3_pen1_r); DECLARE_READ32_MEMBER(hidctch3_pen2_r); + DECLARE_WRITE32_MEMBER(eolith_vram_w); + DECLARE_READ32_MEMBER(eolith_vram_r); }; /*----------- defined in video/eolith.c -----------*/ -READ32_HANDLER( eolith_vram_r ); -WRITE32_HANDLER( eolith_vram_w ); VIDEO_START( eolith ); SCREEN_UPDATE_IND16( eolith ); diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h index 5ac564e10f8..0cf519f3185 100644 --- a/src/mame/includes/epos.h +++ b/src/mame/includes/epos.h @@ -20,10 +20,10 @@ public: /* misc */ int m_counter; DECLARE_WRITE8_MEMBER(dealer_decrypt_rom); + DECLARE_WRITE8_MEMBER(epos_port_1_w); }; /*----------- defined in video/epos.c -----------*/ -WRITE8_HANDLER( epos_port_1_w ); SCREEN_UPDATE_RGB32( epos ); diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index 5fa09f6c605..ba97c208fe5 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -66,24 +66,24 @@ public: DECLARE_WRITE16_MEMBER(mcu_w); DECLARE_WRITE16_MEMBER(mcu_halt_assert_w); DECLARE_WRITE16_MEMBER(mcu_halt_clear_w); + DECLARE_READ16_MEMBER(equites_fg_videoram_r); + DECLARE_WRITE16_MEMBER(equites_fg_videoram_w); + DECLARE_WRITE16_MEMBER(equites_bg_videoram_w); + DECLARE_WRITE16_MEMBER(equites_bgcolor_w); + DECLARE_WRITE16_MEMBER(equites_scrollreg_w); + DECLARE_WRITE16_MEMBER(splndrbt_selchar0_w); + DECLARE_WRITE16_MEMBER(splndrbt_selchar1_w); + DECLARE_WRITE16_MEMBER(equites_flip0_w); + DECLARE_WRITE16_MEMBER(equites_flip1_w); + DECLARE_WRITE16_MEMBER(splndrbt_flip0_w); + DECLARE_WRITE16_MEMBER(splndrbt_flip1_w); + DECLARE_WRITE16_MEMBER(splndrbt_bg_scrollx_w); + DECLARE_WRITE16_MEMBER(splndrbt_bg_scrolly_w); }; /*----------- defined in video/equites.c -----------*/ -extern READ16_HANDLER(equites_fg_videoram_r); -extern WRITE16_HANDLER(equites_fg_videoram_w); -extern WRITE16_HANDLER(equites_bg_videoram_w); -extern WRITE16_HANDLER(equites_scrollreg_w); -extern WRITE16_HANDLER(equites_bgcolor_w); -extern WRITE16_HANDLER(splndrbt_selchar0_w); -extern WRITE16_HANDLER(splndrbt_selchar1_w); -extern WRITE16_HANDLER(equites_flip0_w); -extern WRITE16_HANDLER(equites_flip1_w); -extern WRITE16_HANDLER(splndrbt_flip0_w); -extern WRITE16_HANDLER(splndrbt_flip1_w); -extern WRITE16_HANDLER(splndrbt_bg_scrollx_w); -extern WRITE16_HANDLER(splndrbt_bg_scrolly_w); extern PALETTE_INIT( equites ); extern VIDEO_START( equites ); diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index b5483477297..274a0a42983 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -41,14 +41,14 @@ public: DECLARE_WRITE16_MEMBER(esd_eeprom_w); DECLARE_WRITE8_MEMBER(esd16_sound_rombank_w); DECLARE_READ8_MEMBER(esd16_sound_command_r); + DECLARE_WRITE16_MEMBER(esd16_vram_0_w); + DECLARE_WRITE16_MEMBER(esd16_vram_1_w); + DECLARE_WRITE16_MEMBER(esd16_tilemap0_color_w); }; /*----------- defined in video/esd16.c -----------*/ -WRITE16_HANDLER( esd16_vram_0_w ); -WRITE16_HANDLER( esd16_vram_1_w ); -WRITE16_HANDLER( esd16_tilemap0_color_w ); VIDEO_START( esd16 ); SCREEN_UPDATE_IND16( hedpanic ); diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index 26350a5f913..4dd96934e29 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -33,6 +33,11 @@ public: DECLARE_WRITE8_MEMBER(espial_master_interrupt_mask_w); DECLARE_WRITE8_MEMBER(espial_master_soundlatch_w); DECLARE_WRITE8_MEMBER(espial_sound_nmi_mask_w); + DECLARE_WRITE8_MEMBER(espial_videoram_w); + DECLARE_WRITE8_MEMBER(espial_colorram_w); + DECLARE_WRITE8_MEMBER(espial_attributeram_w); + DECLARE_WRITE8_MEMBER(espial_scrollram_w); + DECLARE_WRITE8_MEMBER(espial_flipscreen_w); }; /*----------- defined in video/espial.c -----------*/ @@ -40,9 +45,4 @@ public: PALETTE_INIT( espial ); VIDEO_START( espial ); VIDEO_START( netwars ); -WRITE8_HANDLER( espial_videoram_w ); -WRITE8_HANDLER( espial_colorram_w ); -WRITE8_HANDLER( espial_attributeram_w ); -WRITE8_HANDLER( espial_scrollram_w ); -WRITE8_HANDLER( espial_flipscreen_w ); SCREEN_UPDATE_IND16( espial ); diff --git a/src/mame/includes/esripsys.h b/src/mame/includes/esripsys.h index 8fa5e093f93..c196f00b29c 100644 --- a/src/mame/includes/esripsys.h +++ b/src/mame/includes/esripsys.h @@ -84,6 +84,7 @@ public: DECLARE_WRITE8_MEMBER(tms5220_w); DECLARE_WRITE8_MEMBER(control_w); DECLARE_WRITE8_MEMBER(volume_dac_w); + DECLARE_WRITE8_MEMBER(esripsys_bg_intensity_w); }; @@ -92,7 +93,6 @@ public: VIDEO_START( esripsys ); SCREEN_UPDATE_RGB32( esripsys ); -WRITE8_HANDLER( esripsys_bg_intensity_w ); INTERRUPT_GEN( esripsys_vblank_irq ); int esripsys_draw(running_machine &machine, int l, int r, int fig, int attr, int addr, int col, int x_scale, int bank); diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index 596dfa6cd00..3b0f3bbb92d 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -30,16 +30,16 @@ public: int m_sc2on; required_device<buffered_spriteram8_device> m_spriteram; + DECLARE_WRITE8_MEMBER(exedexes_videoram_w); + DECLARE_WRITE8_MEMBER(exedexes_colorram_w); + DECLARE_WRITE8_MEMBER(exedexes_c804_w); + DECLARE_WRITE8_MEMBER(exedexes_gfxctrl_w); }; /*----------- defined in video/exedexes.c -----------*/ -extern WRITE8_HANDLER( exedexes_videoram_w ); -extern WRITE8_HANDLER( exedexes_colorram_w ); -extern WRITE8_HANDLER( exedexes_c804_w ); -extern WRITE8_HANDLER( exedexes_gfxctrl_w ); extern PALETTE_INIT( exedexes ); extern VIDEO_START( exedexes ); diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index 321a80dcb4d..279fdb2f4df 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -47,6 +47,9 @@ public: /* devices */ device_t *m_maincpu; DECLARE_READ8_MEMBER(exerion_protection_r); + DECLARE_WRITE8_MEMBER(exerion_videoreg_w); + DECLARE_WRITE8_MEMBER(exerion_video_latch_w); + DECLARE_READ8_MEMBER(exerion_video_timing_r); }; @@ -57,6 +60,3 @@ PALETTE_INIT( exerion ); VIDEO_START( exerion ); SCREEN_UPDATE_IND16( exerion ); -WRITE8_HANDLER( exerion_videoreg_w ); -WRITE8_HANDLER( exerion_video_latch_w ); -READ8_HANDLER( exerion_video_timing_r ); diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index 989f208efec..0cca66ad70c 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -44,6 +44,7 @@ public: bitmap_ind16 m_motion_object_2_vid; bitmap_ind16 m_motion_object_2_clip; DECLARE_WRITE8_MEMBER(fax_bank_select_w); + DECLARE_READ8_MEMBER(exidy_interrupt_r); }; @@ -55,4 +56,3 @@ SCREEN_UPDATE_IND16( exidy ); INTERRUPT_GEN( exidy_vblank_interrupt ); -READ8_HANDLER( exidy_interrupt_r ); diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h index 59b76eae8bb..e3f304481da 100644 --- a/src/mame/includes/exidy440.h +++ b/src/mame/includes/exidy440.h @@ -41,6 +41,15 @@ public: DECLARE_READ8_MEMBER(claypign_protection_r); DECLARE_READ8_MEMBER(topsecex_input_port_5_r); DECLARE_WRITE8_MEMBER(topsecex_yscroll_w); + DECLARE_READ8_MEMBER(exidy440_videoram_r); + DECLARE_WRITE8_MEMBER(exidy440_videoram_w); + DECLARE_READ8_MEMBER(exidy440_paletteram_r); + DECLARE_WRITE8_MEMBER(exidy440_paletteram_w); + DECLARE_READ8_MEMBER(exidy440_horizontal_pos_r); + DECLARE_READ8_MEMBER(exidy440_vertical_pos_r); + DECLARE_WRITE8_MEMBER(exidy440_spriteram_w); + DECLARE_WRITE8_MEMBER(exidy440_control_w); + DECLARE_WRITE8_MEMBER(exidy440_interrupt_clear_w); }; @@ -53,15 +62,6 @@ void exidy440_bank_select(running_machine &machine, UINT8 bank); INTERRUPT_GEN( exidy440_vblank_interrupt ); -READ8_HANDLER( exidy440_videoram_r ); -WRITE8_HANDLER( exidy440_videoram_w ); -READ8_HANDLER( exidy440_paletteram_r ); -WRITE8_HANDLER( exidy440_paletteram_w ); -WRITE8_HANDLER( exidy440_spriteram_w ); -WRITE8_HANDLER( exidy440_control_w ); -READ8_HANDLER( exidy440_vertical_pos_r ); -READ8_HANDLER( exidy440_horizontal_pos_r ); -WRITE8_HANDLER( exidy440_interrupt_clear_w ); MACHINE_CONFIG_EXTERN( exidy440_video ); MACHINE_CONFIG_EXTERN( topsecex_video ); diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index 7ff803b620c..dfb00574424 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -32,17 +32,17 @@ public: DECLARE_READ8_MEMBER(exprraid_protection_r); DECLARE_WRITE8_MEMBER(sound_cpu_command_w); DECLARE_READ8_MEMBER(vblank_r); + DECLARE_WRITE8_MEMBER(exprraid_videoram_w); + DECLARE_WRITE8_MEMBER(exprraid_colorram_w); + DECLARE_WRITE8_MEMBER(exprraid_flipscreen_w); + DECLARE_WRITE8_MEMBER(exprraid_bgselect_w); + DECLARE_WRITE8_MEMBER(exprraid_scrollx_w); + DECLARE_WRITE8_MEMBER(exprraid_scrolly_w); }; /*----------- defined in video/exprraid.c -----------*/ -extern WRITE8_HANDLER( exprraid_videoram_w ); -extern WRITE8_HANDLER( exprraid_colorram_w ); -extern WRITE8_HANDLER( exprraid_flipscreen_w ); -extern WRITE8_HANDLER( exprraid_bgselect_w ); -extern WRITE8_HANDLER( exprraid_scrollx_w ); -extern WRITE8_HANDLER( exprraid_scrolly_w ); extern VIDEO_START( exprraid ); extern SCREEN_UPDATE_IND16( exprraid ); diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h index 642b6ff88d2..b6cb911bd7b 100644 --- a/src/mame/includes/exzisus.h +++ b/src/mame/includes/exzisus.h @@ -22,19 +22,19 @@ public: DECLARE_WRITE8_MEMBER(exzisus_sharedram_ab_w); DECLARE_WRITE8_MEMBER(exzisus_sharedram_ac_w); DECLARE_WRITE8_MEMBER(exzisus_cpub_reset_w); + DECLARE_READ8_MEMBER(exzisus_videoram_0_r); + DECLARE_READ8_MEMBER(exzisus_videoram_1_r); + DECLARE_READ8_MEMBER(exzisus_objectram_0_r); + DECLARE_READ8_MEMBER(exzisus_objectram_1_r); + DECLARE_WRITE8_MEMBER(exzisus_videoram_0_w); + DECLARE_WRITE8_MEMBER(exzisus_videoram_1_w); + DECLARE_WRITE8_MEMBER(exzisus_objectram_0_w); + DECLARE_WRITE8_MEMBER(exzisus_objectram_1_w); }; /*----------- defined in video/exzisus.c -----------*/ -READ8_HANDLER( exzisus_videoram_0_r ); -READ8_HANDLER( exzisus_videoram_1_r ); -READ8_HANDLER( exzisus_objectram_0_r ); -READ8_HANDLER( exzisus_objectram_1_r ); -WRITE8_HANDLER( exzisus_videoram_0_w ); -WRITE8_HANDLER( exzisus_videoram_1_w ); -WRITE8_HANDLER( exzisus_objectram_0_w ); -WRITE8_HANDLER( exzisus_objectram_1_w ); SCREEN_UPDATE_IND16( exzisus ); diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index 2dd1972370a..9422a69d32b 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -47,18 +47,18 @@ public: DECLARE_READ16_MEMBER(command_pending_r); DECLARE_WRITE8_MEMBER(pending_command_clear_w); DECLARE_WRITE16_MEMBER(f1gpb_misc_w); + DECLARE_READ16_MEMBER(f1gp_zoomdata_r); + DECLARE_WRITE16_MEMBER(f1gp_zoomdata_w); + DECLARE_READ16_MEMBER(f1gp_rozvideoram_r); + DECLARE_WRITE16_MEMBER(f1gp_rozvideoram_w); + DECLARE_WRITE16_MEMBER(f1gp_fgvideoram_w); + DECLARE_WRITE16_MEMBER(f1gp_fgscroll_w); + DECLARE_WRITE16_MEMBER(f1gp_gfxctrl_w); + DECLARE_WRITE16_MEMBER(f1gp2_gfxctrl_w); }; /*----------- defined in video/f1gp.c -----------*/ -READ16_HANDLER( f1gp_zoomdata_r ); -WRITE16_HANDLER( f1gp_zoomdata_w ); -READ16_HANDLER( f1gp_rozvideoram_r ); -WRITE16_HANDLER( f1gp_rozvideoram_w ); -WRITE16_HANDLER( f1gp_fgvideoram_w ); -WRITE16_HANDLER( f1gp_fgscroll_w ); -WRITE16_HANDLER( f1gp_gfxctrl_w ); -WRITE16_HANDLER( f1gp2_gfxctrl_w ); VIDEO_START( f1gp ); VIDEO_START( f1gpb ); diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index 3263fde172e..a8367889dda 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -32,6 +32,8 @@ public: required_device<cpu_device> m_maincpu; DECLARE_WRITE8_MEMBER(k007121_registers_w); DECLARE_WRITE8_MEMBER(fastlane_bankswitch_w); + DECLARE_WRITE8_MEMBER(fastlane_vram1_w); + DECLARE_WRITE8_MEMBER(fastlane_vram2_w); }; @@ -39,8 +41,6 @@ public: /*----------- defined in video/fastlane.c -----------*/ -WRITE8_HANDLER( fastlane_vram1_w ); -WRITE8_HANDLER( fastlane_vram2_w ); PALETTE_INIT( fastlane ); VIDEO_START( fastlane ); diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index b7934f7187e..7be2a17bcc6 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -58,6 +58,7 @@ public: DECLARE_WRITE8_MEMBER(ed00_w); DECLARE_READ8_MEMBER(e300_r); DECLARE_WRITE8_MEMBER(ee00_w); + DECLARE_WRITE8_MEMBER(fcombat_videoreg_w); }; @@ -68,4 +69,3 @@ PALETTE_INIT( fcombat ); VIDEO_START( fcombat ); SCREEN_UPDATE_IND16( fcombat ); -WRITE8_HANDLER( fcombat_videoreg_w ); diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index c63239f1054..171a2a42917 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -37,6 +37,9 @@ public: DECLARE_READ8_MEMBER(fgoal_shifter_reverse_r); DECLARE_WRITE8_MEMBER(fgoal_sound1_w); DECLARE_WRITE8_MEMBER(fgoal_sound2_w); + DECLARE_WRITE8_MEMBER(fgoal_color_w); + DECLARE_WRITE8_MEMBER(fgoal_ypos_w); + DECLARE_WRITE8_MEMBER(fgoal_xpos_w); }; @@ -45,7 +48,4 @@ public: VIDEO_START( fgoal ); SCREEN_UPDATE_IND16( fgoal ); -WRITE8_HANDLER( fgoal_color_w ); -WRITE8_HANDLER( fgoal_xpos_w ); -WRITE8_HANDLER( fgoal_ypos_w ); diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index f6982f6e48c..d5888a1c610 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -40,12 +40,12 @@ public: DECLARE_WRITE8_MEMBER(i8039_irqen_w); DECLARE_READ8_MEMBER(i8039_T1_r); DECLARE_WRITE8_MEMBER(i8039_T0_w); + DECLARE_WRITE8_MEMBER(finalizr_videoctrl_w); }; /*----------- defined in video/finalizr.c -----------*/ -WRITE8_HANDLER( finalizr_videoctrl_w ); PALETTE_INIT( finalizr ); VIDEO_START( finalizr ); diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index a2b07b9bd96..23417f0d284 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -50,18 +50,18 @@ public: DECLARE_WRITE8_MEMBER(firetrap_sound_bankselect_w); DECLARE_WRITE8_MEMBER(firetrap_adpcm_data_w); DECLARE_WRITE8_MEMBER(flip_screen_w); + DECLARE_WRITE8_MEMBER(firetrap_fgvideoram_w); + DECLARE_WRITE8_MEMBER(firetrap_bg1videoram_w); + DECLARE_WRITE8_MEMBER(firetrap_bg2videoram_w); + DECLARE_WRITE8_MEMBER(firetrap_bg1_scrollx_w); + DECLARE_WRITE8_MEMBER(firetrap_bg1_scrolly_w); + DECLARE_WRITE8_MEMBER(firetrap_bg2_scrollx_w); + DECLARE_WRITE8_MEMBER(firetrap_bg2_scrolly_w); }; /*----------- defined in video/firetrap.c -----------*/ -WRITE8_HANDLER( firetrap_fgvideoram_w ); -WRITE8_HANDLER( firetrap_bg1videoram_w ); -WRITE8_HANDLER( firetrap_bg2videoram_w ); -WRITE8_HANDLER( firetrap_bg1_scrollx_w ); -WRITE8_HANDLER( firetrap_bg1_scrolly_w ); -WRITE8_HANDLER( firetrap_bg2_scrollx_w ); -WRITE8_HANDLER( firetrap_bg2_scrolly_w ); PALETTE_INIT( firetrap ); VIDEO_START( firetrap ); diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index 90e1b6ebf42..d841b556276 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -36,14 +36,14 @@ public: DECLARE_WRITE8_MEMBER(snd_porta_w); DECLARE_WRITE8_MEMBER(snd_portb_w); DECLARE_WRITE8_MEMBER(snd_portc_w); + DECLARE_WRITE16_MEMBER(fof_bak_tileram_w); + DECLARE_WRITE16_MEMBER(fof_mid_tileram_w); + DECLARE_WRITE16_MEMBER(fof_txt_tileram_w); }; /*----------- defined in video/fitfight.c -----------*/ -WRITE16_HANDLER( fof_bak_tileram_w ); -WRITE16_HANDLER( fof_mid_tileram_w ); -WRITE16_HANDLER( fof_txt_tileram_w ); VIDEO_START(fitfight); SCREEN_UPDATE_IND16(fitfight); diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index 9bd62578e87..ac9aadf7c3c 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -30,6 +30,8 @@ public: DECLARE_WRITE8_MEMBER(flkatck_ls138_w); DECLARE_READ8_MEMBER(multiply_r); DECLARE_WRITE8_MEMBER(multiply_w); + DECLARE_WRITE8_MEMBER(flkatck_k007121_w); + DECLARE_WRITE8_MEMBER(flkatck_k007121_regs_w); }; @@ -38,8 +40,6 @@ public: /*----------- defined in video/flkatck.c -----------*/ -WRITE8_HANDLER( flkatck_k007121_w ); -WRITE8_HANDLER( flkatck_k007121_regs_w ); VIDEO_START( flkatck ); SCREEN_UPDATE_IND16( flkatck ); diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h index 1b442d9a334..0b6448bad27 100644 --- a/src/mame/includes/flower.h +++ b/src/mame/includes/flower.h @@ -23,6 +23,10 @@ public: DECLARE_WRITE8_MEMBER(flower_coin_counter_w); DECLARE_WRITE8_MEMBER(flower_coin_lockout_w); DECLARE_WRITE8_MEMBER(sound_command_w); + DECLARE_WRITE8_MEMBER(flower_textram_w); + DECLARE_WRITE8_MEMBER(flower_bg0ram_w); + DECLARE_WRITE8_MEMBER(flower_bg1ram_w); + DECLARE_WRITE8_MEMBER(flower_flipscreen_w); }; @@ -36,10 +40,6 @@ DECLARE_LEGACY_SOUND_DEVICE(FLOWER, flower_sound); /*----------- defined in video/flower.c -----------*/ -WRITE8_HANDLER( flower_textram_w ); -WRITE8_HANDLER( flower_bg0ram_w ); -WRITE8_HANDLER( flower_bg1ram_w ); -WRITE8_HANDLER( flower_flipscreen_w ); SCREEN_UPDATE_IND16( flower ); VIDEO_START( flower ); diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h index 0b51760074a..eee181bfe0a 100644 --- a/src/mame/includes/flstory.h +++ b/src/mame/includes/flstory.h @@ -72,29 +72,36 @@ public: DECLARE_WRITE8_MEMBER(nmi_enable_w); DECLARE_READ8_MEMBER(rumba_mcu_r); DECLARE_WRITE8_MEMBER(rumba_mcu_w); + DECLARE_READ8_MEMBER(flstory_68705_port_a_r); + DECLARE_WRITE8_MEMBER(flstory_68705_port_a_w); + DECLARE_WRITE8_MEMBER(flstory_68705_ddr_a_w); + DECLARE_READ8_MEMBER(flstory_68705_port_b_r); + DECLARE_WRITE8_MEMBER(flstory_68705_port_b_w); + DECLARE_WRITE8_MEMBER(flstory_68705_ddr_b_w); + DECLARE_READ8_MEMBER(flstory_68705_port_c_r); + DECLARE_WRITE8_MEMBER(flstory_68705_port_c_w); + DECLARE_WRITE8_MEMBER(flstory_68705_ddr_c_w); + DECLARE_WRITE8_MEMBER(flstory_mcu_w); + DECLARE_READ8_MEMBER(flstory_mcu_r); + DECLARE_READ8_MEMBER(flstory_mcu_status_r); + DECLARE_WRITE8_MEMBER(onna34ro_mcu_w); + DECLARE_READ8_MEMBER(onna34ro_mcu_r); + DECLARE_READ8_MEMBER(onna34ro_mcu_status_r); + DECLARE_WRITE8_MEMBER(victnine_mcu_w); + DECLARE_READ8_MEMBER(victnine_mcu_r); + DECLARE_READ8_MEMBER(victnine_mcu_status_r); + DECLARE_WRITE8_MEMBER(flstory_videoram_w); + DECLARE_WRITE8_MEMBER(flstory_palette_w); + DECLARE_READ8_MEMBER(flstory_palette_r); + DECLARE_WRITE8_MEMBER(flstory_gfxctrl_w); + DECLARE_READ8_MEMBER(victnine_gfxctrl_r); + DECLARE_WRITE8_MEMBER(victnine_gfxctrl_w); + DECLARE_WRITE8_MEMBER(flstory_scrlram_w); }; /*----------- defined in machine/flstory.c -----------*/ -READ8_HANDLER( flstory_68705_port_a_r ); -WRITE8_HANDLER( flstory_68705_port_a_w ); -READ8_HANDLER( flstory_68705_port_b_r ); -WRITE8_HANDLER( flstory_68705_port_b_w ); -READ8_HANDLER( flstory_68705_port_c_r ); -WRITE8_HANDLER( flstory_68705_port_c_w ); -WRITE8_HANDLER( flstory_68705_ddr_a_w ); -WRITE8_HANDLER( flstory_68705_ddr_b_w ); -WRITE8_HANDLER( flstory_68705_ddr_c_w ); -WRITE8_HANDLER( flstory_mcu_w ); -READ8_HANDLER( flstory_mcu_r ); -READ8_HANDLER( flstory_mcu_status_r ); -WRITE8_HANDLER( onna34ro_mcu_w ); -READ8_HANDLER( onna34ro_mcu_r ); -READ8_HANDLER( onna34ro_mcu_status_r ); -WRITE8_HANDLER( victnine_mcu_w ); -READ8_HANDLER( victnine_mcu_r ); -READ8_HANDLER( victnine_mcu_status_r ); /*----------- defined in video/flstory.c -----------*/ @@ -106,10 +113,3 @@ SCREEN_UPDATE_IND16( victnine ); VIDEO_START( rumba ); SCREEN_UPDATE_IND16( rumba ); -WRITE8_HANDLER( flstory_videoram_w ); -READ8_HANDLER( flstory_palette_r ); -WRITE8_HANDLER( flstory_palette_w ); -WRITE8_HANDLER( flstory_gfxctrl_w ); -WRITE8_HANDLER( flstory_scrlram_w ); -READ8_HANDLER( victnine_gfxctrl_r ); -WRITE8_HANDLER( victnine_gfxctrl_w ); diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h index 6161692788e..bf741bd4660 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -33,6 +33,7 @@ public: DECLARE_READ8_MEMBER(oigas_2_r); DECLARE_READ8_MEMBER(freekick_ff_r); DECLARE_WRITE8_MEMBER(freekick_ff_w); + DECLARE_WRITE8_MEMBER(freek_videoram_w); }; @@ -42,4 +43,3 @@ VIDEO_START(freekick); SCREEN_UPDATE_IND16(gigas); SCREEN_UPDATE_IND16(pbillrd); SCREEN_UPDATE_IND16(freekick); -WRITE8_HANDLER( freek_videoram_w ); diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index 8477a16ff17..fd86e9ebd6b 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -45,6 +45,39 @@ public: DECLARE_WRITE8_MEMBER(fromanc2_subcpu_nmi_clr); DECLARE_READ8_MEMBER(fromanc2_sndcpu_nmi_clr); DECLARE_WRITE8_MEMBER(fromanc2_subcpu_rombank_w); + DECLARE_READ16_MEMBER(fromanc2_paletteram_0_r); + DECLARE_READ16_MEMBER(fromanc2_paletteram_1_r); + DECLARE_WRITE16_MEMBER(fromanc2_paletteram_0_w); + DECLARE_WRITE16_MEMBER(fromanc2_paletteram_1_w); + DECLARE_READ16_MEMBER(fromancr_paletteram_0_r); + DECLARE_READ16_MEMBER(fromancr_paletteram_1_r); + DECLARE_WRITE16_MEMBER(fromancr_paletteram_0_w); + DECLARE_WRITE16_MEMBER(fromancr_paletteram_1_w); + DECLARE_READ16_MEMBER(fromanc4_paletteram_0_r); + DECLARE_READ16_MEMBER(fromanc4_paletteram_1_r); + DECLARE_WRITE16_MEMBER(fromanc4_paletteram_0_w); + DECLARE_WRITE16_MEMBER(fromanc4_paletteram_1_w); + DECLARE_WRITE16_MEMBER(fromanc2_videoram_0_w); + DECLARE_WRITE16_MEMBER(fromanc2_videoram_1_w); + DECLARE_WRITE16_MEMBER(fromanc2_videoram_2_w); + DECLARE_WRITE16_MEMBER(fromanc2_videoram_3_w); + DECLARE_WRITE16_MEMBER(fromanc2_gfxreg_0_w); + DECLARE_WRITE16_MEMBER(fromanc2_gfxreg_1_w); + DECLARE_WRITE16_MEMBER(fromanc2_gfxreg_2_w); + DECLARE_WRITE16_MEMBER(fromanc2_gfxreg_3_w); + DECLARE_WRITE16_MEMBER(fromanc2_gfxbank_0_w); + DECLARE_WRITE16_MEMBER(fromanc2_gfxbank_1_w); + DECLARE_WRITE16_MEMBER(fromancr_videoram_0_w); + DECLARE_WRITE16_MEMBER(fromancr_videoram_1_w); + DECLARE_WRITE16_MEMBER(fromancr_videoram_2_w); + DECLARE_WRITE16_MEMBER(fromancr_gfxreg_0_w); + DECLARE_WRITE16_MEMBER(fromancr_gfxreg_1_w); + DECLARE_WRITE16_MEMBER(fromanc4_videoram_0_w); + DECLARE_WRITE16_MEMBER(fromanc4_videoram_1_w); + DECLARE_WRITE16_MEMBER(fromanc4_videoram_2_w); + DECLARE_WRITE16_MEMBER(fromanc4_gfxreg_0_w); + DECLARE_WRITE16_MEMBER(fromanc4_gfxreg_1_w); + DECLARE_WRITE16_MEMBER(fromanc4_gfxreg_2_w); }; @@ -58,37 +91,4 @@ VIDEO_START( fromanc2 ); VIDEO_START( fromancr ); VIDEO_START( fromanc4 ); -READ16_HANDLER( fromanc2_paletteram_0_r ); -READ16_HANDLER( fromanc2_paletteram_1_r ); -WRITE16_HANDLER( fromanc2_paletteram_0_w ); -WRITE16_HANDLER( fromanc2_paletteram_1_w ); -READ16_HANDLER( fromancr_paletteram_0_r ); -READ16_HANDLER( fromancr_paletteram_1_r ); -WRITE16_HANDLER( fromancr_paletteram_0_w ); -WRITE16_HANDLER( fromancr_paletteram_1_w ); -READ16_HANDLER( fromanc4_paletteram_0_r ); -READ16_HANDLER( fromanc4_paletteram_1_r ); -WRITE16_HANDLER( fromanc4_paletteram_0_w ); -WRITE16_HANDLER( fromanc4_paletteram_1_w ); -WRITE16_HANDLER( fromanc2_videoram_0_w ); -WRITE16_HANDLER( fromanc2_videoram_1_w ); -WRITE16_HANDLER( fromanc2_videoram_2_w ); -WRITE16_HANDLER( fromanc2_videoram_3_w ); -WRITE16_HANDLER( fromancr_videoram_0_w ); -WRITE16_HANDLER( fromancr_videoram_1_w ); -WRITE16_HANDLER( fromancr_videoram_2_w ); -WRITE16_HANDLER( fromanc4_videoram_0_w ); -WRITE16_HANDLER( fromanc4_videoram_1_w ); -WRITE16_HANDLER( fromanc4_videoram_2_w ); -WRITE16_HANDLER( fromanc2_gfxreg_0_w ); -WRITE16_HANDLER( fromanc2_gfxreg_1_w ); -WRITE16_HANDLER( fromanc2_gfxreg_2_w ); -WRITE16_HANDLER( fromanc2_gfxreg_3_w ); -WRITE16_HANDLER( fromancr_gfxreg_0_w ); -WRITE16_HANDLER( fromancr_gfxreg_1_w ); -WRITE16_HANDLER( fromanc2_gfxbank_0_w ); -WRITE16_HANDLER( fromanc2_gfxbank_1_w ); void fromancr_gfxbank_w(running_machine &machine, int data); -WRITE16_HANDLER( fromanc4_gfxreg_0_w ); -WRITE16_HANDLER( fromanc4_gfxreg_1_w ); -WRITE16_HANDLER( fromanc4_gfxreg_2_w ); diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index 2eae78bdf95..077d7da7814 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -61,6 +61,14 @@ public: DECLARE_WRITE8_MEMBER(fromance_portselect_w); DECLARE_READ8_MEMBER(fromance_keymatrix_r); DECLARE_WRITE8_MEMBER(fromance_coinctr_w); + DECLARE_WRITE8_MEMBER(fromance_gfxreg_w); + DECLARE_READ8_MEMBER(fromance_paletteram_r); + DECLARE_WRITE8_MEMBER(fromance_paletteram_w); + DECLARE_READ8_MEMBER(fromance_videoram_r); + DECLARE_WRITE8_MEMBER(fromance_videoram_w); + DECLARE_WRITE8_MEMBER(fromance_scroll_w); + DECLARE_WRITE8_MEMBER(fromance_crtc_data_w); + DECLARE_WRITE8_MEMBER(fromance_crtc_register_w); }; @@ -73,15 +81,7 @@ VIDEO_START( hatris ); SCREEN_UPDATE_IND16( fromance ); SCREEN_UPDATE_IND16( pipedrm ); -WRITE8_HANDLER( fromance_crtc_data_w ); -WRITE8_HANDLER( fromance_crtc_register_w ); -WRITE8_HANDLER( fromance_gfxreg_w ); -WRITE8_HANDLER( fromance_scroll_w ); -READ8_HANDLER( fromance_paletteram_r ); -WRITE8_HANDLER( fromance_paletteram_w ); -READ8_HANDLER( fromance_videoram_r ); -WRITE8_HANDLER( fromance_videoram_w ); diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index 26db086709e..a137a2e75b7 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -15,16 +15,16 @@ public: int m_gfx_bank; DECLARE_READ8_MEMBER(funkybee_input_port_0_r); DECLARE_WRITE8_MEMBER(funkybee_coin_counter_w); + DECLARE_WRITE8_MEMBER(funkybee_videoram_w); + DECLARE_WRITE8_MEMBER(funkybee_colorram_w); + DECLARE_WRITE8_MEMBER(funkybee_gfx_bank_w); + DECLARE_WRITE8_MEMBER(funkybee_scroll_w); + DECLARE_WRITE8_MEMBER(funkybee_flipscreen_w); }; /*----------- defined in video/funkybee.c -----------*/ -WRITE8_HANDLER( funkybee_videoram_w ); -WRITE8_HANDLER( funkybee_colorram_w ); -WRITE8_HANDLER( funkybee_gfx_bank_w ); -WRITE8_HANDLER( funkybee_scroll_w ); -WRITE8_HANDLER( funkybee_flipscreen_w ); PALETTE_INIT( funkybee ); VIDEO_START( funkybee ); diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index 8451372433d..ec50024c937 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -9,13 +9,13 @@ public: tilemap_t *m_bg_tilemap; DECLARE_READ8_MEMBER(questions_r); DECLARE_WRITE8_MEMBER(question_bank_w); + DECLARE_WRITE8_MEMBER(funworld_videoram_w); + DECLARE_WRITE8_MEMBER(funworld_colorram_w); }; /*----------- defined in video/funworld.c -----------*/ -WRITE8_HANDLER( funworld_videoram_w ); -WRITE8_HANDLER( funworld_colorram_w ); PALETTE_INIT( funworld ); VIDEO_START( funworld ); VIDEO_START( magicrd2 ); diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h index 5d26c7fef70..8b6f786f34a 100644 --- a/src/mame/includes/funybubl.h +++ b/src/mame/includes/funybubl.h @@ -17,13 +17,13 @@ public: DECLARE_WRITE8_MEMBER(funybubl_vidram_bank_w); DECLARE_WRITE8_MEMBER(funybubl_cpurombank_w); DECLARE_WRITE8_MEMBER(funybubl_soundcommand_w); + DECLARE_WRITE8_MEMBER(funybubl_paldatawrite); }; /*----------- defined in video/funybubl.c -----------*/ -WRITE8_HANDLER ( funybubl_paldatawrite ); VIDEO_START(funybubl); SCREEN_UPDATE_IND16(funybubl); diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index 0cb47493e89..43291a117d7 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -27,15 +27,15 @@ public: DECLARE_WRITE16_MEMBER(fuuki16_vregs_w); DECLARE_WRITE16_MEMBER(fuuki16_sound_command_w); DECLARE_WRITE8_MEMBER(fuuki16_sound_rombank_w); + DECLARE_WRITE16_MEMBER(fuuki16_vram_0_w); + DECLARE_WRITE16_MEMBER(fuuki16_vram_1_w); + DECLARE_WRITE16_MEMBER(fuuki16_vram_2_w); + DECLARE_WRITE16_MEMBER(fuuki16_vram_3_w); }; /*----------- defined in video/fuukifg2.c -----------*/ -WRITE16_HANDLER( fuuki16_vram_0_w ); -WRITE16_HANDLER( fuuki16_vram_1_w ); -WRITE16_HANDLER( fuuki16_vram_2_w ); -WRITE16_HANDLER( fuuki16_vram_3_w ); VIDEO_START( fuuki16 ); SCREEN_UPDATE_IND16( fuuki16 ); diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index 710f5dcbd62..5c58b631f0c 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -45,15 +45,15 @@ public: DECLARE_READ8_MEMBER(snd_z80_r); DECLARE_WRITE8_MEMBER(snd_z80_w); DECLARE_WRITE8_MEMBER(snd_ymf278b_w); + DECLARE_WRITE32_MEMBER(fuuki32_vram_0_w); + DECLARE_WRITE32_MEMBER(fuuki32_vram_1_w); + DECLARE_WRITE32_MEMBER(fuuki32_vram_2_w); + DECLARE_WRITE32_MEMBER(fuuki32_vram_3_w); }; /*----------- defined in video/fuuki32.c -----------*/ -WRITE32_HANDLER( fuuki32_vram_0_w ); -WRITE32_HANDLER( fuuki32_vram_1_w ); -WRITE32_HANDLER( fuuki32_vram_2_w ); -WRITE32_HANDLER( fuuki32_vram_3_w ); VIDEO_START( fuuki32 ); SCREEN_UPDATE_IND16( fuuki32 ); diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index 1f451f5ed35..eb0f6c5e1c9 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -29,13 +29,13 @@ public: DECLARE_WRITE16_MEMBER(gaelco_encrypted_w); DECLARE_WRITE16_MEMBER(thoop_vram_encrypted_w); DECLARE_WRITE16_MEMBER(thoop_encrypted_w); + DECLARE_WRITE16_MEMBER(gaelco_vram_w); }; /*----------- defined in video/gaelco.c -----------*/ -WRITE16_HANDLER( gaelco_vram_w ); VIDEO_START( bigkarnk ); VIDEO_START( maniacsq ); diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h index 18a8574906d..c89e081cc7e 100644 --- a/src/mame/includes/gaelco2.h +++ b/src/mame/includes/gaelco2.h @@ -25,6 +25,17 @@ public: DECLARE_READ16_MEMBER(p2_gun_x); DECLARE_READ16_MEMBER(p2_gun_y); DECLARE_READ16_MEMBER(dallas_kludge_r); + DECLARE_WRITE16_MEMBER(gaelco2_coin_w); + DECLARE_WRITE16_MEMBER(gaelco2_coin2_w); + DECLARE_WRITE16_MEMBER(wrally2_coin_w); + DECLARE_WRITE16_MEMBER(touchgo_coin_w); + DECLARE_WRITE16_MEMBER(bang_clr_gun_int_w); + DECLARE_WRITE16_MEMBER(wrally2_adc_clk); + DECLARE_WRITE16_MEMBER(wrally2_adc_cs); + DECLARE_READ16_MEMBER(snowboar_protection_r); + DECLARE_WRITE16_MEMBER(snowboar_protection_w); + DECLARE_WRITE16_MEMBER(gaelco2_vram_w); + DECLARE_WRITE16_MEMBER(gaelco2_palette_w); }; @@ -34,25 +45,14 @@ DRIVER_INIT( alighunt ); DRIVER_INIT( touchgo ); DRIVER_INIT( snowboar ); DRIVER_INIT( bang ); -WRITE16_HANDLER( gaelco2_coin_w ); -WRITE16_HANDLER( gaelco2_coin2_w ); -WRITE16_HANDLER( wrally2_coin_w ); -WRITE16_HANDLER( touchgo_coin_w ); -WRITE16_HANDLER( bang_clr_gun_int_w ); TIMER_DEVICE_CALLBACK( bang_irq ); CUSTOM_INPUT( wrally2_analog_bit_r ); -WRITE16_HANDLER( wrally2_adc_clk ); -WRITE16_HANDLER( wrally2_adc_cs ); WRITE16_DEVICE_HANDLER( gaelco2_eeprom_cs_w ); WRITE16_DEVICE_HANDLER( gaelco2_eeprom_sk_w ); WRITE16_DEVICE_HANDLER( gaelco2_eeprom_data_w ); -READ16_HANDLER( snowboar_protection_r ); -WRITE16_HANDLER( snowboar_protection_w ); /*----------- defined in video/gaelco2.c -----------*/ -WRITE16_HANDLER( gaelco2_vram_w ); -WRITE16_HANDLER( gaelco2_palette_w ); SCREEN_UPDATE_IND16( gaelco2 ); VIDEO_START( gaelco2 ); SCREEN_UPDATE_IND16( gaelco2_left ); diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index d0e6fd44307..37718ca2919 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -94,16 +94,16 @@ public: DECLARE_WRITE32_MEMBER(radikalb_lamp_w); DECLARE_WRITE32_MEMBER(unknown_137_w); DECLARE_WRITE32_MEMBER(unknown_13a_w); + DECLARE_WRITE32_MEMBER(gaelco3d_render_w); + DECLARE_WRITE16_MEMBER(gaelco3d_paletteram_w); + DECLARE_WRITE32_MEMBER(gaelco3d_paletteram_020_w); }; /*----------- defined in video/gaelco3d.c -----------*/ void gaelco3d_render(screen_device &screen); -WRITE32_HANDLER( gaelco3d_render_w ); -WRITE16_HANDLER( gaelco3d_paletteram_w ); -WRITE32_HANDLER( gaelco3d_paletteram_020_w ); VIDEO_START( gaelco3d ); SCREEN_UPDATE_IND16( gaelco3d ); diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index 6659fca35b0..684b083a44e 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -49,6 +49,22 @@ public: DECLARE_READ16_MEMBER(wildfang_protection_r); DECLARE_WRITE16_MEMBER(raiga_protection_w); DECLARE_READ16_MEMBER(raiga_protection_r); + DECLARE_WRITE16_MEMBER(gaiden_flip_w); + DECLARE_WRITE16_MEMBER(gaiden_txscrollx_w); + DECLARE_WRITE16_MEMBER(gaiden_txscrolly_w); + DECLARE_WRITE16_MEMBER(gaiden_fgscrollx_w); + DECLARE_WRITE16_MEMBER(gaiden_fgscrolly_w); + DECLARE_WRITE16_MEMBER(gaiden_bgscrollx_w); + DECLARE_WRITE16_MEMBER(gaiden_bgscrolly_w); + DECLARE_WRITE16_MEMBER(gaiden_txoffsety_w); + DECLARE_WRITE16_MEMBER(gaiden_fgoffsety_w); + DECLARE_WRITE16_MEMBER(gaiden_bgoffsety_w); + DECLARE_WRITE16_MEMBER(gaiden_sproffsety_w); + DECLARE_WRITE16_MEMBER(gaiden_videoram3_w); + DECLARE_READ16_MEMBER(gaiden_videoram3_r); + DECLARE_WRITE16_MEMBER(gaiden_videoram2_w); + DECLARE_READ16_MEMBER(gaiden_videoram2_r); + DECLARE_WRITE16_MEMBER(gaiden_videoram_w); }; @@ -63,20 +79,4 @@ SCREEN_UPDATE_RGB32( gaiden ); SCREEN_UPDATE_RGB32( raiga ); SCREEN_UPDATE_IND16( drgnbowl ); -WRITE16_HANDLER( gaiden_videoram_w ); -WRITE16_HANDLER( gaiden_videoram2_w ); -READ16_HANDLER( gaiden_videoram2_r ); -WRITE16_HANDLER( gaiden_videoram3_w ); -READ16_HANDLER( gaiden_videoram3_r ); -WRITE16_HANDLER( gaiden_flip_w ); -WRITE16_HANDLER( gaiden_txscrollx_w ); -WRITE16_HANDLER( gaiden_txscrolly_w ); -WRITE16_HANDLER( gaiden_fgscrollx_w ); -WRITE16_HANDLER( gaiden_fgscrolly_w ); -WRITE16_HANDLER( gaiden_bgscrollx_w ); -WRITE16_HANDLER( gaiden_bgscrolly_w ); -WRITE16_HANDLER( gaiden_txoffsety_w ); -WRITE16_HANDLER( gaiden_fgoffsety_w ); -WRITE16_HANDLER( gaiden_bgoffsety_w ); -WRITE16_HANDLER( gaiden_sproffsety_w ); diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index 5e9b61a90e8..5679c4f5c73 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -35,6 +35,8 @@ public: DECLARE_READ8_MEMBER(bosco_dsw_r); DECLARE_WRITE8_MEMBER(galaga_flip_screen_w); DECLARE_WRITE8_MEMBER(bosco_latch_w); + DECLARE_WRITE8_MEMBER(galaga_videoram_w); + DECLARE_WRITE8_MEMBER(gatsbee_bank_w); }; class xevious_state : public galaga_state @@ -121,8 +123,6 @@ struct star extern const struct star star_seed_tab[]; PALETTE_INIT( galaga ); -WRITE8_HANDLER( galaga_videoram_w ); -WRITE8_HANDLER( gatsbee_bank_w ); VIDEO_START( galaga ); SCREEN_UPDATE_IND16( galaga ); SCREEN_VBLANK( galaga ); /* update starfield */ diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index f9e79e977e6..80e215294b7 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -79,6 +79,17 @@ public: rgb_t m_bullet_color[8]; UINT8 m_gfxbank[5]; required_shared_ptr<UINT8> m_spriteram; + DECLARE_WRITE8_MEMBER(galaxian_videoram_w); + DECLARE_WRITE8_MEMBER(galaxian_objram_w); + DECLARE_WRITE8_MEMBER(galaxian_flip_screen_x_w); + DECLARE_WRITE8_MEMBER(galaxian_flip_screen_y_w); + DECLARE_WRITE8_MEMBER(galaxian_flip_screen_xy_w); + DECLARE_WRITE8_MEMBER(galaxian_stars_enable_w); + DECLARE_WRITE8_MEMBER(scramble_background_enable_w); + DECLARE_WRITE8_MEMBER(scramble_background_red_w); + DECLARE_WRITE8_MEMBER(scramble_background_green_w); + DECLARE_WRITE8_MEMBER(scramble_background_blue_w); + DECLARE_WRITE8_MEMBER(galaxian_gfxbank_w); }; @@ -90,20 +101,9 @@ PALETTE_INIT( moonwar ); VIDEO_START( galaxian ); SCREEN_UPDATE_RGB32( galaxian ); -WRITE8_HANDLER( galaxian_videoram_w ); -WRITE8_HANDLER( galaxian_objram_w ); -WRITE8_HANDLER( galaxian_flip_screen_x_w ); -WRITE8_HANDLER( galaxian_flip_screen_y_w ); -WRITE8_HANDLER( galaxian_flip_screen_xy_w ); -WRITE8_HANDLER( galaxian_stars_enable_w ); -WRITE8_HANDLER( scramble_background_enable_w ); -WRITE8_HANDLER( scramble_background_red_w ); -WRITE8_HANDLER( scramble_background_green_w ); -WRITE8_HANDLER( scramble_background_blue_w ); -WRITE8_HANDLER( galaxian_gfxbank_w ); TIMER_DEVICE_CALLBACK( galaxian_stars_blink_timer ); diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index f07133244c7..2cab16a3d52 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -88,6 +88,41 @@ public: DECLARE_READ8_MEMBER(scramb2_port2_r); DECLARE_WRITE8_MEMBER(harem_nmi_mask_w); DECLARE_READ8_MEMBER(hexpoola_data_port_r); + DECLARE_WRITE8_MEMBER(galaxold_nmi_enable_w); + DECLARE_WRITE8_MEMBER(galaxold_coin_lockout_w); + DECLARE_WRITE8_MEMBER(galaxold_coin_counter_w); + DECLARE_WRITE8_MEMBER(galaxold_coin_counter_1_w); + DECLARE_WRITE8_MEMBER(galaxold_coin_counter_2_w); + DECLARE_WRITE8_MEMBER(galaxold_leds_w); + DECLARE_WRITE8_MEMBER(zigzag_sillyprotection_w); + DECLARE_READ8_MEMBER(scramblb_protection_1_r); + DECLARE_READ8_MEMBER(scramblb_protection_2_r); + DECLARE_WRITE8_MEMBER(_4in1_bank_w); + DECLARE_READ8_MEMBER(checkmaj_protection_r); + DECLARE_READ8_MEMBER(dingo_3000_r); + DECLARE_READ8_MEMBER(dingo_3035_r); + DECLARE_READ8_MEMBER(dingoe_3001_r); + DECLARE_WRITE8_MEMBER(racknrol_tiles_bank_w); + DECLARE_WRITE8_MEMBER(galaxold_videoram_w); + DECLARE_READ8_MEMBER(galaxold_videoram_r); + DECLARE_WRITE8_MEMBER(galaxold_attributesram_w); + DECLARE_WRITE8_MEMBER(galaxold_flip_screen_x_w); + DECLARE_WRITE8_MEMBER(galaxold_flip_screen_y_w); + DECLARE_WRITE8_MEMBER(gteikob2_flip_screen_x_w); + DECLARE_WRITE8_MEMBER(gteikob2_flip_screen_y_w); + DECLARE_WRITE8_MEMBER(hotshock_flip_screen_w); + DECLARE_WRITE8_MEMBER(scrambold_background_enable_w); + DECLARE_WRITE8_MEMBER(scrambold_background_red_w); + DECLARE_WRITE8_MEMBER(scrambold_background_green_w); + DECLARE_WRITE8_MEMBER(scrambold_background_blue_w); + DECLARE_WRITE8_MEMBER(galaxold_stars_enable_w); + DECLARE_WRITE8_MEMBER(darkplnt_bullet_color_w); + DECLARE_WRITE8_MEMBER(galaxold_gfxbank_w); + DECLARE_WRITE8_MEMBER(rockclim_videoram_w); + DECLARE_WRITE8_MEMBER(rockclim_scroll_w); + DECLARE_READ8_MEMBER(rockclim_videoram_r); + DECLARE_WRITE8_MEMBER(dambustr_bg_split_line_w); + DECLARE_WRITE8_MEMBER(dambustr_bg_color_w); }; @@ -106,25 +141,9 @@ PALETTE_INIT( turtles ); VIDEO_START( dambustr ); -WRITE8_HANDLER( galaxold_videoram_w ); -READ8_HANDLER( galaxold_videoram_r ); -WRITE8_HANDLER( rockclim_videoram_w ); -WRITE8_HANDLER( rockclim_scroll_w ); -READ8_HANDLER( rockclim_videoram_r ); -WRITE8_HANDLER( dambustr_bg_split_line_w ); -WRITE8_HANDLER( dambustr_bg_color_w ); -WRITE8_HANDLER( galaxold_attributesram_w ); -WRITE8_HANDLER( galaxold_stars_enable_w ); -WRITE8_HANDLER( scrambold_background_enable_w ); -WRITE8_HANDLER( scrambold_background_red_w ); -WRITE8_HANDLER( scrambold_background_green_w ); -WRITE8_HANDLER( scrambold_background_blue_w ); -WRITE8_HANDLER( hotshock_flip_screen_w ); -WRITE8_HANDLER( darkplnt_bullet_color_w ); -WRITE8_HANDLER( racknrol_tiles_bank_w ); VIDEO_START( galaxold_plain ); VIDEO_START( galaxold ); @@ -153,9 +172,6 @@ void galaxold_draw_stars(running_machine &machine, bitmap_ind16 &bitmap, const r SCREEN_UPDATE_IND16( galaxold ); SCREEN_UPDATE_IND16( dambustr ); -WRITE8_HANDLER( galaxold_gfxbank_w ); -WRITE8_HANDLER( galaxold_flip_screen_x_w ); -WRITE8_HANDLER( galaxold_flip_screen_y_w ); /*----------- defined in machine/galaxold.c -----------*/ @@ -168,23 +184,14 @@ WRITE_LINE_DEVICE_HANDLER( galaxold_7474_9m_1_callback ); DRIVER_INIT( 4in1 ); DRIVER_INIT( ladybugg ); -WRITE8_HANDLER( galaxold_nmi_enable_w ); MACHINE_RESET( galaxold ); MACHINE_RESET( devilfsg ); MACHINE_RESET( hunchbkg ); -WRITE8_HANDLER( galaxold_coin_lockout_w ); -WRITE8_HANDLER( galaxold_coin_counter_w ); #define galaxold_coin_counter_0_w galaxold_coin_counter_w -WRITE8_HANDLER( galaxold_coin_counter_1_w ); -WRITE8_HANDLER( galaxold_coin_counter_2_w ); -WRITE8_HANDLER( galaxold_leds_w ); -READ8_HANDLER( scramblb_protection_1_r ); -READ8_HANDLER( scramblb_protection_2_r ); -WRITE8_HANDLER( _4in1_bank_w ); CUSTOM_INPUT( _4in1_fake_port_r ); INTERRUPT_GEN( hunchbks_vh_interrupt ); diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index 3a3342a42ed..7aff1704272 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -39,19 +39,19 @@ public: DECLARE_WRITE8_MEMBER(youmab_81_w); DECLARE_WRITE8_MEMBER(youmab_84_w); DECLARE_WRITE8_MEMBER(youmab_86_w); + DECLARE_WRITE8_MEMBER(galivan_videoram_w); + DECLARE_WRITE8_MEMBER(galivan_gfxbank_w); + DECLARE_WRITE8_MEMBER(ninjemak_gfxbank_w); + DECLARE_WRITE8_MEMBER(galivan_scrollx_w); + DECLARE_WRITE8_MEMBER(galivan_scrolly_w); }; /*----------- defined in video/galivan.c -----------*/ -WRITE8_HANDLER( galivan_scrollx_w ); -WRITE8_HANDLER( galivan_scrolly_w ); -WRITE8_HANDLER( galivan_videoram_w ); -WRITE8_HANDLER( galivan_gfxbank_w ); WRITE8_HANDLER( ninjemak_scrollx_w ); WRITE8_HANDLER( ninjemak_scrolly_w ); -WRITE8_HANDLER( ninjemak_gfxbank_w ); PALETTE_INIT( galivan ); diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index 0f6b859b6fe..b1f52042c49 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -29,20 +29,20 @@ public: DECLARE_WRITE8_MEMBER(gaplus_irq_3_ctrl_w); DECLARE_WRITE8_MEMBER(gaplus_sreset_w); DECLARE_WRITE8_MEMBER(gaplus_freset_w); + DECLARE_WRITE8_MEMBER(gaplus_customio_3_w); + DECLARE_READ8_MEMBER(gaplus_customio_3_r); + DECLARE_READ8_MEMBER(gaplus_videoram_r); + DECLARE_WRITE8_MEMBER(gaplus_videoram_w); + DECLARE_WRITE8_MEMBER(gaplus_starfield_control_w); }; /*----------- defined in machine/gaplus.c -----------*/ -WRITE8_HANDLER( gaplus_customio_3_w ); -READ8_HANDLER( gaplus_customio_3_r ); /*----------- defined in video/gaplus.c -----------*/ -READ8_HANDLER( gaplus_videoram_r ); -WRITE8_HANDLER( gaplus_videoram_w ); -WRITE8_HANDLER( gaplus_starfield_control_w ); VIDEO_START( gaplus ); PALETTE_INIT( gaplus ); SCREEN_UPDATE_IND16( gaplus ); diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h index 6b54fec46ca..8a9de22ce4f 100644 --- a/src/mame/includes/gatron.h +++ b/src/mame/includes/gatron.h @@ -7,12 +7,12 @@ public: UINT8 *m_videoram; tilemap_t *m_bg_tilemap; DECLARE_WRITE8_MEMBER(output_port_0_w); + DECLARE_WRITE8_MEMBER(gat_videoram_w); }; /*----------- defined in video/gatron.c -----------*/ -WRITE8_HANDLER( gat_videoram_w ); PALETTE_INIT( gat ); VIDEO_START( gat ); SCREEN_UPDATE_IND16( gat ); diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index 438b8fc2338..9bbc65e46c1 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -33,16 +33,16 @@ public: DECLARE_WRITE8_MEMBER(gberetb_flipscreen_w); DECLARE_READ8_MEMBER(gberetb_irq_ack_r); DECLARE_WRITE8_MEMBER(gberetb_nmi_ack_w); + DECLARE_WRITE8_MEMBER(gberet_videoram_w); + DECLARE_WRITE8_MEMBER(gberet_colorram_w); + DECLARE_WRITE8_MEMBER(gberet_scroll_w); + DECLARE_WRITE8_MEMBER(gberet_sprite_bank_w); + DECLARE_WRITE8_MEMBER(gberetb_scroll_w); }; /*----------- defined in video/gberet.c -----------*/ -WRITE8_HANDLER( gberet_videoram_w ); -WRITE8_HANDLER( gberet_colorram_w ); -WRITE8_HANDLER( gberet_scroll_w ); -WRITE8_HANDLER( gberetb_scroll_w ); -WRITE8_HANDLER( gberet_sprite_bank_w ); PALETTE_INIT( gberet ); VIDEO_START( gberet ); diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index 03234575a7f..06245d9e0fe 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -44,6 +44,10 @@ public: required_device<msm5205_device> m_msm; DECLARE_READ16_MEMBER(ioc_r); DECLARE_WRITE16_MEMBER(ioc_w); + DECLARE_READ16_MEMBER(gcpinbal_tilemaps_word_r); + DECLARE_WRITE16_MEMBER(gcpinbal_tilemaps_word_w); + DECLARE_READ16_MEMBER(gcpinbal_ctrl_word_r); + DECLARE_WRITE16_MEMBER(gcpinbal_ctrl_word_w); }; @@ -52,5 +56,3 @@ public: VIDEO_START( gcpinbal ); SCREEN_UPDATE_IND16( gcpinbal ); -READ16_HANDLER ( gcpinbal_tilemaps_word_r ); -WRITE16_HANDLER( gcpinbal_tilemaps_word_w ); diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index 66f0fca3cd0..ad5e49e7a74 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -31,15 +31,15 @@ public: /* devices */ device_t *m_audiocpu; + DECLARE_WRITE16_MEMBER(ginganin_fgram16_w); + DECLARE_WRITE16_MEMBER(ginganin_txtram16_w); + DECLARE_WRITE16_MEMBER(ginganin_vregs16_w); }; /*----------- defined in video/ginganin.c -----------*/ -WRITE16_HANDLER( ginganin_fgram16_w ); -WRITE16_HANDLER( ginganin_txtram16_w ); -WRITE16_HANDLER( ginganin_vregs16_w ); VIDEO_START( ginganin ); SCREEN_UPDATE_IND16( ginganin ); diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h index 771115b9d52..bae570e125a 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -25,18 +25,18 @@ public: int m_fg_tile_bank; int m_bg_tile_bank; UINT8 *m_spriteram; + DECLARE_WRITE8_MEMBER(gladiatr_videoram_w); + DECLARE_WRITE8_MEMBER(gladiatr_colorram_w); + DECLARE_WRITE8_MEMBER(gladiatr_textram_w); + DECLARE_WRITE8_MEMBER(gladiatr_paletteram_w); + DECLARE_WRITE8_MEMBER(gladiatr_spritebuffer_w); + DECLARE_WRITE8_MEMBER(gladiatr_spritebank_w); + DECLARE_WRITE8_MEMBER(ppking_video_registers_w); + DECLARE_WRITE8_MEMBER(gladiatr_video_registers_w); }; /*----------- defined in video/gladiatr.c -----------*/ -WRITE8_HANDLER( gladiatr_videoram_w ); -WRITE8_HANDLER( gladiatr_colorram_w ); -WRITE8_HANDLER( gladiatr_textram_w ); -WRITE8_HANDLER( gladiatr_paletteram_w ); -WRITE8_HANDLER( ppking_video_registers_w ); -WRITE8_HANDLER( gladiatr_video_registers_w ); -WRITE8_HANDLER( gladiatr_spritebuffer_w ); -WRITE8_HANDLER( gladiatr_spritebank_w ); VIDEO_START( ppking ); SCREEN_UPDATE_IND16( ppking ); VIDEO_START( gladiatr ); diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index c0321932f35..44ed3eeac69 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -28,13 +28,13 @@ public: DECLARE_WRITE16_MEMBER(clr_int_w); DECLARE_WRITE16_MEMBER(OKIM6295_bankswitch_w); DECLARE_WRITE16_MEMBER(glass_coin_w); + DECLARE_WRITE16_MEMBER(glass_blitter_w); + DECLARE_WRITE16_MEMBER(glass_vram_w); }; /*----------- defined in video/glass.c -----------*/ -WRITE16_HANDLER( glass_vram_w ); -WRITE16_HANDLER( glass_blitter_w ); VIDEO_START( glass ); SCREEN_UPDATE_IND16( glass ); diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index b1491315563..8f9e93dc996 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -29,16 +29,16 @@ public: DECLARE_WRITE8_MEMBER(gng_bankswitch_w); DECLARE_WRITE8_MEMBER(gng_coin_counter_w); DECLARE_READ8_MEMBER(diamond_hack_r); + DECLARE_WRITE8_MEMBER(gng_fgvideoram_w); + DECLARE_WRITE8_MEMBER(gng_bgvideoram_w); + DECLARE_WRITE8_MEMBER(gng_bgscrollx_w); + DECLARE_WRITE8_MEMBER(gng_bgscrolly_w); + DECLARE_WRITE8_MEMBER(gng_flipscreen_w); }; /*----------- defined in video/gng.c -----------*/ -WRITE8_HANDLER( gng_fgvideoram_w ); -WRITE8_HANDLER( gng_bgvideoram_w ); -WRITE8_HANDLER( gng_bgscrollx_w ); -WRITE8_HANDLER( gng_bgscrolly_w ); -WRITE8_HANDLER( gng_flipscreen_w ); VIDEO_START( gng ); SCREEN_UPDATE_IND16( gng ); diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index cd247b24cef..4a74bd0e3fd 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -34,6 +34,11 @@ public: DECLARE_WRITE16_MEMBER(goal92_sound_command_w); DECLARE_READ16_MEMBER(goal92_inputs_r); DECLARE_WRITE8_MEMBER(adpcm_data_w); + DECLARE_READ16_MEMBER(goal92_fg_bank_r); + DECLARE_WRITE16_MEMBER(goal92_fg_bank_w); + DECLARE_WRITE16_MEMBER(goal92_text_w); + DECLARE_WRITE16_MEMBER(goal92_background_w); + DECLARE_WRITE16_MEMBER(goal92_foreground_w); }; @@ -42,11 +47,6 @@ public: /*----------- defined in video/goal92.c -----------*/ -WRITE16_HANDLER( goal92_background_w ); -WRITE16_HANDLER( goal92_foreground_w ); -WRITE16_HANDLER( goal92_text_w ); -WRITE16_HANDLER( goal92_fg_bank_w ); -READ16_HANDLER( goal92_fg_bank_r ); VIDEO_START( goal92 ); SCREEN_UPDATE_IND16( goal92 ); diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index 91a778b740f..ddb5f6c517b 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -35,14 +35,14 @@ public: DECLARE_WRITE8_MEMBER(prot_fd99_w); DECLARE_WRITE8_MEMBER(prot_fc66_w); DECLARE_WRITE8_MEMBER(prot_fcb0_w); + DECLARE_WRITE8_MEMBER(goindol_fg_videoram_w); + DECLARE_WRITE8_MEMBER(goindol_bg_videoram_w); }; /*----------- defined in video/goindol.c -----------*/ -WRITE8_HANDLER( goindol_fg_videoram_w ); -WRITE8_HANDLER( goindol_bg_videoram_w ); VIDEO_START( goindol ); SCREEN_UPDATE_IND16( goindol ); diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index 1f732674114..495c33bbff4 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -68,26 +68,26 @@ public: DECLARE_READ8_MEMBER(fixedval74_r); DECLARE_READ8_MEMBER(fixedvale4_r); DECLARE_READ8_MEMBER(fixedvalc7_r); + DECLARE_WRITE8_MEMBER(cm_girl_scroll_w); + DECLARE_WRITE8_MEMBER(cm_outport0_w); + DECLARE_WRITE8_MEMBER(goldstar_fg_vidram_w); + DECLARE_WRITE8_MEMBER(goldstar_fg_atrram_w); + DECLARE_WRITE8_MEMBER(goldstar_reel1_ram_w); + DECLARE_WRITE8_MEMBER(goldstar_reel2_ram_w); + DECLARE_WRITE8_MEMBER(goldstar_reel3_ram_w); + DECLARE_WRITE8_MEMBER(unkch_reel1_attrram_w); + DECLARE_WRITE8_MEMBER(unkch_reel2_attrram_w); + DECLARE_WRITE8_MEMBER(unkch_reel3_attrram_w); + DECLARE_WRITE8_MEMBER(goldstar_fa00_w); + DECLARE_WRITE8_MEMBER(cm_background_col_w); }; /*----------- defined in video/goldstar.c -----------*/ -WRITE8_HANDLER( goldstar_reel1_ram_w ); -WRITE8_HANDLER( goldstar_reel2_ram_w ); -WRITE8_HANDLER( goldstar_reel3_ram_w ); -WRITE8_HANDLER( unkch_reel1_attrram_w ); -WRITE8_HANDLER( unkch_reel2_attrram_w ); -WRITE8_HANDLER( unkch_reel3_attrram_w ); -WRITE8_HANDLER( goldstar_fg_vidram_w ); -WRITE8_HANDLER( goldstar_fg_atrram_w ); -WRITE8_HANDLER( cm_girl_scroll_w ); -WRITE8_HANDLER( goldstar_fa00_w ); -WRITE8_HANDLER( cm_background_col_w ); -WRITE8_HANDLER( cm_outport0_w ); VIDEO_START( goldstar ); VIDEO_START( bingowng ); VIDEO_START( cherrym ); diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h index 431af90c774..7776818f704 100644 --- a/src/mame/includes/gomoku.h +++ b/src/mame/includes/gomoku.h @@ -14,6 +14,11 @@ public: tilemap_t *m_fg_tilemap; bitmap_ind16 m_bg_bitmap; DECLARE_READ8_MEMBER(input_port_r); + DECLARE_WRITE8_MEMBER(gomoku_videoram_w); + DECLARE_WRITE8_MEMBER(gomoku_colorram_w); + DECLARE_WRITE8_MEMBER(gomoku_bgram_w); + DECLARE_WRITE8_MEMBER(gomoku_flipscreen_w); + DECLARE_WRITE8_MEMBER(gomoku_bg_dispsw_w); }; @@ -31,8 +36,3 @@ PALETTE_INIT( gomoku ); VIDEO_START( gomoku ); SCREEN_UPDATE_IND16( gomoku ); -WRITE8_HANDLER( gomoku_videoram_w ); -WRITE8_HANDLER( gomoku_colorram_w ); -WRITE8_HANDLER( gomoku_bgram_w ); -WRITE8_HANDLER( gomoku_flipscreen_w ); -WRITE8_HANDLER( gomoku_bg_dispsw_w ); diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h index fa377ba033f..47aae31e859 100644 --- a/src/mame/includes/gotcha.h +++ b/src/mame/includes/gotcha.h @@ -27,6 +27,11 @@ public: /* devices */ device_t *m_audiocpu; DECLARE_WRITE16_MEMBER(gotcha_lamps_w); + DECLARE_WRITE16_MEMBER(gotcha_fgvideoram_w); + DECLARE_WRITE16_MEMBER(gotcha_bgvideoram_w); + DECLARE_WRITE16_MEMBER(gotcha_gfxbank_select_w); + DECLARE_WRITE16_MEMBER(gotcha_gfxbank_w); + DECLARE_WRITE16_MEMBER(gotcha_scroll_w); }; @@ -36,8 +41,3 @@ public: VIDEO_START( gotcha ); SCREEN_UPDATE_IND16( gotcha ); -WRITE16_HANDLER( gotcha_fgvideoram_w ); -WRITE16_HANDLER( gotcha_bgvideoram_w ); -WRITE16_HANDLER( gotcha_gfxbank_select_w ); -WRITE16_HANDLER( gotcha_gfxbank_w ); -WRITE16_HANDLER( gotcha_scroll_w ); diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index 7db22f33185..0a4fca58b02 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -248,16 +248,16 @@ public: DECLARE_WRITE8_MEMBER(laserdisc_select_w); DECLARE_WRITE8_MEMBER(laserdisc_command_w); DECLARE_WRITE8_MEMBER(gottlieb_sh_w); + DECLARE_WRITE8_MEMBER(gottlieb_paletteram_w); + DECLARE_WRITE8_MEMBER(gottlieb_video_control_w); + DECLARE_WRITE8_MEMBER(gottlieb_laserdisc_video_control_w); + DECLARE_WRITE8_MEMBER(gottlieb_videoram_w); + DECLARE_WRITE8_MEMBER(gottlieb_charram_w); }; /*----------- defined in video/gottlieb.c -----------*/ -extern WRITE8_HANDLER( gottlieb_videoram_w ); -extern WRITE8_HANDLER( gottlieb_charram_w ); -extern WRITE8_HANDLER( gottlieb_video_control_w ); -extern WRITE8_HANDLER( gottlieb_laserdisc_video_control_w ); -extern WRITE8_HANDLER( gottlieb_paletteram_w ); VIDEO_START( gottlieb ); VIDEO_START( screwloo ); diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index 9ef7c59ae24..f4a90ad8ba3 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -22,6 +22,9 @@ public: /* devices */ samples_device *m_samples; + DECLARE_WRITE8_MEMBER(gotya_videoram_w); + DECLARE_WRITE8_MEMBER(gotya_colorram_w); + DECLARE_WRITE8_MEMBER(gotya_video_control_w); }; @@ -32,9 +35,6 @@ WRITE8_HANDLER( gotya_soundlatch_w ); /*----------- defined in video/gotya.c -----------*/ -WRITE8_HANDLER( gotya_videoram_w ); -WRITE8_HANDLER( gotya_colorram_w ); -WRITE8_HANDLER( gotya_video_control_w ); PALETTE_INIT( gotya ); VIDEO_START( gotya ); diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h index 18eb210e6f8..9a01e7aa3fb 100644 --- a/src/mame/includes/gradius3.h +++ b/src/mame/includes/gradius3.h @@ -41,6 +41,8 @@ public: DECLARE_WRITE16_MEMBER(cpuB_irqtrigger_w); DECLARE_WRITE16_MEMBER(sound_command_w); DECLARE_WRITE16_MEMBER(sound_irq_w); + DECLARE_READ16_MEMBER(gradius3_gfxrom_r); + DECLARE_WRITE16_MEMBER(gradius3_gfxram_w); }; /*----------- defined in video/gradius3.c -----------*/ @@ -48,8 +50,6 @@ public: extern void gradius3_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask,int *shadow); extern void gradius3_tile_callback(running_machine &machine, int layer,int bank,int *code,int *color,int *flags,int *priority); -READ16_HANDLER( gradius3_gfxrom_r ); -WRITE16_HANDLER( gradius3_gfxram_w ); VIDEO_START( gradius3 ); SCREEN_UPDATE_IND16( gradius3 ); diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index c039f9de00d..b069e799bf5 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -50,6 +50,9 @@ public: DECLARE_WRITE8_MEMBER(main_to_sub_comm_w); DECLARE_READ8_MEMBER(main_to_sub_comm_r); UINT8 get_pc3259_bits(int offs); + DECLARE_WRITE8_MEMBER(grchamp_left_w); + DECLARE_WRITE8_MEMBER(grchamp_center_w); + DECLARE_WRITE8_MEMBER(grchamp_right_w); }; /* Discrete Sound Input Nodes */ @@ -72,6 +75,3 @@ DISCRETE_SOUND_EXTERN( grchamp ); PALETTE_INIT( grchamp ); VIDEO_START( grchamp ); SCREEN_UPDATE_RGB32( grchamp ); -WRITE8_HANDLER( grchamp_left_w ); -WRITE8_HANDLER( grchamp_center_w ); -WRITE8_HANDLER( grchamp_right_w ); diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h index 6c4cc5d9bea..4a8e83c6025 100644 --- a/src/mame/includes/gridlee.h +++ b/src/mame/includes/gridlee.h @@ -45,6 +45,9 @@ public: DECLARE_WRITE8_MEMBER(led_0_w); DECLARE_WRITE8_MEMBER(led_1_w); DECLARE_WRITE8_MEMBER(gridlee_coin_counter_w); + DECLARE_WRITE8_MEMBER(gridlee_cocktail_flip_w); + DECLARE_WRITE8_MEMBER(gridlee_videoram_w); + DECLARE_WRITE8_MEMBER(gridlee_palette_select_w); }; @@ -63,6 +66,3 @@ PALETTE_INIT( gridlee ); VIDEO_START( gridlee ); SCREEN_UPDATE_IND16( gridlee ); -WRITE8_HANDLER( gridlee_cocktail_flip_w ); -WRITE8_HANDLER( gridlee_videoram_w ); -WRITE8_HANDLER( gridlee_palette_select_w ); diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index 49fc4a7fd55..561c96e2524 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -72,17 +72,19 @@ public: DECLARE_READ16_MEMBER(twrldc94_prot_reg_r); DECLARE_READ16_MEMBER(vbl_toggle_r); DECLARE_WRITE16_MEMBER(vbl_toggle_w); + DECLARE_WRITE16_MEMBER(VS920A_0_vram_w); + DECLARE_WRITE16_MEMBER(VS920A_1_vram_w); + DECLARE_WRITE16_MEMBER(MB60553_0_regs_w); + DECLARE_WRITE16_MEMBER(MB60553_1_regs_w); + DECLARE_WRITE16_MEMBER(MB60553_0_vram_w); + DECLARE_WRITE16_MEMBER(MB60553_1_vram_w); + DECLARE_WRITE16_MEMBER(gsx_videoram3_w); + void MB60553_reg_written(int numchip, int num_reg); }; /*----------- defined in video/gstriker.c -----------*/ -WRITE16_HANDLER( VS920A_0_vram_w ); -WRITE16_HANDLER( VS920A_1_vram_w ); -WRITE16_HANDLER( MB60553_0_regs_w ); -WRITE16_HANDLER( MB60553_1_regs_w ); -WRITE16_HANDLER( MB60553_0_vram_w ); -WRITE16_HANDLER( MB60553_1_vram_w ); SCREEN_UPDATE_IND16( gstriker ); VIDEO_START( gstriker ); diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h index 87945f64284..e9eaa3aee44 100644 --- a/src/mame/includes/gsword.h +++ b/src/mame/includes/gsword.h @@ -19,15 +19,15 @@ public: int m_charpalbank; int m_flipscreen; tilemap_t *m_bg_tilemap; + DECLARE_WRITE8_MEMBER(gsword_videoram_w); + DECLARE_WRITE8_MEMBER(gsword_charbank_w); + DECLARE_WRITE8_MEMBER(gsword_videoctrl_w); + DECLARE_WRITE8_MEMBER(gsword_scroll_w); }; /*----------- defined in video/gsword.c -----------*/ -WRITE8_HANDLER( gsword_charbank_w ); -WRITE8_HANDLER( gsword_videoctrl_w ); -WRITE8_HANDLER( gsword_videoram_w ); -WRITE8_HANDLER( gsword_scroll_w ); PALETTE_INIT( josvolly ); PALETTE_INIT( gsword ); diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h index 53821b69fd3..094fbe39771 100644 --- a/src/mame/includes/gumbo.h +++ b/src/mame/includes/gumbo.h @@ -18,13 +18,13 @@ public: /* video-related */ tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; + DECLARE_WRITE16_MEMBER(gumbo_bg_videoram_w); + DECLARE_WRITE16_MEMBER(gumbo_fg_videoram_w); }; /*----------- defined in video/gumbo.c -----------*/ -WRITE16_HANDLER( gumbo_bg_videoram_w ); -WRITE16_HANDLER( gumbo_fg_videoram_w ); VIDEO_START( gumbo ); SCREEN_UPDATE_IND16( gumbo ); diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h index b6cd782cb35..10cfc3f7dc4 100644 --- a/src/mame/includes/gundealr.h +++ b/src/mame/includes/gundealr.h @@ -25,18 +25,18 @@ public: /* misc */ int m_input_ports_hack; DECLARE_WRITE8_MEMBER(yamyam_bankswitch_w); + DECLARE_WRITE8_MEMBER(gundealr_bg_videoram_w); + DECLARE_WRITE8_MEMBER(gundealr_fg_videoram_w); + DECLARE_WRITE8_MEMBER(gundealr_paletteram_w); + DECLARE_WRITE8_MEMBER(gundealr_fg_scroll_w); + DECLARE_WRITE8_MEMBER(yamyam_fg_scroll_w); + DECLARE_WRITE8_MEMBER(gundealr_flipscreen_w); }; /*----------- defined in video/gundealr.c -----------*/ -WRITE8_HANDLER( gundealr_paletteram_w ); -WRITE8_HANDLER( gundealr_bg_videoram_w ); -WRITE8_HANDLER( gundealr_fg_videoram_w ); -WRITE8_HANDLER( gundealr_fg_scroll_w ); -WRITE8_HANDLER( yamyam_fg_scroll_w ); -WRITE8_HANDLER( gundealr_flipscreen_w ); SCREEN_UPDATE_IND16( gundealr ); VIDEO_START( gundealr ); diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index 92211268998..578782d7dca 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -26,15 +26,15 @@ public: UINT8 m_bgon; UINT8 m_sprite3bank; DECLARE_READ8_MEMBER(gunsmoke_protection_r); + DECLARE_WRITE8_MEMBER(gunsmoke_videoram_w); + DECLARE_WRITE8_MEMBER(gunsmoke_colorram_w); + DECLARE_WRITE8_MEMBER(gunsmoke_c804_w); + DECLARE_WRITE8_MEMBER(gunsmoke_d806_w); }; /*----------- defined in video/gunsmoke.c -----------*/ -WRITE8_HANDLER( gunsmoke_c804_w ); -WRITE8_HANDLER( gunsmoke_d806_w ); -WRITE8_HANDLER( gunsmoke_videoram_w ); -WRITE8_HANDLER( gunsmoke_colorram_w ); PALETTE_INIT( gunsmoke ); VIDEO_START( gunsmoke ); diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index 9aabfa001f3..7f5e7a2f64e 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -30,13 +30,13 @@ public: DECLARE_WRITE8_MEMBER(gyruss_i8039_irq_w); DECLARE_WRITE8_MEMBER(master_nmi_mask_w); DECLARE_WRITE8_MEMBER(slave_irq_mask_w); + DECLARE_WRITE8_MEMBER(gyruss_spriteram_w); + DECLARE_READ8_MEMBER(gyruss_scanline_r); }; /*----------- defined in video/gyruss.c -----------*/ -WRITE8_HANDLER( gyruss_spriteram_w ); -READ8_HANDLER( gyruss_scanline_r ); PALETTE_INIT( gyruss ); VIDEO_START( gyruss ); diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h index 8666a2ef2de..627f0f81a30 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -21,13 +21,13 @@ public: int m_mux; DECLARE_READ8_MEMBER(hanaawas_input_port_0_r); DECLARE_WRITE8_MEMBER(hanaawas_inputs_mux_w); + DECLARE_WRITE8_MEMBER(hanaawas_videoram_w); + DECLARE_WRITE8_MEMBER(hanaawas_colorram_w); }; /*----------- defined in video/hanaawas.c -----------*/ -WRITE8_HANDLER( hanaawas_videoram_w ); -WRITE8_HANDLER( hanaawas_colorram_w ); WRITE8_DEVICE_HANDLER( hanaawas_portB_w ); PALETTE_INIT( hanaawas ); diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index 5b7dd4aa36e..c0019aea02d 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -38,17 +38,17 @@ public: DECLARE_WRITE8_MEMBER(hcastle_bankswitch_w); DECLARE_WRITE8_MEMBER(hcastle_soundirq_w); DECLARE_WRITE8_MEMBER(hcastle_coin_w); + DECLARE_WRITE8_MEMBER(hcastle_pf1_video_w); + DECLARE_WRITE8_MEMBER(hcastle_pf2_video_w); + DECLARE_WRITE8_MEMBER(hcastle_gfxbank_w); + DECLARE_READ8_MEMBER(hcastle_gfxbank_r); + DECLARE_WRITE8_MEMBER(hcastle_pf1_control_w); + DECLARE_WRITE8_MEMBER(hcastle_pf2_control_w); }; /*----------- defined in video/hcastle.c -----------*/ -WRITE8_HANDLER( hcastle_pf1_video_w ); -WRITE8_HANDLER( hcastle_pf2_video_w ); -READ8_HANDLER( hcastle_gfxbank_r ); -WRITE8_HANDLER( hcastle_gfxbank_w ); -WRITE8_HANDLER( hcastle_pf1_control_w ); -WRITE8_HANDLER( hcastle_pf2_control_w ); PALETTE_INIT( hcastle ); SCREEN_UPDATE_IND16( hcastle ); diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h index da9c864e9f8..ed2b7671d79 100644 --- a/src/mame/includes/hexion.h +++ b/src/mame/includes/hexion.h @@ -12,6 +12,11 @@ public: int m_gfxrom_select; tilemap_t *m_bg_tilemap[2]; DECLARE_WRITE8_MEMBER(coincntr_w); + DECLARE_WRITE8_MEMBER(hexion_bankswitch_w); + DECLARE_READ8_MEMBER(hexion_bankedram_r); + DECLARE_WRITE8_MEMBER(hexion_bankedram_w); + DECLARE_WRITE8_MEMBER(hexion_bankctrl_w); + DECLARE_WRITE8_MEMBER(hexion_gfxrom_select_w); }; @@ -20,8 +25,3 @@ public: VIDEO_START( hexion ); SCREEN_UPDATE_IND16( hexion ); -WRITE8_HANDLER( hexion_bankswitch_w ); -READ8_HANDLER( hexion_bankedram_r ); -WRITE8_HANDLER( hexion_bankedram_w ); -WRITE8_HANDLER( hexion_bankctrl_w ); -WRITE8_HANDLER( hexion_gfxrom_select_w ); diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index 4b3508c7957..29382d80638 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -18,14 +18,14 @@ public: /* video-related */ tilemap_t *m_bg_tilemap; + DECLARE_WRITE8_MEMBER(higemaru_videoram_w); + DECLARE_WRITE8_MEMBER(higemaru_colorram_w); + DECLARE_WRITE8_MEMBER(higemaru_c800_w); }; /*----------- defined in video/higemaru.c -----------*/ -WRITE8_HANDLER( higemaru_videoram_w ); -WRITE8_HANDLER( higemaru_colorram_w ); -WRITE8_HANDLER( higemaru_c800_w ); PALETTE_INIT( higemaru ); VIDEO_START( higemaru ); diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index 1a1db1c8c19..48b77eb9127 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -24,6 +24,9 @@ public: device_t *m_subcpu; DECLARE_WRITE8_MEMBER(himesiki_rombank_w); DECLARE_WRITE8_MEMBER(himesiki_sound_w); + DECLARE_WRITE8_MEMBER(himesiki_bg_ram_w); + DECLARE_WRITE8_MEMBER(himesiki_scrollx_w); + DECLARE_WRITE8_MEMBER(himesiki_flip_w); }; @@ -32,6 +35,3 @@ public: VIDEO_START( himesiki ); SCREEN_UPDATE_IND16( himesiki ); -WRITE8_HANDLER( himesiki_bg_ram_w ); -WRITE8_HANDLER( himesiki_scrollx_w ); -WRITE8_HANDLER( himesiki_flip_w ); diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h index d77eaa910aa..c69392ef3f9 100644 --- a/src/mame/includes/hnayayoi.h +++ b/src/mame/includes/hnayayoi.h @@ -23,6 +23,10 @@ public: DECLARE_READ8_MEMBER(keyboard_0_r); DECLARE_READ8_MEMBER(keyboard_1_r); DECLARE_WRITE8_MEMBER(keyboard_w); + DECLARE_WRITE8_MEMBER(dynax_blitter_rev1_param_w); + DECLARE_WRITE8_MEMBER(dynax_blitter_rev1_start_w); + DECLARE_WRITE8_MEMBER(dynax_blitter_rev1_clear_w); + DECLARE_WRITE8_MEMBER(hnayayoi_palbank_w); }; @@ -32,7 +36,3 @@ VIDEO_START( hnayayoi ); VIDEO_START( untoucha ); SCREEN_UPDATE_IND16( hnayayoi ); -WRITE8_HANDLER( dynax_blitter_rev1_param_w ); -WRITE8_HANDLER( dynax_blitter_rev1_start_w ); -WRITE8_HANDLER( dynax_blitter_rev1_clear_w ); -WRITE8_HANDLER( hnayayoi_palbank_w ); diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index 7377bed2e28..32a84fa225f 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -133,12 +133,12 @@ public: DECLARE_WRITE32_MEMBER(activate_3d_buffer); DECLARE_READ8_MEMBER(hng64_comm_shared_r); DECLARE_WRITE8_MEMBER(hng64_comm_shared_w); + DECLARE_WRITE32_MEMBER(hng64_videoram_w); }; /*----------- defined in video/hng64.c -----------*/ -WRITE32_HANDLER( hng64_videoram_w ); void hng64_command3d(running_machine& machine, const UINT16* packet); VIDEO_START( hng64 ); diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index 9cfba256f37..98c7fe37fae 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -21,6 +21,11 @@ public: tilemap_t *m_bg_tilemap; int m_palette_offset; int m_po[2]; + DECLARE_WRITE8_MEMBER(holeland_videoram_w); + DECLARE_WRITE8_MEMBER(holeland_colorram_w); + DECLARE_WRITE8_MEMBER(holeland_pal_offs_w); + DECLARE_WRITE8_MEMBER(holeland_scroll_w); + DECLARE_WRITE8_MEMBER(holeland_flipscreen_w); }; @@ -31,8 +36,3 @@ VIDEO_START( crzrally ); SCREEN_UPDATE_IND16( holeland ); SCREEN_UPDATE_IND16( crzrally ); -WRITE8_HANDLER( holeland_videoram_w ); -WRITE8_HANDLER( holeland_colorram_w ); -WRITE8_HANDLER( holeland_flipscreen_w ); -WRITE8_HANDLER( holeland_pal_offs_w ); -WRITE8_HANDLER( holeland_scroll_w ); diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index 0fd376fdd1b..8b1ebf6b8ba 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -61,23 +61,23 @@ public: DECLARE_WRITE8_MEMBER(bankswitch_w); DECLARE_READ8_MEMBER(mirderby_prot_r); DECLARE_WRITE8_MEMBER(mirderby_prot_w); + DECLARE_WRITE8_MEMBER(mrokumei_videoram_w); + DECLARE_WRITE8_MEMBER(reikaids_videoram_w); + DECLARE_WRITE8_MEMBER(reikaids_gfx_bank_w); + DECLARE_WRITE8_MEMBER(pteacher_gfx_bank_w); + DECLARE_WRITE8_MEMBER(homedata_blitter_param_w); + DECLARE_WRITE8_MEMBER(mrokumei_blitter_bank_w); + DECLARE_WRITE8_MEMBER(reikaids_blitter_bank_w); + DECLARE_WRITE8_MEMBER(pteacher_blitter_bank_w); + DECLARE_WRITE8_MEMBER(mrokumei_blitter_start_w); + DECLARE_WRITE8_MEMBER(reikaids_blitter_start_w); + DECLARE_WRITE8_MEMBER(pteacher_blitter_start_w); }; /*----------- defined in video/homedata.c -----------*/ -WRITE8_HANDLER( mrokumei_videoram_w ); -WRITE8_HANDLER( reikaids_videoram_w ); -WRITE8_HANDLER( reikaids_gfx_bank_w ); -WRITE8_HANDLER( pteacher_gfx_bank_w ); -WRITE8_HANDLER( homedata_blitter_param_w ); -WRITE8_HANDLER( mrokumei_blitter_bank_w ); -WRITE8_HANDLER( reikaids_blitter_bank_w ); -WRITE8_HANDLER( pteacher_blitter_bank_w ); -WRITE8_HANDLER( mrokumei_blitter_start_w ); -WRITE8_HANDLER( reikaids_blitter_start_w ); -WRITE8_HANDLER( pteacher_blitter_start_w ); PALETTE_INIT( mrokumei ); PALETTE_INIT( reikaids ); diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index 2c31a799dfa..0dc237015e7 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -25,13 +25,13 @@ public: int m_xpc; int m_gc_up; int m_gc_down; + DECLARE_WRITE8_MEMBER(homerun_videoram_w); + DECLARE_WRITE8_MEMBER(homerun_color_w); }; /*----------- defined in video/homerun.c -----------*/ -WRITE8_HANDLER( homerun_videoram_w ); -WRITE8_HANDLER( homerun_color_w ); WRITE8_DEVICE_HANDLER( homerun_banking_w ); VIDEO_START(homerun); diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h index 87416719f6f..8bc03854337 100644 --- a/src/mame/includes/hyhoo.h +++ b/src/mame/includes/hyhoo.h @@ -17,6 +17,8 @@ public: int m_highcolorflag; int m_flipscreen; bitmap_rgb32 m_tmpbitmap; + DECLARE_WRITE8_MEMBER(hyhoo_blitter_w); + DECLARE_WRITE8_MEMBER(hyhoo_romsel_w); }; @@ -25,5 +27,3 @@ public: SCREEN_UPDATE_RGB32( hyhoo ); VIDEO_START( hyhoo ); -WRITE8_HANDLER( hyhoo_blitter_w ); -WRITE8_HANDLER( hyhoo_romsel_w ); diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h index 7ee7130c040..f73e79a4bef 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -20,13 +20,13 @@ public: UINT8 m_irq_mask; DECLARE_WRITE8_MEMBER(hyperspt_coin_counter_w); DECLARE_WRITE8_MEMBER(irq_mask_w); + DECLARE_WRITE8_MEMBER(hyperspt_videoram_w); + DECLARE_WRITE8_MEMBER(hyperspt_colorram_w); + DECLARE_WRITE8_MEMBER(hyperspt_flipscreen_w); }; /*----------- defined in video/hyperspt.c -----------*/ -WRITE8_HANDLER( hyperspt_videoram_w ); -WRITE8_HANDLER( hyperspt_colorram_w ); -WRITE8_HANDLER( hyperspt_flipscreen_w ); PALETTE_INIT( hyperspt ); VIDEO_START( hyperspt ); diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index 5d23b5a37ee..4836c701546 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -57,6 +57,14 @@ public: DECLARE_WRITE16_MEMBER(hyprduel_cpusync_trigger2_w); DECLARE_READ16_MEMBER(hyprduel_bankedrom_r); DECLARE_WRITE16_MEMBER(hyprduel_blitter_w); + DECLARE_WRITE16_MEMBER(hyprduel_paletteram_w); + DECLARE_WRITE16_MEMBER(hyprduel_vram_0_w); + DECLARE_WRITE16_MEMBER(hyprduel_vram_1_w); + DECLARE_WRITE16_MEMBER(hyprduel_vram_2_w); + DECLARE_WRITE16_MEMBER(hyprduel_window_w); + DECLARE_WRITE16_MEMBER(hyprduel_scrollreg_w); + DECLARE_WRITE16_MEMBER(hyprduel_scrollreg_init_w); + void blt_write( address_space *space, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask ); }; @@ -64,13 +72,6 @@ public: /*----------- defined in video/hyprduel.c -----------*/ -WRITE16_HANDLER( hyprduel_paletteram_w ); -WRITE16_HANDLER( hyprduel_window_w ); -WRITE16_HANDLER( hyprduel_vram_0_w ); -WRITE16_HANDLER( hyprduel_vram_1_w ); -WRITE16_HANDLER( hyprduel_vram_2_w ); -WRITE16_HANDLER( hyprduel_scrollreg_w ); -WRITE16_HANDLER( hyprduel_scrollreg_init_w ); VIDEO_START( hyprduel_14220 ); VIDEO_START( magerror_14220 ); diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index 888ea74c5d8..4d03bd0ab3b 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -30,12 +30,12 @@ public: required_device<cpu_device> m_subcpu; DECLARE_READ8_MEMBER(ikki_e000_r); DECLARE_WRITE8_MEMBER(ikki_coin_counters); + DECLARE_WRITE8_MEMBER(ikki_scrn_ctrl_w); }; /*----------- defined in video/ikki.c -----------*/ -WRITE8_HANDLER( ikki_scrn_ctrl_w ); PALETTE_INIT( ikki ); VIDEO_START( ikki ); diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index 622833c7dd8..c56fb17c16a 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -33,17 +33,17 @@ public: DECLARE_WRITE16_MEMBER(inufuku_soundcommand_w); DECLARE_WRITE8_MEMBER(pending_command_clear_w); DECLARE_WRITE8_MEMBER(inufuku_soundrombank_w); + DECLARE_WRITE16_MEMBER(inufuku_palettereg_w); + DECLARE_WRITE16_MEMBER(inufuku_scrollreg_w); + DECLARE_READ16_MEMBER(inufuku_bg_videoram_r); + DECLARE_WRITE16_MEMBER(inufuku_bg_videoram_w); + DECLARE_READ16_MEMBER(inufuku_tx_videoram_r); + DECLARE_WRITE16_MEMBER(inufuku_tx_videoram_w); }; /*----------- defined in video/inufuku.c -----------*/ -READ16_HANDLER( inufuku_bg_videoram_r ); -WRITE16_HANDLER( inufuku_bg_videoram_w ); -READ16_HANDLER( inufuku_tx_videoram_r ); -WRITE16_HANDLER( inufuku_tx_videoram_w ); -WRITE16_HANDLER( inufuku_palettereg_w ); -WRITE16_HANDLER( inufuku_scrollreg_w ); SCREEN_UPDATE_IND16( inufuku ); VIDEO_START( inufuku ); diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h index 44460dd0729..63a0c0f595f 100644 --- a/src/mame/includes/iqblock.h +++ b/src/mame/includes/iqblock.h @@ -19,15 +19,15 @@ public: DECLARE_WRITE8_MEMBER(grndtour_prot_w); DECLARE_WRITE8_MEMBER(iqblock_irqack_w); DECLARE_READ8_MEMBER(extrarom_r); + DECLARE_WRITE8_MEMBER(iqblock_fgvideoram_w); + DECLARE_WRITE8_MEMBER(iqblock_bgvideoram_w); + DECLARE_READ8_MEMBER(iqblock_bgvideoram_r); + DECLARE_WRITE8_MEMBER(iqblock_fgscroll_w); }; /*----------- defined in video/iqblock.c -----------*/ -WRITE8_HANDLER( iqblock_fgvideoram_w ); -WRITE8_HANDLER( iqblock_bgvideoram_w ); -READ8_HANDLER( iqblock_bgvideoram_r ); -WRITE8_HANDLER( iqblock_fgscroll_w ); VIDEO_START( iqblock ); SCREEN_UPDATE_IND16( iqblock ); diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index 6b63ebca34c..ad9837fe3ab 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -63,6 +63,15 @@ public: DECLARE_WRITE8_MEMBER(irobot_nvram_w); DECLARE_WRITE8_MEMBER(irobot_clearirq_w); DECLARE_WRITE8_MEMBER(irobot_clearfirq_w); + DECLARE_READ8_MEMBER(irobot_sharedmem_r); + DECLARE_WRITE8_MEMBER(irobot_sharedmem_w); + DECLARE_WRITE8_MEMBER(irobot_statwr_w); + DECLARE_WRITE8_MEMBER(irobot_out0_w); + DECLARE_WRITE8_MEMBER(irobot_rom_banksel_w); + DECLARE_WRITE8_MEMBER(irobot_control_w); + DECLARE_READ8_MEMBER(irobot_control_r); + DECLARE_READ8_MEMBER(irobot_status_r); + DECLARE_WRITE8_MEMBER(irobot_paletteram_w); }; /*----------- defined in machine/irobot.c -----------*/ @@ -73,14 +82,6 @@ MACHINE_RESET( irobot ); TIMER_DEVICE_CALLBACK( irobot_irvg_done_callback ); TIMER_DEVICE_CALLBACK( irobot_irmb_done_callback ); -READ8_HANDLER( irobot_status_r ); -WRITE8_HANDLER( irobot_statwr_w ); -WRITE8_HANDLER( irobot_out0_w ); -WRITE8_HANDLER( irobot_rom_banksel_w ); -READ8_HANDLER( irobot_control_r ); -WRITE8_HANDLER( irobot_control_w ); -READ8_HANDLER( irobot_sharedmem_r ); -WRITE8_HANDLER( irobot_sharedmem_w ); /*----------- defined in video/irobot.c -----------*/ @@ -89,7 +90,6 @@ PALETTE_INIT( irobot ); VIDEO_START( irobot ); SCREEN_UPDATE_IND16( irobot ); -WRITE8_HANDLER( irobot_paletteram_w ); void irobot_poly_clear(running_machine &machine); void irobot_run_video(running_machine &machine); diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index 90e87397918..c87d83ff4eb 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -29,16 +29,16 @@ public: device_t *m_maincpu; device_t *m_soundcpu; DECLARE_WRITE8_MEMBER(ironhors_sh_irqtrigger_w); + DECLARE_WRITE8_MEMBER(ironhors_videoram_w); + DECLARE_WRITE8_MEMBER(ironhors_colorram_w); + DECLARE_WRITE8_MEMBER(ironhors_charbank_w); + DECLARE_WRITE8_MEMBER(ironhors_palettebank_w); + DECLARE_WRITE8_MEMBER(ironhors_flipscreen_w); }; /*----------- defined in video/ironhors.c -----------*/ -WRITE8_HANDLER( ironhors_videoram_w ); -WRITE8_HANDLER( ironhors_colorram_w ); -WRITE8_HANDLER( ironhors_palettebank_w ); -WRITE8_HANDLER( ironhors_charbank_w ); -WRITE8_HANDLER( ironhors_flipscreen_w ); PALETTE_INIT( ironhors ); VIDEO_START( ironhors ); diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index 9047793a4bf..fa6d18ca876 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -102,6 +102,27 @@ public: DECLARE_WRITE32_MEMBER(test1_w); DECLARE_READ32_MEMBER(test2_r); DECLARE_WRITE32_MEMBER(test2_w); + DECLARE_WRITE16_MEMBER(timekill_colora_w); + DECLARE_WRITE16_MEMBER(timekill_colorbc_w); + DECLARE_WRITE16_MEMBER(timekill_intensity_w); + DECLARE_WRITE16_MEMBER(bloodstm_color1_w); + DECLARE_WRITE16_MEMBER(bloodstm_color2_w); + DECLARE_WRITE16_MEMBER(bloodstm_plane_w); + DECLARE_WRITE32_MEMBER(drivedge_color0_w); + DECLARE_WRITE32_MEMBER(itech020_color1_w); + DECLARE_WRITE32_MEMBER(itech020_color2_w); + DECLARE_WRITE32_MEMBER(itech020_plane_w); + DECLARE_WRITE16_MEMBER(timekill_paletteram_w); + DECLARE_WRITE16_MEMBER(bloodstm_paletteram_w); + DECLARE_WRITE32_MEMBER(drivedge_paletteram_w); + DECLARE_WRITE32_MEMBER(itech020_paletteram_w); + DECLARE_WRITE16_MEMBER(itech32_video_w); + DECLARE_READ16_MEMBER(itech32_video_r); + DECLARE_WRITE16_MEMBER(bloodstm_video_w); + DECLARE_READ16_MEMBER(bloodstm_video_r); + DECLARE_WRITE32_MEMBER(itech020_video_w); + DECLARE_WRITE32_MEMBER(drivedge_zbuf_control_w); + DECLARE_READ32_MEMBER(itech020_video_r); }; @@ -114,32 +135,11 @@ void itech32_update_interrupts(running_machine &machine, int vint, int xint, int VIDEO_START( itech32 ); -WRITE16_HANDLER( timekill_colora_w ); -WRITE16_HANDLER( timekill_colorbc_w ); -WRITE16_HANDLER( timekill_intensity_w ); -WRITE16_HANDLER( bloodstm_color1_w ); -WRITE16_HANDLER( bloodstm_color2_w ); -WRITE16_HANDLER( bloodstm_plane_w ); -WRITE32_HANDLER( drivedge_color0_w ); -WRITE32_HANDLER( itech020_color1_w ); -WRITE32_HANDLER( itech020_color2_w ); -WRITE32_HANDLER( itech020_plane_w ); -WRITE16_HANDLER( timekill_paletteram_w ); -WRITE16_HANDLER( bloodstm_paletteram_w ); -WRITE32_HANDLER( drivedge_paletteram_w ); -WRITE32_HANDLER( itech020_paletteram_w ); -WRITE16_HANDLER( itech32_video_w ); -READ16_HANDLER( itech32_video_r ); -WRITE16_HANDLER( bloodstm_video_w ); -READ16_HANDLER( bloodstm_video_r ); -WRITE32_HANDLER( itech020_video_w ); -READ32_HANDLER( itech020_video_r ); -WRITE32_HANDLER( drivedge_zbuf_control_w ); SCREEN_UPDATE_IND16( itech32 ); diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index 11aafb2fb84..5e6e16c5c2f 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -63,6 +63,14 @@ public: DECLARE_WRITE16_MEMBER(grom_bank16_w); DECLARE_WRITE16_MEMBER(display_page16_w); DECLARE_WRITE16_MEMBER(palette16_w); + DECLARE_WRITE8_MEMBER(itech8_palette_w); + DECLARE_WRITE8_MEMBER(itech8_page_w); + DECLARE_READ8_MEMBER(itech8_blitter_r); + DECLARE_WRITE8_MEMBER(itech8_blitter_w); + DECLARE_WRITE8_MEMBER(itech8_tms34061_w); + DECLARE_READ8_MEMBER(itech8_tms34061_r); + DECLARE_WRITE8_MEMBER(grmatch_palette_w); + DECLARE_WRITE8_MEMBER(grmatch_xscroll_w); }; @@ -88,18 +96,10 @@ SCREEN_UPDATE_RGB32( slikshot ); VIDEO_START( itech8 ); -WRITE8_HANDLER( itech8_page_w ); -WRITE8_HANDLER( itech8_palette_w ); -READ8_HANDLER( itech8_blitter_r ); -WRITE8_HANDLER( itech8_blitter_w ); -WRITE8_HANDLER( itech8_tms34061_w ); -READ8_HANDLER( itech8_tms34061_r ); -WRITE8_HANDLER( grmatch_palette_w ); -WRITE8_HANDLER( grmatch_xscroll_w ); TIMER_DEVICE_CALLBACK( grmatch_palette_update ); SCREEN_UPDATE_RGB32( itech8_2layer ); diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index 6f3b2d96c03..2d175685656 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -33,16 +33,16 @@ public: DECLARE_WRITE8_MEMBER(jack_sh_command_w); DECLARE_WRITE8_MEMBER(joinem_misc_w); DECLARE_READ8_MEMBER(striv_question_r); + DECLARE_WRITE8_MEMBER(jack_videoram_w); + DECLARE_WRITE8_MEMBER(jack_colorram_w); + DECLARE_WRITE8_MEMBER(jack_paletteram_w); + DECLARE_READ8_MEMBER(jack_flipscreen_r); + DECLARE_WRITE8_MEMBER(jack_flipscreen_w); }; /*----------- defined in video/jack.c -----------*/ -WRITE8_HANDLER( jack_videoram_w ); -WRITE8_HANDLER( jack_colorram_w ); -WRITE8_HANDLER( jack_paletteram_w ); -READ8_HANDLER( jack_flipscreen_r ); -WRITE8_HANDLER( jack_flipscreen_w ); VIDEO_START( jack ); SCREEN_UPDATE_IND16( jack ); diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index 19425e039ae..f789a9e137f 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -28,13 +28,13 @@ public: UINT8 m_irq_enable; UINT8 m_nmi_enable; DECLARE_WRITE8_MEMBER(ctrl_w); + DECLARE_WRITE8_MEMBER(jailbrek_videoram_w); + DECLARE_WRITE8_MEMBER(jailbrek_colorram_w); }; /*----------- defined in video/jailbrek.c -----------*/ -WRITE8_HANDLER( jailbrek_videoram_w ); -WRITE8_HANDLER( jailbrek_colorram_w ); PALETTE_INIT( jailbrek ); VIDEO_START( jailbrek ); diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h index 3aceec252eb..1fb5f4cda1c 100644 --- a/src/mame/includes/jedi.h +++ b/src/mame/includes/jedi.h @@ -52,6 +52,8 @@ public: DECLARE_WRITE8_MEMBER(jedi_coin_counter_w); DECLARE_WRITE8_MEMBER(nvram_data_w); DECLARE_WRITE8_MEMBER(nvram_enable_w); + DECLARE_WRITE8_MEMBER(jedi_vscroll_w); + DECLARE_WRITE8_MEMBER(jedi_hscroll_w); }; @@ -69,5 +71,3 @@ CUSTOM_INPUT( jedi_audio_comm_stat_r ); MACHINE_CONFIG_EXTERN( jedi_video ); -WRITE8_HANDLER( jedi_vscroll_w ); -WRITE8_HANDLER( jedi_hscroll_w ); diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h index c3924878d34..d4a3eb1e933 100644 --- a/src/mame/includes/jpmimpct.h +++ b/src/mame/includes/jpmimpct.h @@ -90,13 +90,13 @@ public: DECLARE_WRITE16_MEMBER(jpmioawp_w); DECLARE_READ16_MEMBER(ump_r); void jpm_draw_lamps(int data, int lamp_strobe); + DECLARE_WRITE16_MEMBER(jpmimpct_bt477_w); + DECLARE_READ16_MEMBER(jpmimpct_bt477_r); }; /*----------- defined in video/jpmimpct.c -----------*/ -READ16_HANDLER( jpmimpct_bt477_r ); -WRITE16_HANDLER( jpmimpct_bt477_w ); void jpmimpct_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg); void jpmimpct_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg); diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h index d8201c3770b..d85b830a946 100644 --- a/src/mame/includes/kaneko16.h +++ b/src/mame/includes/kaneko16.h @@ -120,30 +120,47 @@ public: DECLARE_READ16_MEMBER(gtmr2_IN1_r); DECLARE_WRITE16_MEMBER(shogwarr_oki_bank_w); DECLARE_WRITE16_MEMBER(brapboys_oki_bank_w); + DECLARE_READ16_MEMBER(galpanib_calc_r); + DECLARE_WRITE16_MEMBER(galpanib_calc_w); + DECLARE_WRITE16_MEMBER(bloodwar_calc_w); + DECLARE_READ16_MEMBER(bloodwar_calc_r); + DECLARE_WRITE16_MEMBER(calc3_mcu_ram_w); + DECLARE_WRITE16_MEMBER(calc3_mcu_com0_w); + DECLARE_WRITE16_MEMBER(calc3_mcu_com1_w); + DECLARE_WRITE16_MEMBER(calc3_mcu_com2_w); + DECLARE_WRITE16_MEMBER(calc3_mcu_com3_w); + DECLARE_WRITE16_MEMBER(toybox_mcu_com0_w); + DECLARE_WRITE16_MEMBER(toybox_mcu_com1_w); + DECLARE_WRITE16_MEMBER(toybox_mcu_com2_w); + DECLARE_WRITE16_MEMBER(toybox_mcu_com3_w); + DECLARE_READ16_MEMBER(toybox_mcu_status_r); + void calc3_mcu_com_w(offs_t offset, UINT16 data, UINT16 mem_mask, int _n_); + void toybox_mcu_com_w(offs_t offset, UINT16 data, UINT16 mem_mask, int _n_); + DECLARE_WRITE16_MEMBER(shogwarr_calc_w); + DECLARE_READ16_MEMBER(shogwarr_calc_r); + DECLARE_WRITE16_MEMBER(kaneko16_display_enable); + DECLARE_WRITE16_MEMBER(kaneko16_vram_0_w); + DECLARE_WRITE16_MEMBER(kaneko16_vram_1_w); + DECLARE_WRITE16_MEMBER(kaneko16_vram_2_w); + DECLARE_WRITE16_MEMBER(kaneko16_vram_3_w); + DECLARE_READ16_MEMBER(kaneko16_sprites_regs_r); + DECLARE_WRITE16_MEMBER(kaneko16_sprites_regs_w); + DECLARE_WRITE16_MEMBER(kaneko16_layers_0_regs_w); + DECLARE_WRITE16_MEMBER(kaneko16_layers_1_regs_w); + DECLARE_READ16_MEMBER(kaneko16_bg15_select_r); + DECLARE_WRITE16_MEMBER(kaneko16_bg15_select_w); + DECLARE_READ16_MEMBER(kaneko16_bg15_reg_r); + DECLARE_WRITE16_MEMBER(kaneko16_bg15_reg_w); }; /*----------- defined in machine/kaneko16.c -----------*/ -READ16_HANDLER( galpanib_calc_r ); -WRITE16_HANDLER( galpanib_calc_w ); -READ16_HANDLER( bloodwar_calc_r ); -WRITE16_HANDLER( bloodwar_calc_w ); void calc3_mcu_init(running_machine &machine); -WRITE16_HANDLER( calc3_mcu_ram_w ); -WRITE16_HANDLER( calc3_mcu_com0_w ); -WRITE16_HANDLER( calc3_mcu_com1_w ); -WRITE16_HANDLER( calc3_mcu_com2_w ); -WRITE16_HANDLER( calc3_mcu_com3_w ); void toybox_mcu_init(running_machine &machine); -WRITE16_HANDLER( toybox_mcu_com0_w ); -WRITE16_HANDLER( toybox_mcu_com1_w ); -WRITE16_HANDLER( toybox_mcu_com2_w ); -WRITE16_HANDLER( toybox_mcu_com3_w ); -READ16_HANDLER( toybox_mcu_status_r ); void bloodwar_mcu_run(running_machine &machine); void bonkadv_mcu_run(running_machine &machine); @@ -164,26 +181,13 @@ MACHINE_RESET( kaneko16 ); /*----------- defined in video/kaneko16.c -----------*/ -WRITE16_HANDLER( kaneko16_display_enable ); -WRITE16_HANDLER( kaneko16_vram_0_w ); -WRITE16_HANDLER( kaneko16_vram_1_w ); -WRITE16_HANDLER( kaneko16_vram_2_w ); -WRITE16_HANDLER( kaneko16_vram_3_w ); -WRITE16_HANDLER( kaneko16_layers_0_regs_w ); -WRITE16_HANDLER( kaneko16_layers_1_regs_w ); -READ16_HANDLER ( kaneko16_sprites_regs_r ); -WRITE16_HANDLER( kaneko16_sprites_regs_w ); void kaneko16_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect); -READ16_HANDLER ( kaneko16_bg15_select_r ); -WRITE16_HANDLER( kaneko16_bg15_select_w ); -READ16_HANDLER ( kaneko16_bg15_reg_r ); -WRITE16_HANDLER( kaneko16_bg15_reg_w ); PALETTE_INIT( berlwall ); diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h index 7e469f1d167..5846cd11518 100644 --- a/src/mame/includes/kangaroo.h +++ b/src/mame/includes/kangaroo.h @@ -23,6 +23,8 @@ public: DECLARE_READ8_MEMBER(mcu_sim_r); DECLARE_WRITE8_MEMBER(mcu_sim_w); DECLARE_WRITE8_MEMBER(kangaroo_coin_counter_w); + DECLARE_WRITE8_MEMBER(kangaroo_videoram_w); + DECLARE_WRITE8_MEMBER(kangaroo_video_control_w); }; @@ -33,5 +35,3 @@ public: VIDEO_START( kangaroo ); SCREEN_UPDATE_RGB32( kangaroo ); -WRITE8_HANDLER( kangaroo_videoram_w ); -WRITE8_HANDLER( kangaroo_video_control_w ); diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index 581cf3b6d81..41c21221b26 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -40,6 +40,8 @@ public: required_device<buffered_spriteram16_device> m_spriteram; DECLARE_WRITE16_MEMBER(karnov_control_w); DECLARE_READ16_MEMBER(karnov_control_r); + DECLARE_WRITE16_MEMBER(karnov_videoram_w); + DECLARE_WRITE16_MEMBER(karnov_playfield_swap_w); }; enum { @@ -54,8 +56,6 @@ enum { /*----------- defined in video/karnov.c -----------*/ -WRITE16_HANDLER( karnov_playfield_swap_w ); -WRITE16_HANDLER( karnov_videoram_w ); void karnov_flipscreen_w(running_machine &machine, int data); diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index cd771829ddc..f2c1c53ff14 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -34,14 +34,14 @@ public: DECLARE_WRITE8_MEMBER(sound_msm_w); DECLARE_READ8_MEMBER(sound_reset_r); DECLARE_WRITE8_MEMBER(kc_sound_control_w); + DECLARE_WRITE8_MEMBER(kchamp_videoram_w); + DECLARE_WRITE8_MEMBER(kchamp_colorram_w); + DECLARE_WRITE8_MEMBER(kchamp_flipscreen_w); }; /*----------- defined in video/kchamp.c -----------*/ -WRITE8_HANDLER( kchamp_videoram_w ); -WRITE8_HANDLER( kchamp_colorram_w ); -WRITE8_HANDLER( kchamp_flipscreen_w ); PALETTE_INIT( kchamp ); VIDEO_START( kchamp ); diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index f304f59d6b3..ef030155bbf 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -42,14 +42,14 @@ public: required_device<eeprom_device> m_eeprom; DECLARE_READ16_MEMBER(kickgoal_eeprom_r); DECLARE_WRITE16_MEMBER(kickgoal_eeprom_w); + DECLARE_WRITE16_MEMBER(kickgoal_fgram_w); + DECLARE_WRITE16_MEMBER(kickgoal_bgram_w); + DECLARE_WRITE16_MEMBER(kickgoal_bg2ram_w); }; /*----------- defined in video/kickgoal.c -----------*/ -WRITE16_HANDLER( kickgoal_fgram_w ); -WRITE16_HANDLER( kickgoal_bgram_w ); -WRITE16_HANDLER( kickgoal_bg2ram_w ); VIDEO_START( kickgoal ); SCREEN_UPDATE_IND16( kickgoal ); diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index d33ec3f93e9..288ad806692 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -35,16 +35,16 @@ public: DECLARE_WRITE8_MEMBER(sprite_interrupt_w); DECLARE_WRITE8_MEMBER(scroll_interrupt_w); DECLARE_WRITE8_MEMBER(sound_command_w); + DECLARE_WRITE8_MEMBER(kingofb_videoram_w); + DECLARE_WRITE8_MEMBER(kingofb_colorram_w); + DECLARE_WRITE8_MEMBER(kingofb_videoram2_w); + DECLARE_WRITE8_MEMBER(kingofb_colorram2_w); + DECLARE_WRITE8_MEMBER(kingofb_f800_w); }; /*----------- defined in video/kingobox.c -----------*/ -WRITE8_HANDLER( kingofb_videoram_w ); -WRITE8_HANDLER( kingofb_colorram_w ); -WRITE8_HANDLER( kingofb_videoram2_w ); -WRITE8_HANDLER( kingofb_colorram2_w ); -WRITE8_HANDLER( kingofb_f800_w ); PALETTE_INIT( kingofb ); VIDEO_START( kingofb ); diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index 77a5d3953e2..b7d10675929 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -30,15 +30,15 @@ public: device_t *m_soundcpu; DECLARE_WRITE8_MEMBER(sound_cmd_w); DECLARE_WRITE8_MEMBER(sound_irq_ack_w); + DECLARE_WRITE8_MEMBER(kncljoe_videoram_w); + DECLARE_WRITE8_MEMBER(kncljoe_control_w); + DECLARE_WRITE8_MEMBER(kncljoe_scroll_w); }; /*----------- defined in video/kncljoe.c -----------*/ -WRITE8_HANDLER(kncljoe_videoram_w); -WRITE8_HANDLER(kncljoe_control_w); -WRITE8_HANDLER(kncljoe_scroll_w); PALETTE_INIT( kncljoe ); VIDEO_START( kncljoe ); diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index 220b141bef2..a4b528770ce 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -30,6 +30,18 @@ public: DECLARE_WRITE16_MEMBER(tms57002_data_word_w); DECLARE_READ16_MEMBER(tms57002_status_word_r); DECLARE_WRITE16_MEMBER(tms57002_control_word_w); + DECLARE_READ16_MEMBER(K055550_word_r); + DECLARE_WRITE16_MEMBER(K055550_word_w); + DECLARE_WRITE16_MEMBER(K053990_martchmp_word_w); + DECLARE_WRITE32_MEMBER(fantjour_dma_w); + DECLARE_WRITE32_MEMBER(konamigx_type3_psac2_bank_w); + DECLARE_WRITE32_MEMBER(konamigx_palette_w); + DECLARE_WRITE32_MEMBER(konamigx_palette2_w); + DECLARE_WRITE32_MEMBER(konamigx_555_palette_w); + DECLARE_WRITE32_MEMBER(konamigx_555_palette2_w); + DECLARE_WRITE32_MEMBER(konamigx_tilebank_w); + DECLARE_WRITE32_MEMBER(konamigx_t1_psacmap_w); + DECLARE_WRITE32_MEMBER(konamigx_t4_psacmap_w); }; @@ -124,27 +136,16 @@ SCREEN_UPDATE_RGB32(konamigx); SCREEN_UPDATE_RGB32(konamigx_left); SCREEN_UPDATE_RGB32(konamigx_right); -WRITE32_HANDLER( konamigx_palette_w ); #ifdef UNUSED_FUNCTION -WRITE32_HANDLER( konamigx_palette2_w ); -WRITE32_HANDLER( konamigx_555_palette_w ); -WRITE32_HANDLER( konamigx_555_palette2_w ); #endif -WRITE32_HANDLER( konamigx_tilebank_w ); -WRITE32_HANDLER( konamigx_t1_psacmap_w ); -WRITE32_HANDLER( konamigx_t4_psacmap_w ); extern int konamigx_current_frame; -WRITE32_HANDLER( konamigx_type3_psac2_bank_w ); extern UINT32* konamigx_type3_psac2_bank; /*----------- defined in machine/konamigx.c -----------*/ // K055550/K053990/ESC protection devices handlers -READ16_HANDLER ( K055550_word_r ); -WRITE16_HANDLER( K055550_word_w ); -WRITE16_HANDLER( K053990_martchmp_word_w ); void konamigx_esc_alert(UINT32 *srcbase, int srcoffs, int count, int mode); void fantjour_dma_install(running_machine &machine); diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h index a0f06f95f6e..dea20fff97e 100644 --- a/src/mame/includes/kopunch.h +++ b/src/mame/includes/kopunch.h @@ -27,15 +27,15 @@ public: DECLARE_READ8_MEMBER(kopunch_in_r); DECLARE_WRITE8_MEMBER(kopunch_lamp_w); DECLARE_WRITE8_MEMBER(kopunch_coin_w); + DECLARE_WRITE8_MEMBER(kopunch_videoram_w); + DECLARE_WRITE8_MEMBER(kopunch_videoram2_w); + DECLARE_WRITE8_MEMBER(kopunch_scroll_x_w); + DECLARE_WRITE8_MEMBER(kopunch_scroll_y_w); + DECLARE_WRITE8_MEMBER(kopunch_gfxbank_w); }; /*----------- defined in video/kopunch.c -----------*/ -WRITE8_HANDLER( kopunch_videoram_w ); -WRITE8_HANDLER( kopunch_videoram2_w ); -WRITE8_HANDLER( kopunch_scroll_x_w ); -WRITE8_HANDLER( kopunch_scroll_y_w ); -WRITE8_HANDLER( kopunch_gfxbank_w ); PALETTE_INIT( kopunch ); VIDEO_START( kopunch ); diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h index b095346182d..bbfeb89bc72 100644 --- a/src/mame/includes/ksayakyu.h +++ b/src/mame/includes/ksayakyu.h @@ -27,13 +27,13 @@ public: DECLARE_WRITE8_MEMBER(latch_w); DECLARE_READ8_MEMBER(sound_status_r); DECLARE_WRITE8_MEMBER(tomaincpu_w); + DECLARE_WRITE8_MEMBER(ksayakyu_videoram_w); + DECLARE_WRITE8_MEMBER(ksayakyu_videoctrl_w); }; /*----------- defined in video/ksayakyu.c -----------*/ -WRITE8_HANDLER( ksayakyu_videoram_w ); -WRITE8_HANDLER( ksayakyu_videoctrl_w ); PALETTE_INIT( ksayakyu ); VIDEO_START( ksayakyu ); SCREEN_UPDATE_IND16( ksayakyu ); diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h index b79109ca47f..5c11a8937ea 100644 --- a/src/mame/includes/kyugo.h +++ b/src/mame/includes/kyugo.h @@ -37,20 +37,20 @@ public: DECLARE_WRITE8_MEMBER(kyugo_nmi_mask_w); DECLARE_WRITE8_MEMBER(kyugo_sub_cpu_control_w); DECLARE_WRITE8_MEMBER(kyugo_coin_counter_w); + DECLARE_WRITE8_MEMBER(kyugo_fgvideoram_w); + DECLARE_WRITE8_MEMBER(kyugo_bgvideoram_w); + DECLARE_WRITE8_MEMBER(kyugo_bgattribram_w); + DECLARE_READ8_MEMBER(kyugo_spriteram_2_r); + DECLARE_WRITE8_MEMBER(kyugo_scroll_x_lo_w); + DECLARE_WRITE8_MEMBER(kyugo_gfxctrl_w); + DECLARE_WRITE8_MEMBER(kyugo_scroll_y_w); + DECLARE_WRITE8_MEMBER(kyugo_flipscreen_w); }; /*----------- defined in video/kyugo.c -----------*/ -READ8_HANDLER( kyugo_spriteram_2_r ); -WRITE8_HANDLER( kyugo_fgvideoram_w ); -WRITE8_HANDLER( kyugo_bgvideoram_w ); -WRITE8_HANDLER( kyugo_bgattribram_w ); -WRITE8_HANDLER( kyugo_scroll_x_lo_w ); -WRITE8_HANDLER( kyugo_gfxctrl_w ); -WRITE8_HANDLER( kyugo_scroll_y_w ); -WRITE8_HANDLER( kyugo_flipscreen_w ); VIDEO_START( kyugo ); SCREEN_UPDATE_IND16( kyugo ); diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index 7625f6ad015..e9e421c78c6 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -30,14 +30,14 @@ public: required_device<cpu_device> m_maincpu; DECLARE_WRITE8_MEMBER(labyrunr_bankswitch_w); + DECLARE_WRITE8_MEMBER(labyrunr_vram1_w); + DECLARE_WRITE8_MEMBER(labyrunr_vram2_w); }; /*----------- defined in video/labyrunr.c -----------*/ -WRITE8_HANDLER( labyrunr_vram1_w ); -WRITE8_HANDLER( labyrunr_vram2_w ); PALETTE_INIT( labyrunr ); VIDEO_START( labyrunr ); diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h index 8d2b1b224e6..9fb25465ddd 100644 --- a/src/mame/includes/ladybug.h +++ b/src/mame/includes/ladybug.h @@ -47,15 +47,15 @@ public: DECLARE_WRITE8_MEMBER(sraider_sound_high_w); DECLARE_READ8_MEMBER(sraider_8005_r); DECLARE_WRITE8_MEMBER(sraider_misc_w); + DECLARE_WRITE8_MEMBER(ladybug_videoram_w); + DECLARE_WRITE8_MEMBER(ladybug_colorram_w); + DECLARE_WRITE8_MEMBER(ladybug_flipscreen_w); + DECLARE_WRITE8_MEMBER(sraider_io_w); }; /*----------- defined in video/ladybug.c -----------*/ -WRITE8_HANDLER( ladybug_videoram_w ); -WRITE8_HANDLER( ladybug_colorram_w ); -WRITE8_HANDLER( ladybug_flipscreen_w ); -WRITE8_HANDLER( sraider_io_w ); PALETTE_INIT( ladybug ); VIDEO_START( ladybug ); diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index cf59aeed57b..8bc8f58a31a 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -39,22 +39,23 @@ public: DECLARE_WRITE8_MEMBER(nmi_disable_w); DECLARE_WRITE8_MEMBER(nmi_enable_w); DECLARE_READ8_MEMBER(snd_flag_r); + DECLARE_WRITE8_MEMBER(ladyfrog_spriteram_w); + DECLARE_READ8_MEMBER(ladyfrog_spriteram_r); + DECLARE_WRITE8_MEMBER(ladyfrog_videoram_w); + DECLARE_READ8_MEMBER(ladyfrog_videoram_r); + DECLARE_WRITE8_MEMBER(ladyfrog_palette_w); + DECLARE_READ8_MEMBER(ladyfrog_palette_r); + DECLARE_WRITE8_MEMBER(ladyfrog_gfxctrl_w); + DECLARE_WRITE8_MEMBER(ladyfrog_gfxctrl2_w); + DECLARE_READ8_MEMBER(ladyfrog_gfxctrl_r); + DECLARE_READ8_MEMBER(ladyfrog_scrlram_r); + DECLARE_WRITE8_MEMBER(ladyfrog_scrlram_w); }; /*----------- defined in video/ladyfrog.c -----------*/ -WRITE8_HANDLER( ladyfrog_videoram_w ); -WRITE8_HANDLER( ladyfrog_spriteram_w ); -WRITE8_HANDLER( ladyfrog_palette_w ); -WRITE8_HANDLER( ladyfrog_gfxctrl_w ); -WRITE8_HANDLER( ladyfrog_gfxctrl2_w ); -WRITE8_HANDLER( ladyfrog_scrlram_w ); - -READ8_HANDLER( ladyfrog_spriteram_r ); -READ8_HANDLER( ladyfrog_palette_r ); -READ8_HANDLER( ladyfrog_scrlram_r ); -READ8_HANDLER( ladyfrog_videoram_r ); + VIDEO_START( ladyfrog ); VIDEO_START( toucheme ); diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index 99cb1a2e1c2..56a6ebd2e96 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -36,16 +36,17 @@ public: DECLARE_WRITE8_MEMBER(pinbo_sound_command_w); DECLARE_READ8_MEMBER(sound_status_r); DECLARE_WRITE8_MEMBER(sound_select_w); + DECLARE_WRITE8_MEMBER(lasso_videoram_w); + DECLARE_WRITE8_MEMBER(lasso_colorram_w); + DECLARE_WRITE8_MEMBER(lasso_flip_screen_w); + DECLARE_WRITE8_MEMBER(lasso_video_control_w); + DECLARE_WRITE8_MEMBER(wwjgtin_video_control_w); + DECLARE_WRITE8_MEMBER(pinbo_video_control_w); }; /*----------- defined in video/lasso.c -----------*/ -WRITE8_HANDLER( lasso_videoram_w ); -WRITE8_HANDLER( lasso_colorram_w ); -WRITE8_HANDLER( lasso_video_control_w ); -WRITE8_HANDLER( wwjgtin_video_control_w ); -WRITE8_HANDLER( pinbo_video_control_w ); PALETTE_INIT( lasso ); PALETTE_INIT( wwjgtin ); diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index 35561bb87f9..4a03a4b62bd 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -37,18 +37,18 @@ public: required_device<buffered_spriteram16_device> m_spriteram; DECLARE_WRITE16_MEMBER(lastduel_sound_w); DECLARE_WRITE8_MEMBER(mg_bankswitch_w); + DECLARE_WRITE16_MEMBER(lastduel_flip_w); + DECLARE_WRITE16_MEMBER(lastduel_scroll_w); + DECLARE_WRITE16_MEMBER(lastduel_scroll1_w); + DECLARE_WRITE16_MEMBER(lastduel_scroll2_w); + DECLARE_WRITE16_MEMBER(lastduel_vram_w); + DECLARE_WRITE16_MEMBER(madgear_scroll1_w); + DECLARE_WRITE16_MEMBER(madgear_scroll2_w); + DECLARE_WRITE16_MEMBER(lastduel_palette_word_w); }; /*----------- defined in video/lastduel.c -----------*/ -WRITE16_HANDLER( lastduel_vram_w ); -WRITE16_HANDLER( lastduel_flip_w ); -WRITE16_HANDLER( lastduel_scroll1_w ); -WRITE16_HANDLER( lastduel_scroll2_w ); -WRITE16_HANDLER( madgear_scroll1_w ); -WRITE16_HANDLER( madgear_scroll2_w ); -WRITE16_HANDLER( lastduel_scroll_w ); -WRITE16_HANDLER( lastduel_palette_word_w ); VIDEO_START( lastduel ); VIDEO_START( madgear ); diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h index bf3a9e022bf..b2a14699ad6 100644 --- a/src/mame/includes/legionna.h +++ b/src/mame/includes/legionna.h @@ -24,6 +24,10 @@ public: UINT16 m_mid_gfx_bank; required_shared_ptr<UINT16> m_spriteram; DECLARE_WRITE16_MEMBER(denjin_paletteram16_xBBBBBGGGGGRRRRR_word_w); + DECLARE_WRITE16_MEMBER(legionna_background_w); + DECLARE_WRITE16_MEMBER(legionna_midground_w); + DECLARE_WRITE16_MEMBER(legionna_foreground_w); + DECLARE_WRITE16_MEMBER(legionna_text_w); }; @@ -31,10 +35,6 @@ public: void heatbrl_setgfxbank(running_machine &machine, UINT16 data); void denjinmk_setgfxbank(running_machine &machine, UINT16 data); -WRITE16_HANDLER( legionna_background_w ); -WRITE16_HANDLER( legionna_foreground_w ); -WRITE16_HANDLER( legionna_midground_w ); -WRITE16_HANDLER( legionna_text_w ); VIDEO_START( legionna ); VIDEO_START( cupsoc ); diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h index c035da5386b..f9e6aff5264 100644 --- a/src/mame/includes/leland.h +++ b/src/mame/includes/leland.h @@ -63,6 +63,51 @@ public: UINT8 m_gfxbank; UINT16 m_last_scanline; emu_timer *m_scanline_timer; + DECLARE_READ8_MEMBER(cerberus_dial_1_r); + DECLARE_READ8_MEMBER(cerberus_dial_2_r); + DECLARE_WRITE8_MEMBER(alleymas_joystick_kludge); + DECLARE_READ8_MEMBER(dangerz_input_y_r); + DECLARE_READ8_MEMBER(dangerz_input_x_r); + DECLARE_READ8_MEMBER(dangerz_input_upper_r); + DECLARE_READ8_MEMBER(redline_pedal_1_r); + DECLARE_READ8_MEMBER(redline_pedal_2_r); + DECLARE_READ8_MEMBER(redline_wheel_1_r); + DECLARE_READ8_MEMBER(redline_wheel_2_r); + DECLARE_READ8_MEMBER(offroad_wheel_1_r); + DECLARE_READ8_MEMBER(offroad_wheel_2_r); + DECLARE_READ8_MEMBER(offroad_wheel_3_r); + DECLARE_READ8_MEMBER(ataxx_trackball_r); + DECLARE_READ8_MEMBER(indyheat_wheel_r); + DECLARE_READ8_MEMBER(indyheat_analog_r); + DECLARE_WRITE8_MEMBER(indyheat_analog_w); + DECLARE_WRITE8_MEMBER(leland_master_alt_bankswitch_w); + DECLARE_WRITE8_MEMBER(leland_battery_ram_w); + DECLARE_WRITE8_MEMBER(ataxx_battery_ram_w); + DECLARE_READ8_MEMBER(leland_master_analog_key_r); + DECLARE_WRITE8_MEMBER(leland_master_analog_key_w); + DECLARE_READ8_MEMBER(leland_master_input_r); + DECLARE_WRITE8_MEMBER(leland_master_output_w); + DECLARE_READ8_MEMBER(ataxx_master_input_r); + DECLARE_WRITE8_MEMBER(ataxx_master_output_w); + DECLARE_WRITE8_MEMBER(leland_gated_paletteram_w); + DECLARE_READ8_MEMBER(leland_gated_paletteram_r); + DECLARE_WRITE8_MEMBER(ataxx_paletteram_and_misc_w); + DECLARE_READ8_MEMBER(ataxx_paletteram_and_misc_r); + DECLARE_WRITE8_MEMBER(leland_slave_small_banksw_w); + DECLARE_WRITE8_MEMBER(leland_slave_large_banksw_w); + DECLARE_WRITE8_MEMBER(ataxx_slave_banksw_w); + DECLARE_READ8_MEMBER(leland_raster_r); + DECLARE_WRITE8_MEMBER(leland_scroll_w); + DECLARE_WRITE8_MEMBER(leland_master_video_addr_w); + DECLARE_WRITE8_MEMBER(leland_mvram_port_w); + DECLARE_READ8_MEMBER(leland_mvram_port_r); + DECLARE_WRITE8_MEMBER(leland_slave_video_addr_w); + DECLARE_WRITE8_MEMBER(leland_svram_port_w); + DECLARE_READ8_MEMBER(leland_svram_port_r); + DECLARE_WRITE8_MEMBER(ataxx_mvram_port_w); + DECLARE_WRITE8_MEMBER(ataxx_svram_port_w); + DECLARE_READ8_MEMBER(ataxx_mvram_port_r); + DECLARE_READ8_MEMBER(ataxx_svram_port_r); }; @@ -74,29 +119,12 @@ public: #define SERIAL_TYPE_ENCRYPT 3 #define SERIAL_TYPE_ENCRYPT_XOR 4 -READ8_HANDLER( cerberus_dial_1_r ); -READ8_HANDLER( cerberus_dial_2_r ); -WRITE8_HANDLER( alleymas_joystick_kludge ); -READ8_HANDLER( dangerz_input_y_r ); -READ8_HANDLER( dangerz_input_x_r ); -READ8_HANDLER( dangerz_input_upper_r ); -READ8_HANDLER( redline_pedal_1_r ); -READ8_HANDLER( redline_pedal_2_r ); -READ8_HANDLER( redline_wheel_1_r ); -READ8_HANDLER( redline_wheel_2_r ); -READ8_HANDLER( offroad_wheel_1_r ); -READ8_HANDLER( offroad_wheel_2_r ); -READ8_HANDLER( offroad_wheel_3_r ); -READ8_HANDLER( ataxx_trackball_r ); -READ8_HANDLER( indyheat_wheel_r ); -READ8_HANDLER( indyheat_analog_r ); -WRITE8_HANDLER( indyheat_analog_w ); MACHINE_START( leland ); MACHINE_RESET( leland ); @@ -105,7 +133,6 @@ MACHINE_RESET( ataxx ); INTERRUPT_GEN( leland_master_interrupt ); -WRITE8_HANDLER( leland_master_alt_bankswitch_w ); void cerberus_bankswitch(running_machine &machine); void mayhem_bankswitch(running_machine &machine); void dangerz_bankswitch(running_machine &machine); @@ -121,30 +148,14 @@ void ataxx_init_eeprom(running_machine &machine, const UINT16 *data); READ8_DEVICE_HANDLER( ataxx_eeprom_r ); WRITE8_DEVICE_HANDLER( ataxx_eeprom_w ); -WRITE8_HANDLER( leland_battery_ram_w ); -WRITE8_HANDLER( ataxx_battery_ram_w ); -READ8_HANDLER( leland_master_analog_key_r ); -WRITE8_HANDLER( leland_master_analog_key_w ); -READ8_HANDLER( leland_master_input_r ); -WRITE8_HANDLER( leland_master_output_w ); -READ8_HANDLER( ataxx_master_input_r ); -WRITE8_HANDLER( ataxx_master_output_w ); -WRITE8_HANDLER( leland_gated_paletteram_w ); -READ8_HANDLER( leland_gated_paletteram_r ); -WRITE8_HANDLER( ataxx_paletteram_and_misc_w ); -READ8_HANDLER( ataxx_paletteram_and_misc_r ); READ8_DEVICE_HANDLER( leland_sound_port_r ); WRITE8_DEVICE_HANDLER( leland_sound_port_w ); -WRITE8_HANDLER( leland_slave_small_banksw_w ); -WRITE8_HANDLER( leland_slave_large_banksw_w ); -WRITE8_HANDLER( ataxx_slave_banksw_w ); -READ8_HANDLER( leland_raster_r ); void leland_rotate_memory(running_machine &machine, const char *cpuname); @@ -172,21 +183,10 @@ ADDRESS_MAP_EXTERN(ataxx_80186_map_io, 16); /*----------- defined in video/leland.c -----------*/ -WRITE8_HANDLER( leland_scroll_w ); WRITE8_DEVICE_HANDLER( leland_gfx_port_w ); -WRITE8_HANDLER( leland_master_video_addr_w ); -WRITE8_HANDLER( leland_mvram_port_w ); -READ8_HANDLER( leland_mvram_port_r ); -WRITE8_HANDLER( leland_slave_video_addr_w ); -WRITE8_HANDLER( leland_svram_port_w ); -READ8_HANDLER( leland_svram_port_r ); -WRITE8_HANDLER( ataxx_mvram_port_w ); -WRITE8_HANDLER( ataxx_svram_port_w ); -READ8_HANDLER( ataxx_mvram_port_r ); -READ8_HANDLER( ataxx_svram_port_r ); MACHINE_CONFIG_EXTERN( leland_video ); MACHINE_CONFIG_EXTERN( ataxx_video ); diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index ddb6b262e46..028e63ab929 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -33,14 +33,14 @@ public: DECLARE_WRITE16_MEMBER(lemmings_palette_24bit_w); DECLARE_WRITE16_MEMBER(lemmings_sound_w); DECLARE_WRITE8_MEMBER(lemmings_sound_ack_w); + DECLARE_WRITE16_MEMBER(lemmings_pixel_0_w); + DECLARE_WRITE16_MEMBER(lemmings_pixel_1_w); + DECLARE_WRITE16_MEMBER(lemmings_vram_w); }; /*----------- defined in video/lemmings.c -----------*/ -WRITE16_HANDLER( lemmings_pixel_0_w ); -WRITE16_HANDLER( lemmings_pixel_1_w ); -WRITE16_HANDLER( lemmings_vram_w ); VIDEO_START( lemmings ); SCREEN_VBLANK( lemmings ); diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h index 3ed332d55a6..d47fb6a4b6d 100644 --- a/src/mame/includes/lethal.h +++ b/src/mame/includes/lethal.h @@ -34,6 +34,7 @@ public: DECLARE_WRITE8_MEMBER(le_bgcolor_w); DECLARE_READ8_MEMBER(guns_r); DECLARE_READ8_MEMBER(gunsaux_r); + DECLARE_WRITE8_MEMBER(lethalen_palette_control); }; /*----------- defined in video/lethal.c -----------*/ @@ -41,7 +42,6 @@ public: extern void lethalen_sprite_callback(running_machine &machine, int *code, int *color, int *priority_mask); extern void lethalen_tile_callback(running_machine &machine, int layer, int *code, int *color, int *flags); -WRITE8_HANDLER(lethalen_palette_control); VIDEO_START(lethalen); SCREEN_UPDATE_IND16(lethalen); diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h index 56be8e67e3c..37dfaf469a5 100644 --- a/src/mame/includes/lethalj.h +++ b/src/mame/includes/lethalj.h @@ -21,15 +21,16 @@ public: DECLARE_WRITE16_MEMBER(ripribit_control_w); DECLARE_WRITE16_MEMBER(cfarm_control_w); DECLARE_WRITE16_MEMBER(cclownz_control_w); + DECLARE_READ16_MEMBER(lethalj_gun_r); + DECLARE_WRITE16_MEMBER(lethalj_blitter_w); + void do_blit(); }; /*----------- defined in video/lethalj.c -----------*/ -READ16_HANDLER( lethalj_gun_r ); VIDEO_START( lethalj ); -WRITE16_HANDLER( lethalj_blitter_w ); void lethalj_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params); diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index cbab7e7dfa3..90b7c03c4c3 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -35,6 +35,13 @@ public: DECLARE_WRITE8_MEMBER(prosoccr_io_bank_w); DECLARE_READ8_MEMBER(prosport_charram_r); DECLARE_WRITE8_MEMBER(prosport_charram_w); + DECLARE_WRITE8_MEMBER(deco16_io_w); + DECLARE_WRITE8_MEMBER(prosoccr_io_w); + DECLARE_WRITE8_MEMBER(prosport_io_w); + DECLARE_WRITE8_MEMBER(liberate_videoram_w); + DECLARE_WRITE8_MEMBER(liberate_colorram_w); + DECLARE_WRITE8_MEMBER(prosport_bg_vram_w); + DECLARE_WRITE8_MEMBER(prosport_paletteram_w); }; @@ -50,11 +57,4 @@ VIDEO_START( prosport ); VIDEO_START( boomrang ); VIDEO_START( liberate ); -WRITE8_HANDLER( deco16_io_w ); -WRITE8_HANDLER( prosoccr_io_w ); -WRITE8_HANDLER( prosport_io_w ); -WRITE8_HANDLER( prosport_paletteram_w ); -WRITE8_HANDLER( prosport_bg_vram_w ); -WRITE8_HANDLER( liberate_videoram_w ); -WRITE8_HANDLER( liberate_colorram_w ); diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h index 254751c543f..a6e1607fe03 100644 --- a/src/mame/includes/lkage.h +++ b/src/mame/includes/lkage.h @@ -56,27 +56,27 @@ public: DECLARE_READ8_MEMBER(fake_mcu_r); DECLARE_WRITE8_MEMBER(fake_mcu_w); DECLARE_READ8_MEMBER(fake_status_r); + DECLARE_READ8_MEMBER(lkage_68705_port_a_r); + DECLARE_WRITE8_MEMBER(lkage_68705_port_a_w); + DECLARE_WRITE8_MEMBER(lkage_68705_ddr_a_w); + DECLARE_READ8_MEMBER(lkage_68705_port_b_r); + DECLARE_WRITE8_MEMBER(lkage_68705_port_b_w); + DECLARE_WRITE8_MEMBER(lkage_68705_ddr_b_w); + DECLARE_READ8_MEMBER(lkage_68705_port_c_r); + DECLARE_WRITE8_MEMBER(lkage_68705_port_c_w); + DECLARE_WRITE8_MEMBER(lkage_68705_ddr_c_w); + DECLARE_WRITE8_MEMBER(lkage_mcu_w); + DECLARE_READ8_MEMBER(lkage_mcu_r); + DECLARE_READ8_MEMBER(lkage_mcu_status_r); + DECLARE_WRITE8_MEMBER(lkage_videoram_w); }; /*----------- defined in machine/lkage.c -----------*/ -READ8_HANDLER( lkage_68705_port_a_r ); -WRITE8_HANDLER( lkage_68705_port_a_w ); -READ8_HANDLER( lkage_68705_port_b_r ); -WRITE8_HANDLER( lkage_68705_port_b_w ); -READ8_HANDLER( lkage_68705_port_c_r ); -WRITE8_HANDLER( lkage_68705_port_c_w ); -WRITE8_HANDLER( lkage_68705_ddr_a_w ); -WRITE8_HANDLER( lkage_68705_ddr_b_w ); -WRITE8_HANDLER( lkage_68705_ddr_c_w ); -WRITE8_HANDLER( lkage_mcu_w ); -READ8_HANDLER( lkage_mcu_r ); -READ8_HANDLER( lkage_mcu_status_r ); /*----------- defined in video/lkage.c -----------*/ -WRITE8_HANDLER( lkage_videoram_w ); VIDEO_START( lkage ); SCREEN_UPDATE_IND16( lkage ); diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index e046e09c0ec..287a1f13630 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -73,6 +73,17 @@ public: device_t *m_f2203_1r; device_t *m_f2203_2r; device_t *m_f2203_3r; + DECLARE_READ16_MEMBER(lockon_crtc_r); + DECLARE_WRITE16_MEMBER(lockon_crtc_w); + DECLARE_WRITE16_MEMBER(lockon_char_w); + DECLARE_WRITE16_MEMBER(lockon_scene_h_scr_w); + DECLARE_WRITE16_MEMBER(lockon_scene_v_scr_w); + DECLARE_WRITE16_MEMBER(lockon_ground_ctrl_w); + DECLARE_WRITE16_MEMBER(lockon_tza112_w); + DECLARE_READ16_MEMBER(lockon_obj_4000_r); + DECLARE_WRITE16_MEMBER(lockon_obj_4000_w); + DECLARE_WRITE16_MEMBER(lockon_fb_clut_w); + DECLARE_WRITE16_MEMBER(lockon_rotate_w); }; @@ -82,15 +93,4 @@ PALETTE_INIT( lockon ); VIDEO_START( lockon ); SCREEN_UPDATE_IND16( lockon ); SCREEN_VBLANK( lockon ); -READ16_HANDLER( lockon_crtc_r ); -WRITE16_HANDLER( lockon_crtc_w ); -WRITE16_HANDLER( lockon_rotate_w ); -WRITE16_HANDLER( lockon_fb_clut_w ); -WRITE16_HANDLER( lockon_scene_h_scr_w ); -WRITE16_HANDLER( lockon_scene_v_scr_w ); -WRITE16_HANDLER( lockon_ground_ctrl_w ); -WRITE16_HANDLER( lockon_char_w ); - -WRITE16_HANDLER( lockon_tza112_w ); -READ16_HANDLER( lockon_obj_4000_r ); -WRITE16_HANDLER( lockon_obj_4000_w ); + diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index 0d0c0f8e09b..2ea0f42d0b1 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -37,16 +37,16 @@ public: DECLARE_READ16_MEMBER(lordgun_gun_1_x_r); DECLARE_READ16_MEMBER(lordgun_gun_1_y_r); DECLARE_WRITE16_MEMBER(lordgun_soundlatch_w); + DECLARE_WRITE16_MEMBER(lordgun_paletteram_w); + DECLARE_WRITE16_MEMBER(lordgun_vram_0_w); + DECLARE_WRITE16_MEMBER(lordgun_vram_1_w); + DECLARE_WRITE16_MEMBER(lordgun_vram_2_w); + DECLARE_WRITE16_MEMBER(lordgun_vram_3_w); }; /*----------- defined in video/lordgun.c -----------*/ -WRITE16_HANDLER( lordgun_paletteram_w ); -WRITE16_HANDLER( lordgun_vram_0_w ); -WRITE16_HANDLER( lordgun_vram_1_w ); -WRITE16_HANDLER( lordgun_vram_2_w ); -WRITE16_HANDLER( lordgun_vram_3_w ); float lordgun_crosshair_mapper(const input_field_config *field, float linear_value); void lordgun_update_gun(running_machine &machine, int i); diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h index fe51430c845..c04ab6326b2 100644 --- a/src/mame/includes/lsasquad.h +++ b/src/mame/includes/lsasquad.h @@ -36,31 +36,31 @@ public: device_t *m_audiocpu; device_t *m_mcu; DECLARE_WRITE8_MEMBER(lsasquad_bankswitch_w); + DECLARE_WRITE8_MEMBER(lsasquad_sh_nmi_disable_w); + DECLARE_WRITE8_MEMBER(lsasquad_sh_nmi_enable_w); + DECLARE_WRITE8_MEMBER(lsasquad_sound_command_w); + DECLARE_READ8_MEMBER(lsasquad_sh_sound_command_r); + DECLARE_WRITE8_MEMBER(lsasquad_sh_result_w); + DECLARE_READ8_MEMBER(lsasquad_sound_result_r); + DECLARE_READ8_MEMBER(lsasquad_sound_status_r); + DECLARE_READ8_MEMBER(daikaiju_sh_sound_command_r); + DECLARE_READ8_MEMBER(daikaiju_sound_status_r); + DECLARE_READ8_MEMBER(lsasquad_68705_port_a_r); + DECLARE_WRITE8_MEMBER(lsasquad_68705_port_a_w); + DECLARE_WRITE8_MEMBER(lsasquad_68705_ddr_a_w); + DECLARE_READ8_MEMBER(lsasquad_68705_port_b_r); + DECLARE_WRITE8_MEMBER(lsasquad_68705_port_b_w); + DECLARE_WRITE8_MEMBER(lsasquad_68705_ddr_b_w); + DECLARE_WRITE8_MEMBER(lsasquad_mcu_w); + DECLARE_READ8_MEMBER(lsasquad_mcu_r); + DECLARE_READ8_MEMBER(lsasquad_mcu_status_r); + DECLARE_READ8_MEMBER(daikaiju_mcu_status_r); }; /*----------- defined in machine/lsasquad.c -----------*/ -WRITE8_HANDLER( lsasquad_sh_nmi_disable_w ); -WRITE8_HANDLER( lsasquad_sh_nmi_enable_w ); -WRITE8_HANDLER( lsasquad_sound_command_w ); -READ8_HANDLER( lsasquad_sh_sound_command_r ); -WRITE8_HANDLER( lsasquad_sh_result_w ); -READ8_HANDLER( lsasquad_sound_result_r ); -READ8_HANDLER( lsasquad_sound_status_r ); -READ8_HANDLER( lsasquad_68705_port_a_r ); -WRITE8_HANDLER( lsasquad_68705_port_a_w ); -WRITE8_HANDLER( lsasquad_68705_ddr_a_w ); -READ8_HANDLER( lsasquad_68705_port_b_r ); -WRITE8_HANDLER( lsasquad_68705_port_b_w ); -WRITE8_HANDLER( lsasquad_68705_ddr_b_w ); -WRITE8_HANDLER( lsasquad_mcu_w ); -READ8_HANDLER( lsasquad_mcu_r ); -READ8_HANDLER( lsasquad_mcu_status_r ); -READ8_HANDLER( daikaiju_sound_status_r ); -READ8_HANDLER( daikaiju_sh_sound_command_r ); -READ8_HANDLER( daikaiju_mcu_status_r ); /*----------- defined in video/lsasquad.c -----------*/ diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h index 44305fced2d..1b0df79e294 100644 --- a/src/mame/includes/lucky74.h +++ b/src/mame/includes/lucky74.h @@ -24,15 +24,15 @@ public: DECLARE_WRITE8_MEMBER(usart_8251_w); DECLARE_READ8_MEMBER(copro_sm7831_r); DECLARE_WRITE8_MEMBER(copro_sm7831_w); + DECLARE_WRITE8_MEMBER(lucky74_fg_videoram_w); + DECLARE_WRITE8_MEMBER(lucky74_fg_colorram_w); + DECLARE_WRITE8_MEMBER(lucky74_bg_videoram_w); + DECLARE_WRITE8_MEMBER(lucky74_bg_colorram_w); }; /*----------- defined in video/lucky74.c -----------*/ -WRITE8_HANDLER( lucky74_fg_videoram_w ); -WRITE8_HANDLER( lucky74_fg_colorram_w ); -WRITE8_HANDLER( lucky74_bg_videoram_w ); -WRITE8_HANDLER( lucky74_bg_colorram_w ); PALETTE_INIT( lucky74 ); VIDEO_START( lucky74 ); SCREEN_UPDATE_IND16( lucky74 ); diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h index 609ddf00825..293160599f4 100644 --- a/src/mame/includes/lvcards.h +++ b/src/mame/includes/lvcards.h @@ -13,13 +13,13 @@ public: DECLARE_WRITE8_MEMBER(control_port_2_w); DECLARE_WRITE8_MEMBER(control_port_2a_w); DECLARE_READ8_MEMBER(payout_r); + DECLARE_WRITE8_MEMBER(lvcards_videoram_w); + DECLARE_WRITE8_MEMBER(lvcards_colorram_w); }; /*----------- defined in video/lvcards.c -----------*/ -WRITE8_HANDLER( lvcards_videoram_w ); -WRITE8_HANDLER( lvcards_colorram_w ); PALETTE_INIT( lvcards ); PALETTE_INIT( ponttehk ); diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index c5b620d1d1a..a511d5e40b5 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -38,17 +38,17 @@ public: DECLARE_WRITE8_MEMBER(avengers_prot_bank_w); DECLARE_READ8_MEMBER(avengers_protection_r); DECLARE_READ8_MEMBER(avengers_soundlatch2_r); + DECLARE_WRITE8_MEMBER(lwings_fgvideoram_w); + DECLARE_WRITE8_MEMBER(lwings_bg1videoram_w); + DECLARE_WRITE8_MEMBER(lwings_bg1_scrollx_w); + DECLARE_WRITE8_MEMBER(lwings_bg1_scrolly_w); + DECLARE_WRITE8_MEMBER(trojan_bg2_scrollx_w); + DECLARE_WRITE8_MEMBER(trojan_bg2_image_w); }; /*----------- defined in video/lwings.c -----------*/ -WRITE8_HANDLER( lwings_fgvideoram_w ); -WRITE8_HANDLER( lwings_bg1videoram_w ); -WRITE8_HANDLER( lwings_bg1_scrollx_w ); -WRITE8_HANDLER( lwings_bg1_scrolly_w ); -WRITE8_HANDLER( trojan_bg2_scrollx_w ); -WRITE8_HANDLER( trojan_bg2_image_w ); VIDEO_START( lwings ); VIDEO_START( trojan ); diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index 80b76debbf3..fbcdf6676cd 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -69,15 +69,15 @@ public: DECLARE_WRITE8_MEMBER(m15_a100_w); DECLARE_READ8_MEMBER(m10_a700_r); DECLARE_READ8_MEMBER(m11_a700_r); + DECLARE_WRITE8_MEMBER(m10_colorram_w); + DECLARE_WRITE8_MEMBER(m10_chargen_w); + DECLARE_WRITE8_MEMBER(m15_chargen_w); }; /*----------- defined in video/m10.c -----------*/ -WRITE8_HANDLER( m10_colorram_w ); -WRITE8_HANDLER( m10_chargen_w ); -WRITE8_HANDLER( m15_chargen_w ); SCREEN_UPDATE_IND16( m10 ); SCREEN_UPDATE_IND16( m15 ); diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h index a7e13f8afe3..03d6b047e8d 100644 --- a/src/mame/includes/m107.h +++ b/src/mame/includes/m107.h @@ -38,13 +38,13 @@ public: DECLARE_WRITE16_MEMBER(m107_sound_status_w); DECLARE_WRITE16_MEMBER(m107_sound_reset_w); DECLARE_WRITE16_MEMBER(wpksoc_output_w); + DECLARE_WRITE16_MEMBER(m107_vram_w); + DECLARE_WRITE16_MEMBER(m107_control_w); + DECLARE_WRITE16_MEMBER(m107_spritebuffer_w); }; /*----------- defined in video/m107.c -----------*/ -WRITE16_HANDLER( m107_spritebuffer_w ); SCREEN_UPDATE_IND16( m107 ); VIDEO_START( m107 ); -WRITE16_HANDLER( m107_control_w ); -WRITE16_HANDLER( m107_vram_w ); diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index 8ed1ec80f8e..eb84579541c 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -18,21 +18,21 @@ public: UINT8 m_bg2xpos; UINT8 m_bg2ypos; UINT8 m_bgcontrol; + DECLARE_WRITE8_MEMBER(m52_scroll_w); + DECLARE_WRITE8_MEMBER(m52_videoram_w); + DECLARE_WRITE8_MEMBER(m52_colorram_w); + DECLARE_READ8_MEMBER(m52_protection_r); + DECLARE_WRITE8_MEMBER(m52_bg1ypos_w); + DECLARE_WRITE8_MEMBER(m52_bg1xpos_w); + DECLARE_WRITE8_MEMBER(m52_bg2xpos_w); + DECLARE_WRITE8_MEMBER(m52_bg2ypos_w); + DECLARE_WRITE8_MEMBER(m52_bgcontrol_w); + DECLARE_WRITE8_MEMBER(m52_flipscreen_w); + DECLARE_WRITE8_MEMBER(alpha1v_flipscreen_w); }; /*----------- defined in video/m52.c -----------*/ -READ8_HANDLER( m52_protection_r ); -WRITE8_HANDLER( m52_scroll_w ); -WRITE8_HANDLER( m52_bg1xpos_w ); -WRITE8_HANDLER( m52_bg1ypos_w ); -WRITE8_HANDLER( m52_bg2xpos_w ); -WRITE8_HANDLER( m52_bg2ypos_w ); -WRITE8_HANDLER( m52_bgcontrol_w ); -WRITE8_HANDLER( m52_flipscreen_w ); -WRITE8_HANDLER( alpha1v_flipscreen_w ); -WRITE8_HANDLER( m52_videoram_w ); -WRITE8_HANDLER( m52_colorram_w ); PALETTE_INIT( m52 ); VIDEO_START( m52 ); diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h index 53031d181c7..46a456ebb8c 100644 --- a/src/mame/includes/m57.h +++ b/src/mame/includes/m57.h @@ -14,12 +14,12 @@ public: /* video-related */ tilemap_t* m_bg_tilemap; int m_flipscreen; + DECLARE_WRITE8_MEMBER(m57_videoram_w); + DECLARE_WRITE8_MEMBER(m57_flipscreen_w); }; /*----------- defined in video/m57.c -----------*/ -WRITE8_HANDLER( m57_videoram_w ); -WRITE8_HANDLER( m57_flipscreen_w ); PALETTE_INIT( m57 ); VIDEO_START( m57 ); diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h index 87daed4f77d..68a7c527502 100644 --- a/src/mame/includes/m58.h +++ b/src/mame/includes/m58.h @@ -17,13 +17,13 @@ public: UINT8 *m_yard_scroll_y_low; UINT8 *m_yard_score_panel_disabled; bitmap_ind16 *m_scroll_panel_bitmap; + DECLARE_WRITE8_MEMBER(yard_videoram_w); + DECLARE_WRITE8_MEMBER(yard_scroll_panel_w); + DECLARE_WRITE8_MEMBER(yard_flipscreen_w); }; /*----------- defined in video/m58.c -----------*/ -WRITE8_HANDLER( yard_videoram_w ); -WRITE8_HANDLER( yard_scroll_panel_w ); -WRITE8_HANDLER( yard_flipscreen_w ); PALETTE_INIT( yard ); VIDEO_START( yard ); diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h index 59e63720581..da108bfbc4b 100644 --- a/src/mame/includes/m62.h +++ b/src/mame/includes/m62.h @@ -37,27 +37,27 @@ public: DECLARE_WRITE8_MEMBER(spelunkr_bankswitch_w); DECLARE_WRITE8_MEMBER(spelunk2_bankswitch_w); DECLARE_WRITE8_MEMBER(youjyudn_bankswitch_w); + DECLARE_WRITE8_MEMBER(m62_flipscreen_w); + DECLARE_WRITE8_MEMBER(m62_hscroll_low_w); + DECLARE_WRITE8_MEMBER(m62_hscroll_high_w); + DECLARE_WRITE8_MEMBER(m62_vscroll_low_w); + DECLARE_WRITE8_MEMBER(m62_vscroll_high_w); + DECLARE_WRITE8_MEMBER(m62_tileram_w); + DECLARE_WRITE8_MEMBER(m62_textram_w); + DECLARE_WRITE8_MEMBER(kungfum_tileram_w); + DECLARE_WRITE8_MEMBER(ldrun3_topbottom_mask_w); + DECLARE_WRITE8_MEMBER(kidniki_text_vscroll_low_w); + DECLARE_WRITE8_MEMBER(kidniki_text_vscroll_high_w); + DECLARE_WRITE8_MEMBER(kidniki_background_bank_w); + DECLARE_WRITE8_MEMBER(spelunkr_palbank_w); + DECLARE_WRITE8_MEMBER(spelunk2_gfxport_w); + DECLARE_WRITE8_MEMBER(horizon_scrollram_w); }; /*----------- defined in video/m62.c -----------*/ -WRITE8_HANDLER( m62_tileram_w ); -WRITE8_HANDLER( m62_textram_w ); -WRITE8_HANDLER( m62_flipscreen_w ); -WRITE8_HANDLER( m62_hscroll_low_w ); -WRITE8_HANDLER( m62_hscroll_high_w ); -WRITE8_HANDLER( m62_vscroll_low_w ); -WRITE8_HANDLER( m62_vscroll_high_w ); -WRITE8_HANDLER( horizon_scrollram_w ); -WRITE8_HANDLER( kidniki_text_vscroll_low_w ); -WRITE8_HANDLER( kidniki_text_vscroll_high_w ); -WRITE8_HANDLER( kidniki_background_bank_w ); -WRITE8_HANDLER( kungfum_tileram_w ); -WRITE8_HANDLER( ldrun3_topbottom_mask_w ); -WRITE8_HANDLER( spelunkr_palbank_w ); -WRITE8_HANDLER( spelunk2_gfxport_w ); PALETTE_INIT( m62 ); PALETTE_INIT( lotlot ); diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 0df896d4013..83343e5c75c 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -64,6 +64,21 @@ public: DECLARE_READ16_MEMBER(soundram_r); DECLARE_WRITE16_MEMBER(soundram_w); DECLARE_READ16_MEMBER(poundfor_trackball_r); + DECLARE_READ16_MEMBER(m72_palette1_r); + DECLARE_READ16_MEMBER(m72_palette2_r); + DECLARE_WRITE16_MEMBER(m72_palette1_w); + DECLARE_WRITE16_MEMBER(m72_palette2_w); + DECLARE_WRITE16_MEMBER(m72_videoram1_w); + DECLARE_WRITE16_MEMBER(m72_videoram2_w); + DECLARE_WRITE16_MEMBER(m72_irq_line_w); + DECLARE_WRITE16_MEMBER(m72_scrollx1_w); + DECLARE_WRITE16_MEMBER(m72_scrollx2_w); + DECLARE_WRITE16_MEMBER(m72_scrolly1_w); + DECLARE_WRITE16_MEMBER(m72_scrolly2_w); + DECLARE_WRITE16_MEMBER(m72_dmaon_w); + DECLARE_WRITE16_MEMBER(m72_port02_w); + DECLARE_WRITE16_MEMBER(rtype2_port02_w); + DECLARE_WRITE16_MEMBER(majtitle_gfx_ctrl_w); }; @@ -77,21 +92,6 @@ VIDEO_START( poundfor ); VIDEO_START( xmultipl ); VIDEO_START( hharryu ); -READ16_HANDLER( m72_palette1_r ); -READ16_HANDLER( m72_palette2_r ); -WRITE16_HANDLER( m72_palette1_w ); -WRITE16_HANDLER( m72_palette2_w ); -WRITE16_HANDLER( m72_videoram1_w ); -WRITE16_HANDLER( m72_videoram2_w ); -WRITE16_HANDLER( m72_irq_line_w ); -WRITE16_HANDLER( m72_scrollx1_w ); -WRITE16_HANDLER( m72_scrollx2_w ); -WRITE16_HANDLER( m72_scrolly1_w ); -WRITE16_HANDLER( m72_scrolly2_w ); -WRITE16_HANDLER( m72_dmaon_w ); -WRITE16_HANDLER( m72_port02_w ); -WRITE16_HANDLER( rtype2_port02_w ); -WRITE16_HANDLER( majtitle_gfx_ctrl_w ); SCREEN_UPDATE_IND16( m72 ); SCREEN_UPDATE_IND16( majtitle ); diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h index 134d0bb981a..ed57b6db5a1 100644 --- a/src/mame/includes/m90.h +++ b/src/mame/includes/m90.h @@ -19,6 +19,8 @@ public: DECLARE_WRITE16_MEMBER(quizf1_bankswitch_w); DECLARE_WRITE16_MEMBER(dynablsb_sound_command_w); DECLARE_WRITE16_MEMBER(unknown_w); + DECLARE_WRITE16_MEMBER(m90_video_control_w); + DECLARE_WRITE16_MEMBER(m90_video_w); }; @@ -30,5 +32,3 @@ VIDEO_START( bomblord ); SCREEN_UPDATE_IND16( m90 ); SCREEN_UPDATE_IND16( dynablsb ); SCREEN_UPDATE_IND16( bomblord ); -WRITE16_HANDLER( m90_video_w ); -WRITE16_HANDLER( m90_video_control_w ); diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h index 48fb6745df8..5e2a11e74e0 100644 --- a/src/mame/includes/m92.h +++ b/src/mame/includes/m92.h @@ -45,6 +45,15 @@ public: DECLARE_WRITE16_MEMBER(m92_sound_irq_ack_w); DECLARE_WRITE16_MEMBER(m92_sound_status_w); DECLARE_WRITE16_MEMBER(m92_sound_reset_w); + DECLARE_WRITE16_MEMBER(m92_spritecontrol_w); + DECLARE_WRITE16_MEMBER(m92_videocontrol_w); + DECLARE_READ16_MEMBER(m92_paletteram_r); + DECLARE_WRITE16_MEMBER(m92_paletteram_w); + DECLARE_WRITE16_MEMBER(m92_vram_w); + DECLARE_WRITE16_MEMBER(m92_pf1_control_w); + DECLARE_WRITE16_MEMBER(m92_pf2_control_w); + DECLARE_WRITE16_MEMBER(m92_pf3_control_w); + DECLARE_WRITE16_MEMBER(m92_master_control_w); }; @@ -55,15 +64,6 @@ extern void m92_sprite_interrupt(running_machine &machine); /*----------- defined in video/m92.c -----------*/ -WRITE16_HANDLER( m92_spritecontrol_w ); -WRITE16_HANDLER( m92_videocontrol_w ); -READ16_HANDLER( m92_paletteram_r ); -WRITE16_HANDLER( m92_paletteram_w ); -WRITE16_HANDLER( m92_vram_w ); -WRITE16_HANDLER( m92_pf1_control_w ); -WRITE16_HANDLER( m92_pf2_control_w ); -WRITE16_HANDLER( m92_pf3_control_w ); -WRITE16_HANDLER( m92_master_control_w ); VIDEO_START( m92 ); SCREEN_UPDATE_IND16( m92 ); diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index 08f236c2e4d..91b51ad53e4 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -48,14 +48,14 @@ public: DECLARE_WRITE32_MEMBER(macrossp_palette_fade_w); DECLARE_WRITE32_MEMBER(macrossp_speedup_w); DECLARE_WRITE32_MEMBER(quizmoon_speedup_w); + DECLARE_WRITE32_MEMBER(macrossp_scra_videoram_w); + DECLARE_WRITE32_MEMBER(macrossp_scrb_videoram_w); + DECLARE_WRITE32_MEMBER(macrossp_scrc_videoram_w); + DECLARE_WRITE32_MEMBER(macrossp_text_videoram_w); }; /*----------- defined in video/macrossp.c -----------*/ -WRITE32_HANDLER( macrossp_scra_videoram_w ); -WRITE32_HANDLER( macrossp_scrb_videoram_w ); -WRITE32_HANDLER( macrossp_scrc_videoram_w ); -WRITE32_HANDLER( macrossp_text_videoram_w ); VIDEO_START(macrossp); SCREEN_UPDATE_RGB32(macrossp); diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h index dbcb54b2f6c..6501e1be76d 100644 --- a/src/mame/includes/madalien.h +++ b/src/mame/includes/madalien.h @@ -37,6 +37,8 @@ public: DECLARE_WRITE8_MEMBER(madalien_output_w); DECLARE_WRITE8_MEMBER(madalien_sound_command_w); DECLARE_READ8_MEMBER(madalien_sound_command_r); + DECLARE_WRITE8_MEMBER(madalien_videoram_w); + DECLARE_WRITE8_MEMBER(madalien_charram_w); }; @@ -44,8 +46,6 @@ public: MACHINE_CONFIG_EXTERN( madalien_video ); -WRITE8_HANDLER( madalien_videoram_w ); -WRITE8_HANDLER( madalien_charram_w ); /*----------- defined in audio/madalien.c -----------*/ diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h index 7f9aa9188a7..f1692ffd8c5 100644 --- a/src/mame/includes/mainsnk.h +++ b/src/mame/includes/mainsnk.h @@ -15,14 +15,14 @@ public: DECLARE_WRITE8_MEMBER(sound_command_w); DECLARE_READ8_MEMBER(sound_command_r); DECLARE_READ8_MEMBER(sound_ack_r); + DECLARE_WRITE8_MEMBER(mainsnk_c600_w); + DECLARE_WRITE8_MEMBER(mainsnk_fgram_w); + DECLARE_WRITE8_MEMBER(mainsnk_bgram_w); }; /*----------- defined in video/mainsnk.c -----------*/ PALETTE_INIT(mainsnk); -WRITE8_HANDLER(mainsnk_c600_w); -WRITE8_HANDLER(mainsnk_fgram_w); -WRITE8_HANDLER(mainsnk_bgram_w); VIDEO_START(mainsnk); SCREEN_UPDATE_IND16(mainsnk); diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h index aa966526565..dc172400aa9 100644 --- a/src/mame/includes/malzak.h +++ b/src/mame/includes/malzak.h @@ -30,11 +30,11 @@ public: DECLARE_WRITE8_MEMBER(port60_w); DECLARE_WRITE8_MEMBER(portc0_w); DECLARE_READ8_MEMBER(collision_r); + DECLARE_WRITE8_MEMBER(malzak_playfield_w); }; /*----------- defined in video/malzak.c -----------*/ -WRITE8_HANDLER( malzak_playfield_w ); SCREEN_UPDATE_IND16( malzak ); diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index 588413b019d..ba3f335aa17 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -18,6 +18,11 @@ public: DECLARE_WRITE8_MEMBER(superpac_latch_w); DECLARE_WRITE8_MEMBER(phozon_latch_w); DECLARE_WRITE8_MEMBER(mappy_latch_w); + DECLARE_WRITE8_MEMBER(superpac_videoram_w); + DECLARE_WRITE8_MEMBER(mappy_videoram_w); + DECLARE_WRITE8_MEMBER(superpac_flipscreen_w); + DECLARE_READ8_MEMBER(superpac_flipscreen_r); + DECLARE_WRITE8_MEMBER(mappy_scroll_w); }; @@ -33,8 +38,3 @@ VIDEO_START( superpac ); VIDEO_START( mappy ); SCREEN_UPDATE_IND16( superpac ); SCREEN_UPDATE_IND16( mappy ); -WRITE8_HANDLER( superpac_videoram_w ); -WRITE8_HANDLER( mappy_videoram_w ); -WRITE8_HANDLER( mappy_scroll_w ); -READ8_HANDLER( superpac_flipscreen_r ); -WRITE8_HANDLER( superpac_flipscreen_w ); diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h index e23753b4b25..dd02a13f6c8 100644 --- a/src/mame/includes/marineb.h +++ b/src/mame/includes/marineb.h @@ -23,18 +23,18 @@ public: UINT8 m_irq_mask; DECLARE_WRITE8_MEMBER(irq_mask_w); + DECLARE_WRITE8_MEMBER(marineb_videoram_w); + DECLARE_WRITE8_MEMBER(marineb_colorram_w); + DECLARE_WRITE8_MEMBER(marineb_column_scroll_w); + DECLARE_WRITE8_MEMBER(marineb_palette_bank_0_w); + DECLARE_WRITE8_MEMBER(marineb_palette_bank_1_w); + DECLARE_WRITE8_MEMBER(marineb_flipscreen_x_w); + DECLARE_WRITE8_MEMBER(marineb_flipscreen_y_w); }; /*----------- defined in video/marineb.c -----------*/ -WRITE8_HANDLER( marineb_videoram_w ); -WRITE8_HANDLER( marineb_colorram_w ); -WRITE8_HANDLER( marineb_column_scroll_w ); -WRITE8_HANDLER( marineb_palette_bank_0_w ); -WRITE8_HANDLER( marineb_palette_bank_1_w ); -WRITE8_HANDLER( marineb_flipscreen_x_w ); -WRITE8_HANDLER( marineb_flipscreen_y_w ); PALETTE_INIT( marineb ); VIDEO_START( marineb ); diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index c7a81c66a98..2c3affc5ed1 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -61,15 +61,15 @@ public: UINT8 m_nmi_mask; DECLARE_WRITE8_MEMBER(nmi_mask_w); + DECLARE_WRITE8_MEMBER(mario_videoram_w); + DECLARE_WRITE8_MEMBER(mario_gfxbank_w); + DECLARE_WRITE8_MEMBER(mario_palettebank_w); + DECLARE_WRITE8_MEMBER(mario_scroll_w); + DECLARE_WRITE8_MEMBER(mario_flip_w); }; /*----------- defined in video/mario.c -----------*/ -WRITE8_HANDLER( mario_videoram_w ); -WRITE8_HANDLER( mario_gfxbank_w ); -WRITE8_HANDLER( mario_palettebank_w ); -WRITE8_HANDLER( mario_scroll_w ); -WRITE8_HANDLER( mario_flip_w ); PALETTE_INIT( mario ); VIDEO_START( mario ); diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h index c6f01fb06d7..6e1a9aa35b1 100644 --- a/src/mame/includes/markham.h +++ b/src/mame/includes/markham.h @@ -19,13 +19,13 @@ public: /* video-related */ tilemap_t *m_bg_tilemap; DECLARE_READ8_MEMBER(markham_e004_r); + DECLARE_WRITE8_MEMBER(markham_videoram_w); + DECLARE_WRITE8_MEMBER(markham_flipscreen_w); }; /*----------- defined in video/markham.c -----------*/ -WRITE8_HANDLER( markham_videoram_w ); -WRITE8_HANDLER( markham_flipscreen_w ); PALETTE_INIT( markham ); VIDEO_START( markham ); diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h index f31b3f7c88b..ff557717cbc 100644 --- a/src/mame/includes/matmania.h +++ b/src/mame/includes/matmania.h @@ -47,6 +47,7 @@ public: device_t *m_mcu; DECLARE_WRITE8_MEMBER(matmania_sh_command_w); DECLARE_WRITE8_MEMBER(maniach_sh_command_w); + DECLARE_WRITE8_MEMBER(matmania_paletteram_w); }; /*----------- defined in machine/maniach.c -----------*/ @@ -67,7 +68,6 @@ READ8_HANDLER( maniach_mcu_status_r ); /*----------- defined in video/matmania.c -----------*/ -WRITE8_HANDLER( matmania_paletteram_w ); PALETTE_INIT( matmania ); SCREEN_UPDATE_IND16( maniach ); VIDEO_START( matmania ); diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h index 82be0db3cc9..2ed49f4a7b6 100644 --- a/src/mame/includes/mcatadv.h +++ b/src/mame/includes/mcatadv.h @@ -30,6 +30,8 @@ public: DECLARE_WRITE16_MEMBER(mcat_coin_w); DECLARE_READ16_MEMBER(mcat_wd_r); DECLARE_WRITE8_MEMBER(mcatadv_sound_bw_w); + DECLARE_WRITE16_MEMBER(mcatadv_videoram1_w); + DECLARE_WRITE16_MEMBER(mcatadv_videoram2_w); }; /*----------- defined in video/mcatadv.c -----------*/ @@ -38,5 +40,3 @@ SCREEN_UPDATE_IND16( mcatadv ); VIDEO_START( mcatadv ); SCREEN_VBLANK( mcatadv ); -WRITE16_HANDLER( mcatadv_videoram1_w ); -WRITE16_HANDLER( mcatadv_videoram2_w ); diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h index 80aeae772c9..f76e7f364a1 100644 --- a/src/mame/includes/mcr.h +++ b/src/mame/includes/mcr.h @@ -26,6 +26,16 @@ public: required_device<z80_device> m_maincpu; required_shared_ptr<UINT8> m_spriteram; + DECLARE_WRITE8_MEMBER(mcr_control_port_w); + DECLARE_WRITE8_MEMBER(mcr_ipu_laserdisk_w); + DECLARE_READ8_MEMBER(mcr_ipu_watchdog_r); + DECLARE_WRITE8_MEMBER(mcr_ipu_watchdog_w); + DECLARE_WRITE8_MEMBER(mcr_91490_paletteram_w); + DECLARE_WRITE8_MEMBER(mcr_90009_videoram_w); + DECLARE_WRITE8_MEMBER(mcr_90010_videoram_w); + DECLARE_READ8_MEMBER(twotiger_videoram_r); + DECLARE_WRITE8_MEMBER(twotiger_videoram_w); + DECLARE_WRITE8_MEMBER(mcr_91490_videoram_w); }; @@ -57,11 +67,7 @@ MACHINE_START( nflfoot ); TIMER_DEVICE_CALLBACK( mcr_interrupt ); TIMER_DEVICE_CALLBACK( mcr_ipu_interrupt ); -WRITE8_HANDLER( mcr_control_port_w ); -WRITE8_HANDLER( mcr_ipu_laserdisk_w ); -READ8_HANDLER( mcr_ipu_watchdog_r ); -WRITE8_HANDLER( mcr_ipu_watchdog_w ); /*----------- defined in video/mcr.c -----------*/ @@ -71,12 +77,6 @@ extern INT8 mcr12_sprite_xoffs_flip; VIDEO_START( mcr ); -WRITE8_HANDLER( mcr_91490_paletteram_w ); -WRITE8_HANDLER( mcr_90009_videoram_w ); -WRITE8_HANDLER( mcr_90010_videoram_w ); -READ8_HANDLER( twotiger_videoram_r ); -WRITE8_HANDLER( twotiger_videoram_w ); -WRITE8_HANDLER( mcr_91490_videoram_w ); SCREEN_UPDATE_IND16( mcr ); diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h index d7744e652e1..6689d6bdad2 100644 --- a/src/mame/includes/mcr3.h +++ b/src/mame/includes/mcr3.h @@ -22,16 +22,16 @@ public: INT16 m_spyhunt_scrolly; tilemap_t *m_bg_tilemap; tilemap_t *m_alpha_tilemap; + DECLARE_WRITE8_MEMBER(mcr3_paletteram_w); + DECLARE_WRITE8_MEMBER(mcr3_videoram_w); + DECLARE_WRITE8_MEMBER(spyhunt_videoram_w); + DECLARE_WRITE8_MEMBER(spyhunt_alpharam_w); + DECLARE_WRITE8_MEMBER(spyhunt_scroll_value_w); }; /*----------- defined in video/mcr3.c -----------*/ -WRITE8_HANDLER( mcr3_paletteram_w ); -WRITE8_HANDLER( mcr3_videoram_w ); -WRITE8_HANDLER( spyhunt_videoram_w ); -WRITE8_HANDLER( spyhunt_alpharam_w ); -WRITE8_HANDLER( spyhunt_scroll_value_w ); VIDEO_START( mcrmono ); VIDEO_START( spyhunt ); diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index 3a4538d91ec..536862c4b02 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -53,6 +53,19 @@ public: DECLARE_READ16_MEMBER(pigskin_port_1_r); DECLARE_READ16_MEMBER(pigskin_port_2_r); DECLARE_READ16_MEMBER(trisport_port_1_r); + DECLARE_WRITE16_MEMBER(mcr68_6840_upper_w); + DECLARE_WRITE16_MEMBER(mcr68_6840_lower_w); + DECLARE_READ16_MEMBER(mcr68_6840_upper_r); + DECLARE_READ16_MEMBER(mcr68_6840_lower_r); + DECLARE_WRITE8_MEMBER(mcr68_6840_w_common); + DECLARE_READ16_MEMBER(mcr68_6840_r_common); + void reload_count(int counter); + UINT16 compute_counter(int counter); + DECLARE_WRITE16_MEMBER(mcr68_paletteram_w); + DECLARE_WRITE16_MEMBER(zwackery_paletteram_w); + DECLARE_WRITE16_MEMBER(mcr68_videoram_w); + DECLARE_WRITE16_MEMBER(zwackery_videoram_w); + DECLARE_WRITE16_MEMBER(zwackery_spriteram_w); }; @@ -73,25 +86,16 @@ MACHINE_RESET( mcr68 ); MACHINE_START( zwackery ); MACHINE_RESET( zwackery ); -WRITE16_HANDLER( mcr68_6840_upper_w ); -WRITE16_HANDLER( mcr68_6840_lower_w ); -READ16_HANDLER( mcr68_6840_upper_r ); -READ16_HANDLER( mcr68_6840_lower_r ); INTERRUPT_GEN( mcr68_interrupt ); /*----------- defined in video/mcr68.c -----------*/ -WRITE16_HANDLER( mcr68_paletteram_w ); -WRITE16_HANDLER( mcr68_videoram_w ); VIDEO_START( mcr68 ); SCREEN_UPDATE_IND16( mcr68 ); -WRITE16_HANDLER( zwackery_paletteram_w ); -WRITE16_HANDLER( zwackery_videoram_w ); -WRITE16_HANDLER( zwackery_spriteram_w ); VIDEO_START( zwackery ); SCREEN_UPDATE_IND16( zwackery ); diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index 9f9228bcf9a..5c907b7e9d4 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -35,6 +35,8 @@ public: DECLARE_WRITE8_MEMBER(meadows_audio_w); DECLARE_WRITE8_MEMBER(audio_hardware_w); DECLARE_READ8_MEMBER(audio_hardware_r); + DECLARE_WRITE8_MEMBER(meadows_videoram_w); + DECLARE_WRITE8_MEMBER(meadows_spriteram_w); }; @@ -49,6 +51,4 @@ void meadows_sh_update(running_machine &machine); VIDEO_START( meadows ); SCREEN_UPDATE_IND16( meadows ); -WRITE8_HANDLER( meadows_videoram_w ); -WRITE8_HANDLER( meadows_spriteram_w ); diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h index 585cd5f31ec..d0d3bf10f69 100644 --- a/src/mame/includes/megasys1.h +++ b/src/mame/includes/megasys1.h @@ -65,6 +65,14 @@ public: DECLARE_READ16_MEMBER(stdragon_mcu_hs_r); DECLARE_WRITE16_MEMBER(stdragon_mcu_hs_w); DECLARE_READ16_MEMBER(monkelf_input_r); + DECLARE_WRITE16_MEMBER(megasys1_scrollram_0_w); + DECLARE_WRITE16_MEMBER(megasys1_scrollram_1_w); + DECLARE_WRITE16_MEMBER(megasys1_scrollram_2_w); + DECLARE_WRITE16_MEMBER(megasys1_vregs_A_w); + DECLARE_READ16_MEMBER(megasys1_vregs_C_r); + DECLARE_WRITE16_MEMBER(megasys1_vregs_C_w); + DECLARE_WRITE16_MEMBER(megasys1_vregs_D_w); + void megasys1_set_vreg_flag(int which, int data); }; @@ -76,12 +84,5 @@ SCREEN_VBLANK( megasys1 ); PALETTE_INIT( megasys1 ); -READ16_HANDLER( megasys1_vregs_C_r ); -WRITE16_HANDLER( megasys1_vregs_A_w ); -WRITE16_HANDLER( megasys1_vregs_C_w ); -WRITE16_HANDLER( megasys1_vregs_D_w ); -WRITE16_HANDLER( megasys1_scrollram_0_w ); -WRITE16_HANDLER( megasys1_scrollram_1_w ); -WRITE16_HANDLER( megasys1_scrollram_2_w ); diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h index f68a5aa3727..1f258df5f17 100644 --- a/src/mame/includes/megazone.h +++ b/src/mame/includes/megazone.h @@ -39,13 +39,13 @@ public: DECLARE_WRITE8_MEMBER(i8039_irqen_and_status_w); DECLARE_WRITE8_MEMBER(megazone_coin_counter_w); DECLARE_WRITE8_MEMBER(irq_mask_w); + DECLARE_WRITE8_MEMBER(megazone_flipscreen_w); }; /*----------- defined in video/megazone.c -----------*/ -WRITE8_HANDLER( megazone_flipscreen_w ); PALETTE_INIT( megazone ); VIDEO_START( megazone ); diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index df37856ef77..397491f3ccc 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -54,22 +54,22 @@ public: DECLARE_WRITE8_MEMBER(rougien_sample_rom_lo_w); DECLARE_WRITE8_MEMBER(rougien_sample_rom_hi_w); DECLARE_WRITE8_MEMBER(rougien_sample_playback_w); + DECLARE_WRITE8_MEMBER(mermaid_videoram2_w); + DECLARE_WRITE8_MEMBER(mermaid_videoram_w); + DECLARE_WRITE8_MEMBER(mermaid_colorram_w); + DECLARE_WRITE8_MEMBER(mermaid_flip_screen_x_w); + DECLARE_WRITE8_MEMBER(mermaid_flip_screen_y_w); + DECLARE_WRITE8_MEMBER(mermaid_bg_scroll_w); + DECLARE_WRITE8_MEMBER(mermaid_fg_scroll_w); + DECLARE_WRITE8_MEMBER(rougien_gfxbankswitch1_w); + DECLARE_WRITE8_MEMBER(rougien_gfxbankswitch2_w); + DECLARE_READ8_MEMBER(mermaid_collision_r); }; /*----------- defined in video/mermaid.c -----------*/ -WRITE8_HANDLER( mermaid_videoram2_w ); -WRITE8_HANDLER( mermaid_videoram_w ); -WRITE8_HANDLER( mermaid_colorram_w ); -WRITE8_HANDLER( mermaid_flip_screen_x_w ); -WRITE8_HANDLER( mermaid_flip_screen_y_w ); -WRITE8_HANDLER( mermaid_bg_scroll_w ); -WRITE8_HANDLER( mermaid_fg_scroll_w ); -WRITE8_HANDLER( rougien_gfxbankswitch1_w ); -WRITE8_HANDLER( rougien_gfxbankswitch2_w ); -READ8_HANDLER( mermaid_collision_r ); PALETTE_INIT( mermaid ); PALETTE_INIT( rougien ); diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h index 0552005f72f..be572f3e730 100644 --- a/src/mame/includes/metlclsh.h +++ b/src/mame/includes/metlclsh.h @@ -35,15 +35,15 @@ public: DECLARE_WRITE8_MEMBER(metlclsh_ack_irq2); DECLARE_WRITE8_MEMBER(metlclsh_ack_nmi2); DECLARE_WRITE8_MEMBER(metlclsh_flipscreen_w); + DECLARE_WRITE8_MEMBER(metlclsh_rambank_w); + DECLARE_WRITE8_MEMBER(metlclsh_gfxbank_w); + DECLARE_WRITE8_MEMBER(metlclsh_bgram_w); + DECLARE_WRITE8_MEMBER(metlclsh_fgram_w); }; /*----------- defined in video/metlclsh.c -----------*/ -WRITE8_HANDLER( metlclsh_bgram_w ); -WRITE8_HANDLER( metlclsh_fgram_w ); -WRITE8_HANDLER( metlclsh_gfxbank_w ); -WRITE8_HANDLER( metlclsh_rambank_w ); VIDEO_START( metlclsh ); SCREEN_UPDATE_IND16( metlclsh ); diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index fc0226ba6e3..7470b2484cb 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -112,16 +112,17 @@ public: DECLARE_WRITE16_MEMBER(vram_1_clr_w); DECLARE_WRITE16_MEMBER(vram_2_clr_w); DECLARE_WRITE8_MEMBER(puzzlet_portb_w); + DECLARE_WRITE16_MEMBER(metro_k053936_w); + DECLARE_WRITE16_MEMBER(metro_vram_0_w); + DECLARE_WRITE16_MEMBER(metro_vram_1_w); + DECLARE_WRITE16_MEMBER(metro_vram_2_w); + DECLARE_WRITE16_MEMBER(metro_window_w); + void blt_write( address_space *space, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask ); }; /*----------- defined in video/metro.c -----------*/ -WRITE16_HANDLER( metro_window_w ); -WRITE16_HANDLER( metro_vram_0_w ); -WRITE16_HANDLER( metro_vram_1_w ); -WRITE16_HANDLER( metro_vram_2_w ); -WRITE16_HANDLER( metro_k053936_w ); VIDEO_START( metro_14100 ); VIDEO_START( metro_14220 ); diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h index 271522c8d3b..925bf211aa8 100644 --- a/src/mame/includes/mexico86.h +++ b/src/mame/includes/mexico86.h @@ -40,25 +40,25 @@ public: int m_qfront; int m_qstate; DECLARE_WRITE8_MEMBER(mexico86_sub_output_w); + DECLARE_WRITE8_MEMBER(mexico86_f008_w); + DECLARE_READ8_MEMBER(mexico86_68705_port_a_r); + DECLARE_WRITE8_MEMBER(mexico86_68705_port_a_w); + DECLARE_WRITE8_MEMBER(mexico86_68705_ddr_a_w); + DECLARE_READ8_MEMBER(mexico86_68705_port_b_r); + DECLARE_WRITE8_MEMBER(mexico86_68705_port_b_w); + DECLARE_WRITE8_MEMBER(mexico86_68705_ddr_b_w); + DECLARE_WRITE8_MEMBER(mexico86_bankswitch_w); }; /*----------- defined in machine/mexico86.c -----------*/ -WRITE8_HANDLER( mexico86_f008_w ); INTERRUPT_GEN( kikikai_interrupt ); INTERRUPT_GEN( mexico86_m68705_interrupt ); -READ8_HANDLER( mexico86_68705_port_a_r ); -WRITE8_HANDLER( mexico86_68705_port_a_w ); -WRITE8_HANDLER( mexico86_68705_ddr_a_w ); -READ8_HANDLER( mexico86_68705_port_b_r ); -WRITE8_HANDLER( mexico86_68705_port_b_w ); -WRITE8_HANDLER( mexico86_68705_ddr_b_w ); /*----------- defined in video/mexico86.c -----------*/ -WRITE8_HANDLER( mexico86_bankswitch_w ); SCREEN_UPDATE_IND16( mexico86 ); SCREEN_UPDATE_IND16( kikikai ); diff --git a/src/mame/includes/mhavoc.h b/src/mame/includes/mhavoc.h index e6463674a1e..d3dc45022cc 100644 --- a/src/mame/includes/mhavoc.h +++ b/src/mame/includes/mhavoc.h @@ -37,6 +37,19 @@ public: UINT8 m_speech_write_buffer; DECLARE_READ8_MEMBER(dual_pokey_r); DECLARE_WRITE8_MEMBER(dual_pokey_w); + DECLARE_WRITE8_MEMBER(mhavoc_alpha_irq_ack_w); + DECLARE_WRITE8_MEMBER(mhavoc_gamma_irq_ack_w); + DECLARE_WRITE8_MEMBER(mhavoc_gamma_w); + DECLARE_READ8_MEMBER(mhavoc_alpha_r); + DECLARE_WRITE8_MEMBER(mhavoc_alpha_w); + DECLARE_READ8_MEMBER(mhavoc_gamma_r); + DECLARE_WRITE8_MEMBER(mhavoc_ram_banksel_w); + DECLARE_WRITE8_MEMBER(mhavoc_rom_banksel_w); + DECLARE_WRITE8_MEMBER(mhavoc_out_0_w); + DECLARE_WRITE8_MEMBER(alphaone_out_0_w); + DECLARE_WRITE8_MEMBER(mhavoc_out_1_w); + DECLARE_WRITE8_MEMBER(mhavocrv_speech_data_w); + DECLARE_WRITE8_MEMBER(mhavocrv_speech_strobe_w); }; @@ -44,21 +57,13 @@ public: TIMER_DEVICE_CALLBACK( mhavoc_cpu_irq_clock ); -WRITE8_HANDLER( mhavoc_alpha_irq_ack_w ); -WRITE8_HANDLER( mhavoc_gamma_irq_ack_w ); MACHINE_START( mhavoc ); MACHINE_RESET( mhavoc ); DRIVER_INIT( mhavocrv ); -WRITE8_HANDLER( mhavoc_gamma_w ); -READ8_HANDLER( mhavoc_alpha_r ); -WRITE8_HANDLER( mhavoc_alpha_w ); -READ8_HANDLER( mhavoc_gamma_r ); -WRITE8_HANDLER( mhavoc_ram_banksel_w ); -WRITE8_HANDLER( mhavoc_rom_banksel_w ); CUSTOM_INPUT( tms5220_r ); CUSTOM_INPUT( gamma_rcvd_r ); @@ -67,8 +72,5 @@ CUSTOM_INPUT( alpha_rcvd_r ); CUSTOM_INPUT( alpha_xmtd_r ); CUSTOM_INPUT( mhavoc_bit67_r ); -WRITE8_HANDLER( mhavoc_out_0_w ); -WRITE8_HANDLER( alphaone_out_0_w ); -WRITE8_HANDLER( mhavoc_out_1_w ); diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index a5a8c2139de..24ee926eb1a 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -72,6 +72,33 @@ public: UINT16 *m_tmp_buffer; int m_drawing_buffer; int m_display_buffer; + DECLARE_WRITE16_MEMBER(micro3d_ti_uart_w); + DECLARE_READ16_MEMBER(micro3d_ti_uart_r); + DECLARE_WRITE32_MEMBER(micro3d_scc_w); + DECLARE_READ32_MEMBER(micro3d_scc_r); + DECLARE_READ16_MEMBER(micro3d_tms_host_r); + DECLARE_WRITE16_MEMBER(micro3d_tms_host_w); + DECLARE_WRITE32_MEMBER(micro3d_mac1_w); + DECLARE_READ32_MEMBER(micro3d_mac2_r); + DECLARE_WRITE32_MEMBER(micro3d_mac2_w); + DECLARE_READ16_MEMBER(micro3d_encoder_h_r); + DECLARE_READ16_MEMBER(micro3d_encoder_l_r); + DECLARE_READ16_MEMBER(micro3d_adc_r); + DECLARE_WRITE16_MEMBER(micro3d_adc_w); + DECLARE_READ16_MEMBER(botssa_140000_r); + DECLARE_READ16_MEMBER(botssa_180000_r); + DECLARE_WRITE16_MEMBER(micro3d_reset_w); + DECLARE_WRITE16_MEMBER(host_drmath_int_w); + DECLARE_WRITE32_MEMBER(micro3d_shared_w); + DECLARE_READ32_MEMBER(micro3d_shared_r); + DECLARE_WRITE32_MEMBER(drmath_int_w); + DECLARE_WRITE32_MEMBER(drmath_intr2_ack); + DECLARE_WRITE16_MEMBER(micro3d_clut_w); + DECLARE_WRITE16_MEMBER(micro3d_creg_w); + DECLARE_WRITE16_MEMBER(micro3d_xfer3dk_w); + DECLARE_WRITE32_MEMBER(micro3d_fifo_w); + DECLARE_WRITE32_MEMBER(micro3d_alt_fifo_w); + DECLARE_READ32_MEMBER(micro3d_pipe_r); }; typedef struct _micro3d_vtx_ @@ -82,37 +109,16 @@ typedef struct _micro3d_vtx_ /*----------- defined in machine/micro3d.c -----------*/ -READ16_HANDLER( micro3d_ti_uart_r ); -WRITE16_HANDLER( micro3d_ti_uart_w ); -READ32_HANDLER( micro3d_scc_r ); -WRITE32_HANDLER( micro3d_scc_w ); -READ16_HANDLER( micro3d_tms_host_r ); -WRITE16_HANDLER( micro3d_tms_host_w ); -READ16_HANDLER( micro3d_adc_r ); -WRITE16_HANDLER( micro3d_adc_w ); -WRITE16_HANDLER( host_drmath_int_w ); -WRITE16_HANDLER( micro3d_reset_w ); -READ16_HANDLER( micro3d_encoder_l_r ); -READ16_HANDLER( micro3d_encoder_h_r ); CUSTOM_INPUT( botssa_hwchk_r ); -READ16_HANDLER( botssa_140000_r ); -READ16_HANDLER( botssa_180000_r ); -READ32_HANDLER( micro3d_shared_r ); -WRITE32_HANDLER( micro3d_shared_w ); -WRITE32_HANDLER( drmath_int_w ); -WRITE32_HANDLER( drmath_intr2_ack ); -WRITE32_HANDLER( micro3d_mac1_w ); -WRITE32_HANDLER( micro3d_mac2_w ); -READ32_HANDLER( micro3d_mac2_r ); void micro3d_duart_irq_handler(device_t *device, UINT8 vector); UINT8 micro3d_duart_input_r(device_t *device); @@ -145,11 +151,5 @@ VIDEO_RESET( micro3d ); void micro3d_tms_interrupt(device_t *device, int state); void micro3d_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params); -WRITE16_HANDLER( micro3d_clut_w ); -WRITE16_HANDLER( micro3d_creg_w ); -WRITE16_HANDLER( micro3d_xfer3dk_w ); -READ32_HANDLER( micro3d_pipe_r ); -WRITE32_HANDLER( micro3d_fifo_w ); -WRITE32_HANDLER( micro3d_alt_fifo_w ); INTERRUPT_GEN( micro3d_vblank ); diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h index 276776a8b99..1c5c06d4535 100644 --- a/src/mame/includes/midtunit.h +++ b/src/mame/includes/midtunit.h @@ -12,15 +12,46 @@ public: m_nvram(*this, "nvram") { } required_shared_ptr<UINT16> m_nvram; + DECLARE_WRITE16_MEMBER(midtunit_cmos_enable_w); + DECLARE_WRITE16_MEMBER(midtunit_cmos_w); + DECLARE_READ16_MEMBER(midtunit_cmos_r); + DECLARE_READ16_MEMBER(midtunit_input_r); + DECLARE_READ16_MEMBER(midtunit_sound_state_r); + DECLARE_READ16_MEMBER(midtunit_sound_r); + DECLARE_WRITE16_MEMBER(midtunit_sound_w); + DECLARE_READ16_MEMBER(mk_prot_r); + DECLARE_WRITE16_MEMBER(mk_prot_w); + DECLARE_READ16_MEMBER(mkturbo_prot_r); + DECLARE_READ16_MEMBER(mk2_prot_const_r); + DECLARE_READ16_MEMBER(mk2_prot_r); + DECLARE_READ16_MEMBER(mk2_prot_shift_r); + DECLARE_WRITE16_MEMBER(mk2_prot_w); + DECLARE_READ16_MEMBER(nbajam_prot_r); + DECLARE_WRITE16_MEMBER(nbajam_prot_w); + DECLARE_WRITE16_MEMBER(jdredd_prot_w); + DECLARE_READ16_MEMBER(jdredd_prot_r); + DECLARE_READ16_MEMBER(jdredd_hack_r); + DECLARE_READ16_MEMBER(midtunit_gfxrom_r); + DECLARE_READ16_MEMBER(midwunit_gfxrom_r); + DECLARE_WRITE16_MEMBER(midtunit_vram_w); + DECLARE_WRITE16_MEMBER(midtunit_vram_data_w); + DECLARE_WRITE16_MEMBER(midtunit_vram_color_w); + DECLARE_READ16_MEMBER(midtunit_vram_r); + DECLARE_READ16_MEMBER(midtunit_vram_data_r); + DECLARE_READ16_MEMBER(midtunit_vram_color_r); + DECLARE_WRITE16_MEMBER(midtunit_control_w); + DECLARE_WRITE16_MEMBER(midwunit_control_w); + DECLARE_READ16_MEMBER(midwunit_control_r); + DECLARE_WRITE16_MEMBER(midtunit_paletteram_w); + DECLARE_WRITE16_MEMBER(midxunit_paletteram_w); + DECLARE_READ16_MEMBER(midxunit_paletteram_r); + DECLARE_READ16_MEMBER(midtunit_dma_r); + DECLARE_WRITE16_MEMBER(midtunit_dma_w); }; /*----------- defined in machine/midtunit.c -----------*/ -WRITE16_HANDLER( midtunit_cmos_enable_w ); -WRITE16_HANDLER( midtunit_cmos_w ); -READ16_HANDLER( midtunit_cmos_r ); -READ16_HANDLER( midtunit_input_r ); DRIVER_INIT( mktunit ); DRIVER_INIT( mkturbo ); @@ -31,9 +62,6 @@ DRIVER_INIT( mk2 ); MACHINE_RESET( midtunit ); -READ16_HANDLER( midtunit_sound_state_r ); -READ16_HANDLER( midtunit_sound_r ); -WRITE16_HANDLER( midtunit_sound_w ); /*----------- defined in video/midtunit.c -----------*/ @@ -46,30 +74,14 @@ VIDEO_START( midtunit ); VIDEO_START( midwunit ); VIDEO_START( midxunit ); -READ16_HANDLER( midtunit_gfxrom_r ); -READ16_HANDLER( midwunit_gfxrom_r ); -WRITE16_HANDLER( midtunit_vram_w ); -WRITE16_HANDLER( midtunit_vram_data_w ); -WRITE16_HANDLER( midtunit_vram_color_w ); -READ16_HANDLER( midtunit_vram_r ); -READ16_HANDLER( midtunit_vram_data_r ); -READ16_HANDLER( midtunit_vram_color_r ); void midtunit_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg); void midtunit_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg); -WRITE16_HANDLER( midtunit_control_w ); -WRITE16_HANDLER( midwunit_control_w ); -READ16_HANDLER( midwunit_control_r ); -WRITE16_HANDLER( midtunit_paletteram_w ); -WRITE16_HANDLER( midxunit_paletteram_w ); -READ16_HANDLER( midxunit_paletteram_r ); -READ16_HANDLER( midtunit_dma_r ); -WRITE16_HANDLER( midtunit_dma_w ); void midtunit_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params); void midxunit_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params); diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h index cce627bedff..bd33ffc0a54 100644 --- a/src/mame/includes/midvunit.h +++ b/src/mame/includes/midvunit.h @@ -66,29 +66,29 @@ public: UINT8 m_video_changed; emu_timer *m_scanline_timer; midvunit_renderer *m_poly; + DECLARE_WRITE32_MEMBER(midvunit_dma_queue_w); + DECLARE_READ32_MEMBER(midvunit_dma_queue_entries_r); + DECLARE_READ32_MEMBER(midvunit_dma_trigger_r); + DECLARE_WRITE32_MEMBER(midvunit_page_control_w); + DECLARE_READ32_MEMBER(midvunit_page_control_r); + DECLARE_WRITE32_MEMBER(midvunit_video_control_w); + DECLARE_READ32_MEMBER(midvunit_scanline_r); + DECLARE_WRITE32_MEMBER(midvunit_videoram_w); + DECLARE_READ32_MEMBER(midvunit_videoram_r); + DECLARE_WRITE32_MEMBER(midvunit_paletteram_w); + DECLARE_WRITE32_MEMBER(midvunit_textureram_w); + DECLARE_READ32_MEMBER(midvunit_textureram_r); }; /*----------- defined in video/midvunit.c -----------*/ -WRITE32_HANDLER( midvunit_dma_queue_w ); -READ32_HANDLER( midvunit_dma_queue_entries_r ); -READ32_HANDLER( midvunit_dma_trigger_r ); -WRITE32_HANDLER( midvunit_page_control_w ); -READ32_HANDLER( midvunit_page_control_r ); -WRITE32_HANDLER( midvunit_video_control_w ); -READ32_HANDLER( midvunit_scanline_r ); -WRITE32_HANDLER( midvunit_videoram_w ); -READ32_HANDLER( midvunit_videoram_r ); -WRITE32_HANDLER( midvunit_paletteram_w ); -WRITE32_HANDLER( midvunit_textureram_w ); -READ32_HANDLER( midvunit_textureram_r ); VIDEO_START( midvunit ); SCREEN_UPDATE_IND16( midvunit ); diff --git a/src/mame/includes/midwunit.h b/src/mame/includes/midwunit.h index 188e039d8f0..68027dd8ff8 100644 --- a/src/mame/includes/midwunit.h +++ b/src/mame/includes/midwunit.h @@ -4,11 +4,11 @@ **************************************************************************/ -class midwunit_state : public driver_device +class midwunit_state : public midtunit_state { public: midwunit_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + : midtunit_state(mconfig, type, tag), m_nvram(*this, "nvram") { } required_shared_ptr<UINT16> m_nvram; @@ -19,17 +19,24 @@ public: UINT8 m_uart[8]; UINT8 m_security_bits; UINT16 *m_umk3_palette; + DECLARE_WRITE16_MEMBER(midwunit_cmos_enable_w); + DECLARE_WRITE16_MEMBER(midwunit_cmos_w); + DECLARE_READ16_MEMBER(midwunit_cmos_r); + DECLARE_WRITE16_MEMBER(midwunit_io_w); + DECLARE_READ16_MEMBER(midwunit_io_r); + DECLARE_READ16_MEMBER(midwunit_security_r); + DECLARE_WRITE16_MEMBER(midwunit_security_w); + DECLARE_READ16_MEMBER(midwunit_sound_r); + DECLARE_READ16_MEMBER(midwunit_sound_state_r); + DECLARE_WRITE16_MEMBER(midwunit_sound_w); + DECLARE_WRITE16_MEMBER(umk3_palette_hack_w); + DECLARE_WRITE16_MEMBER(wwfmania_io_0_w); }; /*----------- defined in machine/midwunit.c -----------*/ -WRITE16_HANDLER( midwunit_cmos_enable_w ); -WRITE16_HANDLER( midwunit_cmos_w ); -READ16_HANDLER( midwunit_cmos_r ); -WRITE16_HANDLER( midwunit_io_w ); -READ16_HANDLER( midwunit_io_r ); DRIVER_INIT( mk3 ); DRIVER_INIT( mk3r20 ); @@ -44,8 +51,4 @@ DRIVER_INIT( rmpgwt ); MACHINE_RESET( midwunit ); -READ16_HANDLER( midwunit_security_r ); -WRITE16_HANDLER( midwunit_security_w ); -READ16_HANDLER( midwunit_sound_r ); -WRITE16_HANDLER( midwunit_sound_w ); diff --git a/src/mame/includes/midxunit.h b/src/mame/includes/midxunit.h index 9e30d17069c..4f1d255b8ab 100644 --- a/src/mame/includes/midxunit.h +++ b/src/mame/includes/midxunit.h @@ -4,11 +4,11 @@ **************************************************************************/ -class midxunit_state : public driver_device +class midxunit_state : public midtunit_state { public: midxunit_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + : midtunit_state(mconfig, type, tag), m_nvram(*this, "nvram") { } required_shared_ptr<UINT16> m_nvram; @@ -19,32 +19,33 @@ public: UINT8 m_analog_port; UINT8 m_uart[8]; UINT8 m_security_bits; + DECLARE_READ16_MEMBER(midxunit_cmos_r); + DECLARE_WRITE16_MEMBER(midxunit_cmos_w); + DECLARE_WRITE16_MEMBER(midxunit_io_w); + DECLARE_WRITE16_MEMBER(midxunit_unknown_w); + DECLARE_READ16_MEMBER(midxunit_io_r); + DECLARE_READ16_MEMBER(midxunit_analog_r); + DECLARE_WRITE16_MEMBER(midxunit_analog_select_w); + DECLARE_READ16_MEMBER(midxunit_status_r); + DECLARE_READ16_MEMBER(midxunit_uart_r); + DECLARE_WRITE16_MEMBER(midxunit_uart_w); + DECLARE_READ16_MEMBER(midxunit_security_r); + DECLARE_WRITE16_MEMBER(midxunit_security_w); + DECLARE_WRITE16_MEMBER(midxunit_security_clock_w); + DECLARE_READ16_MEMBER(midxunit_sound_r); + DECLARE_READ16_MEMBER(midxunit_sound_state_r); + DECLARE_WRITE16_MEMBER(midxunit_sound_w); }; /*----------- defined in machine/midxunit.c -----------*/ -READ16_HANDLER( midxunit_cmos_r ); -WRITE16_HANDLER( midxunit_cmos_w ); -WRITE16_HANDLER( midxunit_io_w ); -WRITE16_HANDLER( midxunit_unknown_w ); -READ16_HANDLER( midxunit_io_r ); -READ16_HANDLER( midxunit_analog_r ); -WRITE16_HANDLER( midxunit_analog_select_w ); -READ16_HANDLER( midxunit_status_r ); -READ16_HANDLER( midxunit_uart_r ); -WRITE16_HANDLER( midxunit_uart_w ); DRIVER_INIT( revx ); MACHINE_RESET( midxunit ); -READ16_HANDLER( midxunit_security_r ); -WRITE16_HANDLER( midxunit_security_w ); -WRITE16_HANDLER( midxunit_security_clock_w ); -READ16_HANDLER( midxunit_sound_r ); -WRITE16_HANDLER( midxunit_sound_w ); diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h index 319d90a4495..ed0a4189d08 100644 --- a/src/mame/includes/midyunit.h +++ b/src/mame/includes/midyunit.h @@ -54,18 +54,34 @@ public: UINT8 m_yawdim_dma; UINT16 m_dma_register[16]; dma_state_t m_dma_state; + DECLARE_WRITE16_MEMBER(midyunit_cmos_w); + DECLARE_READ16_MEMBER(midyunit_cmos_r); + DECLARE_WRITE16_MEMBER(midyunit_cmos_enable_w); + DECLARE_READ16_MEMBER(midyunit_protection_r); + DECLARE_READ16_MEMBER(midyunit_input_r); + DECLARE_WRITE16_MEMBER(midyunit_sound_w); + DECLARE_READ16_MEMBER(term2_input_r); + DECLARE_WRITE16_MEMBER(term2_sound_w); + DECLARE_WRITE16_MEMBER(term2_hack_w); + DECLARE_WRITE16_MEMBER(term2la3_hack_w); + DECLARE_WRITE16_MEMBER(term2la2_hack_w); + DECLARE_WRITE16_MEMBER(term2la1_hack_w); + DECLARE_WRITE8_MEMBER(cvsd_protection_w); + DECLARE_READ16_MEMBER(mkturbo_prot_r); + DECLARE_READ16_MEMBER(midyunit_gfxrom_r); + DECLARE_WRITE16_MEMBER(midyunit_vram_w); + DECLARE_READ16_MEMBER(midyunit_vram_r); + DECLARE_WRITE16_MEMBER(midyunit_control_w); + DECLARE_WRITE16_MEMBER(midyunit_paletteram_w); + DECLARE_READ16_MEMBER(midyunit_dma_r); + DECLARE_WRITE16_MEMBER(midyunit_dma_w); }; /*----------- defined in machine/midyunit.c -----------*/ -WRITE16_HANDLER( midyunit_cmos_w ); -READ16_HANDLER( midyunit_cmos_r ); -WRITE16_HANDLER( midyunit_cmos_enable_w ); -READ16_HANDLER( midyunit_protection_r ); -READ16_HANDLER( midyunit_input_r ); DRIVER_INIT( narc ); DRIVER_INIT( trog ); @@ -84,7 +100,6 @@ DRIVER_INIT( totcarn ); MACHINE_RESET( midyunit ); -WRITE16_HANDLER( midyunit_sound_w ); /*----------- defined in video/midyunit.c -----------*/ @@ -94,18 +109,11 @@ VIDEO_START( midyunit_6bit ); VIDEO_START( mkyawdim ); VIDEO_START( midzunit ); -READ16_HANDLER( midyunit_gfxrom_r ); -WRITE16_HANDLER( midyunit_vram_w ); -READ16_HANDLER( midyunit_vram_r ); void midyunit_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg); void midyunit_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg); -WRITE16_HANDLER( midyunit_control_w ); -WRITE16_HANDLER( midyunit_paletteram_w ); -READ16_HANDLER( midyunit_dma_r ); -WRITE16_HANDLER( midyunit_dma_w ); void midyunit_scanline_update(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms34010_display_params *params); diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h index 45d8759c112..0adf610b22e 100644 --- a/src/mame/includes/midzeus.h +++ b/src/mame/includes/midzeus.h @@ -33,6 +33,8 @@ public: DECLARE_WRITE32_MEMBER(invasn_gun_w); DECLARE_READ32_MEMBER(invasn_gun_r); DECLARE_READ8_MEMBER(PIC16C5X_T0_clk_r); + DECLARE_READ32_MEMBER(zeus_r); + DECLARE_WRITE32_MEMBER(zeus_w); }; @@ -43,8 +45,6 @@ extern UINT32 *zeusbase; VIDEO_START( midzeus ); SCREEN_UPDATE_IND16( midzeus ); -READ32_HANDLER( zeus_r ); -WRITE32_HANDLER( zeus_w ); /*----------- defined in video/midzeus2.c -----------*/ diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h index 0a6d015c084..4ee07d44ba9 100644 --- a/src/mame/includes/mikie.h +++ b/src/mame/includes/mikie.h @@ -32,15 +32,15 @@ public: DECLARE_WRITE8_MEMBER(mikie_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(mikie_coin_counter_w); DECLARE_WRITE8_MEMBER(irq_mask_w); + DECLARE_WRITE8_MEMBER(mikie_videoram_w); + DECLARE_WRITE8_MEMBER(mikie_colorram_w); + DECLARE_WRITE8_MEMBER(mikie_palettebank_w); + DECLARE_WRITE8_MEMBER(mikie_flipscreen_w); }; /*----------- defined in video/mikie.c -----------*/ -WRITE8_HANDLER( mikie_videoram_w ); -WRITE8_HANDLER( mikie_colorram_w ); -WRITE8_HANDLER( mikie_palettebank_w ); -WRITE8_HANDLER( mikie_flipscreen_w ); PALETTE_INIT( mikie ); VIDEO_START( mikie ); diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index 16d4484b1fb..d1517782c29 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -55,30 +55,30 @@ public: DECLARE_WRITE8_MEMBER(input_w); DECLARE_WRITE8_MEMBER(spangbl_msm5205_data_w); DECLARE_WRITE8_MEMBER(mstworld_sound_w); + DECLARE_WRITE8_MEMBER(pang_video_bank_w); + DECLARE_WRITE8_MEMBER(mstworld_video_bank_w); + DECLARE_WRITE8_MEMBER(mgakuen_videoram_w); + DECLARE_READ8_MEMBER(mgakuen_videoram_r); + DECLARE_WRITE8_MEMBER(mgakuen_objram_w); + DECLARE_READ8_MEMBER(mgakuen_objram_r); + DECLARE_WRITE8_MEMBER(pang_videoram_w); + DECLARE_READ8_MEMBER(pang_videoram_r); + DECLARE_WRITE8_MEMBER(pang_colorram_w); + DECLARE_READ8_MEMBER(pang_colorram_r); + DECLARE_WRITE8_MEMBER(pang_gfxctrl_w); + DECLARE_WRITE8_MEMBER(pangbl_gfxctrl_w); + DECLARE_WRITE8_MEMBER(mstworld_gfxctrl_w); + DECLARE_WRITE8_MEMBER(pang_paletteram_w); + DECLARE_READ8_MEMBER(pang_paletteram_r); + DECLARE_WRITE8_MEMBER(mgakuen_paletteram_w); + DECLARE_READ8_MEMBER(mgakuen_paletteram_r); }; /*----------- defined in video/mitchell.c -----------*/ -WRITE8_HANDLER( mgakuen_paletteram_w ); -READ8_HANDLER( mgakuen_paletteram_r ); -WRITE8_HANDLER( mgakuen_videoram_w ); -READ8_HANDLER( mgakuen_videoram_r ); -WRITE8_HANDLER( mgakuen_objram_w ); -READ8_HANDLER( mgakuen_objram_r ); -WRITE8_HANDLER( pang_video_bank_w ); -WRITE8_HANDLER( pang_videoram_w ); -READ8_HANDLER( pang_videoram_r ); -WRITE8_HANDLER( pang_colorram_w ); -READ8_HANDLER( pang_colorram_r ); -WRITE8_HANDLER( pang_gfxctrl_w ); -WRITE8_HANDLER( pangbl_gfxctrl_w ); -WRITE8_HANDLER( pang_paletteram_w ); -READ8_HANDLER( pang_paletteram_r ); -WRITE8_HANDLER( mstworld_gfxctrl_w ); -WRITE8_HANDLER( mstworld_video_bank_w ); VIDEO_START( pang ); SCREEN_UPDATE_IND16( pang ); diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index 9a5a03e04f1..5932e678afc 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -19,6 +19,8 @@ public: UINT8 m_nmi_mask; DECLARE_READ8_MEMBER(keyboard_r); DECLARE_WRITE8_MEMBER(keyboard_select_w); + DECLARE_WRITE8_MEMBER(mjkjidai_videoram_w); + DECLARE_WRITE8_MEMBER(mjkjidai_ctrl_w); }; @@ -26,7 +28,5 @@ public: VIDEO_START( mjkjidai ); SCREEN_UPDATE_IND16( mjkjidai ); -WRITE8_HANDLER( mjkjidai_videoram_w ); -WRITE8_HANDLER( mjkjidai_ctrl_w ); diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h index 18677b37248..52f190d6b1f 100644 --- a/src/mame/includes/model1.h +++ b/src/mame/includes/model1.h @@ -106,6 +106,22 @@ public: DECLARE_READ16_MEMBER(m1_snd_v60_ready_r); DECLARE_WRITE16_MEMBER(m1_snd_68k_latch1_w); DECLARE_WRITE16_MEMBER(m1_snd_68k_latch2_w); + DECLARE_READ16_MEMBER(model1_tgp_copro_r); + DECLARE_WRITE16_MEMBER(model1_tgp_copro_w); + DECLARE_READ16_MEMBER(model1_tgp_copro_adr_r); + DECLARE_WRITE16_MEMBER(model1_tgp_copro_adr_w); + DECLARE_READ16_MEMBER(model1_tgp_copro_ram_r); + DECLARE_WRITE16_MEMBER(model1_tgp_copro_ram_w); + DECLARE_READ16_MEMBER(model1_tgp_vr_adr_r); + DECLARE_WRITE16_MEMBER(model1_tgp_vr_adr_w); + DECLARE_READ16_MEMBER(model1_vr_tgp_ram_r); + DECLARE_WRITE16_MEMBER(model1_vr_tgp_ram_w); + DECLARE_READ16_MEMBER(model1_vr_tgp_r); + DECLARE_WRITE16_MEMBER(model1_vr_tgp_w); + DECLARE_READ32_MEMBER(copro_ram_r); + DECLARE_WRITE32_MEMBER(copro_ram_w); + DECLARE_READ16_MEMBER(model1_listctl_r); + DECLARE_WRITE16_MEMBER(model1_listctl_w); }; @@ -113,19 +129,7 @@ public: extern const mb86233_cpu_core model1_vr_tgp_config; -READ16_HANDLER( model1_tgp_copro_r ); -WRITE16_HANDLER( model1_tgp_copro_w ); -READ16_HANDLER( model1_tgp_copro_adr_r ); -WRITE16_HANDLER( model1_tgp_copro_adr_w ); -READ16_HANDLER( model1_tgp_copro_ram_r ); -WRITE16_HANDLER( model1_tgp_copro_ram_w ); -READ16_HANDLER( model1_vr_tgp_r ); -WRITE16_HANDLER( model1_vr_tgp_w ); -READ16_HANDLER( model1_tgp_vr_adr_r ); -WRITE16_HANDLER( model1_tgp_vr_adr_w ); -READ16_HANDLER( model1_vr_tgp_ram_r ); -WRITE16_HANDLER( model1_vr_tgp_ram_w ); ADDRESS_MAP_EXTERN( model1_vr_tgp_map, 32 ); @@ -141,5 +145,3 @@ VIDEO_START(model1); SCREEN_UPDATE_RGB32(model1); SCREEN_VBLANK(model1); -READ16_HANDLER( model1_listctl_r ); -WRITE16_HANDLER( model1_listctl_w ); diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h index a299786a8c9..c5d78ad76a0 100644 --- a/src/mame/includes/model3.h +++ b/src/mame/includes/model3.h @@ -103,6 +103,19 @@ public: cached_texture *m_texcache[2][1024/32][2048/32]; required_device<cpu_device> m_maincpu; + DECLARE_READ32_MEMBER(rtc72421_r); + DECLARE_WRITE32_MEMBER(rtc72421_w); + DECLARE_READ64_MEMBER(model3_char_r); + DECLARE_WRITE64_MEMBER(model3_char_w); + DECLARE_READ64_MEMBER(model3_tile_r); + DECLARE_WRITE64_MEMBER(model3_tile_w); + DECLARE_READ64_MEMBER(model3_vid_reg_r); + DECLARE_WRITE64_MEMBER(model3_vid_reg_w); + DECLARE_WRITE64_MEMBER(model3_palette_w); + DECLARE_READ64_MEMBER(model3_palette_r); + DECLARE_WRITE64_MEMBER(real3d_display_list_w); + DECLARE_WRITE64_MEMBER(real3d_polygon_ram_w); + DECLARE_WRITE64_MEMBER(real3d_cmd_w); }; @@ -117,27 +130,14 @@ void model3_machine_init(running_machine &machine, int step); int model3_tap_read(running_machine &machine); void model3_tap_write(running_machine &machine, int tck, int tms, int tdi, int trst); void model3_tap_reset(running_machine &machine); -READ32_HANDLER(rtc72421_r); -WRITE32_HANDLER(rtc72421_w); /*----------- defined in video/model3.c -----------*/ -READ64_HANDLER(model3_char_r); -WRITE64_HANDLER(model3_char_w); -READ64_HANDLER(model3_tile_r); -WRITE64_HANDLER(model3_tile_w); -READ64_HANDLER(model3_vid_reg_r); -WRITE64_HANDLER(model3_vid_reg_w); -READ64_HANDLER(model3_palette_r); -WRITE64_HANDLER(model3_palette_w); VIDEO_START(model3); SCREEN_UPDATE_IND16(model3); -WRITE64_HANDLER(real3d_cmd_w); -WRITE64_HANDLER(real3d_display_list_w); -WRITE64_HANDLER(real3d_polygon_ram_w); void real3d_display_list_end(running_machine &machine); void real3d_display_list1_dma(address_space *space, UINT32 src, UINT32 dst, int length, int byteswap); void real3d_display_list2_dma(address_space *space, UINT32 src, UINT32 dst, int length, int byteswap); diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h index 5164d10a6f0..b4f57e5048c 100644 --- a/src/mame/includes/momoko.h +++ b/src/mame/includes/momoko.h @@ -31,20 +31,20 @@ public: UINT8 m_fg_mask; UINT8 m_flipscreen; DECLARE_WRITE8_MEMBER(momoko_bg_read_bank_w); + DECLARE_WRITE8_MEMBER(momoko_fg_scrollx_w); + DECLARE_WRITE8_MEMBER(momoko_fg_scrolly_w); + DECLARE_WRITE8_MEMBER(momoko_fg_select_w); + DECLARE_WRITE8_MEMBER(momoko_text_scrolly_w); + DECLARE_WRITE8_MEMBER(momoko_text_mode_w); + DECLARE_WRITE8_MEMBER(momoko_bg_scrollx_w); + DECLARE_WRITE8_MEMBER(momoko_bg_scrolly_w); + DECLARE_WRITE8_MEMBER(momoko_bg_select_w); + DECLARE_WRITE8_MEMBER(momoko_bg_priority_w); + DECLARE_WRITE8_MEMBER(momoko_flipscreen_w); }; /*----------- defined in video/momoko.c -----------*/ -WRITE8_HANDLER( momoko_fg_scrollx_w ); -WRITE8_HANDLER( momoko_fg_scrolly_w ); -WRITE8_HANDLER( momoko_text_scrolly_w ); -WRITE8_HANDLER( momoko_text_mode_w ); -WRITE8_HANDLER( momoko_bg_scrollx_w ); -WRITE8_HANDLER( momoko_bg_scrolly_w ); -WRITE8_HANDLER( momoko_flipscreen_w ); -WRITE8_HANDLER( momoko_fg_select_w); -WRITE8_HANDLER( momoko_bg_select_w); -WRITE8_HANDLER( momoko_bg_priority_w); SCREEN_UPDATE_IND16( momoko ); diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h index 045009f61da..ee7c1c6f227 100644 --- a/src/mame/includes/mosaic.h +++ b/src/mame/includes/mosaic.h @@ -25,13 +25,13 @@ public: DECLARE_READ8_MEMBER(protection_r); DECLARE_WRITE8_MEMBER(gfire2_protection_w); DECLARE_READ8_MEMBER(gfire2_protection_r); + DECLARE_WRITE8_MEMBER(mosaic_fgvideoram_w); + DECLARE_WRITE8_MEMBER(mosaic_bgvideoram_w); }; /*----------- defined in video/mosaic.c -----------*/ -WRITE8_HANDLER( mosaic_fgvideoram_w ); -WRITE8_HANDLER( mosaic_bgvideoram_w ); VIDEO_START( mosaic ); SCREEN_UPDATE_IND16( mosaic ); diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h index a071d773a30..6a75a9217cf 100644 --- a/src/mame/includes/mouser.h +++ b/src/mame/includes/mouser.h @@ -27,12 +27,12 @@ public: DECLARE_WRITE8_MEMBER(mouser_sound_interrupt_w); DECLARE_READ8_MEMBER(mouser_sound_byte_r); DECLARE_WRITE8_MEMBER(mouser_sound_nmi_clear_w); + DECLARE_WRITE8_MEMBER(mouser_flip_screen_x_w); + DECLARE_WRITE8_MEMBER(mouser_flip_screen_y_w); }; /*----------- defined in video/mouser.c -----------*/ -WRITE8_HANDLER( mouser_flip_screen_x_w ); -WRITE8_HANDLER( mouser_flip_screen_y_w ); PALETTE_INIT( mouser ); SCREEN_UPDATE_IND16( mouser ); diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h index 4388bed842e..138b74df34e 100644 --- a/src/mame/includes/mrdo.h +++ b/src/mame/includes/mrdo.h @@ -21,16 +21,16 @@ public: tilemap_t *m_fg_tilemap; int m_flipscreen; DECLARE_READ8_MEMBER(mrdo_SECRE_r); + DECLARE_WRITE8_MEMBER(mrdo_bgvideoram_w); + DECLARE_WRITE8_MEMBER(mrdo_fgvideoram_w); + DECLARE_WRITE8_MEMBER(mrdo_scrollx_w); + DECLARE_WRITE8_MEMBER(mrdo_scrolly_w); + DECLARE_WRITE8_MEMBER(mrdo_flipscreen_w); }; /*----------- defined in video/mrdo.c -----------*/ -WRITE8_HANDLER( mrdo_bgvideoram_w ); -WRITE8_HANDLER( mrdo_fgvideoram_w ); -WRITE8_HANDLER( mrdo_scrollx_w ); -WRITE8_HANDLER( mrdo_scrolly_w ); -WRITE8_HANDLER( mrdo_flipscreen_w ); PALETTE_INIT( mrdo ); VIDEO_START( mrdo ); diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index 00c299a79af..a21b060c70b 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -37,13 +37,13 @@ public: DECLARE_WRITE8_MEMBER(mrflea_select1_w); DECLARE_READ8_MEMBER(mrflea_input1_r); DECLARE_WRITE8_MEMBER(mrflea_data1_w); + DECLARE_WRITE8_MEMBER(mrflea_gfx_bank_w); + DECLARE_WRITE8_MEMBER(mrflea_videoram_w); + DECLARE_WRITE8_MEMBER(mrflea_spriteram_w); }; /*----------- defined in video/mrflea.c -----------*/ -WRITE8_HANDLER( mrflea_gfx_bank_w ); -WRITE8_HANDLER( mrflea_videoram_w ); -WRITE8_HANDLER( mrflea_spriteram_w ); SCREEN_UPDATE_IND16( mrflea ); diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h index 9337653130f..a17d8227b61 100644 --- a/src/mame/includes/mrjong.h +++ b/src/mame/includes/mrjong.h @@ -17,14 +17,14 @@ public: /* video-related */ tilemap_t *m_bg_tilemap; DECLARE_READ8_MEMBER(io_0x03_r); + DECLARE_WRITE8_MEMBER(mrjong_videoram_w); + DECLARE_WRITE8_MEMBER(mrjong_colorram_w); + DECLARE_WRITE8_MEMBER(mrjong_flipscreen_w); }; /*----------- defined in video/mrjong.c -----------*/ -WRITE8_HANDLER( mrjong_videoram_w ); -WRITE8_HANDLER( mrjong_colorram_w ); -WRITE8_HANDLER( mrjong_flipscreen_w ); PALETTE_INIT( mrjong ); VIDEO_START( mrjong ); diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h index 2e85077a7c6..0bd6dfd70da 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -63,6 +63,8 @@ public: DECLARE_READ8_MEMBER(latch_r); DECLARE_WRITE8_MEMBER(ms32_snd_bank_w); DECLARE_WRITE8_MEMBER(to_main_w); + DECLARE_WRITE32_MEMBER(ms32_brightness_w); + DECLARE_WRITE32_MEMBER(ms32_gfxctrl_w); }; @@ -71,9 +73,7 @@ public: //extern UINT32 *ms32_fce00000; -WRITE32_HANDLER( ms32_brightness_w ); -WRITE32_HANDLER( ms32_gfxctrl_w ); VIDEO_START( ms32 ); VIDEO_START( f1superb ); SCREEN_UPDATE_RGB32( ms32 ); diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h index b24bb6e7d53..f825b6c9c24 100644 --- a/src/mame/includes/msisaac.h +++ b/src/mame/includes/msisaac.h @@ -52,22 +52,23 @@ public: DECLARE_READ8_MEMBER(msisaac_mcu_status_r); DECLARE_WRITE8_MEMBER(msisaac_mcu_w); DECLARE_WRITE8_MEMBER(sound_control_1_w); + DECLARE_WRITE8_MEMBER(msisaac_fg_scrolly_w); + DECLARE_WRITE8_MEMBER(msisaac_fg_scrollx_w); + DECLARE_WRITE8_MEMBER(msisaac_bg2_scrolly_w); + DECLARE_WRITE8_MEMBER(msisaac_bg2_scrollx_w); + DECLARE_WRITE8_MEMBER(msisaac_bg_scrolly_w); + DECLARE_WRITE8_MEMBER(msisaac_bg_scrollx_w); + DECLARE_WRITE8_MEMBER(msisaac_textbank1_w); + DECLARE_WRITE8_MEMBER(msisaac_bg2_textbank_w); + DECLARE_WRITE8_MEMBER(msisaac_bg_videoram_w); + DECLARE_WRITE8_MEMBER(msisaac_bg2_videoram_w); + DECLARE_WRITE8_MEMBER(msisaac_fg_videoram_w); }; /*----------- defined in video/msisaac.c -----------*/ -WRITE8_HANDLER( msisaac_fg_scrolly_w ); -WRITE8_HANDLER( msisaac_fg_scrollx_w ); -WRITE8_HANDLER( msisaac_bg_scrolly_w ); -WRITE8_HANDLER( msisaac_bg_scrollx_w ); -WRITE8_HANDLER( msisaac_bg2_scrolly_w ); -WRITE8_HANDLER( msisaac_bg2_scrollx_w ); -WRITE8_HANDLER( msisaac_bg2_textbank_w ); -WRITE8_HANDLER( msisaac_bg_videoram_w ); -WRITE8_HANDLER( msisaac_bg2_videoram_w ); -WRITE8_HANDLER( msisaac_fg_videoram_w ); SCREEN_UPDATE_IND16( msisaac ); VIDEO_START( msisaac ); diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h index d2110bc1dca..ade6f95e711 100644 --- a/src/mame/includes/mugsmash.h +++ b/src/mame/includes/mugsmash.h @@ -18,6 +18,9 @@ public: device_t *m_audiocpu; DECLARE_WRITE16_MEMBER(mugsmash_reg2_w); DECLARE_READ16_MEMBER(mugsmash_input_ports_r); + DECLARE_WRITE16_MEMBER(mugsmash_videoram1_w); + DECLARE_WRITE16_MEMBER(mugsmash_videoram2_w); + DECLARE_WRITE16_MEMBER(mugsmash_reg_w); }; @@ -26,6 +29,3 @@ public: VIDEO_START( mugsmash ); SCREEN_UPDATE_IND16( mugsmash ); -WRITE16_HANDLER( mugsmash_reg_w ); -WRITE16_HANDLER( mugsmash_videoram2_w ); -WRITE16_HANDLER( mugsmash_videoram1_w ); diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h index 30a00a53add..9c934f04215 100644 --- a/src/mame/includes/munchmo.h +++ b/src/mame/includes/munchmo.h @@ -32,13 +32,13 @@ public: DECLARE_WRITE8_MEMBER(mnchmobl_nmi_enable_w); DECLARE_WRITE8_MEMBER(mnchmobl_soundlatch_w); DECLARE_WRITE8_MEMBER(sound_nmi_ack_w); + DECLARE_WRITE8_MEMBER(mnchmobl_palette_bank_w); + DECLARE_WRITE8_MEMBER(mnchmobl_flipscreen_w); }; /*----------- defined in video/munchmo.c -----------*/ -WRITE8_HANDLER( mnchmobl_palette_bank_w ); -WRITE8_HANDLER( mnchmobl_flipscreen_w ); PALETTE_INIT( mnchmobl ); VIDEO_START( mnchmobl ); diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index a8625909101..6cb78509bf6 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -10,14 +10,14 @@ public: int m_control_byte; UINT8 *m_spriteram; size_t m_spriteram_size; + DECLARE_WRITE8_MEMBER(mustache_videoram_w); + DECLARE_WRITE8_MEMBER(mustache_video_control_w); + DECLARE_WRITE8_MEMBER(mustache_scroll_w); }; /*----------- defined in video/mustache.c -----------*/ -WRITE8_HANDLER( mustache_videoram_w ); -WRITE8_HANDLER( mustache_scroll_w ); -WRITE8_HANDLER( mustache_video_control_w ); VIDEO_START( mustache ); SCREEN_UPDATE_IND16( mustache ); PALETTE_INIT( mustache ); diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index 66d2501ef62..9c2552495ed 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -32,6 +32,7 @@ public: UINT8 *m_video_control; DECLARE_WRITE8_MEMBER(irq_clear_w); DECLARE_WRITE8_MEMBER(mystston_ay8910_select_w); + DECLARE_WRITE8_MEMBER(mystston_video_control_w); }; @@ -43,4 +44,3 @@ void mystston_on_scanline_interrupt(running_machine &machine); /*----------- defined in video/mystston.c -----------*/ MACHINE_CONFIG_EXTERN( mystston_video ); -WRITE8_HANDLER( mystston_video_control_w ); diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h index ce4d9ef3e26..a520e48214c 100644 --- a/src/mame/includes/mystwarr.h +++ b/src/mame/includes/mystwarr.h @@ -1,8 +1,8 @@ -class mystwarr_state : public driver_device +class mystwarr_state : public konamigx_state { public: mystwarr_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + : konamigx_state(mconfig, type, tag), m_maincpu(*this,"maincpu") { } @@ -42,6 +42,14 @@ public: DECLARE_READ16_MEMBER(mccontrol_r); DECLARE_WRITE16_MEMBER(mccontrol_w); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); + + DECLARE_WRITE16_MEMBER(ddd_053936_enable_w); + DECLARE_WRITE16_MEMBER(ddd_053936_clip_w); + DECLARE_READ16_MEMBER(gai_053936_tilerom_0_r); + DECLARE_READ16_MEMBER(ddd_053936_tilerom_0_r); + DECLARE_READ16_MEMBER(ddd_053936_tilerom_1_r); + DECLARE_READ16_MEMBER(gai_053936_tilerom_2_r); + DECLARE_READ16_MEMBER(ddd_053936_tilerom_2_r); }; @@ -58,10 +66,3 @@ SCREEN_UPDATE_RGB32( mystwarr ); SCREEN_UPDATE_RGB32( metamrph ); SCREEN_UPDATE_RGB32( martchmp ); -WRITE16_HANDLER( ddd_053936_enable_w ); -WRITE16_HANDLER( ddd_053936_clip_w ); -READ16_HANDLER( gai_053936_tilerom_0_r ); -READ16_HANDLER( ddd_053936_tilerom_0_r ); -READ16_HANDLER( ddd_053936_tilerom_1_r ); -READ16_HANDLER( gai_053936_tilerom_2_r ); -READ16_HANDLER( ddd_053936_tilerom_2_r ); diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h index fab85da868f..9f1f2d62d1b 100644 --- a/src/mame/includes/n8080.h +++ b/src/mame/includes/n8080.h @@ -41,13 +41,13 @@ public: DECLARE_WRITE8_MEMBER(n8080_shift_bits_w); DECLARE_WRITE8_MEMBER(n8080_shift_data_w); DECLARE_READ8_MEMBER(n8080_shift_r); + DECLARE_WRITE8_MEMBER(n8080_video_control_w); }; /*----------- defined in video/n8080.c -----------*/ -WRITE8_HANDLER( n8080_video_control_w ); PALETTE_INIT( n8080 ); PALETTE_INIT( helifire ); diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h index d5487e659e5..030330c9e6b 100644 --- a/src/mame/includes/namcofl.h +++ b/src/mame/includes/namcofl.h @@ -49,6 +49,7 @@ public: DECLARE_READ8_MEMBER(dac2_r); DECLARE_READ8_MEMBER(dac1_r); DECLARE_READ8_MEMBER(dac0_r); + DECLARE_WRITE32_MEMBER(namcofl_spritebank_w); }; @@ -57,4 +58,3 @@ public: VIDEO_START( namcofl ); SCREEN_UPDATE_IND16( namcofl ); -WRITE32_HANDLER( namcofl_spritebank_w ); diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h index ca29ebadefc..a7f89b2624c 100644 --- a/src/mame/includes/namcona1.h +++ b/src/mame/includes/namcona1.h @@ -77,20 +77,20 @@ public: DECLARE_WRITE8_MEMBER(port8_w); DECLARE_READ8_MEMBER(portana_r); void write_version_info(); + DECLARE_WRITE16_MEMBER(namcona1_videoram_w); + DECLARE_READ16_MEMBER(namcona1_videoram_r); + DECLARE_READ16_MEMBER(namcona1_paletteram_r); + DECLARE_WRITE16_MEMBER(namcona1_paletteram_w); + DECLARE_READ16_MEMBER(namcona1_gfxram_r); + DECLARE_WRITE16_MEMBER(namcona1_gfxram_w); }; /*----------- defined in video/namcona1.c -----------*/ -extern WRITE16_HANDLER( namcona1_videoram_w ); -extern READ16_HANDLER( namcona1_videoram_r ); -extern READ16_HANDLER( namcona1_gfxram_r ); -extern WRITE16_HANDLER( namcona1_gfxram_w ); -extern READ16_HANDLER( namcona1_paletteram_r ); -extern WRITE16_HANDLER( namcona1_paletteram_w ); extern SCREEN_UPDATE_IND16( namcona1 ); extern VIDEO_START( namcona1 ); diff --git a/src/mame/includes/namcond1.h b/src/mame/includes/namcond1.h index f8796b76912..5bc19bdd4d9 100644 --- a/src/mame/includes/namcond1.h +++ b/src/mame/includes/namcond1.h @@ -20,15 +20,15 @@ public: DECLARE_READ8_MEMBER(mcu_p7_read); DECLARE_READ8_MEMBER(mcu_pa_read); DECLARE_WRITE8_MEMBER(mcu_pa_write); + DECLARE_READ16_MEMBER(namcond1_shared_ram_r); + DECLARE_READ16_MEMBER(namcond1_cuskey_r); + DECLARE_WRITE16_MEMBER(namcond1_shared_ram_w); + DECLARE_WRITE16_MEMBER(namcond1_cuskey_w); }; /*----------- defined in machine/namcond1.c -----------*/ -READ16_HANDLER( namcond1_shared_ram_r ); -READ16_HANDLER( namcond1_cuskey_r ); -WRITE16_HANDLER( namcond1_shared_ram_w ); -WRITE16_HANDLER( namcond1_cuskey_w ); MACHINE_START( namcond1 ); MACHINE_RESET( namcond1 ); diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index f762b1d3fc4..443bfb34bc7 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -55,6 +55,13 @@ public: DECLARE_WRITE8_MEMBER(namcos1_dac_gain_w); DECLARE_WRITE8_MEMBER(namcos1_dac0_w); DECLARE_WRITE8_MEMBER(namcos1_dac1_w); + DECLARE_WRITE8_MEMBER(namcos1_sound_bankswitch_w); + DECLARE_WRITE8_MEMBER(namcos1_cpu_control_w); + DECLARE_WRITE8_MEMBER(namcos1_watchdog_w); + DECLARE_WRITE8_MEMBER(namcos1_bankswitch_w); + DECLARE_WRITE8_MEMBER(namcos1_subcpu_bank_w); + DECLARE_WRITE8_MEMBER(namcos1_mcu_bankswitch_w); + DECLARE_WRITE8_MEMBER(namcos1_mcu_patch_w); }; @@ -65,15 +72,8 @@ void namcos1_init_DACs(running_machine &machine); /*----------- defined in machine/namcos1.c -----------*/ -WRITE8_HANDLER( namcos1_bankswitch_w ); -WRITE8_HANDLER( namcos1_subcpu_bank_w ); -WRITE8_HANDLER( namcos1_cpu_control_w ); -WRITE8_HANDLER( namcos1_watchdog_w ); -WRITE8_HANDLER( namcos1_sound_bankswitch_w ); -WRITE8_HANDLER( namcos1_mcu_bankswitch_w ); -WRITE8_HANDLER( namcos1_mcu_patch_w ); MACHINE_RESET( namcos1 ); diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h index 3d66ca11a6a..9e3a487e37e 100644 --- a/src/mame/includes/namcos21.h +++ b/src/mame/includes/namcos21.h @@ -130,6 +130,12 @@ public: DECLARE_WRITE16_MEMBER(winrun_68k_dspcomram_w); DECLARE_READ16_MEMBER(winrun_dspcomram_control_r); DECLARE_WRITE16_MEMBER(winrun_dspcomram_control_w); + DECLARE_READ16_MEMBER(winrun_gpu_color_r); + DECLARE_WRITE16_MEMBER(winrun_gpu_color_w); + DECLARE_READ16_MEMBER(winrun_gpu_register_r); + DECLARE_WRITE16_MEMBER(winrun_gpu_register_w); + DECLARE_WRITE16_MEMBER(winrun_gpu_videoram_w); + DECLARE_READ16_MEMBER(winrun_gpu_videoram_r); }; @@ -138,14 +144,8 @@ public: extern void namcos21_ClearPolyFrameBuffer( running_machine &machine ); extern void namcos21_DrawQuad( running_machine &machine, int sx[4], int sy[4], int zcode[4], int color ); -extern READ16_HANDLER(winrun_gpu_color_r); -extern WRITE16_HANDLER(winrun_gpu_color_w); -extern READ16_HANDLER(winrun_gpu_videoram_r); -extern WRITE16_HANDLER(winrun_gpu_videoram_w); -extern READ16_HANDLER(winrun_gpu_register_r); -extern WRITE16_HANDLER(winrun_gpu_register_w); extern VIDEO_START( namcos21 ) ; extern SCREEN_UPDATE_IND16( namcos21 ); diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index 672cbae38d6..790e750d6e9 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -106,41 +106,41 @@ public: UINT8 *m_dirtypal; bitmap_ind16 *m_mix_bitmap; tilemap_t *m_bgtilemap; + DECLARE_READ32_MEMBER(namcos22_gamma_r); + DECLARE_WRITE32_MEMBER(namcos22_gamma_w); + DECLARE_WRITE32_MEMBER(namcos22s_czram_w); + DECLARE_READ32_MEMBER(namcos22s_czram_r); + DECLARE_READ32_MEMBER(namcos22s_vics_control_r); + DECLARE_WRITE32_MEMBER(namcos22s_vics_control_w); + DECLARE_READ32_MEMBER(namcos22_textram_r); + DECLARE_WRITE32_MEMBER(namcos22_textram_w); + DECLARE_READ32_MEMBER(namcos22_tilemapattr_r); + DECLARE_WRITE32_MEMBER(namcos22_tilemapattr_w); + DECLARE_READ32_MEMBER(namcos22s_spotram_r); + DECLARE_WRITE32_MEMBER(namcos22s_spotram_w); + DECLARE_READ32_MEMBER(namcos22_dspram_r); + DECLARE_WRITE32_MEMBER(namcos22_dspram_w); + DECLARE_READ32_MEMBER(namcos22_cgram_r); + DECLARE_WRITE32_MEMBER(namcos22_cgram_w); + DECLARE_READ32_MEMBER(namcos22_paletteram_r); + DECLARE_WRITE32_MEMBER(namcos22_paletteram_w); + DECLARE_WRITE16_MEMBER(namcos22_dspram16_bank_w); + DECLARE_READ16_MEMBER(namcos22_dspram16_r); + DECLARE_WRITE16_MEMBER(namcos22_dspram16_w); }; /*----------- defined in video/namcos22.c -----------*/ -WRITE16_HANDLER( namcos22_dspram16_bank_w ); -READ16_HANDLER( namcos22_dspram16_r ); -WRITE16_HANDLER( namcos22_dspram16_w ); -READ32_HANDLER( namcos22_cgram_r ); -WRITE32_HANDLER( namcos22_cgram_w ); -READ32_HANDLER( namcos22s_czram_r ); -WRITE32_HANDLER( namcos22s_czram_w ); -READ32_HANDLER( namcos22s_spotram_r ); -WRITE32_HANDLER( namcos22s_spotram_w ); -READ32_HANDLER( namcos22_paletteram_r ); -WRITE32_HANDLER( namcos22_paletteram_w ); -READ32_HANDLER( namcos22_textram_r ); -WRITE32_HANDLER( namcos22_textram_w ); -READ32_HANDLER( namcos22s_vics_control_r ); -WRITE32_HANDLER( namcos22s_vics_control_w ); -READ32_HANDLER( namcos22_gamma_r ); -WRITE32_HANDLER( namcos22_gamma_w ); -READ32_HANDLER( namcos22_tilemapattr_r ); -WRITE32_HANDLER( namcos22_tilemapattr_w ); -READ32_HANDLER( namcos22_dspram_r ); -WRITE32_HANDLER( namcos22_dspram_w ); VIDEO_START( namcos22 ); diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h index 9fd7f2a59e7..fb82c8f2620 100644 --- a/src/mame/includes/namcos86.h +++ b/src/mame/includes/namcos86.h @@ -29,6 +29,18 @@ public: DECLARE_WRITE8_MEMBER(namcos86_led_w); DECLARE_WRITE8_MEMBER(cus115_w); DECLARE_READ8_MEMBER(readFF); + DECLARE_READ8_MEMBER(rthunder_videoram1_r); + DECLARE_WRITE8_MEMBER(rthunder_videoram1_w); + DECLARE_READ8_MEMBER(rthunder_videoram2_r); + DECLARE_WRITE8_MEMBER(rthunder_videoram2_w); + DECLARE_WRITE8_MEMBER(rthunder_tilebank_select_w); + DECLARE_WRITE8_MEMBER(rthunder_scroll0_w); + DECLARE_WRITE8_MEMBER(rthunder_scroll1_w); + DECLARE_WRITE8_MEMBER(rthunder_scroll2_w); + DECLARE_WRITE8_MEMBER(rthunder_scroll3_w); + DECLARE_WRITE8_MEMBER(rthunder_backcolor_w); + DECLARE_READ8_MEMBER(rthunder_spriteram_r); + DECLARE_WRITE8_MEMBER(rthunder_spriteram_w); }; @@ -39,15 +51,3 @@ VIDEO_START( namcos86 ); SCREEN_UPDATE_IND16( namcos86 ); SCREEN_VBLANK( namcos86 ); -READ8_HANDLER( rthunder_videoram1_r ); -WRITE8_HANDLER( rthunder_videoram1_w ); -READ8_HANDLER( rthunder_videoram2_r ); -WRITE8_HANDLER( rthunder_videoram2_w ); -WRITE8_HANDLER( rthunder_scroll0_w ); -WRITE8_HANDLER( rthunder_scroll1_w ); -WRITE8_HANDLER( rthunder_scroll2_w ); -WRITE8_HANDLER( rthunder_scroll3_w ); -WRITE8_HANDLER( rthunder_backcolor_w ); -WRITE8_HANDLER( rthunder_tilebank_select_w ); -READ8_HANDLER( rthunder_spriteram_r ); -WRITE8_HANDLER( rthunder_spriteram_w ); diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h index 3bfb5694b11..acef37e386c 100644 --- a/src/mame/includes/naughtyb.h +++ b/src/mame/includes/naughtyb.h @@ -21,13 +21,13 @@ public: DECLARE_WRITE8_MEMBER(popflame_protection_w); DECLARE_READ8_MEMBER(trvmstr_questions_r); DECLARE_WRITE8_MEMBER(trvmstr_questions_w); + DECLARE_WRITE8_MEMBER(naughtyb_videoreg_w); + DECLARE_WRITE8_MEMBER(popflame_videoreg_w); }; /*----------- defined in video/naughtyb.c -----------*/ -WRITE8_HANDLER( naughtyb_videoreg_w ); -WRITE8_HANDLER( popflame_videoreg_w ); VIDEO_START( naughtyb ); PALETTE_INIT( naughtyb ); diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h index c11548cf876..84d70fef3f4 100644 --- a/src/mame/includes/nbmj8688.h +++ b/src/mame/includes/nbmj8688.h @@ -28,6 +28,22 @@ public: int m_mjsikaku_flipscreen_old; DECLARE_READ8_MEMBER(ff_r); DECLARE_WRITE8_MEMBER(barline_output_w); + DECLARE_WRITE8_MEMBER(nbmj8688_clut_w); + DECLARE_WRITE8_MEMBER(nbmj8688_blitter_w); + DECLARE_WRITE8_MEMBER(mjsikaku_gfxflag2_w); + DECLARE_WRITE8_MEMBER(mjsikaku_gfxflag3_w); + DECLARE_WRITE8_MEMBER(mjsikaku_scrolly_w); + DECLARE_WRITE8_MEMBER(mjsikaku_romsel_w); + DECLARE_WRITE8_MEMBER(secolove_romsel_w); + DECLARE_WRITE8_MEMBER(crystalg_romsel_w); + DECLARE_WRITE8_MEMBER(seiha_romsel_w); + DECLARE_WRITE8_MEMBER(nbmj8688_HD61830B_0_instr_w); + DECLARE_WRITE8_MEMBER(nbmj8688_HD61830B_1_instr_w); + DECLARE_WRITE8_MEMBER(nbmj8688_HD61830B_both_instr_w); + DECLARE_WRITE8_MEMBER(nbmj8688_HD61830B_0_data_w); + DECLARE_WRITE8_MEMBER(nbmj8688_HD61830B_1_data_w); + DECLARE_WRITE8_MEMBER(nbmj8688_HD61830B_both_data_w); + void mjsikaku_vramflip(); }; @@ -46,18 +62,4 @@ VIDEO_START( mbmj8688_hybrid_16bit ); VIDEO_START( mbmj8688_pure_16bit ); VIDEO_START( mbmj8688_pure_16bit_LCD ); -WRITE8_HANDLER( nbmj8688_clut_w ); -WRITE8_HANDLER( nbmj8688_blitter_w ); -WRITE8_HANDLER( mjsikaku_gfxflag2_w ); -WRITE8_HANDLER( mjsikaku_scrolly_w ); -WRITE8_HANDLER( mjsikaku_romsel_w ); -WRITE8_HANDLER( secolove_romsel_w ); -WRITE8_HANDLER( seiha_romsel_w ); -WRITE8_HANDLER( crystalg_romsel_w ); -WRITE8_HANDLER( nbmj8688_HD61830B_0_instr_w ); -WRITE8_HANDLER( nbmj8688_HD61830B_0_data_w ); -WRITE8_HANDLER( nbmj8688_HD61830B_1_instr_w ); -WRITE8_HANDLER( nbmj8688_HD61830B_1_data_w ); -WRITE8_HANDLER( nbmj8688_HD61830B_both_instr_w ); -WRITE8_HANDLER( nbmj8688_HD61830B_both_data_w ); diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h index 17407d83993..0babd377257 100644 --- a/src/mame/includes/nbmj8891.h +++ b/src/mame/includes/nbmj8891.h @@ -29,6 +29,23 @@ public: int m_param_cnt; int m_flipscreen_old; DECLARE_READ8_MEMBER(taiwanmb_unk_r); + DECLARE_READ8_MEMBER(nbmj8891_palette_type1_r); + DECLARE_WRITE8_MEMBER(nbmj8891_palette_type1_w); + DECLARE_READ8_MEMBER(nbmj8891_palette_type2_r); + DECLARE_WRITE8_MEMBER(nbmj8891_palette_type2_w); + DECLARE_READ8_MEMBER(nbmj8891_palette_type3_r); + DECLARE_WRITE8_MEMBER(nbmj8891_palette_type3_w); + DECLARE_WRITE8_MEMBER(nbmj8891_clutsel_w); + DECLARE_READ8_MEMBER(nbmj8891_clut_r); + DECLARE_WRITE8_MEMBER(nbmj8891_clut_w); + DECLARE_WRITE8_MEMBER(nbmj8891_blitter_w); + DECLARE_WRITE8_MEMBER(nbmj8891_taiwanmb_blitter_w); + DECLARE_WRITE8_MEMBER(nbmj8891_taiwanmb_gfxdraw_w); + DECLARE_WRITE8_MEMBER(nbmj8891_taiwanmb_gfxflag_w); + DECLARE_WRITE8_MEMBER(nbmj8891_taiwanmb_mcu_w); + DECLARE_WRITE8_MEMBER(nbmj8891_scrolly_w); + DECLARE_WRITE8_MEMBER(nbmj8891_vramsel_w); + DECLARE_WRITE8_MEMBER(nbmj8891_romsel_w); }; @@ -38,20 +55,3 @@ SCREEN_UPDATE_IND16( nbmj8891 ); VIDEO_START( nbmj8891_1layer ); VIDEO_START( nbmj8891_2layer ); -READ8_HANDLER( nbmj8891_palette_type1_r ); -WRITE8_HANDLER( nbmj8891_palette_type1_w ); -READ8_HANDLER( nbmj8891_palette_type2_r ); -WRITE8_HANDLER( nbmj8891_palette_type2_w ); -READ8_HANDLER( nbmj8891_palette_type3_r ); -WRITE8_HANDLER( nbmj8891_palette_type3_w ); -WRITE8_HANDLER( nbmj8891_blitter_w ); -WRITE8_HANDLER( nbmj8891_scrolly_w ); -WRITE8_HANDLER( nbmj8891_vramsel_w ); -WRITE8_HANDLER( nbmj8891_romsel_w ); -WRITE8_HANDLER( nbmj8891_clutsel_w ); -READ8_HANDLER( nbmj8891_clut_r ); -WRITE8_HANDLER( nbmj8891_clut_w ); -WRITE8_HANDLER( nbmj8891_taiwanmb_blitter_w ); -WRITE8_HANDLER( nbmj8891_taiwanmb_gfxflag_w ); -WRITE8_HANDLER( nbmj8891_taiwanmb_gfxdraw_w ); -WRITE8_HANDLER( nbmj8891_taiwanmb_mcu_w ); diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h index a5a0d0aac83..83eefd192c9 100644 --- a/src/mame/includes/nbmj8900.h +++ b/src/mame/includes/nbmj8900.h @@ -28,6 +28,19 @@ public: UINT8 *m_palette; UINT8 *m_clut; int m_flipscreen_old; + DECLARE_READ8_MEMBER(nbmj8900_palette_type1_r); + DECLARE_WRITE8_MEMBER(nbmj8900_palette_type1_w); + DECLARE_READ8_MEMBER(nbmj8900_palette_type2_r); + DECLARE_WRITE8_MEMBER(nbmj8900_palette_type2_w); + DECLARE_READ8_MEMBER(nbmj8900_palette_type3_r); + DECLARE_WRITE8_MEMBER(nbmj8900_palette_type3_w); + DECLARE_WRITE8_MEMBER(nbmj8900_clutsel_w); + DECLARE_READ8_MEMBER(nbmj8900_clut_r); + DECLARE_WRITE8_MEMBER(nbmj8900_clut_w); + DECLARE_WRITE8_MEMBER(nbmj8900_blitter_w); + DECLARE_WRITE8_MEMBER(nbmj8900_scrolly_w); + DECLARE_WRITE8_MEMBER(nbmj8900_vramsel_w); + DECLARE_WRITE8_MEMBER(nbmj8900_romsel_w); }; @@ -36,12 +49,3 @@ public: SCREEN_UPDATE_IND16( nbmj8900 ); VIDEO_START( nbmj8900_2layer ); -READ8_HANDLER( nbmj8900_palette_type1_r ); -WRITE8_HANDLER( nbmj8900_palette_type1_w ); -WRITE8_HANDLER( nbmj8900_blitter_w ); -WRITE8_HANDLER( nbmj8900_scrolly_w ); -WRITE8_HANDLER( nbmj8900_vramsel_w ); -WRITE8_HANDLER( nbmj8900_romsel_w ); -WRITE8_HANDLER( nbmj8900_clutsel_w ); -READ8_HANDLER( nbmj8900_clut_r ); -WRITE8_HANDLER( nbmj8900_clut_w ); diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h index fd4da2dba40..ceccad4863d 100644 --- a/src/mame/includes/nbmj8991.h +++ b/src/mame/includes/nbmj8991.h @@ -25,6 +25,12 @@ public: DECLARE_WRITE8_MEMBER(nbmj8991_soundbank_w); DECLARE_WRITE8_MEMBER(nbmj8991_sound_w); DECLARE_READ8_MEMBER(nbmj8991_sound_r); + DECLARE_WRITE8_MEMBER(nbmj8991_palette_type1_w); + DECLARE_WRITE8_MEMBER(nbmj8991_palette_type2_w); + DECLARE_WRITE8_MEMBER(nbmj8991_palette_type3_w); + DECLARE_WRITE8_MEMBER(nbmj8991_blitter_w); + DECLARE_READ8_MEMBER(nbmj8991_clut_r); + DECLARE_WRITE8_MEMBER(nbmj8991_clut_w); }; @@ -34,9 +40,3 @@ SCREEN_UPDATE_IND16( nbmj8991_type1 ); SCREEN_UPDATE_IND16( nbmj8991_type2 ); VIDEO_START( nbmj8991 ); -WRITE8_HANDLER( nbmj8991_palette_type1_w ); -WRITE8_HANDLER( nbmj8991_palette_type2_w ); -WRITE8_HANDLER( nbmj8991_palette_type3_w ); -WRITE8_HANDLER( nbmj8991_blitter_w ); -READ8_HANDLER( nbmj8991_clut_r ); -WRITE8_HANDLER( nbmj8991_clut_w ); diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h index 456afbecac7..381baeef5c1 100644 --- a/src/mame/includes/nbmj9195.h +++ b/src/mame/includes/nbmj9195.h @@ -95,6 +95,16 @@ public: DECLARE_WRITE8_MEMBER(tmpz84c011_1_dir_pc_w); DECLARE_WRITE8_MEMBER(tmpz84c011_1_dir_pd_w); DECLARE_WRITE8_MEMBER(tmpz84c011_1_dir_pe_w); + DECLARE_READ8_MEMBER(nbmj9195_palette_r); + DECLARE_WRITE8_MEMBER(nbmj9195_palette_w); + DECLARE_READ8_MEMBER(nbmj9195_nb22090_palette_r); + DECLARE_WRITE8_MEMBER(nbmj9195_nb22090_palette_w); + DECLARE_WRITE8_MEMBER(nbmj9195_blitter_0_w); + DECLARE_WRITE8_MEMBER(nbmj9195_blitter_1_w); + DECLARE_READ8_MEMBER(nbmj9195_blitter_0_r); + DECLARE_READ8_MEMBER(nbmj9195_blitter_1_r); + DECLARE_WRITE8_MEMBER(nbmj9195_clut_0_w); + DECLARE_WRITE8_MEMBER(nbmj9195_clut_1_w); }; @@ -105,17 +115,7 @@ VIDEO_START( nbmj9195_1layer ); VIDEO_START( nbmj9195_2layer ); VIDEO_START( nbmj9195_nb22090 ); -READ8_HANDLER( nbmj9195_palette_r ); -WRITE8_HANDLER( nbmj9195_palette_w ); -READ8_HANDLER( nbmj9195_nb22090_palette_r ); -WRITE8_HANDLER( nbmj9195_nb22090_palette_w ); -READ8_HANDLER( nbmj9195_blitter_0_r ); -READ8_HANDLER( nbmj9195_blitter_1_r ); -WRITE8_HANDLER( nbmj9195_blitter_0_w ); -WRITE8_HANDLER( nbmj9195_blitter_1_w ); -WRITE8_HANDLER( nbmj9195_clut_0_w ); -WRITE8_HANDLER( nbmj9195_clut_1_w ); void nbmj9195_clutsel_w(address_space *space, int data); void nbmj9195_gfxflag2_w(address_space *space, int data); diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index 03fd53c1345..1ddfb9ff980 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -56,22 +56,22 @@ public: DECLARE_READ16_MEMBER(selected_ip_word_r); DECLARE_WRITE16_MEMBER(nemesis_soundlatch_word_w); DECLARE_READ8_MEMBER(wd_r); + DECLARE_WRITE16_MEMBER(nemesis_gfx_flipx_word_w); + DECLARE_WRITE16_MEMBER(nemesis_gfx_flipy_word_w); + DECLARE_WRITE16_MEMBER(salamand_control_port_word_w); + DECLARE_WRITE16_MEMBER(nemesis_palette_word_w); + DECLARE_WRITE16_MEMBER(salamander_palette_word_w); + DECLARE_WRITE16_MEMBER(nemesis_videoram1_word_w); + DECLARE_WRITE16_MEMBER(nemesis_videoram2_word_w); + DECLARE_WRITE16_MEMBER(nemesis_colorram1_word_w); + DECLARE_WRITE16_MEMBER(nemesis_colorram2_word_w); + DECLARE_WRITE16_MEMBER(nemesis_charram_word_w); }; /*----------- defined in video/nemesis.c -----------*/ -WRITE16_HANDLER( nemesis_gfx_flipx_word_w ); -WRITE16_HANDLER( nemesis_gfx_flipy_word_w ); -WRITE16_HANDLER( salamand_control_port_word_w ); -WRITE16_HANDLER( salamander_palette_word_w ); -WRITE16_HANDLER( nemesis_palette_word_w ); -WRITE16_HANDLER( nemesis_videoram1_word_w ); -WRITE16_HANDLER( nemesis_videoram2_word_w ); -WRITE16_HANDLER( nemesis_colorram1_word_w ); -WRITE16_HANDLER( nemesis_colorram2_word_w ); -WRITE16_HANDLER( nemesis_charram_word_w ); VIDEO_START( nemesis ); SCREEN_UPDATE_IND16( nemesis ); diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index c4443939f5c..0c9fa165f22 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -124,6 +124,10 @@ public: DECLARE_WRITE16_MEMBER(system_control_w); DECLARE_WRITE16_MEMBER(watchdog_w); DECLARE_READ16_MEMBER(neogeo_unmapped_r); + DECLARE_READ16_MEMBER(neogeo_paletteram_r); + DECLARE_WRITE16_MEMBER(neogeo_paletteram_w); + DECLARE_READ16_MEMBER(neogeo_video_register_r); + DECLARE_WRITE16_MEMBER(neogeo_video_register_w); }; @@ -229,13 +233,9 @@ VIDEO_START( neogeo ); VIDEO_RESET( neogeo ); SCREEN_UPDATE_RGB32( neogeo ); -READ16_HANDLER( neogeo_video_register_r ); -WRITE16_HANDLER( neogeo_video_register_w ); void neogeo_set_palette_bank(running_machine &machine, UINT8 data); void neogeo_set_screen_dark(running_machine &machine, UINT8 data); -READ16_HANDLER( neogeo_paletteram_r ); -WRITE16_HANDLER( neogeo_paletteram_w ); void neogeo_set_fixed_layer_source(running_machine &machine, UINT8 data); diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h index f103b75f602..308ebc43b53 100644 --- a/src/mame/includes/news.h +++ b/src/mame/includes/news.h @@ -14,14 +14,14 @@ public: tilemap_t *m_fg_tilemap; tilemap_t *m_bg_tilemap; int m_bgpic; + DECLARE_WRITE8_MEMBER(news_fgram_w); + DECLARE_WRITE8_MEMBER(news_bgram_w); + DECLARE_WRITE8_MEMBER(news_bgpic_w); }; /*----------- defined in video/news.c -----------*/ -WRITE8_HANDLER( news_fgram_w ); -WRITE8_HANDLER( news_bgram_w ); -WRITE8_HANDLER( news_bgpic_w ); VIDEO_START( news ); SCREEN_UPDATE_IND16( news ); diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h index 9f9acf532eb..7162592ac26 100644 --- a/src/mame/includes/ninjakd2.h +++ b/src/mame/includes/ninjakd2.h @@ -34,28 +34,28 @@ public: DECLARE_WRITE8_MEMBER(ninjakd2_pcm_play_w); DECLARE_READ8_MEMBER(omegaf_io_protection_r); DECLARE_WRITE8_MEMBER(omegaf_io_protection_w); + DECLARE_WRITE8_MEMBER(ninjakd2_bgvideoram_w); + DECLARE_WRITE8_MEMBER(ninjakd2_fgvideoram_w); + DECLARE_WRITE8_MEMBER(robokid_bg0_bank_w); + DECLARE_WRITE8_MEMBER(robokid_bg1_bank_w); + DECLARE_WRITE8_MEMBER(robokid_bg2_bank_w); + DECLARE_READ8_MEMBER(robokid_bg0_videoram_r); + DECLARE_READ8_MEMBER(robokid_bg1_videoram_r); + DECLARE_READ8_MEMBER(robokid_bg2_videoram_r); + DECLARE_WRITE8_MEMBER(robokid_bg0_videoram_w); + DECLARE_WRITE8_MEMBER(robokid_bg1_videoram_w); + DECLARE_WRITE8_MEMBER(robokid_bg2_videoram_w); + DECLARE_WRITE8_MEMBER(ninjakd2_bg_ctrl_w); + DECLARE_WRITE8_MEMBER(robokid_bg0_ctrl_w); + DECLARE_WRITE8_MEMBER(robokid_bg1_ctrl_w); + DECLARE_WRITE8_MEMBER(robokid_bg2_ctrl_w); + DECLARE_WRITE8_MEMBER(ninjakd2_sprite_overdraw_w); }; /*----------- defined in video/ninjakd2.c -----------*/ -extern WRITE8_HANDLER( ninjakd2_bgvideoram_w ); -extern WRITE8_HANDLER( ninjakd2_fgvideoram_w ); -extern WRITE8_HANDLER( ninjakd2_bg_ctrl_w ); -extern WRITE8_HANDLER( ninjakd2_sprite_overdraw_w ); -extern READ8_HANDLER( robokid_bg0_videoram_r ); -extern READ8_HANDLER( robokid_bg1_videoram_r ); -extern READ8_HANDLER( robokid_bg2_videoram_r ); -extern WRITE8_HANDLER( robokid_bg0_videoram_w ); -extern WRITE8_HANDLER( robokid_bg1_videoram_w ); -extern WRITE8_HANDLER( robokid_bg2_videoram_w ); -extern WRITE8_HANDLER( robokid_bg0_ctrl_w ); -extern WRITE8_HANDLER( robokid_bg1_ctrl_w ); -extern WRITE8_HANDLER( robokid_bg2_ctrl_w ); -extern WRITE8_HANDLER( robokid_bg0_bank_w ); -extern WRITE8_HANDLER( robokid_bg1_bank_w ); -extern WRITE8_HANDLER( robokid_bg2_bank_w ); extern VIDEO_START( ninjakd2 ); extern VIDEO_START( mnight ); diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h index 0e7125c6fb1..334dfc685aa 100644 --- a/src/mame/includes/nitedrvr.h +++ b/src/mame/includes/nitedrvr.h @@ -42,17 +42,19 @@ public: /* devices */ device_t *m_maincpu; device_t *m_discrete; + DECLARE_READ8_MEMBER(nitedrvr_steering_reset_r); + DECLARE_WRITE8_MEMBER(nitedrvr_steering_reset_w); + DECLARE_READ8_MEMBER(nitedrvr_in0_r); + DECLARE_READ8_MEMBER(nitedrvr_in1_r); + DECLARE_WRITE8_MEMBER(nitedrvr_out0_w); + DECLARE_WRITE8_MEMBER(nitedrvr_out1_w); + DECLARE_WRITE8_MEMBER(nitedrvr_videoram_w); + DECLARE_WRITE8_MEMBER(nitedrvr_hvc_w); }; /*----------- defined in machine/nitedrvr.c -----------*/ -READ8_HANDLER( nitedrvr_in0_r ); -READ8_HANDLER( nitedrvr_in1_r ); -READ8_HANDLER( nitedrvr_steering_reset_r ); -WRITE8_HANDLER( nitedrvr_steering_reset_w ); -WRITE8_HANDLER( nitedrvr_out0_w ); -WRITE8_HANDLER( nitedrvr_out1_w ); TIMER_DEVICE_CALLBACK( nitedrvr_crash_toggle_callback ); @@ -67,8 +69,6 @@ DISCRETE_SOUND_EXTERN( nitedrvr ); /*----------- defined in video/nitedrvr.c -----------*/ -WRITE8_HANDLER( nitedrvr_hvc_w ); -WRITE8_HANDLER( nitedrvr_videoram_w ); VIDEO_START( nitedrvr ); SCREEN_UPDATE_IND16( nitedrvr ); diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h index 62edb6c563c..cde22ec330f 100644 --- a/src/mame/includes/niyanpai.h +++ b/src/mame/includes/niyanpai.h @@ -61,6 +61,20 @@ public: DECLARE_READ16_MEMBER(niyanpai_dipsw_r); DECLARE_READ16_MEMBER(musobana_inputport_0_r); DECLARE_WRITE16_MEMBER(musobana_inputport_w); + DECLARE_READ16_MEMBER(niyanpai_palette_r); + DECLARE_WRITE16_MEMBER(niyanpai_palette_w); + DECLARE_WRITE16_MEMBER(niyanpai_blitter_0_w); + DECLARE_WRITE16_MEMBER(niyanpai_blitter_1_w); + DECLARE_WRITE16_MEMBER(niyanpai_blitter_2_w); + DECLARE_READ16_MEMBER(niyanpai_blitter_0_r); + DECLARE_READ16_MEMBER(niyanpai_blitter_1_r); + DECLARE_READ16_MEMBER(niyanpai_blitter_2_r); + DECLARE_WRITE16_MEMBER(niyanpai_clut_0_w); + DECLARE_WRITE16_MEMBER(niyanpai_clut_1_w); + DECLARE_WRITE16_MEMBER(niyanpai_clut_2_w); + DECLARE_WRITE16_MEMBER(niyanpai_clutsel_0_w); + DECLARE_WRITE16_MEMBER(niyanpai_clutsel_1_w); + DECLARE_WRITE16_MEMBER(niyanpai_clutsel_2_w); }; @@ -69,18 +83,4 @@ public: SCREEN_UPDATE_IND16( niyanpai ); VIDEO_START( niyanpai ); -READ16_HANDLER( niyanpai_palette_r ); -WRITE16_HANDLER( niyanpai_palette_w ); -READ16_HANDLER( niyanpai_blitter_0_r ); -READ16_HANDLER( niyanpai_blitter_1_r ); -READ16_HANDLER( niyanpai_blitter_2_r ); -WRITE16_HANDLER( niyanpai_blitter_0_w ); -WRITE16_HANDLER( niyanpai_blitter_1_w ); -WRITE16_HANDLER( niyanpai_blitter_2_w ); -WRITE16_HANDLER( niyanpai_clut_0_w ); -WRITE16_HANDLER( niyanpai_clut_1_w ); -WRITE16_HANDLER( niyanpai_clut_2_w ); -WRITE16_HANDLER( niyanpai_clutsel_0_w ); -WRITE16_HANDLER( niyanpai_clutsel_1_w ); -WRITE16_HANDLER( niyanpai_clutsel_2_w ); diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h index 9d14122af2a..ba162184646 100644 --- a/src/mame/includes/nmk16.h +++ b/src/mame/includes/nmk16.h @@ -65,29 +65,29 @@ public: DECLARE_WRITE16_MEMBER(twinactn_scroll0_w); DECLARE_WRITE16_MEMBER(twinactn_scroll1_w); DECLARE_WRITE16_MEMBER(twinactn_flipscreen_w); + DECLARE_WRITE16_MEMBER(nmk_bgvideoram0_w); + DECLARE_WRITE16_MEMBER(nmk_bgvideoram1_w); + DECLARE_WRITE16_MEMBER(nmk_bgvideoram2_w); + DECLARE_WRITE16_MEMBER(nmk_bgvideoram3_w); + DECLARE_WRITE16_MEMBER(nmk_fgvideoram_w); + DECLARE_WRITE16_MEMBER(nmk_txvideoram_w); + DECLARE_WRITE16_MEMBER(mustang_scroll_w); + DECLARE_WRITE16_MEMBER(bioshipbg_scroll_w); + DECLARE_WRITE16_MEMBER(nmk_scroll_w); + DECLARE_WRITE16_MEMBER(nmk_scroll_2_w); + DECLARE_WRITE16_MEMBER(vandyke_scroll_w); + DECLARE_WRITE16_MEMBER(vandykeb_scroll_w); + DECLARE_WRITE16_MEMBER(manybloc_scroll_w); + DECLARE_WRITE16_MEMBER(nmk_flipscreen_w); + DECLARE_WRITE16_MEMBER(nmk_tilebank_w); + DECLARE_WRITE16_MEMBER(bioship_scroll_w); + DECLARE_WRITE16_MEMBER(bioship_bank_w); }; /*----------- defined in video/nmk16.c -----------*/ -WRITE16_HANDLER( nmk_bgvideoram0_w ); -WRITE16_HANDLER( nmk_bgvideoram1_w ); -WRITE16_HANDLER( nmk_bgvideoram2_w ); -WRITE16_HANDLER( nmk_bgvideoram3_w ); -WRITE16_HANDLER( nmk_fgvideoram_w ); -WRITE16_HANDLER( nmk_txvideoram_w ); -WRITE16_HANDLER( nmk_scroll_w ); -WRITE16_HANDLER( nmk_scroll_2_w ); -WRITE16_HANDLER( nmk_flipscreen_w ); -WRITE16_HANDLER( nmk_tilebank_w ); -WRITE16_HANDLER( bioship_scroll_w ); -WRITE16_HANDLER( bioship_bank_w ); -WRITE16_HANDLER( mustang_scroll_w ); -WRITE16_HANDLER( bioshipbg_scroll_w ); -WRITE16_HANDLER( vandyke_scroll_w ); -WRITE16_HANDLER( vandykeb_scroll_w ); -WRITE16_HANDLER( manybloc_scroll_w ); VIDEO_START( macross ); VIDEO_START( gunnail ); diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h index edc58c65ff0..69bb7a011d3 100644 --- a/src/mame/includes/nova2001.h +++ b/src/mame/includes/nova2001.h @@ -12,20 +12,20 @@ public: UINT8 *m_spriteram; DECLARE_WRITE8_MEMBER(ninjakun_cpu1_io_A002_w); DECLARE_WRITE8_MEMBER(ninjakun_cpu2_io_A002_w); + DECLARE_WRITE8_MEMBER(ninjakun_paletteram_w); + DECLARE_WRITE8_MEMBER(nova2001_fg_videoram_w); + DECLARE_WRITE8_MEMBER(nova2001_bg_videoram_w); + DECLARE_WRITE8_MEMBER(ninjakun_bg_videoram_w); + DECLARE_READ8_MEMBER(ninjakun_bg_videoram_r); + DECLARE_WRITE8_MEMBER(nova2001_scroll_x_w); + DECLARE_WRITE8_MEMBER(nova2001_scroll_y_w); + DECLARE_WRITE8_MEMBER(nova2001_flipscreen_w); + DECLARE_WRITE8_MEMBER(pkunwar_flipscreen_w); }; /*----------- defined in video/nova2001.c -----------*/ -extern WRITE8_HANDLER( nova2001_fg_videoram_w ); -extern WRITE8_HANDLER( nova2001_bg_videoram_w ); -extern WRITE8_HANDLER( ninjakun_bg_videoram_w ); -extern READ8_HANDLER( ninjakun_bg_videoram_r ); -extern WRITE8_HANDLER( nova2001_scroll_x_w ); -extern WRITE8_HANDLER( nova2001_scroll_y_w ); -extern WRITE8_HANDLER( nova2001_flipscreen_w ); -extern WRITE8_HANDLER( pkunwar_flipscreen_w ); -extern WRITE8_HANDLER( ninjakun_paletteram_w ); extern PALETTE_INIT( nova2001 ); extern VIDEO_START( nova2001 ); diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h index 6c679ede83b..9f64a2afde0 100644 --- a/src/mame/includes/nycaptor.h +++ b/src/mame/includes/nycaptor.h @@ -67,40 +67,40 @@ public: DECLARE_READ8_MEMBER(cyclshtg_mcu_status_r1); DECLARE_WRITE8_MEMBER(cyclshtg_generic_control_w); DECLARE_READ8_MEMBER(unk_r); + DECLARE_READ8_MEMBER(nycaptor_68705_port_a_r); + DECLARE_WRITE8_MEMBER(nycaptor_68705_port_a_w); + DECLARE_WRITE8_MEMBER(nycaptor_68705_ddr_a_w); + DECLARE_READ8_MEMBER(nycaptor_68705_port_b_r); + DECLARE_WRITE8_MEMBER(nycaptor_68705_port_b_w); + DECLARE_WRITE8_MEMBER(nycaptor_68705_ddr_b_w); + DECLARE_READ8_MEMBER(nycaptor_68705_port_c_r); + DECLARE_WRITE8_MEMBER(nycaptor_68705_port_c_w); + DECLARE_WRITE8_MEMBER(nycaptor_68705_ddr_c_w); + DECLARE_WRITE8_MEMBER(nycaptor_mcu_w); + DECLARE_READ8_MEMBER(nycaptor_mcu_r); + DECLARE_READ8_MEMBER(nycaptor_mcu_status_r1); + DECLARE_READ8_MEMBER(nycaptor_mcu_status_r2); + DECLARE_WRITE8_MEMBER(nycaptor_spriteram_w); + DECLARE_READ8_MEMBER(nycaptor_spriteram_r); + DECLARE_WRITE8_MEMBER(nycaptor_videoram_w); + DECLARE_READ8_MEMBER(nycaptor_videoram_r); + DECLARE_WRITE8_MEMBER(nycaptor_palette_w); + DECLARE_READ8_MEMBER(nycaptor_palette_r); + DECLARE_WRITE8_MEMBER(nycaptor_gfxctrl_w); + DECLARE_READ8_MEMBER(nycaptor_gfxctrl_r); + DECLARE_READ8_MEMBER(nycaptor_scrlram_r); + DECLARE_WRITE8_MEMBER(nycaptor_scrlram_w); }; /*----------- defined in machine/nycaptor.c -----------*/ -READ8_HANDLER( nycaptor_mcu_r ); -READ8_HANDLER( nycaptor_mcu_status_r1 ); -READ8_HANDLER( nycaptor_mcu_status_r2 ); -READ8_HANDLER( nycaptor_68705_port_c_r ); -READ8_HANDLER( nycaptor_68705_port_b_r ); -READ8_HANDLER( nycaptor_68705_port_a_r ); -WRITE8_HANDLER( nycaptor_mcu_w ); -WRITE8_HANDLER( nycaptor_68705_port_a_w ); -WRITE8_HANDLER( nycaptor_68705_port_b_w ); -WRITE8_HANDLER( nycaptor_68705_port_c_w ); -WRITE8_HANDLER( nycaptor_68705_ddr_a_w ); -WRITE8_HANDLER( nycaptor_68705_ddr_b_w ); -WRITE8_HANDLER( nycaptor_68705_ddr_c_w ); /*----------- defined in video/nycaptor.c -----------*/ -READ8_HANDLER( nycaptor_videoram_r ); -READ8_HANDLER( nycaptor_spriteram_r ); -READ8_HANDLER( nycaptor_palette_r ); -READ8_HANDLER( nycaptor_gfxctrl_r ); -READ8_HANDLER( nycaptor_scrlram_r ); -WRITE8_HANDLER( nycaptor_videoram_w ); -WRITE8_HANDLER( nycaptor_spriteram_w ); -WRITE8_HANDLER( nycaptor_palette_w ); -WRITE8_HANDLER( nycaptor_gfxctrl_w ); -WRITE8_HANDLER( nycaptor_scrlram_w ); VIDEO_START( nycaptor ); SCREEN_UPDATE_IND16( nycaptor ); diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h index b2f2ba97aac..8f040fdfadb 100644 --- a/src/mame/includes/ohmygod.h +++ b/src/mame/includes/ohmygod.h @@ -26,15 +26,15 @@ public: int m_adpcm_bank_shift; int m_sndbank; DECLARE_WRITE16_MEMBER(ohmygod_ctrl_w); + DECLARE_WRITE16_MEMBER(ohmygod_videoram_w); + DECLARE_WRITE16_MEMBER(ohmygod_spritebank_w); + DECLARE_WRITE16_MEMBER(ohmygod_scrollx_w); + DECLARE_WRITE16_MEMBER(ohmygod_scrolly_w); }; /*----------- defined in video/ohmygod.c -----------*/ -WRITE16_HANDLER( ohmygod_videoram_w ); -WRITE16_HANDLER( ohmygod_spritebank_w ); -WRITE16_HANDLER( ohmygod_scrollx_w ); -WRITE16_HANDLER( ohmygod_scrolly_w ); VIDEO_START( ohmygod ); SCREEN_UPDATE_IND16( ohmygod ); diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h index 96f3dc90f91..0f111bf8418 100644 --- a/src/mame/includes/ojankohs.h +++ b/src/mame/includes/ojankohs.h @@ -45,19 +45,19 @@ public: DECLARE_READ8_MEMBER(ccasino_dipsw4_r); DECLARE_WRITE8_MEMBER(ojankoy_coinctr_w); DECLARE_WRITE8_MEMBER(ccasino_coinctr_w); + DECLARE_WRITE8_MEMBER(ojankohs_palette_w); + DECLARE_WRITE8_MEMBER(ccasino_palette_w); + DECLARE_WRITE8_MEMBER(ojankoc_palette_w); + DECLARE_WRITE8_MEMBER(ojankohs_videoram_w); + DECLARE_WRITE8_MEMBER(ojankohs_colorram_w); + DECLARE_WRITE8_MEMBER(ojankohs_gfxreg_w); + DECLARE_WRITE8_MEMBER(ojankohs_flipscreen_w); + DECLARE_WRITE8_MEMBER(ojankoc_videoram_w); }; /*----------- defined in video/ojankohs.c -----------*/ -WRITE8_HANDLER( ojankohs_palette_w ); -WRITE8_HANDLER( ccasino_palette_w ); -WRITE8_HANDLER( ojankohs_videoram_w ); -WRITE8_HANDLER( ojankohs_colorram_w ); -WRITE8_HANDLER( ojankohs_gfxreg_w ); -WRITE8_HANDLER( ojankohs_flipscreen_w ); -WRITE8_HANDLER( ojankoc_palette_w ); -WRITE8_HANDLER( ojankoc_videoram_w ); PALETTE_INIT( ojankoy ); diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h index 84bb158d0d3..293b6f31826 100644 --- a/src/mame/includes/oneshot.h +++ b/src/mame/includes/oneshot.h @@ -34,13 +34,13 @@ public: DECLARE_READ16_MEMBER(oneshot_gun_y_p1_r); DECLARE_READ16_MEMBER(oneshot_gun_x_p2_r); DECLARE_READ16_MEMBER(oneshot_gun_y_p2_r); + DECLARE_WRITE16_MEMBER(oneshot_bg_videoram_w); + DECLARE_WRITE16_MEMBER(oneshot_mid_videoram_w); + DECLARE_WRITE16_MEMBER(oneshot_fg_videoram_w); }; /*----------- defined in video/oneshot.c -----------*/ -WRITE16_HANDLER( oneshot_bg_videoram_w ); -WRITE16_HANDLER( oneshot_mid_videoram_w ); -WRITE16_HANDLER( oneshot_fg_videoram_w ); VIDEO_START( oneshot ); SCREEN_UPDATE_IND16( oneshot ); diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h index 0080fd08f6c..dcecf8399dc 100644 --- a/src/mame/includes/opwolf.h +++ b/src/mame/includes/opwolf.h @@ -58,6 +58,12 @@ public: DECLARE_READ8_MEMBER(z80_input2_r); DECLARE_WRITE8_MEMBER(opwolf_adpcm_d_w); DECLARE_WRITE8_MEMBER(opwolf_adpcm_e_w); + DECLARE_WRITE16_MEMBER(opwolf_cchip_status_w); + DECLARE_WRITE16_MEMBER(opwolf_cchip_bank_w); + DECLARE_WRITE16_MEMBER(opwolf_cchip_data_w); + DECLARE_READ16_MEMBER(opwolf_cchip_status_r); + DECLARE_READ16_MEMBER(opwolf_cchip_data_r); + DECLARE_WRITE16_MEMBER(opwolf_spritectrl_w); }; @@ -65,15 +71,9 @@ public: void opwolf_cchip_init(running_machine &machine); -READ16_HANDLER( opwolf_cchip_status_r ); -READ16_HANDLER( opwolf_cchip_data_r ); -WRITE16_HANDLER( opwolf_cchip_status_w ); -WRITE16_HANDLER( opwolf_cchip_data_w ); -WRITE16_HANDLER( opwolf_cchip_bank_w ); /*----------- defined in video/opwolf.c -----------*/ -WRITE16_HANDLER( opwolf_spritectrl_w ); SCREEN_UPDATE_IND16( opwolf ); diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index cd0b7fbfc33..285fb9a6788 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -36,6 +36,7 @@ public: device_t *m_maincpu; device_t *m_discrete; DECLARE_WRITE8_MEMBER(orbit_misc_w); + DECLARE_WRITE8_MEMBER(orbit_playfield_w); }; @@ -53,4 +54,3 @@ DISCRETE_SOUND_EXTERN( orbit ); VIDEO_START( orbit ); SCREEN_UPDATE_IND16( orbit ); -WRITE8_HANDLER( orbit_playfield_w ); diff --git a/src/mame/includes/othldrby.h b/src/mame/includes/othldrby.h index 1fe8feecb39..2d7b9e5489e 100644 --- a/src/mame/includes/othldrby.h +++ b/src/mame/includes/othldrby.h @@ -29,16 +29,16 @@ public: DECLARE_WRITE16_MEMBER(coinctrl_w); DECLARE_WRITE16_MEMBER(calendar_w); DECLARE_READ16_MEMBER(calendar_r); + DECLARE_WRITE16_MEMBER(othldrby_videoram_addr_w); + DECLARE_READ16_MEMBER(othldrby_videoram_r); + DECLARE_WRITE16_MEMBER(othldrby_videoram_w); + DECLARE_WRITE16_MEMBER(othldrby_vreg_addr_w); + DECLARE_WRITE16_MEMBER(othldrby_vreg_w); }; /*----------- defined in video/othldrby.c -----------*/ -WRITE16_HANDLER( othldrby_videoram_addr_w ); -READ16_HANDLER( othldrby_videoram_r ); -WRITE16_HANDLER( othldrby_videoram_w ); -WRITE16_HANDLER( othldrby_vreg_addr_w ); -WRITE16_HANDLER( othldrby_vreg_w ); VIDEO_START( othldrby ); SCREEN_VBLANK( othldrby ); diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index a8d5afbbe4f..d2929a6b31d 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -25,16 +25,16 @@ public: DECLARE_WRITE8_MEMBER(pacland_irq_1_ctrl_w); DECLARE_WRITE8_MEMBER(pacland_irq_2_ctrl_w); DECLARE_READ8_MEMBER(readFF); + DECLARE_WRITE8_MEMBER(pacland_videoram_w); + DECLARE_WRITE8_MEMBER(pacland_videoram2_w); + DECLARE_WRITE8_MEMBER(pacland_scroll0_w); + DECLARE_WRITE8_MEMBER(pacland_scroll1_w); + DECLARE_WRITE8_MEMBER(pacland_bankswitch_w); }; /*----------- defined in video/pacland.c -----------*/ -WRITE8_HANDLER( pacland_videoram_w ); -WRITE8_HANDLER( pacland_videoram2_w ); -WRITE8_HANDLER( pacland_scroll0_w ); -WRITE8_HANDLER( pacland_scroll1_w ); -WRITE8_HANDLER( pacland_bankswitch_w ); PALETTE_INIT( pacland ); VIDEO_START( pacland ); diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h index 737daebc48e..261cfaf5eb4 100644 --- a/src/mame/includes/pacman.h +++ b/src/mame/includes/pacman.h @@ -75,6 +75,21 @@ public: DECLARE_WRITE8_MEMBER(mspacman_enable_decode_w); DECLARE_WRITE8_MEMBER(irq_mask_w); DECLARE_READ8_MEMBER(cannonbp_protection_r); + DECLARE_WRITE8_MEMBER(pacman_videoram_w); + DECLARE_WRITE8_MEMBER(pacman_colorram_w); + DECLARE_WRITE8_MEMBER(pacman_flipscreen_w); + DECLARE_WRITE8_MEMBER(pengo_palettebank_w); + DECLARE_WRITE8_MEMBER(pengo_colortablebank_w); + DECLARE_WRITE8_MEMBER(pengo_gfxbank_w); + DECLARE_WRITE8_MEMBER(s2650games_videoram_w); + DECLARE_WRITE8_MEMBER(s2650games_colorram_w); + DECLARE_WRITE8_MEMBER(s2650games_scroll_w); + DECLARE_WRITE8_MEMBER(s2650games_tilesbank_w); + DECLARE_WRITE8_MEMBER(jrpacman_videoram_w); + DECLARE_WRITE8_MEMBER(jrpacman_charbank_w); + DECLARE_WRITE8_MEMBER(jrpacman_spritebank_w); + DECLARE_WRITE8_MEMBER(jrpacman_scroll_w); + DECLARE_WRITE8_MEMBER(jrpacman_bgpriority_w); }; @@ -84,35 +99,20 @@ PALETTE_INIT( pacman ); VIDEO_START( pacman ); SCREEN_UPDATE_IND16( pacman ); -WRITE8_HANDLER( pacman_videoram_w ); -WRITE8_HANDLER( pacman_colorram_w ); -WRITE8_HANDLER( pacman_flipscreen_w ); VIDEO_START( pengo ); -WRITE8_HANDLER( pengo_palettebank_w ); -WRITE8_HANDLER( pengo_colortablebank_w ); -WRITE8_HANDLER( pengo_gfxbank_w ); VIDEO_START( s2650games ); SCREEN_UPDATE_IND16( s2650games ); -WRITE8_HANDLER( s2650games_videoram_w ); -WRITE8_HANDLER( s2650games_colorram_w ); -WRITE8_HANDLER( s2650games_scroll_w ); -WRITE8_HANDLER( s2650games_tilesbank_w ); VIDEO_START( jrpacman ); -WRITE8_HANDLER( jrpacman_videoram_w ); -WRITE8_HANDLER( jrpacman_charbank_w ); -WRITE8_HANDLER( jrpacman_spritebank_w ); -WRITE8_HANDLER( jrpacman_scroll_w ); -WRITE8_HANDLER( jrpacman_bgpriority_w ); VIDEO_START( birdiy ); diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index 00b9e7d5fa9..33f8d450cae 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -36,6 +36,10 @@ public: DECLARE_WRITE8_MEMBER(pandoras_i8039_irqtrigger_w); DECLARE_WRITE8_MEMBER(i8039_irqen_and_status_w); DECLARE_WRITE8_MEMBER(pandoras_z80_irqtrigger_w); + DECLARE_WRITE8_MEMBER(pandoras_vram_w); + DECLARE_WRITE8_MEMBER(pandoras_cram_w); + DECLARE_WRITE8_MEMBER(pandoras_scrolly_w); + DECLARE_WRITE8_MEMBER(pandoras_flipscreen_w); }; @@ -43,10 +47,6 @@ public: PALETTE_INIT( pandoras ); -WRITE8_HANDLER( pandoras_vram_w ); -WRITE8_HANDLER( pandoras_cram_w ); -WRITE8_HANDLER( pandoras_flipscreen_w ); -WRITE8_HANDLER( pandoras_scrolly_w ); VIDEO_START( pandoras ); SCREEN_UPDATE_IND16( pandoras ); diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index a2bb743eaed..3e548501caf 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -27,21 +27,21 @@ public: int irq_count; DECLARE_WRITE8_MEMBER(paradise_rombank_w); DECLARE_WRITE8_MEMBER(torus_coin_counter_w); + DECLARE_WRITE8_MEMBER(paradise_flipscreen_w); + DECLARE_WRITE8_MEMBER(tgtball_flipscreen_w); + DECLARE_WRITE8_MEMBER(paradise_palette_w); + DECLARE_WRITE8_MEMBER(paradise_vram_0_w); + DECLARE_WRITE8_MEMBER(paradise_palbank_w); + DECLARE_WRITE8_MEMBER(paradise_vram_1_w); + DECLARE_WRITE8_MEMBER(paradise_vram_2_w); + DECLARE_WRITE8_MEMBER(paradise_pixmap_w); + DECLARE_WRITE8_MEMBER(paradise_priority_w); }; /*----------- defined in video/paradise.c -----------*/ -WRITE8_HANDLER( paradise_vram_0_w ); -WRITE8_HANDLER( paradise_vram_1_w ); -WRITE8_HANDLER( paradise_vram_2_w ); -WRITE8_HANDLER( paradise_flipscreen_w ); -WRITE8_HANDLER( tgtball_flipscreen_w ); -WRITE8_HANDLER( paradise_palette_w ); -WRITE8_HANDLER( paradise_pixmap_w ); -WRITE8_HANDLER( paradise_priority_w ); -WRITE8_HANDLER( paradise_palbank_w ); VIDEO_START( paradise ); diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h index b55131f4ba2..b8e7dac356b 100644 --- a/src/mame/includes/pass.h +++ b/src/mame/includes/pass.h @@ -9,13 +9,13 @@ public: UINT16 *m_bg_videoram; UINT16 *m_fg_videoram; + DECLARE_WRITE16_MEMBER(pass_bg_videoram_w); + DECLARE_WRITE16_MEMBER(pass_fg_videoram_w); }; /*----------- defined in video/pass.c -----------*/ -WRITE16_HANDLER( pass_fg_videoram_w ); -WRITE16_HANDLER( pass_bg_videoram_w ); VIDEO_START( pass ); SCREEN_UPDATE_IND16( pass ); diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h index d518fdbc739..b6665035fb5 100644 --- a/src/mame/includes/pastelg.h +++ b/src/mame/includes/pastelg.h @@ -24,6 +24,12 @@ public: DECLARE_READ8_MEMBER(threeds_inputport1_r); DECLARE_READ8_MEMBER(threeds_inputport2_r); DECLARE_WRITE8_MEMBER(threeds_inputportsel_w); + DECLARE_WRITE8_MEMBER(pastelg_clut_w); + DECLARE_WRITE8_MEMBER(pastelg_blitter_w); + DECLARE_WRITE8_MEMBER(threeds_romsel_w); + DECLARE_WRITE8_MEMBER(threeds_output_w); + DECLARE_READ8_MEMBER(threeds_rom_readback_r); + DECLARE_WRITE8_MEMBER(pastelg_romsel_w); }; @@ -33,11 +39,5 @@ PALETTE_INIT( pastelg ); SCREEN_UPDATE_IND16( pastelg ); VIDEO_START( pastelg ); -WRITE8_HANDLER( pastelg_clut_w ); -WRITE8_HANDLER( pastelg_romsel_w ); -WRITE8_HANDLER( threeds_romsel_w ); -WRITE8_HANDLER( threeds_output_w ); -WRITE8_HANDLER( pastelg_blitter_w ); -READ8_HANDLER( threeds_rom_readback_r ); int pastelg_blitter_src_addr_r(address_space *space); diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h index 736ec212800..04b9b087556 100644 --- a/src/mame/includes/pbaction.h +++ b/src/mame/includes/pbaction.h @@ -33,17 +33,17 @@ public: DECLARE_WRITE8_MEMBER(pbaction_sh_command_w); DECLARE_WRITE8_MEMBER(nmi_mask_w); DECLARE_READ8_MEMBER(pbactio3_prot_kludge_r); + DECLARE_WRITE8_MEMBER(pbaction_videoram_w); + DECLARE_WRITE8_MEMBER(pbaction_colorram_w); + DECLARE_WRITE8_MEMBER(pbaction_videoram2_w); + DECLARE_WRITE8_MEMBER(pbaction_colorram2_w); + DECLARE_WRITE8_MEMBER(pbaction_scroll_w); + DECLARE_WRITE8_MEMBER(pbaction_flipscreen_w); }; /*----------- defined in video/pbaction.c -----------*/ -extern WRITE8_HANDLER( pbaction_videoram_w ); -extern WRITE8_HANDLER( pbaction_colorram_w ); -extern WRITE8_HANDLER( pbaction_videoram2_w ); -extern WRITE8_HANDLER( pbaction_colorram2_w ); -extern WRITE8_HANDLER( pbaction_flipscreen_w ); -extern WRITE8_HANDLER( pbaction_scroll_w ); extern VIDEO_START( pbaction ); extern SCREEN_UPDATE_IND16( pbaction ); diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index ea44908e1b4..66a44c9fd4b 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -67,6 +67,8 @@ public: DECLARE_WRITE16_MEMBER(z80_ctrl_w); DECLARE_WRITE16_MEMBER(m68k_l1_w); DECLARE_WRITE8_MEMBER(z80_l3_w); + DECLARE_WRITE16_MEMBER(pgm_tx_videoram_w); + DECLARE_WRITE16_MEMBER(pgm_bg_videoram_w); }; @@ -369,8 +371,6 @@ INPUT_PORTS_EXTERN( olds ); /*----------- defined in video/pgm.c -----------*/ -WRITE16_HANDLER( pgm_tx_videoram_w ); -WRITE16_HANDLER( pgm_bg_videoram_w ); VIDEO_START( pgm ); SCREEN_VBLANK( pgm ); diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h index f0edde19333..91c9f05dbb5 100644 --- a/src/mame/includes/phoenix.h +++ b/src/mame/includes/phoenix.h @@ -20,6 +20,11 @@ public: tilemap_t *m_bg_tilemap; UINT8 m_survival_input_latches[2]; UINT8 m_survival_input_readc; + DECLARE_WRITE8_MEMBER(phoenix_videoram_w); + DECLARE_WRITE8_MEMBER(phoenix_videoreg_w); + DECLARE_WRITE8_MEMBER(pleiads_videoreg_w); + DECLARE_WRITE8_MEMBER(phoenix_scroll_w); + DECLARE_READ8_MEMBER(survival_input_port_0_r); }; @@ -54,14 +59,9 @@ PALETTE_INIT( pleiads ); VIDEO_START( phoenix ); SCREEN_UPDATE_IND16( phoenix ); -WRITE8_HANDLER( phoenix_videoram_w ); -WRITE8_HANDLER( phoenix_videoreg_w ); -WRITE8_HANDLER( pleiads_videoreg_w ); -WRITE8_HANDLER( phoenix_scroll_w ); CUSTOM_INPUT( player_input_r ); CUSTOM_INPUT( pleiads_protection_r ); -READ8_HANDLER( survival_input_port_0_r ); READ8_DEVICE_HANDLER( survival_protection_r ); READ_LINE_DEVICE_HANDLER( survival_sid_callback ); diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h index 82865f4896b..a8d16473cfb 100644 --- a/src/mame/includes/pingpong.h +++ b/src/mame/includes/pingpong.h @@ -18,13 +18,13 @@ public: DECLARE_WRITE8_MEMBER(cashquiz_question_bank_high_w); DECLARE_WRITE8_MEMBER(cashquiz_question_bank_low_w); DECLARE_WRITE8_MEMBER(coin_w); + DECLARE_WRITE8_MEMBER(pingpong_videoram_w); + DECLARE_WRITE8_MEMBER(pingpong_colorram_w); }; /*----------- defined in video/pingpong.c -----------*/ -WRITE8_HANDLER( pingpong_videoram_w ); -WRITE8_HANDLER( pingpong_colorram_w ); PALETTE_INIT( pingpong ); VIDEO_START( pingpong ); diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h index b54fc5001f7..47a5fc0a1ad 100644 --- a/src/mame/includes/pirates.h +++ b/src/mame/includes/pirates.h @@ -14,14 +14,14 @@ public: tilemap_t *m_bg_tilemap; DECLARE_WRITE16_MEMBER(pirates_out_w); DECLARE_READ16_MEMBER(genix_prot_r); + DECLARE_WRITE16_MEMBER(pirates_tx_tileram_w); + DECLARE_WRITE16_MEMBER(pirates_fg_tileram_w); + DECLARE_WRITE16_MEMBER(pirates_bg_tileram_w); }; /*----------- defined in video/pirates.c -----------*/ -WRITE16_HANDLER( pirates_tx_tileram_w ); -WRITE16_HANDLER( pirates_fg_tileram_w ); -WRITE16_HANDLER( pirates_bg_tileram_w ); VIDEO_START( pirates ); SCREEN_UPDATE_IND16( pirates ); diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h index 15128bdf4ed..71e3ad38817 100644 --- a/src/mame/includes/pitnrun.h +++ b/src/mame/includes/pitnrun.h @@ -28,35 +28,35 @@ public: DECLARE_WRITE8_MEMBER(nmi_enable_w); DECLARE_WRITE8_MEMBER(pitnrun_hflip_w); DECLARE_WRITE8_MEMBER(pitnrun_vflip_w); + DECLARE_READ8_MEMBER(pitnrun_mcu_data_r); + DECLARE_WRITE8_MEMBER(pitnrun_mcu_data_w); + DECLARE_READ8_MEMBER(pitnrun_mcu_status_r); + DECLARE_READ8_MEMBER(pitnrun_68705_portA_r); + DECLARE_WRITE8_MEMBER(pitnrun_68705_portA_w); + DECLARE_READ8_MEMBER(pitnrun_68705_portB_r); + DECLARE_WRITE8_MEMBER(pitnrun_68705_portB_w); + DECLARE_READ8_MEMBER(pitnrun_68705_portC_r); + DECLARE_WRITE8_MEMBER(pitnrun_videoram_w); + DECLARE_WRITE8_MEMBER(pitnrun_videoram2_w); + DECLARE_WRITE8_MEMBER(pitnrun_char_bank_select); + DECLARE_WRITE8_MEMBER(pitnrun_scroll_w); + DECLARE_WRITE8_MEMBER(pitnrun_ha_w); + DECLARE_WRITE8_MEMBER(pitnrun_h_heed_w); + DECLARE_WRITE8_MEMBER(pitnrun_v_heed_w); + DECLARE_WRITE8_MEMBER(pitnrun_color_select_w); }; /*----------- defined in machine/pitnrun.c -----------*/ -WRITE8_HANDLER (pitnrun_68705_portA_w); -WRITE8_HANDLER (pitnrun_68705_portB_w); -READ8_HANDLER (pitnrun_68705_portA_r); -READ8_HANDLER (pitnrun_68705_portB_r); -READ8_HANDLER (pitnrun_68705_portC_r); MACHINE_RESET( pitnrun ); -READ8_HANDLER( pitnrun_mcu_data_r ); -READ8_HANDLER( pitnrun_mcu_status_r ); -WRITE8_HANDLER( pitnrun_mcu_data_w ); /*----------- defined in video/pitnrun.c -----------*/ -WRITE8_HANDLER( pitnrun_videoram_w ); -WRITE8_HANDLER( pitnrun_videoram2_w ); -WRITE8_HANDLER(pitnrun_ha_w); -WRITE8_HANDLER(pitnrun_h_heed_w); -WRITE8_HANDLER(pitnrun_v_heed_w); -WRITE8_HANDLER(pitnrun_color_select_w); -WRITE8_HANDLER( pitnrun_char_bank_select ); -WRITE8_HANDLER( pitnrun_scroll_w ); PALETTE_INIT(pitnrun); VIDEO_START(pitnrun); diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h index b08a8a9fdc1..c767a89d2c2 100644 --- a/src/mame/includes/playch10.h +++ b/src/mame/includes/playch10.h @@ -50,6 +50,36 @@ public: DECLARE_WRITE8_MEMBER(ram_8w_w); DECLARE_WRITE8_MEMBER(sprite_dma_w); DECLARE_WRITE8_MEMBER(time_w); + DECLARE_WRITE8_MEMBER(pc10_SDCS_w); + DECLARE_WRITE8_MEMBER(pc10_CNTRLMASK_w); + DECLARE_WRITE8_MEMBER(pc10_DISPMASK_w); + DECLARE_WRITE8_MEMBER(pc10_SOUNDMASK_w); + DECLARE_WRITE8_MEMBER(pc10_NMIENABLE_w); + DECLARE_WRITE8_MEMBER(pc10_DOGDI_w); + DECLARE_WRITE8_MEMBER(pc10_GAMERES_w); + DECLARE_WRITE8_MEMBER(pc10_GAMESTOP_w); + DECLARE_WRITE8_MEMBER(pc10_PPURES_w); + DECLARE_READ8_MEMBER(pc10_detectclr_r); + DECLARE_WRITE8_MEMBER(pc10_CARTSEL_w); + DECLARE_READ8_MEMBER(pc10_prot_r); + DECLARE_WRITE8_MEMBER(pc10_prot_w); + DECLARE_WRITE8_MEMBER(pc10_in0_w); + DECLARE_READ8_MEMBER(pc10_in0_r); + DECLARE_READ8_MEMBER(pc10_in1_r); + DECLARE_WRITE8_MEMBER(pc10_nt_w); + DECLARE_READ8_MEMBER(pc10_nt_r); + DECLARE_WRITE8_MEMBER(pc10_chr_w); + DECLARE_READ8_MEMBER(pc10_chr_r); + DECLARE_WRITE8_MEMBER(mmc1_rom_switch_w); + DECLARE_WRITE8_MEMBER(aboard_vrom_switch_w); + DECLARE_WRITE8_MEMBER(bboard_rom_switch_w); + DECLARE_WRITE8_MEMBER(cboard_vrom_switch_w); + DECLARE_WRITE8_MEMBER(eboard_rom_switch_w); + DECLARE_WRITE8_MEMBER(gboard_rom_switch_w); + DECLARE_WRITE8_MEMBER(iboard_rom_switch_w); + DECLARE_WRITE8_MEMBER(hboard_rom_switch_w); + void pc10_set_mirroring(int mirroring); + DECLARE_WRITE8_MEMBER(playch10_videoram_w); }; @@ -75,22 +105,6 @@ DRIVER_INIT( pchboard ); /* h-board games */ DRIVER_INIT( pciboard ); /* i-board games */ DRIVER_INIT( pckboard ); /* k-board games */ CUSTOM_INPUT( pc10_int_detect_r ); -READ8_HANDLER( pc10_prot_r ); -READ8_HANDLER( pc10_detectclr_r ); -READ8_HANDLER( pc10_in0_r ); -READ8_HANDLER( pc10_in1_r ); -WRITE8_HANDLER( pc10_SDCS_w ); -WRITE8_HANDLER( pc10_CNTRLMASK_w ); -WRITE8_HANDLER( pc10_DISPMASK_w ); -WRITE8_HANDLER( pc10_SOUNDMASK_w ); -WRITE8_HANDLER( pc10_NMIENABLE_w ); -WRITE8_HANDLER( pc10_DOGDI_w ); -WRITE8_HANDLER( pc10_GAMERES_w ); -WRITE8_HANDLER( pc10_GAMESTOP_w ); -WRITE8_HANDLER( pc10_PPURES_w ); -WRITE8_HANDLER( pc10_prot_w ); -WRITE8_HANDLER( pc10_CARTSEL_w ); -WRITE8_HANDLER( pc10_in0_w ); @@ -99,7 +113,6 @@ WRITE8_HANDLER( pc10_in0_w ); extern const ppu2c0x_interface playch10_ppu_interface; extern const ppu2c0x_interface playch10_ppu_interface_hboard; -WRITE8_HANDLER( playch10_videoram_w ); PALETTE_INIT( playch10 ); VIDEO_START( playch10 ); VIDEO_START( playch10_hboard ); diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index 12f0e907543..efecfc00567 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -58,21 +58,21 @@ public: DECLARE_WRITE8_MEMBER(playmark_oki_w); DECLARE_WRITE8_MEMBER(playmark_snd_control_w); DECLARE_READ8_MEMBER(PIC16C5X_T0_clk_r); + DECLARE_WRITE16_MEMBER(wbeachvl_txvideoram_w); + DECLARE_WRITE16_MEMBER(wbeachvl_fgvideoram_w); + DECLARE_WRITE16_MEMBER(wbeachvl_bgvideoram_w); + DECLARE_WRITE16_MEMBER(hrdtimes_txvideoram_w); + DECLARE_WRITE16_MEMBER(hrdtimes_fgvideoram_w); + DECLARE_WRITE16_MEMBER(hrdtimes_bgvideoram_w); + DECLARE_WRITE16_MEMBER(bigtwin_paletteram_w); + DECLARE_WRITE16_MEMBER(bigtwin_scroll_w); + DECLARE_WRITE16_MEMBER(wbeachvl_scroll_w); + DECLARE_WRITE16_MEMBER(excelsr_scroll_w); + DECLARE_WRITE16_MEMBER(hrdtimes_scroll_w); }; /*----------- defined in video/playmark.c -----------*/ -WRITE16_HANDLER( wbeachvl_txvideoram_w ); -WRITE16_HANDLER( wbeachvl_fgvideoram_w ); -WRITE16_HANDLER( wbeachvl_bgvideoram_w ); -WRITE16_HANDLER( hrdtimes_txvideoram_w ); -WRITE16_HANDLER( hrdtimes_fgvideoram_w ); -WRITE16_HANDLER( hrdtimes_bgvideoram_w ); -WRITE16_HANDLER( bigtwin_paletteram_w ); -WRITE16_HANDLER( bigtwin_scroll_w ); -WRITE16_HANDLER( wbeachvl_scroll_w ); -WRITE16_HANDLER( excelsr_scroll_w ); -WRITE16_HANDLER( hrdtimes_scroll_w ); VIDEO_START( bigtwin ); VIDEO_START( bigtwinb ); diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index cfc7d320d15..7d9dff8039a 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -56,6 +56,10 @@ public: DECLARE_READ16_MEMBER(dsp56k_ram_bank04_read); DECLARE_WRITE16_MEMBER(dsp56k_ram_bank04_write); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); + DECLARE_READ32_MEMBER(polygonet_ttl_ram_r); + DECLARE_WRITE32_MEMBER(polygonet_ttl_ram_w); + DECLARE_READ32_MEMBER(polygonet_roz_ram_r); + DECLARE_WRITE32_MEMBER(polygonet_roz_ram_w); }; /*----------- defined in video/plygonet.c -----------*/ @@ -63,7 +67,3 @@ public: VIDEO_START( polygonet ); SCREEN_UPDATE_IND16( polygonet ); -READ32_HANDLER( polygonet_ttl_ram_r ); -WRITE32_HANDLER( polygonet_ttl_ram_w ); -READ32_HANDLER( polygonet_roz_ram_r ); -WRITE32_HANDLER( polygonet_roz_ram_w ); diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h index 6d6b42f14a1..266fe5dba75 100644 --- a/src/mame/includes/pokechmp.h +++ b/src/mame/includes/pokechmp.h @@ -12,13 +12,13 @@ public: DECLARE_WRITE8_MEMBER(pokechmp_sound_bank_w); DECLARE_WRITE8_MEMBER(pokechmp_sound_w); DECLARE_WRITE8_MEMBER(pokechmp_paletteram_w); + DECLARE_WRITE8_MEMBER(pokechmp_videoram_w); + DECLARE_WRITE8_MEMBER(pokechmp_flipscreen_w); }; /*----------- defined in video/pokechmp.c -----------*/ -WRITE8_HANDLER( pokechmp_videoram_w ); -WRITE8_HANDLER( pokechmp_flipscreen_w ); VIDEO_START( pokechmp ); SCREEN_UPDATE_IND16( pokechmp ); diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h index cf35677e318..11295d84b22 100644 --- a/src/mame/includes/polepos.h +++ b/src/mame/includes/polepos.h @@ -39,6 +39,25 @@ public: DECLARE_READ8_MEMBER(polepos_ready_r); DECLARE_WRITE8_MEMBER(polepos_latch_w); DECLARE_WRITE16_MEMBER(polepos_z8002_nvi_enable_w); + DECLARE_READ16_MEMBER(polepos_sprite16_r); + DECLARE_WRITE16_MEMBER(polepos_sprite16_w); + DECLARE_READ8_MEMBER(polepos_sprite_r); + DECLARE_WRITE8_MEMBER(polepos_sprite_w); + DECLARE_READ16_MEMBER(polepos_road16_r); + DECLARE_WRITE16_MEMBER(polepos_road16_w); + DECLARE_READ8_MEMBER(polepos_road_r); + DECLARE_WRITE8_MEMBER(polepos_road_w); + DECLARE_WRITE16_MEMBER(polepos_road16_vscroll_w); + DECLARE_READ16_MEMBER(polepos_view16_r); + DECLARE_WRITE16_MEMBER(polepos_view16_w); + DECLARE_READ8_MEMBER(polepos_view_r); + DECLARE_WRITE8_MEMBER(polepos_view_w); + DECLARE_WRITE16_MEMBER(polepos_view16_hscroll_w); + DECLARE_WRITE8_MEMBER(polepos_chacl_w); + DECLARE_READ16_MEMBER(polepos_alpha16_r); + DECLARE_WRITE16_MEMBER(polepos_alpha16_w); + DECLARE_READ8_MEMBER(polepos_alpha_r); + DECLARE_WRITE8_MEMBER(polepos_alpha_w); }; @@ -58,23 +77,4 @@ VIDEO_START( polepos ); PALETTE_INIT( polepos ); SCREEN_UPDATE_IND16( polepos ); -WRITE16_HANDLER( polepos_view16_w ); -WRITE16_HANDLER( polepos_road16_w ); -WRITE16_HANDLER( polepos_alpha16_w ); -WRITE16_HANDLER( polepos_sprite16_w ); -WRITE8_HANDLER( polepos_view_w ); -WRITE8_HANDLER( polepos_road_w ); -WRITE8_HANDLER( polepos_alpha_w ); -WRITE8_HANDLER( polepos_sprite_w ); -WRITE8_HANDLER( polepos_chacl_w ); - -READ16_HANDLER( polepos_view16_r ); -READ16_HANDLER( polepos_road16_r ); -READ16_HANDLER( polepos_alpha16_r ); -READ16_HANDLER( polepos_sprite16_r ); -READ8_HANDLER( polepos_view_r ); -READ8_HANDLER( polepos_road_r ); -READ8_HANDLER( polepos_alpha_r ); -READ8_HANDLER( polepos_sprite_r ); -WRITE16_HANDLER( polepos_view16_hscroll_w ); -WRITE16_HANDLER( polepos_road16_vscroll_w ); + diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h index 2c479d61d75..a2faad21e6c 100644 --- a/src/mame/includes/policetr.h +++ b/src/mame/includes/policetr.h @@ -35,16 +35,16 @@ public: DECLARE_WRITE32_MEMBER(policetr_bsmt2000_data_w); DECLARE_READ32_MEMBER(bsmt2000_data_r); DECLARE_WRITE32_MEMBER(speedup_w); + DECLARE_WRITE32_MEMBER(policetr_video_w); + DECLARE_READ32_MEMBER(policetr_video_r); + DECLARE_WRITE32_MEMBER(policetr_palette_offset_w); + DECLARE_WRITE32_MEMBER(policetr_palette_data_w); }; /*----------- defined in video/policetr.c -----------*/ -WRITE32_HANDLER( policetr_video_w ); -READ32_HANDLER( policetr_video_r ); -WRITE32_HANDLER( policetr_palette_offset_w ); -WRITE32_HANDLER( policetr_palette_data_w ); VIDEO_START( policetr ); SCREEN_UPDATE_IND16( policetr ); diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h index ca74c592387..9ada62dee25 100644 --- a/src/mame/includes/polyplay.h +++ b/src/mame/includes/polyplay.h @@ -26,6 +26,7 @@ public: DECLARE_WRITE8_MEMBER(polyplay_sound_channel); DECLARE_WRITE8_MEMBER(polyplay_start_timer2); DECLARE_READ8_MEMBER(polyplay_random_read); + DECLARE_WRITE8_MEMBER(polyplay_characterram_w); }; @@ -43,4 +44,3 @@ SAMPLES_START( polyplay_sh_start ); PALETTE_INIT( polyplay ); VIDEO_START( polyplay ); SCREEN_UPDATE_IND16( polyplay ); -WRITE8_HANDLER( polyplay_characterram_w ); diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h index 8dd0eb11d0d..165372f8135 100644 --- a/src/mame/includes/pooyan.h +++ b/src/mame/includes/pooyan.h @@ -20,14 +20,14 @@ public: /* devices */ cpu_device *m_maincpu; DECLARE_WRITE8_MEMBER(irq_enable_w); + DECLARE_WRITE8_MEMBER(pooyan_videoram_w); + DECLARE_WRITE8_MEMBER(pooyan_colorram_w); + DECLARE_WRITE8_MEMBER(pooyan_flipscreen_w); }; /*----------- defined in video/pooyan.c -----------*/ -WRITE8_HANDLER( pooyan_videoram_w ); -WRITE8_HANDLER( pooyan_colorram_w ); -WRITE8_HANDLER( pooyan_flipscreen_w ); PALETTE_INIT( pooyan ); VIDEO_START( pooyan ); diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h index d54605c9636..b7fba42d2fe 100644 --- a/src/mame/includes/popeye.h +++ b/src/mame/includes/popeye.h @@ -22,15 +22,15 @@ public: size_t m_spriteram_size; DECLARE_READ8_MEMBER(protection_r); DECLARE_WRITE8_MEMBER(protection_w); + DECLARE_WRITE8_MEMBER(popeye_videoram_w); + DECLARE_WRITE8_MEMBER(popeye_colorram_w); + DECLARE_WRITE8_MEMBER(popeye_bitmap_w); + DECLARE_WRITE8_MEMBER(skyskipr_bitmap_w); }; /*----------- defined in video/popeye.c -----------*/ -WRITE8_HANDLER( popeye_videoram_w ); -WRITE8_HANDLER( popeye_colorram_w ); -WRITE8_HANDLER( popeye_bitmap_w ); -WRITE8_HANDLER( skyskipr_bitmap_w ); PALETTE_INIT( popeye ); PALETTE_INIT( popeyebl ); diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h index 5c8dd6e8ca5..ca2634c85c3 100644 --- a/src/mame/includes/popper.h +++ b/src/mame/includes/popper.h @@ -35,18 +35,18 @@ public: DECLARE_READ8_MEMBER(popper_input_ports_r); DECLARE_READ8_MEMBER(popper_soundcpu_nmi_r); DECLARE_WRITE8_MEMBER(nmi_mask_w); + DECLARE_WRITE8_MEMBER(popper_ol_videoram_w); + DECLARE_WRITE8_MEMBER(popper_videoram_w); + DECLARE_WRITE8_MEMBER(popper_ol_attribram_w); + DECLARE_WRITE8_MEMBER(popper_attribram_w); + DECLARE_WRITE8_MEMBER(popper_flipscreen_w); + DECLARE_WRITE8_MEMBER(popper_e002_w); + DECLARE_WRITE8_MEMBER(popper_gfx_bank_w); }; /*----------- defined in video/popper.c -----------*/ -WRITE8_HANDLER( popper_videoram_w ); -WRITE8_HANDLER( popper_attribram_w ); -WRITE8_HANDLER( popper_ol_videoram_w ); -WRITE8_HANDLER( popper_ol_attribram_w ); -WRITE8_HANDLER( popper_flipscreen_w ); -WRITE8_HANDLER( popper_e002_w ); -WRITE8_HANDLER( popper_gfx_bank_w ); PALETTE_INIT( popper ); VIDEO_START( popper ); diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h index c0667b76e10..376ecae2ac4 100644 --- a/src/mame/includes/portrait.h +++ b/src/mame/includes/portrait.h @@ -14,6 +14,8 @@ public: DECLARE_WRITE8_MEMBER(portrait_ctrl_w); DECLARE_WRITE8_MEMBER(portrait_positive_scroll_w); DECLARE_WRITE8_MEMBER(portrait_negative_scroll_w); + DECLARE_WRITE8_MEMBER(portrait_bgvideo_write); + DECLARE_WRITE8_MEMBER(portrait_fgvideo_write); }; @@ -22,5 +24,3 @@ public: PALETTE_INIT( portrait ); VIDEO_START( portrait ); SCREEN_UPDATE_IND16( portrait ); -WRITE8_HANDLER( portrait_bgvideo_write ); -WRITE8_HANDLER( portrait_fgvideo_write ); diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index 100c8a8b374..a084cd5d26d 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -16,18 +16,18 @@ public: DECLARE_WRITE16_MEMBER(powerins_okibank_w); DECLARE_WRITE16_MEMBER(powerins_soundlatch_w); DECLARE_READ8_MEMBER(powerinb_fake_ym2203_r); + DECLARE_WRITE16_MEMBER(powerins_flipscreen_w); + DECLARE_WRITE16_MEMBER(powerins_tilebank_w); + DECLARE_WRITE16_MEMBER(powerins_paletteram16_w); + DECLARE_WRITE16_MEMBER(powerins_vram_0_w); + DECLARE_WRITE16_MEMBER(powerins_vram_1_w); }; /*----------- defined in video/powerins.c -----------*/ -WRITE16_HANDLER( powerins_flipscreen_w ); -WRITE16_HANDLER( powerins_tilebank_w ); -WRITE16_HANDLER( powerins_paletteram16_w ); -WRITE16_HANDLER( powerins_vram_0_w ); -WRITE16_HANDLER( powerins_vram_1_w ); VIDEO_START( powerins ); SCREEN_UPDATE_IND16( powerins ); diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h index cf58ac85daa..cd362ac7745 100644 --- a/src/mame/includes/prehisle.h +++ b/src/mame/includes/prehisle.h @@ -14,15 +14,15 @@ public: tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; DECLARE_WRITE16_MEMBER(prehisle_sound16_w); + DECLARE_WRITE16_MEMBER(prehisle_bg_videoram16_w); + DECLARE_WRITE16_MEMBER(prehisle_fg_videoram16_w); + DECLARE_READ16_MEMBER(prehisle_control16_r); + DECLARE_WRITE16_MEMBER(prehisle_control16_w); }; /*----------- defined in video/prehisle.c -----------*/ -WRITE16_HANDLER( prehisle_bg_videoram16_w ); -WRITE16_HANDLER( prehisle_fg_videoram16_w ); -WRITE16_HANDLER( prehisle_control16_w ); -READ16_HANDLER( prehisle_control16_r ); VIDEO_START( prehisle ); SCREEN_UPDATE_IND16( prehisle ); diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index 0e0836a8e91..5258cb098ae 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -68,6 +68,8 @@ public: DECLARE_WRITE8_MEMBER(psikyo_clear_nmi_w); DECLARE_WRITE8_MEMBER(sngkace_sound_bankswitch_w); DECLARE_WRITE8_MEMBER(gunbird_sound_bankswitch_w); + DECLARE_WRITE32_MEMBER(psikyo_vram_0_w); + DECLARE_WRITE32_MEMBER(psikyo_vram_1_w); }; @@ -75,8 +77,6 @@ public: void psikyo_switch_banks(running_machine &machine, int tmap, int bank); -WRITE32_HANDLER( psikyo_vram_0_w ); -WRITE32_HANDLER( psikyo_vram_1_w ); VIDEO_START( sngkace ); VIDEO_START( psikyo ); diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h index 030da767162..6083cc4d643 100644 --- a/src/mame/includes/psychic5.h +++ b/src/mame/includes/psychic5.h @@ -31,24 +31,24 @@ public: DECLARE_WRITE8_MEMBER(bombsa_bankselect_w); DECLARE_WRITE8_MEMBER(psychic5_coin_counter_w); DECLARE_WRITE8_MEMBER(bombsa_flipscreen_w); + DECLARE_READ8_MEMBER(psychic5_vram_page_select_r); + DECLARE_WRITE8_MEMBER(psychic5_vram_page_select_w); + DECLARE_WRITE8_MEMBER(psychic5_title_screen_w); + DECLARE_READ8_MEMBER(psychic5_paged_ram_r); + DECLARE_WRITE8_MEMBER(psychic5_paged_ram_w); + DECLARE_WRITE8_MEMBER(bombsa_paged_ram_w); + DECLARE_WRITE8_MEMBER(bombsa_unknown_w); }; /*----------- defined in video/psychic5.c -----------*/ -WRITE8_HANDLER( psychic5_paged_ram_w ); -WRITE8_HANDLER( psychic5_vram_page_select_w ); -WRITE8_HANDLER( psychic5_title_screen_w ); -READ8_HANDLER( psychic5_paged_ram_r ); -READ8_HANDLER( psychic5_vram_page_select_r ); VIDEO_START( psychic5 ); VIDEO_RESET( psychic5 ); SCREEN_UPDATE_RGB32( psychic5 ); -WRITE8_HANDLER( bombsa_paged_ram_w ); -WRITE8_HANDLER( bombsa_unknown_w ); VIDEO_START( bombsa ); VIDEO_RESET( bombsa ); diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h index 0fcb2637291..10b62ebf651 100644 --- a/src/mame/includes/punchout.h +++ b/src/mame/includes/punchout.h @@ -30,16 +30,16 @@ public: DECLARE_READ8_MEMBER(spunchout_exp_r); DECLARE_WRITE8_MEMBER(spunchout_exp_w); DECLARE_WRITE8_MEMBER(nmi_mask_w); + DECLARE_WRITE8_MEMBER(punchout_bg_top_videoram_w); + DECLARE_WRITE8_MEMBER(punchout_bg_bot_videoram_w); + DECLARE_WRITE8_MEMBER(armwrest_fg_videoram_w); + DECLARE_WRITE8_MEMBER(punchout_spr1_videoram_w); + DECLARE_WRITE8_MEMBER(punchout_spr2_videoram_w); }; /*----------- defined in video/punchout.c -----------*/ -WRITE8_HANDLER( punchout_bg_top_videoram_w ); -WRITE8_HANDLER( punchout_bg_bot_videoram_w ); -WRITE8_HANDLER( armwrest_fg_videoram_w ); -WRITE8_HANDLER( punchout_spr1_videoram_w ); -WRITE8_HANDLER( punchout_spr2_videoram_w ); VIDEO_START( punchout ); VIDEO_START( armwrest ); diff --git a/src/mame/includes/pushman.h b/src/mame/includes/pushman.h index 5eef1e92ab4..39030a5c39c 100644 --- a/src/mame/includes/pushman.h +++ b/src/mame/includes/pushman.h @@ -37,13 +37,13 @@ public: DECLARE_WRITE16_MEMBER(bballs_68705_w); DECLARE_READ8_MEMBER(pushman_68000_r); DECLARE_WRITE8_MEMBER(pushman_68000_w); + DECLARE_WRITE16_MEMBER(pushman_scroll_w); + DECLARE_WRITE16_MEMBER(pushman_videoram_w); }; /*----------- defined in video/pushman.c -----------*/ -WRITE16_HANDLER( pushman_scroll_w ); -WRITE16_HANDLER( pushman_videoram_w ); VIDEO_START( pushman ); diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h index ecd1aac4f02..2420f8d50e6 100644 --- a/src/mame/includes/qix.h +++ b/src/mame/includes/qix.h @@ -41,6 +41,29 @@ public: UINT8 m_leds; UINT8 *m_scanline_latch; pen_t m_pens[NUM_PENS]; + DECLARE_WRITE8_MEMBER(zookeep_bankswitch_w); + DECLARE_WRITE8_MEMBER(qix_data_firq_w); + DECLARE_WRITE8_MEMBER(qix_data_firq_ack_w); + DECLARE_READ8_MEMBER(qix_data_firq_r); + DECLARE_READ8_MEMBER(qix_data_firq_ack_r); + DECLARE_WRITE8_MEMBER(qix_video_firq_w); + DECLARE_WRITE8_MEMBER(qix_video_firq_ack_w); + DECLARE_READ8_MEMBER(qix_video_firq_r); + DECLARE_READ8_MEMBER(qix_video_firq_ack_r); + DECLARE_READ8_MEMBER(qix_68705_portA_r); + DECLARE_READ8_MEMBER(qix_68705_portB_r); + DECLARE_READ8_MEMBER(qix_68705_portC_r); + DECLARE_WRITE8_MEMBER(qix_68705_portA_w); + DECLARE_WRITE8_MEMBER(qix_68705_portB_w); + DECLARE_WRITE8_MEMBER(qix_68705_portC_w); + DECLARE_READ8_MEMBER(qix_videoram_r); + DECLARE_WRITE8_MEMBER(qix_videoram_w); + DECLARE_WRITE8_MEMBER(slither_videoram_w); + DECLARE_READ8_MEMBER(qix_addresslatch_r); + DECLARE_WRITE8_MEMBER(qix_addresslatch_w); + DECLARE_WRITE8_MEMBER(slither_addresslatch_w); + DECLARE_WRITE8_MEMBER(qix_paletteram_w); + DECLARE_WRITE8_MEMBER(qix_palettebank_w); }; @@ -57,24 +80,9 @@ extern const pia6821_interface slither_pia_2_intf; MACHINE_START( qixmcu ); MACHINE_RESET( qix ); -WRITE8_HANDLER( zookeep_bankswitch_w ); -READ8_HANDLER( qix_data_firq_r ); -READ8_HANDLER( qix_data_firq_ack_r ); -WRITE8_HANDLER( qix_data_firq_w ); -WRITE8_HANDLER( qix_data_firq_ack_w ); -READ8_HANDLER( qix_video_firq_r ); -READ8_HANDLER( qix_video_firq_ack_r ); -WRITE8_HANDLER( qix_video_firq_w ); -WRITE8_HANDLER( qix_video_firq_ack_w ); -READ8_HANDLER( qix_68705_portA_r ); -READ8_HANDLER( qix_68705_portB_r ); -READ8_HANDLER( qix_68705_portC_r ); -WRITE8_HANDLER( qix_68705_portA_w ); -WRITE8_HANDLER( qix_68705_portB_w ); -WRITE8_HANDLER( qix_68705_portC_w ); WRITE8_DEVICE_HANDLER( qix_pia_w ); @@ -88,7 +96,6 @@ MACHINE_CONFIG_EXTERN( zookeep_video ); MACHINE_CONFIG_EXTERN( slither_video ); WRITE8_DEVICE_HANDLER( qix_flip_screen_w ); -WRITE8_HANDLER( qix_palettebank_w ); /*----------- defined in audio/qix.c -----------*/ diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h index a4f8bdcbf2c..485e6479e7d 100644 --- a/src/mame/includes/quizdna.h +++ b/src/mame/includes/quizdna.h @@ -15,6 +15,12 @@ public: size_t m_spriteram_size; DECLARE_WRITE8_MEMBER(quizdna_rombank_w); DECLARE_WRITE8_MEMBER(gekiretu_rombank_w); + DECLARE_WRITE8_MEMBER(quizdna_bg_ram_w); + DECLARE_WRITE8_MEMBER(quizdna_fg_ram_w); + DECLARE_WRITE8_MEMBER(quizdna_bg_yscroll_w); + DECLARE_WRITE8_MEMBER(quizdna_bg_xscroll_w); + DECLARE_WRITE8_MEMBER(quizdna_screen_ctrl_w); + DECLARE_WRITE8_MEMBER(paletteram_xBGR_RRRR_GGGG_BBBB_w); }; @@ -23,10 +29,4 @@ public: VIDEO_START( quizdna ); SCREEN_UPDATE_IND16( quizdna ); -WRITE8_HANDLER( quizdna_fg_ram_w ); -WRITE8_HANDLER( quizdna_bg_ram_w ); -WRITE8_HANDLER( quizdna_bg_yscroll_w ); -WRITE8_HANDLER( quizdna_bg_xscroll_w ); -WRITE8_HANDLER( quizdna_screen_ctrl_w ); -WRITE8_HANDLER( paletteram_xBGR_RRRR_GGGG_BBBB_w ); diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h index cb84ab6807d..fb2c819cbda 100644 --- a/src/mame/includes/quizpani.h +++ b/src/mame/includes/quizpani.h @@ -11,14 +11,14 @@ public: tilemap_t *m_txt_tilemap; int m_bgbank; int m_txtbank; + DECLARE_WRITE16_MEMBER(quizpani_bg_videoram_w); + DECLARE_WRITE16_MEMBER(quizpani_txt_videoram_w); + DECLARE_WRITE16_MEMBER(quizpani_tilesbank_w); }; /*----------- defined in video/quizpani.c -----------*/ -WRITE16_HANDLER( quizpani_bg_videoram_w ); -WRITE16_HANDLER( quizpani_txt_videoram_w ); -WRITE16_HANDLER( quizpani_tilesbank_w ); VIDEO_START( quizpani ); SCREEN_UPDATE_IND16( quizpani ); diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h index 0f6fdf72fcc..dd49752cd5e 100644 --- a/src/mame/includes/raiden.h +++ b/src/mame/includes/raiden.h @@ -19,16 +19,16 @@ public: int m_alternate; required_device<buffered_spriteram16_device> m_spriteram; DECLARE_READ16_MEMBER(sub_cpu_spin_r); + DECLARE_WRITE16_MEMBER(raiden_background_w); + DECLARE_WRITE16_MEMBER(raiden_foreground_w); + DECLARE_WRITE16_MEMBER(raiden_text_w); + DECLARE_WRITE16_MEMBER(raiden_control_w); + DECLARE_WRITE16_MEMBER(raidena_control_w); }; /*----------- defined in video/raiden.c -----------*/ -WRITE16_HANDLER( raiden_background_w ); -WRITE16_HANDLER( raiden_foreground_w ); -WRITE16_HANDLER( raiden_text_w ); VIDEO_START( raiden ); VIDEO_START( raidena ); -WRITE16_HANDLER( raiden_control_w ); -WRITE16_HANDLER( raidena_control_w ); SCREEN_UPDATE_IND16( raiden ); diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h index 411d8fc7297..d49b9504f93 100644 --- a/src/mame/includes/rainbow.h +++ b/src/mame/includes/rainbow.h @@ -34,17 +34,19 @@ public: device_t *m_pc090oj; DECLARE_WRITE16_MEMBER(jumping_sound_w); DECLARE_READ8_MEMBER(jumping_latch_r); + DECLARE_WRITE16_MEMBER(rbisland_cchip_ctrl_w); + DECLARE_WRITE16_MEMBER(rbisland_cchip_bank_w); + DECLARE_WRITE16_MEMBER(rbisland_cchip_ram_w); + DECLARE_READ16_MEMBER(rbisland_cchip_ctrl_r); + DECLARE_READ16_MEMBER(rbisland_cchip_ram_r); + DECLARE_WRITE16_MEMBER(rbisland_spritectrl_w); + DECLARE_WRITE16_MEMBER(jumping_spritectrl_w); }; /*----------- defined in machine/rainbow.c -----------*/ void rbisland_cchip_init(running_machine &machine, int version); -READ16_HANDLER( rbisland_cchip_ctrl_r ); -READ16_HANDLER( rbisland_cchip_ram_r ); -WRITE16_HANDLER( rbisland_cchip_ctrl_w ); -WRITE16_HANDLER( rbisland_cchip_bank_w ); -WRITE16_HANDLER( rbisland_cchip_ram_w ); /*----------- defined in video/rainbow.c -----------*/ @@ -53,5 +55,3 @@ SCREEN_UPDATE_IND16( rainbow ); VIDEO_START( jumping ); SCREEN_UPDATE_IND16( jumping ); -WRITE16_HANDLER( jumping_spritectrl_w ); -WRITE16_HANDLER( rbisland_spritectrl_w ); diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h index 9b1bdbbb30c..babdac6e6d6 100644 --- a/src/mame/includes/rallyx.h +++ b/src/mame/includes/rallyx.h @@ -42,15 +42,15 @@ public: DECLARE_WRITE8_MEMBER(rallyx_bang_w); DECLARE_WRITE8_MEMBER(rallyx_latch_w); DECLARE_WRITE8_MEMBER(locomotn_latch_w); + DECLARE_WRITE8_MEMBER(rallyx_videoram_w); + DECLARE_WRITE8_MEMBER(rallyx_scrollx_w); + DECLARE_WRITE8_MEMBER(rallyx_scrolly_w); + DECLARE_WRITE8_MEMBER(tactcian_starson_w); }; /*----------- defined in video/rallyx.c -----------*/ -WRITE8_HANDLER( rallyx_videoram_w ); -WRITE8_HANDLER( rallyx_scrollx_w ); -WRITE8_HANDLER( rallyx_scrolly_w ); -WRITE8_HANDLER( tactcian_starson_w ); PALETTE_INIT( rallyx ); PALETTE_INIT( jungler ); diff --git a/src/mame/includes/rastan.h b/src/mame/includes/rastan.h index da561ddd18c..5705d07620a 100644 --- a/src/mame/includes/rastan.h +++ b/src/mame/includes/rastan.h @@ -27,11 +27,11 @@ public: device_t *m_pc090oj; device_t *m_pc080sn; DECLARE_WRITE8_MEMBER(rastan_msm5205_address_w); + DECLARE_WRITE16_MEMBER(rastan_spritectrl_w); }; /*----------- defined in video/rastan.c -----------*/ -WRITE16_HANDLER( rastan_spritectrl_w ); SCREEN_UPDATE_IND16( rastan ); diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h index 7b9c637de4b..75ac4158bc1 100644 --- a/src/mame/includes/realbrk.h +++ b/src/mame/includes/realbrk.h @@ -25,6 +25,12 @@ public: DECLARE_READ16_MEMBER(backup_ram_r); DECLARE_READ16_MEMBER(backup_ram_dx_r); DECLARE_WRITE16_MEMBER(backup_ram_w); + DECLARE_WRITE16_MEMBER(realbrk_flipscreen_w); + DECLARE_WRITE16_MEMBER(dai2kaku_flipscreen_w); + DECLARE_WRITE16_MEMBER(realbrk_vram_0_w); + DECLARE_WRITE16_MEMBER(realbrk_vram_1_w); + DECLARE_WRITE16_MEMBER(realbrk_vram_2_w); + DECLARE_WRITE16_MEMBER(realbrk_vregs_w); }; @@ -37,12 +43,6 @@ VIDEO_START(realbrk); SCREEN_UPDATE_IND16(realbrk); SCREEN_UPDATE_IND16(dai2kaku); -WRITE16_HANDLER( realbrk_vram_0_w ); -WRITE16_HANDLER( realbrk_vram_1_w ); -WRITE16_HANDLER( realbrk_vram_2_w ); -WRITE16_HANDLER( realbrk_vregs_w ); -WRITE16_HANDLER( realbrk_flipscreen_w ); -WRITE16_HANDLER( dai2kaku_flipscreen_w ); #endif diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h index 4785e2a4350..8558070e924 100644 --- a/src/mame/includes/redalert.h +++ b/src/mame/includes/redalert.h @@ -25,6 +25,7 @@ public: DECLARE_WRITE8_MEMBER(redalert_interrupt_clear_w); DECLARE_READ8_MEMBER(panther_interrupt_clear_r); DECLARE_READ8_MEMBER(panther_unk_r); + DECLARE_WRITE8_MEMBER(redalert_bitmap_videoram_w); }; @@ -42,7 +43,6 @@ MACHINE_CONFIG_EXTERN( demoneye_audio ); /*----------- defined in video/redalert.c -----------*/ -WRITE8_HANDLER( redalert_bitmap_videoram_w ); MACHINE_CONFIG_EXTERN( ww3_video ); MACHINE_CONFIG_EXTERN( panther_video ); diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h index c63e9279276..3a45ee9cf61 100644 --- a/src/mame/includes/renegade.h +++ b/src/mame/includes/renegade.h @@ -55,6 +55,11 @@ public: DECLARE_READ8_MEMBER(renegade_68705_port_c_r); DECLARE_WRITE8_MEMBER(renegade_68705_port_c_w); DECLARE_WRITE8_MEMBER(renegade_68705_ddr_c_w); + DECLARE_WRITE8_MEMBER(renegade_videoram_w); + DECLARE_WRITE8_MEMBER(renegade_videoram2_w); + DECLARE_WRITE8_MEMBER(renegade_flipscreen_w); + DECLARE_WRITE8_MEMBER(renegade_scroll0_w); + DECLARE_WRITE8_MEMBER(renegade_scroll1_w); }; @@ -62,8 +67,3 @@ public: SCREEN_UPDATE_IND16( renegade ); VIDEO_START( renegade ); -WRITE8_HANDLER( renegade_scroll0_w ); -WRITE8_HANDLER( renegade_scroll1_w ); -WRITE8_HANDLER( renegade_videoram_w ); -WRITE8_HANDLER( renegade_videoram2_w ); -WRITE8_HANDLER( renegade_flipscreen_w ); diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h index 815a7ea6782..dee331efdd8 100644 --- a/src/mame/includes/retofinv.h +++ b/src/mame/includes/retofinv.h @@ -38,23 +38,26 @@ public: DECLARE_WRITE8_MEMBER(irq1_ack_w); DECLARE_WRITE8_MEMBER(coincounter_w); DECLARE_WRITE8_MEMBER(coinlockout_w); + DECLARE_READ8_MEMBER(retofinv_68705_portA_r); + DECLARE_WRITE8_MEMBER(retofinv_68705_portA_w); + DECLARE_WRITE8_MEMBER(retofinv_68705_ddrA_w); + DECLARE_READ8_MEMBER(retofinv_68705_portB_r); + DECLARE_WRITE8_MEMBER(retofinv_68705_portB_w); + DECLARE_WRITE8_MEMBER(retofinv_68705_ddrB_w); + DECLARE_READ8_MEMBER(retofinv_68705_portC_r); + DECLARE_WRITE8_MEMBER(retofinv_68705_portC_w); + DECLARE_WRITE8_MEMBER(retofinv_68705_ddrC_w); + DECLARE_WRITE8_MEMBER(retofinv_mcu_w); + DECLARE_READ8_MEMBER(retofinv_mcu_r); + DECLARE_READ8_MEMBER(retofinv_mcu_status_r); + DECLARE_WRITE8_MEMBER(retofinv_bg_videoram_w); + DECLARE_WRITE8_MEMBER(retofinv_fg_videoram_w); + DECLARE_WRITE8_MEMBER(retofinv_gfx_ctrl_w); }; /*----------- defined in machine/retofinv.c -----------*/ -READ8_HANDLER( retofinv_68705_portA_r ); -WRITE8_HANDLER( retofinv_68705_portA_w ); -WRITE8_HANDLER( retofinv_68705_ddrA_w ); -READ8_HANDLER( retofinv_68705_portB_r ); -WRITE8_HANDLER( retofinv_68705_portB_w ); -WRITE8_HANDLER( retofinv_68705_ddrB_w ); -READ8_HANDLER( retofinv_68705_portC_r ); -WRITE8_HANDLER( retofinv_68705_portC_w ); -WRITE8_HANDLER( retofinv_68705_ddrC_w ); -WRITE8_HANDLER( retofinv_mcu_w ); -READ8_HANDLER( retofinv_mcu_r ); -READ8_HANDLER( retofinv_mcu_status_r ); /*----------- defined in video/retofinv.c -----------*/ @@ -62,6 +65,3 @@ READ8_HANDLER( retofinv_mcu_status_r ); VIDEO_START( retofinv ); PALETTE_INIT( retofinv ); SCREEN_UPDATE_IND16( retofinv ); -WRITE8_HANDLER( retofinv_bg_videoram_w ); -WRITE8_HANDLER( retofinv_fg_videoram_w ); -WRITE8_HANDLER( retofinv_gfx_ctrl_w ); diff --git a/src/mame/includes/rltennis.h b/src/mame/includes/rltennis.h index 25fb00d22e9..3536fc024bf 100644 --- a/src/mame/includes/rltennis.h +++ b/src/mame/includes/rltennis.h @@ -39,11 +39,11 @@ public: DECLARE_READ16_MEMBER(rlt_io_r); DECLARE_WRITE16_MEMBER(rlt_snd1_w); DECLARE_WRITE16_MEMBER(rlt_snd2_w); + DECLARE_WRITE16_MEMBER(rlt_blitter_w); }; -WRITE16_HANDLER( rlt_blitter_w ); VIDEO_START( rltennis ); SCREEN_UPDATE_IND16( rltennis ); diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h index 39edb343d7a..455a30b2b90 100644 --- a/src/mame/includes/rockrage.h +++ b/src/mame/includes/rockrage.h @@ -23,12 +23,12 @@ public: device_t *m_k007420; DECLARE_WRITE8_MEMBER(rockrage_bankswitch_w); DECLARE_WRITE8_MEMBER(rockrage_sh_irqtrigger_w); + DECLARE_WRITE8_MEMBER(rockrage_vreg_w); }; /*----------- defined in video/rockrage.c -----------*/ -WRITE8_HANDLER( rockrage_vreg_w ); SCREEN_UPDATE_IND16( rockrage ); PALETTE_INIT( rockrage ); diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h index de5f03d8197..3955ebf45d4 100644 --- a/src/mame/includes/rocnrope.h +++ b/src/mame/includes/rocnrope.h @@ -17,13 +17,13 @@ public: UINT8 m_irq_mask; DECLARE_WRITE8_MEMBER(rocnrope_interrupt_vector_w); DECLARE_WRITE8_MEMBER(irq_mask_w); + DECLARE_WRITE8_MEMBER(rocnrope_videoram_w); + DECLARE_WRITE8_MEMBER(rocnrope_colorram_w); + DECLARE_WRITE8_MEMBER(rocnrope_flipscreen_w); }; /*----------- defined in video/rocnrope.c -----------*/ -WRITE8_HANDLER( rocnrope_videoram_w ); -WRITE8_HANDLER( rocnrope_colorram_w ); -WRITE8_HANDLER( rocnrope_flipscreen_w ); PALETTE_INIT( rocnrope ); VIDEO_START( rocnrope ); diff --git a/src/mame/includes/rohga.h b/src/mame/includes/rohga.h index c5a4fd1123e..46726e3cc91 100644 --- a/src/mame/includes/rohga.h +++ b/src/mame/includes/rohga.h @@ -42,13 +42,13 @@ public: optional_device<buffered_spriteram16_device> m_spriteram2; DECLARE_READ16_MEMBER(rohga_irq_ack_r); DECLARE_WRITE16_MEMBER(wizdfire_irq_ack_w); + DECLARE_WRITE16_MEMBER(rohga_buffer_spriteram16_w); }; /*----------- defined in video/rohga.c -----------*/ -WRITE16_HANDLER( rohga_buffer_spriteram16_w ); VIDEO_START( rohga ); VIDEO_START( schmeisr ); diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h index b4909e7bd0d..82885c94e36 100644 --- a/src/mame/includes/rollrace.h +++ b/src/mame/includes/rollrace.h @@ -24,6 +24,13 @@ public: DECLARE_WRITE8_MEMBER(ra_fake_d800_w); DECLARE_WRITE8_MEMBER(nmi_mask_w); DECLARE_WRITE8_MEMBER(sound_nmi_mask_w); + DECLARE_WRITE8_MEMBER(rollrace_charbank_w); + DECLARE_WRITE8_MEMBER(rollrace_bkgpen_w); + DECLARE_WRITE8_MEMBER(rollrace_spritebank_w); + DECLARE_WRITE8_MEMBER(rollrace_backgroundpage_w); + DECLARE_WRITE8_MEMBER(rollrace_backgroundcolor_w); + DECLARE_WRITE8_MEMBER(rollrace_flipy_w); + DECLARE_WRITE8_MEMBER(rollrace_flipx_w); }; @@ -32,11 +39,4 @@ public: PALETTE_INIT( rollrace ); SCREEN_UPDATE_IND16( rollrace ); -WRITE8_HANDLER( rollrace_charbank_w ); -WRITE8_HANDLER( rollrace_backgroundpage_w ); -WRITE8_HANDLER( rollrace_backgroundcolor_w ); -WRITE8_HANDLER( rollrace_bkgpen_w ); -WRITE8_HANDLER( rollrace_flipy_w ); -WRITE8_HANDLER( rollrace_spritebank_w ); -WRITE8_HANDLER( rollrace_flipx_w ); diff --git a/src/mame/includes/route16.h b/src/mame/includes/route16.h index c38fefb1f75..a32b3952f6f 100644 --- a/src/mame/includes/route16.h +++ b/src/mame/includes/route16.h @@ -21,13 +21,13 @@ public: DECLARE_READ8_MEMBER(speakres_in3_r); DECLARE_WRITE8_MEMBER(speakres_out2_w); DECLARE_READ8_MEMBER(routex_prot_read); + DECLARE_WRITE8_MEMBER(route16_out0_w); + DECLARE_WRITE8_MEMBER(route16_out1_w); }; /*----------- defined in video/route16.c -----------*/ -WRITE8_HANDLER( route16_out0_w ); -WRITE8_HANDLER( route16_out1_w ); SCREEN_UPDATE_RGB32( route16 ); SCREEN_UPDATE_RGB32( stratvox ); SCREEN_UPDATE_RGB32( ttmahjng ); diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h index 94d6f2031c0..eb18fa0b344 100644 --- a/src/mame/includes/rpunch.h +++ b/src/mame/includes/rpunch.h @@ -22,6 +22,12 @@ public: DECLARE_WRITE16_MEMBER(sound_command_w); DECLARE_READ8_MEMBER(sound_command_r); DECLARE_READ16_MEMBER(sound_busy_r); + DECLARE_WRITE16_MEMBER(rpunch_videoram_w); + DECLARE_WRITE16_MEMBER(rpunch_videoreg_w); + DECLARE_WRITE16_MEMBER(rpunch_scrollreg_w); + DECLARE_WRITE16_MEMBER(rpunch_crtc_data_w); + DECLARE_WRITE16_MEMBER(rpunch_crtc_register_w); + DECLARE_WRITE16_MEMBER(rpunch_ins_w); }; @@ -30,9 +36,3 @@ public: VIDEO_START( rpunch ); SCREEN_UPDATE_IND16( rpunch ); -WRITE16_HANDLER( rpunch_videoram_w ); -WRITE16_HANDLER( rpunch_videoreg_w ); -WRITE16_HANDLER( rpunch_scrollreg_w ); -WRITE16_HANDLER( rpunch_ins_w ); -WRITE16_HANDLER( rpunch_crtc_data_w ); -WRITE16_HANDLER( rpunch_crtc_register_w ); diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h index 05ac95e3506..6cba3a3fa68 100644 --- a/src/mame/includes/runaway.h +++ b/src/mame/includes/runaway.h @@ -12,6 +12,9 @@ public: DECLARE_READ8_MEMBER(runaway_input_r); DECLARE_WRITE8_MEMBER(runaway_led_w); DECLARE_WRITE8_MEMBER(runaway_irq_ack_w); + DECLARE_WRITE8_MEMBER(runaway_paletteram_w); + DECLARE_WRITE8_MEMBER(runaway_video_ram_w); + DECLARE_WRITE8_MEMBER(runaway_tile_bank_w); }; @@ -22,6 +25,3 @@ VIDEO_START( qwak ); SCREEN_UPDATE_IND16( runaway ); SCREEN_UPDATE_IND16( qwak ); -WRITE8_HANDLER( runaway_paletteram_w ); -WRITE8_HANDLER( runaway_video_ram_w ); -WRITE8_HANDLER( runaway_tile_bank_w ); diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index ff08b4a1fde..01d7e893e83 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -42,6 +42,9 @@ public: DECLARE_READ16_MEMBER(sound_status_msb_r); DECLARE_WRITE8_MEMBER(sound_status_w); DECLARE_WRITE8_MEMBER(z80ctrl_w); + DECLARE_READ16_MEMBER(rng_ttl_ram_r); + DECLARE_WRITE16_MEMBER(rng_ttl_ram_w); + DECLARE_WRITE16_MEMBER(rng_936_videoram_w); }; @@ -51,9 +54,6 @@ public: extern void rng_sprite_callback(running_machine &machine, int *code, int *color, int *priority_mask); -READ16_HANDLER( rng_ttl_ram_r ); -WRITE16_HANDLER( rng_ttl_ram_w ); -WRITE16_HANDLER( rng_936_videoram_w ); VIDEO_START( rng ); SCREEN_UPDATE_IND16( rng ); diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h index 762c1025566..431f328d148 100644 --- a/src/mame/includes/sauro.h +++ b/src/mame/includes/sauro.h @@ -19,18 +19,18 @@ public: DECLARE_WRITE8_MEMBER(sauro_coin1_w); DECLARE_WRITE8_MEMBER(sauro_coin2_w); DECLARE_WRITE8_MEMBER(flip_screen_w); + DECLARE_WRITE8_MEMBER(tecfri_videoram_w); + DECLARE_WRITE8_MEMBER(tecfri_colorram_w); + DECLARE_WRITE8_MEMBER(tecfri_videoram2_w); + DECLARE_WRITE8_MEMBER(tecfri_colorram2_w); + DECLARE_WRITE8_MEMBER(tecfri_scroll_bg_w); + DECLARE_WRITE8_MEMBER(sauro_palette_bank_w); + DECLARE_WRITE8_MEMBER(sauro_scroll_fg_w); }; /*----------- defined in video/sauro.c -----------*/ -WRITE8_HANDLER( tecfri_videoram_w ); -WRITE8_HANDLER( tecfri_colorram_w ); -WRITE8_HANDLER( tecfri_videoram2_w ); -WRITE8_HANDLER( tecfri_colorram2_w ); -WRITE8_HANDLER( tecfri_scroll_bg_w ); -WRITE8_HANDLER( sauro_scroll_fg_w ); -WRITE8_HANDLER( sauro_palette_bank_w ); VIDEO_START( sauro ); VIDEO_START( trckydoc ); diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h index 60f92eaa5aa..81f330d23e8 100644 --- a/src/mame/includes/sbasketb.h +++ b/src/mame/includes/sbasketb.h @@ -19,13 +19,13 @@ public: DECLARE_WRITE8_MEMBER(sbasketb_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(sbasketb_coin_counter_w); DECLARE_WRITE8_MEMBER(irq_mask_w); + DECLARE_WRITE8_MEMBER(sbasketb_videoram_w); + DECLARE_WRITE8_MEMBER(sbasketb_colorram_w); + DECLARE_WRITE8_MEMBER(sbasketb_flipscreen_w); }; /*----------- defined in video/sbasketb.c -----------*/ -WRITE8_HANDLER( sbasketb_videoram_w ); -WRITE8_HANDLER( sbasketb_colorram_w ); -WRITE8_HANDLER( sbasketb_flipscreen_w ); PALETTE_INIT( sbasketb ); VIDEO_START( sbasketb ); diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h index 2e1b0854943..31cdad4fd6c 100644 --- a/src/mame/includes/sbugger.h +++ b/src/mame/includes/sbugger.h @@ -8,6 +8,8 @@ public: UINT8 *m_videoram_attr; tilemap_t *m_tilemap; + DECLARE_WRITE8_MEMBER(sbugger_videoram_w); + DECLARE_WRITE8_MEMBER(sbugger_videoram_attr_w); }; @@ -16,5 +18,3 @@ public: PALETTE_INIT(sbugger); SCREEN_UPDATE_IND16(sbugger); VIDEO_START(sbugger); -WRITE8_HANDLER( sbugger_videoram_attr_w ); -WRITE8_HANDLER( sbugger_videoram_w ); diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h index 9cddd33465c..8732e892aa3 100644 --- a/src/mame/includes/scotrsht.h +++ b/src/mame/includes/scotrsht.h @@ -16,15 +16,15 @@ public: int m_palette_bank; DECLARE_WRITE8_MEMBER(ctrl_w); DECLARE_WRITE8_MEMBER(scotrsht_soundlatch_w); + DECLARE_WRITE8_MEMBER(scotrsht_videoram_w); + DECLARE_WRITE8_MEMBER(scotrsht_colorram_w); + DECLARE_WRITE8_MEMBER(scotrsht_charbank_w); + DECLARE_WRITE8_MEMBER(scotrsht_palettebank_w); }; /*----------- defined in video/scotrsht.c -----------*/ -WRITE8_HANDLER( scotrsht_videoram_w ); -WRITE8_HANDLER( scotrsht_colorram_w ); -WRITE8_HANDLER( scotrsht_charbank_w ); -WRITE8_HANDLER( scotrsht_palettebank_w ); PALETTE_INIT( scotrsht ); VIDEO_START( scotrsht ); diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index 1bb7a68024e..c35d85247be 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -23,15 +23,15 @@ public: DECLARE_WRITE16_MEMBER(sderby_out_w); DECLARE_WRITE16_MEMBER(scmatto_out_w); DECLARE_WRITE16_MEMBER(roulette_out_w); + DECLARE_WRITE16_MEMBER(sderby_videoram_w); + DECLARE_WRITE16_MEMBER(sderby_md_videoram_w); + DECLARE_WRITE16_MEMBER(sderby_fg_videoram_w); + DECLARE_WRITE16_MEMBER(sderby_scroll_w); }; /*----------- defined in video/sderby.c -----------*/ -WRITE16_HANDLER( sderby_videoram_w ); -WRITE16_HANDLER( sderby_md_videoram_w ); -WRITE16_HANDLER( sderby_fg_videoram_w ); VIDEO_START( sderby ); SCREEN_UPDATE_IND16( sderby ); SCREEN_UPDATE_IND16( pmroulet ); -WRITE16_HANDLER( sderby_scroll_w ); diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index 9a7c57b6cd7..658a089c696 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -54,6 +54,18 @@ public: DECLARE_READ8_MEMBER(spaceod_mangled_ports_r); DECLARE_READ8_MEMBER(spaceod_port_fc_r); DECLARE_WRITE8_MEMBER(coin_count_w); + DECLARE_WRITE8_MEMBER(segag80r_videoram_w); + DECLARE_READ8_MEMBER(segag80r_video_port_r); + DECLARE_WRITE8_MEMBER(segag80r_video_port_w); + DECLARE_READ8_MEMBER(spaceod_back_port_r); + DECLARE_WRITE8_MEMBER(spaceod_back_port_w); + DECLARE_WRITE8_MEMBER(monsterb_videoram_w); + DECLARE_WRITE8_MEMBER(monsterb_back_port_w); + DECLARE_WRITE8_MEMBER(pignewt_videoram_w); + DECLARE_WRITE8_MEMBER(pignewt_back_color_w); + DECLARE_WRITE8_MEMBER(pignewt_back_port_w); + DECLARE_WRITE8_MEMBER(sindbadm_videoram_w); + DECLARE_WRITE8_MEMBER(sindbadm_back_port_w); }; @@ -80,29 +92,17 @@ WRITE8_HANDLER( spaceod_sound_w ); INTERRUPT_GEN( segag80r_vblank_start ); -WRITE8_HANDLER( segag80r_videoram_w ); -READ8_HANDLER( segag80r_video_port_r ); -WRITE8_HANDLER( segag80r_video_port_w ); VIDEO_START( segag80r ); SCREEN_UPDATE_IND16( segag80r ); -READ8_HANDLER( spaceod_back_port_r ); -WRITE8_HANDLER( spaceod_back_port_w ); -WRITE8_HANDLER( monsterb_videoram_w ); -WRITE8_HANDLER( monsterb_back_port_w ); -WRITE8_HANDLER( pignewt_videoram_w ); -WRITE8_HANDLER( pignewt_back_port_w ); -WRITE8_HANDLER( pignewt_back_color_w ); INTERRUPT_GEN( sindbadm_vblank_start ); -WRITE8_HANDLER( sindbadm_videoram_w ); -WRITE8_HANDLER( sindbadm_back_port_w ); diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index 795ab466ca2..91af4504d54 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -57,35 +57,59 @@ public: UINT32 *m_spriteram_32bit; void (*m_system32_prot_vblank)(device_t *device); int m_print_count; + DECLARE_WRITE16_MEMBER(ga2_dpram_w); + DECLARE_READ16_MEMBER(ga2_dpram_r); + DECLARE_READ16_MEMBER(ga2_sprite_protection_r); + DECLARE_READ16_MEMBER(ga2_wakeup_protection_r); + DECLARE_WRITE16_MEMBER(sonic_level_load_protection); + DECLARE_READ16_MEMBER(brival_protection_r); + DECLARE_WRITE16_MEMBER(brival_protection_w); + DECLARE_WRITE16_MEMBER(darkedge_protection_w); + DECLARE_READ16_MEMBER(darkedge_protection_r); + DECLARE_WRITE16_MEMBER(dbzvrvs_protection_w); + DECLARE_READ16_MEMBER(dbzvrvs_protection_r); + DECLARE_READ16_MEMBER(arabfgt_protection_r); + DECLARE_WRITE16_MEMBER(arabfgt_protection_w); + DECLARE_READ16_MEMBER(arf_wakeup_protection_r); + DECLARE_WRITE16_MEMBER(jleague_protection_w); + DECLARE_READ16_MEMBER(arescue_dsp_r); + DECLARE_WRITE16_MEMBER(arescue_dsp_w); + DECLARE_READ16_MEMBER(system32_paletteram_r); + DECLARE_WRITE16_MEMBER(system32_paletteram_w); + DECLARE_READ32_MEMBER(multi32_paletteram_0_r); + DECLARE_WRITE32_MEMBER(multi32_paletteram_0_w); + DECLARE_READ32_MEMBER(multi32_paletteram_1_r); + DECLARE_WRITE32_MEMBER(multi32_paletteram_1_w); + DECLARE_READ16_MEMBER(system32_videoram_r); + DECLARE_WRITE16_MEMBER(system32_videoram_w); + DECLARE_READ32_MEMBER(multi32_videoram_r); + DECLARE_WRITE32_MEMBER(multi32_videoram_w); + DECLARE_READ16_MEMBER(system32_sprite_control_r); + DECLARE_WRITE16_MEMBER(system32_sprite_control_w); + DECLARE_READ32_MEMBER(multi32_sprite_control_r); + DECLARE_WRITE32_MEMBER(multi32_sprite_control_w); + DECLARE_READ16_MEMBER(system32_spriteram_r); + DECLARE_WRITE16_MEMBER(system32_spriteram_w); + DECLARE_READ32_MEMBER(multi32_spriteram_r); + DECLARE_WRITE32_MEMBER(multi32_spriteram_w); + DECLARE_READ16_MEMBER(system32_mixer_r); + DECLARE_WRITE16_MEMBER(system32_mixer_w); + DECLARE_WRITE32_MEMBER(multi32_mixer_0_w); + DECLARE_WRITE32_MEMBER(multi32_mixer_1_w); }; /*----------- defined in machine/segas32.c -----------*/ -READ16_HANDLER( arabfgt_protection_r ); -READ16_HANDLER( arf_wakeup_protection_r ); -WRITE16_HANDLER( arabfgt_protection_w ); -READ16_HANDLER( brival_protection_r ); -WRITE16_HANDLER( brival_protection_w ); -READ16_HANDLER( darkedge_protection_r ); -WRITE16_HANDLER( darkedge_protection_w ); void darkedge_fd1149_vblank(device_t *device); -WRITE16_HANDLER( jleague_protection_w ); -READ16_HANDLER( dbzvrvs_protection_r ); -WRITE16_HANDLER( dbzvrvs_protection_w ); extern const UINT8 ga2_v25_opcode_table[]; void decrypt_ga2_protrom(running_machine &machine); -READ16_HANDLER( ga2_dpram_r ); -WRITE16_HANDLER( ga2_dpram_w ); -WRITE16_HANDLER(sonic_level_load_protection); -READ16_HANDLER( arescue_dsp_r ); -WRITE16_HANDLER( arescue_dsp_w ); /*----------- defined in video/segas32.c -----------*/ @@ -97,29 +121,7 @@ SCREEN_UPDATE_RGB32(multi32_left); SCREEN_UPDATE_RGB32(multi32_right); void system32_set_vblank(running_machine &machine, int state); -READ16_HANDLER( system32_videoram_r ); -WRITE16_HANDLER( system32_videoram_w ); -READ32_HANDLER( multi32_videoram_r ); -WRITE32_HANDLER( multi32_videoram_w ); - -READ16_HANDLER( system32_spriteram_r ); -WRITE16_HANDLER( system32_spriteram_w ); -READ32_HANDLER( multi32_spriteram_r ); -WRITE32_HANDLER( multi32_spriteram_w ); - -READ16_HANDLER( system32_paletteram_r ); -WRITE16_HANDLER( system32_paletteram_w ); -READ32_HANDLER( multi32_paletteram_0_r ); -WRITE32_HANDLER( multi32_paletteram_0_w ); -READ32_HANDLER( multi32_paletteram_1_r ); -WRITE32_HANDLER( multi32_paletteram_1_w ); - -READ16_HANDLER( system32_sprite_control_r ); -WRITE16_HANDLER( system32_sprite_control_w ); -READ32_HANDLER( multi32_sprite_control_r ); -WRITE32_HANDLER( multi32_sprite_control_w ); - -WRITE16_HANDLER( system32_mixer_w ); -READ16_HANDLER( system32_mixer_r ); -WRITE32_HANDLER( multi32_mixer_0_w ); -WRITE32_HANDLER( multi32_mixer_1_w ); + + + + diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h index 83697c828d7..0e441b843e2 100644 --- a/src/mame/includes/seibuspi.h +++ b/src/mame/includes/seibuspi.h @@ -44,6 +44,15 @@ public: UINT8 m_alpha_table[8192]; UINT8 m_sprite_bpp; DECLARE_READ32_MEMBER(ejanhs_speedup_r); + DECLARE_READ32_MEMBER(spi_layer_bank_r); + DECLARE_WRITE32_MEMBER(spi_layer_bank_w); + DECLARE_READ32_MEMBER(spi_layer_enable_r); + DECLARE_WRITE32_MEMBER(spi_layer_enable_w); + DECLARE_WRITE32_MEMBER(tilemap_dma_start_w); + DECLARE_WRITE32_MEMBER(palette_dma_start_w); + DECLARE_WRITE32_MEMBER(sprite_dma_start_w); + DECLARE_WRITE32_MEMBER(video_dma_length_w); + DECLARE_WRITE32_MEMBER(video_dma_address_w); }; @@ -60,14 +69,6 @@ SCREEN_UPDATE_RGB32( spi ); VIDEO_START( sys386f2 ); SCREEN_UPDATE_RGB32( sys386f2 ); -READ32_HANDLER( spi_layer_bank_r ); -WRITE32_HANDLER( spi_layer_bank_w ); -WRITE32_HANDLER( spi_layer_enable_w ); void rf2_set_layer_banks(running_machine &machine, int banks); -WRITE32_HANDLER( tilemap_dma_start_w ); -WRITE32_HANDLER( palette_dma_start_w ); -WRITE32_HANDLER( video_dma_length_w ); -WRITE32_HANDLER( video_dma_address_w ); -WRITE32_HANDLER( sprite_dma_start_w ); diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index 6e2aea766bc..d241b98c413 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -19,13 +19,13 @@ public: UINT8 *m_row_scroll; UINT8 m_irq_mask; + DECLARE_WRITE8_MEMBER(seicross_videoram_w); + DECLARE_WRITE8_MEMBER(seicross_colorram_w); }; /*----------- defined in video/seicross.c -----------*/ -WRITE8_HANDLER( seicross_videoram_w ); -WRITE8_HANDLER( seicross_colorram_w ); PALETTE_INIT( seicross ); VIDEO_START( seicross ); diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h index 68a82815a78..aa43aa7db57 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -43,6 +43,12 @@ public: DECLARE_WRITE8_MEMBER(senjyo_paletteram_w); DECLARE_WRITE8_MEMBER(starforb_scrolly2); DECLARE_WRITE8_MEMBER(starforb_scrollx2); + DECLARE_WRITE8_MEMBER(senjyo_fgvideoram_w); + DECLARE_WRITE8_MEMBER(senjyo_fgcolorram_w); + DECLARE_WRITE8_MEMBER(senjyo_bg1videoram_w); + DECLARE_WRITE8_MEMBER(senjyo_bg2videoram_w); + DECLARE_WRITE8_MEMBER(senjyo_bg3videoram_w); + DECLARE_WRITE8_MEMBER(senjyo_bgstripes_w); }; @@ -58,12 +64,6 @@ WRITE8_HANDLER( senjyo_volume_w ); /*----------- defined in video/senjyo.c -----------*/ -WRITE8_HANDLER( senjyo_fgvideoram_w ); -WRITE8_HANDLER( senjyo_fgcolorram_w ); -WRITE8_HANDLER( senjyo_bg1videoram_w ); -WRITE8_HANDLER( senjyo_bg2videoram_w ); -WRITE8_HANDLER( senjyo_bg3videoram_w ); -WRITE8_HANDLER( senjyo_bgstripes_w ); VIDEO_START( senjyo ); SCREEN_UPDATE_IND16( senjyo ); diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index 818ebbbd032..5668ed54dbd 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -88,17 +88,17 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_subcpu; + DECLARE_WRITE16_MEMBER(seta_vregs_w); + DECLARE_WRITE16_MEMBER(seta_vram_0_w); + DECLARE_WRITE16_MEMBER(seta_vram_2_w); + DECLARE_WRITE16_MEMBER(twineagl_tilebank_w); }; /*----------- defined in video/seta.c -----------*/ void seta_coin_lockout_w(running_machine &machine, int data); -WRITE16_HANDLER( twineagl_tilebank_w ); -WRITE16_HANDLER( seta_vram_0_w ); -WRITE16_HANDLER( seta_vram_2_w ); -WRITE16_HANDLER( seta_vregs_w ); PALETTE_INIT( blandia ); PALETTE_INIT( gundhara ); diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index 0b9ab2bb3fb..a0d2bb9711c 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -28,11 +28,11 @@ public: UINT8 m_funcube_serial_fifo[4]; UINT8 m_funcube_serial_count; + DECLARE_WRITE16_MEMBER(seta2_vregs_w); }; /*----------- defined in video/seta2.c -----------*/ -WRITE16_HANDLER( seta2_vregs_w ); VIDEO_START( seta2 ); VIDEO_START( seta2_xoffset ); diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h index de41f922f3e..1492a7e9e05 100644 --- a/src/mame/includes/sf.h +++ b/src/mame/includes/sf.h @@ -34,15 +34,15 @@ public: DECLARE_READ16_MEMBER(button1_r); DECLARE_READ16_MEMBER(button2_r); DECLARE_WRITE8_MEMBER(sound2_bank_w); + DECLARE_WRITE16_MEMBER(sf_videoram_w); + DECLARE_WRITE16_MEMBER(sf_bg_scroll_w); + DECLARE_WRITE16_MEMBER(sf_fg_scroll_w); + DECLARE_WRITE16_MEMBER(sf_gfxctrl_w); }; /*----------- defined in video/sf.c -----------*/ -WRITE16_HANDLER( sf_bg_scroll_w ); -WRITE16_HANDLER( sf_fg_scroll_w ); -WRITE16_HANDLER( sf_videoram_w ); -WRITE16_HANDLER( sf_gfxctrl_w ); VIDEO_START( sf ); SCREEN_UPDATE_IND16( sf ); diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index 3ee932bd331..dde71510e11 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -27,18 +27,18 @@ public: DECLARE_WRITE16_MEMBER(shadfrce_irq_ack_w); DECLARE_WRITE16_MEMBER(shadfrce_irq_w); DECLARE_WRITE16_MEMBER(shadfrce_scanline_w); + DECLARE_WRITE16_MEMBER(shadfrce_fgvideoram_w); + DECLARE_WRITE16_MEMBER(shadfrce_bg0videoram_w); + DECLARE_WRITE16_MEMBER(shadfrce_bg1videoram_w); + DECLARE_WRITE16_MEMBER(shadfrce_bg0scrollx_w); + DECLARE_WRITE16_MEMBER(shadfrce_bg0scrolly_w); + DECLARE_WRITE16_MEMBER(shadfrce_bg1scrollx_w); + DECLARE_WRITE16_MEMBER(shadfrce_bg1scrolly_w); }; /*----------- defined in video/shadfrce.c -----------*/ -WRITE16_HANDLER ( shadfrce_bg0scrollx_w ); -WRITE16_HANDLER ( shadfrce_bg1scrollx_w ); -WRITE16_HANDLER ( shadfrce_bg0scrolly_w ); -WRITE16_HANDLER ( shadfrce_bg1scrolly_w ); VIDEO_START( shadfrce ); SCREEN_VBLANK(shadfrce); SCREEN_UPDATE_IND16( shadfrce ); -WRITE16_HANDLER( shadfrce_fgvideoram_w ); -WRITE16_HANDLER( shadfrce_bg0videoram_w ); -WRITE16_HANDLER( shadfrce_bg1videoram_w ); diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h index a559e70427b..83051cff268 100644 --- a/src/mame/includes/shangha3.h +++ b/src/mame/includes/shangha3.h @@ -21,13 +21,13 @@ public: DECLARE_WRITE16_MEMBER(heberpop_coinctrl_w); DECLARE_WRITE16_MEMBER(blocken_coinctrl_w); DECLARE_WRITE16_MEMBER(heberpop_sound_command_w); + DECLARE_WRITE16_MEMBER(shangha3_flipscreen_w); + DECLARE_WRITE16_MEMBER(shangha3_gfxlist_addr_w); + DECLARE_WRITE16_MEMBER(shangha3_blitter_go_w); }; /*----------- defined in video/shangha3.c -----------*/ -WRITE16_HANDLER( shangha3_flipscreen_w ); -WRITE16_HANDLER( shangha3_gfxlist_addr_w ); -WRITE16_HANDLER( shangha3_blitter_go_w ); VIDEO_START( shangha3 ); SCREEN_UPDATE_IND16( shangha3 ); diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h index c610bb49be3..e28936b4430 100644 --- a/src/mame/includes/shangkid.h +++ b/src/mame/includes/shangkid.h @@ -16,6 +16,7 @@ public: DECLARE_WRITE8_MEMBER(shangkid_cpu_reset_w); DECLARE_WRITE8_MEMBER(shangkid_sound_enable_w); DECLARE_READ8_MEMBER(shangkid_soundlatch_r); + DECLARE_WRITE8_MEMBER(shangkid_videoram_w); }; @@ -23,7 +24,6 @@ public: VIDEO_START( shangkid ); SCREEN_UPDATE_IND16( shangkid ); -WRITE8_HANDLER( shangkid_videoram_w ); PALETTE_INIT( dynamski ); SCREEN_UPDATE_IND16( dynamski ); diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h index d7fc09548d8..54ab992f8ce 100644 --- a/src/mame/includes/shaolins.h +++ b/src/mame/includes/shaolins.h @@ -16,16 +16,16 @@ public: UINT8 m_nmi_enable; required_device<cpu_device> m_maincpu; + DECLARE_WRITE8_MEMBER(shaolins_videoram_w); + DECLARE_WRITE8_MEMBER(shaolins_colorram_w); + DECLARE_WRITE8_MEMBER(shaolins_palettebank_w); + DECLARE_WRITE8_MEMBER(shaolins_scroll_w); + DECLARE_WRITE8_MEMBER(shaolins_nmi_w); }; /*----------- defined in video/sauro.c -----------*/ -WRITE8_HANDLER( shaolins_videoram_w ); -WRITE8_HANDLER( shaolins_colorram_w ); -WRITE8_HANDLER( shaolins_palettebank_w ); -WRITE8_HANDLER( shaolins_scroll_w ); -WRITE8_HANDLER( shaolins_nmi_w ); PALETTE_INIT( shaolins ); VIDEO_START( shaolins ); diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h index 095f565a5b2..b40786f0cca 100644 --- a/src/mame/includes/shisen.h +++ b/src/mame/includes/shisen.h @@ -10,14 +10,14 @@ public: UINT8 *m_videoram; DECLARE_READ8_MEMBER(sichuan2_dsw1_r); DECLARE_WRITE8_MEMBER(sichuan2_coin_w); + DECLARE_WRITE8_MEMBER(sichuan2_videoram_w); + DECLARE_WRITE8_MEMBER(sichuan2_bankswitch_w); + DECLARE_WRITE8_MEMBER(sichuan2_paletteram_w); }; /*----------- defined in video/shisen.c -----------*/ -WRITE8_HANDLER( sichuan2_videoram_w ); -WRITE8_HANDLER( sichuan2_bankswitch_w ); -WRITE8_HANDLER( sichuan2_paletteram_w ); VIDEO_START( sichuan2 ); SCREEN_UPDATE_IND16( sichuan2 ); diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index 88eb9c429a3..26b42451337 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -14,13 +14,13 @@ public: DECLARE_WRITE8_MEMBER(sound_cpu_command_w); DECLARE_WRITE8_MEMBER(shootout_flipscreen_w); DECLARE_WRITE8_MEMBER(shootout_coin_counter_w); + DECLARE_WRITE8_MEMBER(shootout_videoram_w); + DECLARE_WRITE8_MEMBER(shootout_textram_w); }; /*----------- defined in video/shootout.c -----------*/ -WRITE8_HANDLER( shootout_videoram_w ); -WRITE8_HANDLER( shootout_textram_w ); PALETTE_INIT( shootout ); VIDEO_START( shootout ); diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index 08f593344ac..b125669eda8 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -32,16 +32,16 @@ public: DECLARE_WRITE8_MEMBER(sidearms_bankswitch_w); DECLARE_READ8_MEMBER(turtship_ports_r); DECLARE_WRITE8_MEMBER(whizz_bankswitch_w); + DECLARE_WRITE8_MEMBER(sidearms_videoram_w); + DECLARE_WRITE8_MEMBER(sidearms_colorram_w); + DECLARE_WRITE8_MEMBER(sidearms_c804_w); + DECLARE_WRITE8_MEMBER(sidearms_gfxctrl_w); + DECLARE_WRITE8_MEMBER(sidearms_star_scrollx_w); + DECLARE_WRITE8_MEMBER(sidearms_star_scrolly_w); }; /*----------- defined in video/sidearms.c -----------*/ -WRITE8_HANDLER( sidearms_videoram_w ); -WRITE8_HANDLER( sidearms_colorram_w ); -WRITE8_HANDLER( sidearms_star_scrollx_w ); -WRITE8_HANDLER( sidearms_star_scrolly_w ); -WRITE8_HANDLER( sidearms_c804_w ); -WRITE8_HANDLER( sidearms_gfxctrl_w ); VIDEO_START( sidearms ); SCREEN_UPDATE_IND16( sidearms ); diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index 0cf0856df0f..1056d428082 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -19,6 +19,9 @@ public: DECLARE_READ8_MEMBER(sidepckt_i8751_r); DECLARE_WRITE8_MEMBER(sidepckt_i8751_w); DECLARE_WRITE8_MEMBER(sidepctj_i8751_w); + DECLARE_WRITE8_MEMBER(sidepckt_videoram_w); + DECLARE_WRITE8_MEMBER(sidepckt_colorram_w); + DECLARE_WRITE8_MEMBER(sidepckt_flipscreen_w); }; @@ -28,6 +31,3 @@ PALETTE_INIT( sidepckt ); VIDEO_START( sidepckt ); SCREEN_UPDATE_IND16( sidepckt ); -WRITE8_HANDLER( sidepckt_flipscreen_w ); -WRITE8_HANDLER( sidepckt_videoram_w ); -WRITE8_HANDLER( sidepckt_colorram_w ); diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h index 673d4912fff..eca93eff06a 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -14,13 +14,13 @@ public: tilemap_t *m_fg3_tilemap; DECLARE_WRITE32_MEMBER(paletteram32_xRRRRRGGGGGBBBBB_dword_w); DECLARE_WRITE32_MEMBER(silk_coin_counter_w); + DECLARE_WRITE32_MEMBER(silkroad_fgram_w); + DECLARE_WRITE32_MEMBER(silkroad_fgram2_w); + DECLARE_WRITE32_MEMBER(silkroad_fgram3_w); }; /*----------- defined in video/silkroad.c -----------*/ -WRITE32_HANDLER( silkroad_fgram_w ); -WRITE32_HANDLER( silkroad_fgram2_w ); -WRITE32_HANDLER( silkroad_fgram3_w ); VIDEO_START(silkroad); SCREEN_UPDATE_IND16(silkroad); diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h index 14950803d02..8b4beebe25e 100644 --- a/src/mame/includes/simpsons.h +++ b/src/mame/includes/simpsons.h @@ -30,13 +30,17 @@ public: device_t *m_k053251; DECLARE_WRITE8_MEMBER(z80_bankswitch_w); DECLARE_WRITE8_MEMBER(z80_arm_nmi_w); + DECLARE_WRITE8_MEMBER(simpsons_eeprom_w); + DECLARE_WRITE8_MEMBER(simpsons_coin_counter_w); + DECLARE_READ8_MEMBER(simpsons_sound_interrupt_r); + DECLARE_READ8_MEMBER(simpsons_k052109_r); + DECLARE_WRITE8_MEMBER(simpsons_k052109_w); + DECLARE_READ8_MEMBER(simpsons_k053247_r); + DECLARE_WRITE8_MEMBER(simpsons_k053247_w); }; /*----------- defined in machine/simpsons.c -----------*/ -WRITE8_HANDLER( simpsons_eeprom_w ); -WRITE8_HANDLER( simpsons_coin_counter_w ); -READ8_HANDLER( simpsons_sound_interrupt_r ); READ8_DEVICE_HANDLER( simpsons_sound_r ); MACHINE_RESET( simpsons ); MACHINE_START( simpsons ); diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h index 5d9ecb22a95..72cc5400ed9 100644 --- a/src/mame/includes/skydiver.h +++ b/src/mame/includes/skydiver.h @@ -30,6 +30,18 @@ public: tilemap_t *m_bg_tilemap; int m_width; DECLARE_WRITE8_MEMBER(skydiver_nmion_w); + DECLARE_WRITE8_MEMBER(skydiver_videoram_w); + DECLARE_READ8_MEMBER(skydiver_wram_r); + DECLARE_WRITE8_MEMBER(skydiver_wram_w); + DECLARE_WRITE8_MEMBER(skydiver_width_w); + DECLARE_WRITE8_MEMBER(skydiver_coin_lockout_w); + DECLARE_WRITE8_MEMBER(skydiver_start_lamp_1_w); + DECLARE_WRITE8_MEMBER(skydiver_start_lamp_2_w); + DECLARE_WRITE8_MEMBER(skydiver_lamp_s_w); + DECLARE_WRITE8_MEMBER(skydiver_lamp_k_w); + DECLARE_WRITE8_MEMBER(skydiver_lamp_y_w); + DECLARE_WRITE8_MEMBER(skydiver_lamp_d_w); + DECLARE_WRITE8_MEMBER(skydiver_2000_201F_w); }; @@ -41,17 +53,5 @@ DISCRETE_SOUND_EXTERN( skydiver ); /*----------- defined in video/skydiver.c -----------*/ MACHINE_RESET( skydiver ); -WRITE8_HANDLER( skydiver_videoram_w ); -WRITE8_HANDLER( skydiver_wram_w ); /* the signal is WRAM, presumably Work RAM */ -READ8_HANDLER( skydiver_wram_r ); -WRITE8_HANDLER( skydiver_start_lamp_1_w ); -WRITE8_HANDLER( skydiver_start_lamp_2_w ); -WRITE8_HANDLER( skydiver_lamp_s_w ); -WRITE8_HANDLER( skydiver_lamp_k_w ); -WRITE8_HANDLER( skydiver_lamp_y_w ); -WRITE8_HANDLER( skydiver_lamp_d_w ); -WRITE8_HANDLER( skydiver_2000_201F_w ); -WRITE8_HANDLER( skydiver_width_w ); -WRITE8_HANDLER( skydiver_coin_lockout_w ); VIDEO_START( skydiver ); SCREEN_UPDATE_IND16( skydiver ); diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index 1f7915cada1..518df562acb 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -24,11 +24,12 @@ public: /* devices */ device_t *m_maincpu; + DECLARE_READ8_MEMBER(skyfox_vregs_r); + DECLARE_WRITE8_MEMBER(skyfox_vregs_w); }; /*----------- defined in video/skyfox.c -----------*/ -WRITE8_HANDLER( skyfox_vregs_w ); PALETTE_INIT( skyfox ); diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h index 27fe3feb4cf..3fa0db39600 100644 --- a/src/mame/includes/skykid.h +++ b/src/mame/includes/skykid.h @@ -23,6 +23,13 @@ public: DECLARE_WRITE8_MEMBER(skykid_irq_1_ctrl_w); DECLARE_WRITE8_MEMBER(skykid_irq_2_ctrl_w); DECLARE_READ8_MEMBER(readFF); + DECLARE_READ8_MEMBER(skykid_videoram_r); + DECLARE_WRITE8_MEMBER(skykid_videoram_w); + DECLARE_READ8_MEMBER(skykid_textram_r); + DECLARE_WRITE8_MEMBER(skykid_textram_w); + DECLARE_WRITE8_MEMBER(skykid_scroll_x_w); + DECLARE_WRITE8_MEMBER(skykid_scroll_y_w); + DECLARE_WRITE8_MEMBER(skykid_flipscreen_priority_w); }; @@ -32,10 +39,3 @@ VIDEO_START( skykid ); SCREEN_UPDATE_IND16( skykid ); PALETTE_INIT( skykid ); -READ8_HANDLER( skykid_videoram_r ); -WRITE8_HANDLER( skykid_videoram_w ); -READ8_HANDLER( skykid_textram_r ); -WRITE8_HANDLER( skykid_textram_w ); -WRITE8_HANDLER( skykid_scroll_x_w ); -WRITE8_HANDLER( skykid_scroll_y_w ); -WRITE8_HANDLER( skykid_flipscreen_priority_w ); diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index 5de267f83dd..8b1586f804d 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -58,6 +58,50 @@ public: required_device<buffered_spriteram8_device> m_spriteram; DECLARE_READ8_MEMBER(tigerh_status_r); DECLARE_READ8_MEMBER(gtstarb1_port_0_read); + DECLARE_WRITE8_MEMBER(slapfight_port_00_w); + DECLARE_WRITE8_MEMBER(slapfight_port_01_w); + DECLARE_WRITE8_MEMBER(slapfight_port_06_w); + DECLARE_WRITE8_MEMBER(slapfight_port_07_w); + DECLARE_WRITE8_MEMBER(slapfight_port_08_w); + DECLARE_WRITE8_MEMBER(slapfight_port_09_w); + DECLARE_READ8_MEMBER(slapfight_port_00_r); + DECLARE_READ8_MEMBER(slapfight_68705_portA_r); + DECLARE_WRITE8_MEMBER(slapfight_68705_portA_w); + DECLARE_WRITE8_MEMBER(slapfight_68705_ddrA_w); + DECLARE_READ8_MEMBER(slapfight_68705_portB_r); + DECLARE_WRITE8_MEMBER(slapfight_68705_portB_w); + DECLARE_WRITE8_MEMBER(slapfight_68705_ddrB_w); + DECLARE_READ8_MEMBER(slapfight_68705_portC_r); + DECLARE_WRITE8_MEMBER(slapfight_68705_portC_w); + DECLARE_WRITE8_MEMBER(slapfight_68705_ddrC_w); + DECLARE_WRITE8_MEMBER(slapfight_mcu_w); + DECLARE_READ8_MEMBER(slapfight_mcu_r); + DECLARE_READ8_MEMBER(slapfight_mcu_status_r); + DECLARE_READ8_MEMBER(getstar_e803_r); + DECLARE_WRITE8_MEMBER(getstar_e803_w); + DECLARE_WRITE8_MEMBER(getstar_sh_intenable_w); + DECLARE_WRITE8_MEMBER(getstar_port_04_w); + DECLARE_READ8_MEMBER(tigerh_68705_portA_r); + DECLARE_WRITE8_MEMBER(tigerh_68705_portA_w); + DECLARE_WRITE8_MEMBER(tigerh_68705_ddrA_w); + DECLARE_READ8_MEMBER(tigerh_68705_portB_r); + DECLARE_WRITE8_MEMBER(tigerh_68705_portB_w); + DECLARE_WRITE8_MEMBER(tigerh_68705_ddrB_w); + DECLARE_READ8_MEMBER(tigerh_68705_portC_r); + DECLARE_WRITE8_MEMBER(tigerh_68705_portC_w); + DECLARE_WRITE8_MEMBER(tigerh_68705_ddrC_w); + DECLARE_WRITE8_MEMBER(tigerh_mcu_w); + DECLARE_READ8_MEMBER(tigerh_mcu_r); + DECLARE_READ8_MEMBER(tigerh_mcu_status_r); + DECLARE_READ8_MEMBER(tigerhb_e803_r); + DECLARE_WRITE8_MEMBER(tigerhb_e803_w); + DECLARE_READ8_MEMBER(perfrman_port_00_r); + DECLARE_WRITE8_MEMBER(slapfight_videoram_w); + DECLARE_WRITE8_MEMBER(slapfight_colorram_w); + DECLARE_WRITE8_MEMBER(slapfight_fixram_w); + DECLARE_WRITE8_MEMBER(slapfight_fixcol_w); + DECLARE_WRITE8_MEMBER(slapfight_flipscreen_w); + DECLARE_WRITE8_MEMBER(slapfight_palette_bank_w); }; @@ -66,63 +110,26 @@ public: /* due to code at 0x108d (GUARDIAN) or 0x1152 (GETSTARJ), register C is a unaltered copy of register A */ -#define GS_SAVE_REGS state->m_gs_a = cpu_get_reg(&space->device(), Z80_BC) >> 0; \ - state->m_gs_d = cpu_get_reg(&space->device(), Z80_DE) >> 8; \ - state->m_gs_e = cpu_get_reg(&space->device(), Z80_DE) >> 0; +#define GS_SAVE_REGS m_gs_a = cpu_get_reg(&space.device(), Z80_BC) >> 0; \ + m_gs_d = cpu_get_reg(&space.device(), Z80_DE) >> 8; \ + m_gs_e = cpu_get_reg(&space.device(), Z80_DE) >> 0; -#define GS_RESET_REGS state->m_gs_a = 0; \ - state->m_gs_d = 0; \ - state->m_gs_e = 0; +#define GS_RESET_REGS m_gs_a = 0; \ + m_gs_d = 0; \ + m_gs_e = 0; /*----------- defined in machine/slapfght.c -----------*/ MACHINE_RESET( slapfight ); -READ8_HANDLER( slapfight_port_00_r ); -WRITE8_HANDLER( slapfight_port_00_w ); -WRITE8_HANDLER( slapfight_port_01_w ); -WRITE8_HANDLER( slapfight_port_06_w ); -WRITE8_HANDLER( slapfight_port_07_w ); -WRITE8_HANDLER( slapfight_port_08_w ); -WRITE8_HANDLER( slapfight_port_09_w ); - -READ8_HANDLER ( slapfight_68705_portA_r ); -WRITE8_HANDLER( slapfight_68705_portA_w ); -READ8_HANDLER ( slapfight_68705_portB_r ); -WRITE8_HANDLER( slapfight_68705_portB_w ); -READ8_HANDLER ( slapfight_68705_portC_r ); -WRITE8_HANDLER( slapfight_68705_portC_w ); -WRITE8_HANDLER( slapfight_68705_ddrA_w ); -WRITE8_HANDLER( slapfight_68705_ddrB_w ); -WRITE8_HANDLER( slapfight_68705_ddrC_w ); -WRITE8_HANDLER( slapfight_mcu_w ); -READ8_HANDLER ( slapfight_mcu_r ); -READ8_HANDLER ( slapfight_mcu_status_r ); - -READ8_HANDLER( getstar_e803_r ); -WRITE8_HANDLER( getstar_e803_w ); - -READ8_HANDLER( perfrman_port_00_r ); - -READ8_HANDLER ( tigerh_68705_portA_r ); -WRITE8_HANDLER( tigerh_68705_portA_w ); -READ8_HANDLER ( tigerh_68705_portB_r ); -WRITE8_HANDLER( tigerh_68705_portB_w ); -READ8_HANDLER ( tigerh_68705_portC_r ); -WRITE8_HANDLER( tigerh_68705_portC_w ); -WRITE8_HANDLER( tigerh_68705_ddrA_w ); -WRITE8_HANDLER( tigerh_68705_ddrB_w ); -WRITE8_HANDLER( tigerh_68705_ddrC_w ); -WRITE8_HANDLER( tigerh_mcu_w ); -READ8_HANDLER ( tigerh_mcu_r ); -READ8_HANDLER ( tigerh_mcu_status_r ); - -READ8_HANDLER( tigerhb_e803_r ); -WRITE8_HANDLER( tigerhb_e803_w ); - - -WRITE8_HANDLER( getstar_sh_intenable_w ); + + + + + + + INTERRUPT_GEN( getstar_interrupt ); @@ -133,9 +140,3 @@ SCREEN_UPDATE_IND16( perfrman ); VIDEO_START( slapfight ); VIDEO_START( perfrman ); -WRITE8_HANDLER( slapfight_flipscreen_w ); -WRITE8_HANDLER( slapfight_fixram_w ); -WRITE8_HANDLER( slapfight_fixcol_w ); -WRITE8_HANDLER( slapfight_videoram_w ); -WRITE8_HANDLER( slapfight_colorram_w ); -WRITE8_HANDLER( slapfight_palette_bank_w ); diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index fc92d23b8fa..79d2a3e0edd 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -97,6 +97,38 @@ public: DECLARE_WRITE8_MEMBER(ikari_coin_counter_w); DECLARE_WRITE8_MEMBER(tdfever_coin_counter_w); DECLARE_WRITE8_MEMBER(countryc_trackball_w); + DECLARE_WRITE8_MEMBER(snk_tx_videoram_w); + DECLARE_WRITE8_MEMBER(marvins_fg_videoram_w); + DECLARE_WRITE8_MEMBER(marvins_bg_videoram_w); + DECLARE_WRITE8_MEMBER(snk_bg_videoram_w); + DECLARE_WRITE8_MEMBER(snk_fg_scrollx_w); + DECLARE_WRITE8_MEMBER(snk_fg_scrolly_w); + DECLARE_WRITE8_MEMBER(snk_bg_scrollx_w); + DECLARE_WRITE8_MEMBER(snk_bg_scrolly_w); + DECLARE_WRITE8_MEMBER(snk_sp16_scrollx_w); + DECLARE_WRITE8_MEMBER(snk_sp16_scrolly_w); + DECLARE_WRITE8_MEMBER(snk_sp32_scrollx_w); + DECLARE_WRITE8_MEMBER(snk_sp32_scrolly_w); + DECLARE_WRITE8_MEMBER(snk_sprite_split_point_w); + DECLARE_WRITE8_MEMBER(marvins_palette_bank_w); + DECLARE_WRITE8_MEMBER(marvins_flipscreen_w); + DECLARE_WRITE8_MEMBER(sgladiat_flipscreen_w); + DECLARE_WRITE8_MEMBER(hal21_flipscreen_w); + DECLARE_WRITE8_MEMBER(marvins_scroll_msb_w); + DECLARE_WRITE8_MEMBER(jcross_scroll_msb_w); + DECLARE_WRITE8_MEMBER(sgladiat_scroll_msb_w); + DECLARE_WRITE8_MEMBER(aso_videoattrs_w); + DECLARE_WRITE8_MEMBER(tnk3_videoattrs_w); + DECLARE_WRITE8_MEMBER(aso_bg_bank_w); + DECLARE_WRITE8_MEMBER(ikari_bg_scroll_msb_w); + DECLARE_WRITE8_MEMBER(ikari_sp_scroll_msb_w); + DECLARE_WRITE8_MEMBER(ikari_unknown_video_w); + DECLARE_WRITE8_MEMBER(gwar_tx_bank_w); + DECLARE_WRITE8_MEMBER(gwar_videoattrs_w); + DECLARE_WRITE8_MEMBER(gwara_videoattrs_w); + DECLARE_WRITE8_MEMBER(gwara_sp_scroll_msb_w); + DECLARE_WRITE8_MEMBER(tdfever_sp_scroll_msb_w); + DECLARE_WRITE8_MEMBER(tdfever_spriteram_w); }; @@ -121,37 +153,5 @@ extern SCREEN_UPDATE_IND16( ikari ); extern SCREEN_UPDATE_IND16( gwar ); extern SCREEN_UPDATE_IND16( tdfever ); -extern WRITE8_HANDLER( snk_fg_scrollx_w ); -extern WRITE8_HANDLER( snk_fg_scrolly_w ); -extern WRITE8_HANDLER( snk_bg_scrollx_w ); -extern WRITE8_HANDLER( snk_bg_scrolly_w ); -extern WRITE8_HANDLER( snk_sp16_scrollx_w ); -extern WRITE8_HANDLER( snk_sp16_scrolly_w ); -extern WRITE8_HANDLER( snk_sp32_scrollx_w ); -extern WRITE8_HANDLER( snk_sp32_scrolly_w ); - -extern WRITE8_HANDLER( snk_sprite_split_point_w ); -extern WRITE8_HANDLER( marvins_palette_bank_w ); -extern WRITE8_HANDLER( marvins_scroll_msb_w ); -extern WRITE8_HANDLER( jcross_scroll_msb_w ); -extern WRITE8_HANDLER( sgladiat_scroll_msb_w ); -extern WRITE8_HANDLER( marvins_flipscreen_w ); -extern WRITE8_HANDLER( sgladiat_flipscreen_w ); -extern WRITE8_HANDLER( hal21_flipscreen_w ); -extern WRITE8_HANDLER( tnk3_videoattrs_w ); -extern WRITE8_HANDLER( aso_videoattrs_w ); -extern WRITE8_HANDLER( aso_bg_bank_w ); -extern WRITE8_HANDLER( ikari_bg_scroll_msb_w ); -extern WRITE8_HANDLER( ikari_sp_scroll_msb_w ); -extern WRITE8_HANDLER( ikari_unknown_video_w ); -extern WRITE8_HANDLER( gwar_tx_bank_w ); -extern WRITE8_HANDLER( gwar_videoattrs_w ); -extern WRITE8_HANDLER( gwara_videoattrs_w ); -extern WRITE8_HANDLER( gwara_sp_scroll_msb_w ); -extern WRITE8_HANDLER( tdfever_sp_scroll_msb_w ); -extern WRITE8_HANDLER( tdfever_spriteram_w ); - -extern WRITE8_HANDLER( snk_tx_videoram_w ); -extern WRITE8_HANDLER( snk_bg_videoram_w ); -extern WRITE8_HANDLER( marvins_fg_videoram_w ); -extern WRITE8_HANDLER( marvins_bg_videoram_w ); + + diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h index 4b560bc08bb..2fcfcc47fda 100644 --- a/src/mame/includes/snk6502.h +++ b/src/mame/includes/snk6502.h @@ -31,6 +31,15 @@ public: rgb_t m_palette[64]; UINT8 m_irq_mask; + DECLARE_WRITE8_MEMBER(snk6502_videoram_w); + DECLARE_WRITE8_MEMBER(snk6502_videoram2_w); + DECLARE_WRITE8_MEMBER(snk6502_colorram_w); + DECLARE_WRITE8_MEMBER(snk6502_charram_w); + DECLARE_WRITE8_MEMBER(snk6502_flipscreen_w); + DECLARE_WRITE8_MEMBER(snk6502_scrollx_w); + DECLARE_WRITE8_MEMBER(snk6502_scrolly_w); + DECLARE_WRITE8_MEMBER(satansat_b002_w); + DECLARE_WRITE8_MEMBER(satansat_backcolor_w); }; @@ -65,21 +74,12 @@ DISCRETE_SOUND_EXTERN( fantasy ); /*----------- defined in video/snk6502.c -----------*/ -WRITE8_HANDLER( snk6502_videoram_w ); -WRITE8_HANDLER( snk6502_videoram2_w ); -WRITE8_HANDLER( snk6502_colorram_w ); -WRITE8_HANDLER( snk6502_charram_w ); -WRITE8_HANDLER( snk6502_flipscreen_w ); -WRITE8_HANDLER( snk6502_scrollx_w ); -WRITE8_HANDLER( snk6502_scrolly_w ); PALETTE_INIT( snk6502 ); VIDEO_START( snk6502 ); SCREEN_UPDATE_IND16( snk6502 ); VIDEO_START( pballoon ); -WRITE8_HANDLER( satansat_b002_w ); -WRITE8_HANDLER( satansat_backcolor_w ); PALETTE_INIT( satansat ); VIDEO_START( satansat ); diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index 1d0aaa94a84..a1b5d65733a 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -25,6 +25,14 @@ public: DECLARE_READ16_MEMBER(protcontrols_r); DECLARE_WRITE16_MEMBER(protection_w); DECLARE_WRITE16_MEMBER(sound_w); + DECLARE_READ16_MEMBER(pow_spriteram_r); + DECLARE_WRITE16_MEMBER(pow_spriteram_w); + DECLARE_READ16_MEMBER(pow_fg_videoram_r); + DECLARE_WRITE16_MEMBER(pow_fg_videoram_w); + DECLARE_WRITE16_MEMBER(searchar_fg_videoram_w); + DECLARE_WRITE16_MEMBER(pow_flipscreen16_w); + DECLARE_WRITE16_MEMBER(searchar_flipscreen16_w); + DECLARE_WRITE16_MEMBER(pow_paletteram16_word_w); }; @@ -33,11 +41,3 @@ public: VIDEO_START( pow ); VIDEO_START( searchar ); SCREEN_UPDATE_IND16( pow ); -WRITE16_HANDLER( pow_paletteram16_word_w ); -WRITE16_HANDLER( pow_flipscreen16_w ); -WRITE16_HANDLER( searchar_flipscreen16_w ); -READ16_HANDLER( pow_spriteram_r ); -WRITE16_HANDLER( pow_spriteram_w ); -READ16_HANDLER( pow_fg_videoram_r ); -WRITE16_HANDLER( pow_fg_videoram_w ); -WRITE16_HANDLER( searchar_fg_videoram_w ); diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h index 459e9b516c1..40612b16536 100644 --- a/src/mame/includes/snookr10.h +++ b/src/mame/includes/snookr10.h @@ -18,13 +18,13 @@ public: DECLARE_READ8_MEMBER(dsw_port_1_r); DECLARE_WRITE8_MEMBER(output_port_0_w); DECLARE_WRITE8_MEMBER(output_port_1_w); + DECLARE_WRITE8_MEMBER(snookr10_videoram_w); + DECLARE_WRITE8_MEMBER(snookr10_colorram_w); }; /*----------- defined in video/snookr10.c -----------*/ -WRITE8_HANDLER( snookr10_videoram_w ); -WRITE8_HANDLER( snookr10_colorram_w ); PALETTE_INIT( snookr10 ); PALETTE_INIT( apple10 ); VIDEO_START( snookr10 ); diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h index cd1dc2f2263..6906c26a093 100644 --- a/src/mame/includes/solomon.h +++ b/src/mame/includes/solomon.h @@ -18,16 +18,16 @@ public: DECLARE_WRITE8_MEMBER(solomon_sh_command_w); DECLARE_READ8_MEMBER(solomon_0xe603_r); DECLARE_WRITE8_MEMBER(nmi_mask_w); + DECLARE_WRITE8_MEMBER(solomon_videoram_w); + DECLARE_WRITE8_MEMBER(solomon_colorram_w); + DECLARE_WRITE8_MEMBER(solomon_videoram2_w); + DECLARE_WRITE8_MEMBER(solomon_colorram2_w); + DECLARE_WRITE8_MEMBER(solomon_flipscreen_w); }; /*----------- defined in video/solomon.c -----------*/ -WRITE8_HANDLER( solomon_videoram_w ); -WRITE8_HANDLER( solomon_colorram_w ); -WRITE8_HANDLER( solomon_videoram2_w ); -WRITE8_HANDLER( solomon_colorram2_w ); -WRITE8_HANDLER( solomon_flipscreen_w ); VIDEO_START( solomon ); SCREEN_UPDATE_IND16( solomon ); diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index b7646721077..52a3963c394 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -28,15 +28,15 @@ public: DECLARE_WRITE8_MEMBER(sonson_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(sonson_coin1_counter_w); DECLARE_WRITE8_MEMBER(sonson_coin2_counter_w); + DECLARE_WRITE8_MEMBER(sonson_videoram_w); + DECLARE_WRITE8_MEMBER(sonson_colorram_w); + DECLARE_WRITE8_MEMBER(sonson_scrollx_w); + DECLARE_WRITE8_MEMBER(sonson_flipscreen_w); }; /*----------- defined in video/sonson.c -----------*/ -WRITE8_HANDLER( sonson_videoram_w ); -WRITE8_HANDLER( sonson_colorram_w ); -WRITE8_HANDLER( sonson_scrollx_w ); -WRITE8_HANDLER( sonson_flipscreen_w ); PALETTE_INIT( sonson ); VIDEO_START( sonson ); diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h index 8b5705f350d..6ed91d55011 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -40,6 +40,8 @@ public: UINT32 m_star_shift_reg; double m_color_weights_rg[3]; double m_color_weights_b[2]; + DECLARE_WRITE8_MEMBER(spacefb_port_0_w); + DECLARE_WRITE8_MEMBER(spacefb_port_2_w); }; @@ -58,5 +60,3 @@ WRITE8_HANDLER( spacefb_port_1_w ); VIDEO_START( spacefb ); SCREEN_UPDATE_RGB32( spacefb ); -WRITE8_HANDLER( spacefb_port_0_w ); -WRITE8_HANDLER( spacefb_port_2_w ); diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h index b3eb22aea95..02f8145f2cf 100644 --- a/src/mame/includes/spcforce.h +++ b/src/mame/includes/spcforce.h @@ -18,10 +18,10 @@ public: DECLARE_READ8_MEMBER(spcforce_t0_r); DECLARE_WRITE8_MEMBER(spcforce_soundtrigger_w); DECLARE_WRITE8_MEMBER(irq_mask_w); + DECLARE_WRITE8_MEMBER(spcforce_flip_screen_w); }; /*----------- defined in video/spcforce.c -----------*/ -WRITE8_HANDLER( spcforce_flip_screen_w ); SCREEN_UPDATE_IND16( spcforce ); diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index bd34c1e2251..d959ed5f64a 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -38,6 +38,9 @@ public: DECLARE_READ8_MEMBER(mcu63701_r); DECLARE_WRITE8_MEMBER(mcu63701_w); DECLARE_READ8_MEMBER(port_0_r); + DECLARE_WRITE8_MEMBER(spdodgeb_scrollx_lo_w); + DECLARE_WRITE8_MEMBER(spdodgeb_ctrl_w); + DECLARE_WRITE8_MEMBER(spdodgeb_videoram_w); }; @@ -47,6 +50,3 @@ PALETTE_INIT( spdodgeb ); VIDEO_START( spdodgeb ); SCREEN_UPDATE_IND16( spdodgeb ); TIMER_DEVICE_CALLBACK( spdodgeb_interrupt ); -WRITE8_HANDLER( spdodgeb_scrollx_lo_w ); -WRITE8_HANDLER( spdodgeb_ctrl_w ); -WRITE8_HANDLER( spdodgeb_videoram_w ); diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h index 1cedd7243ba..2e3f2b2e02a 100644 --- a/src/mame/includes/speedatk.h +++ b/src/mame/includes/speedatk.h @@ -18,14 +18,14 @@ public: DECLARE_WRITE8_MEMBER(key_matrix_w); DECLARE_READ8_MEMBER(key_matrix_status_r); DECLARE_WRITE8_MEMBER(key_matrix_status_w); + DECLARE_WRITE8_MEMBER(speedatk_videoram_w); + DECLARE_WRITE8_MEMBER(speedatk_colorram_w); + DECLARE_WRITE8_MEMBER(speedatk_6845_w); }; /*----------- defined in video/speedatk.c -----------*/ -WRITE8_HANDLER( speedatk_videoram_w ); -WRITE8_HANDLER( speedatk_colorram_w ); -WRITE8_HANDLER( speedatk_6845_w ); PALETTE_INIT( speedatk ); VIDEO_START( speedatk ); SCREEN_UPDATE_IND16( speedatk ); diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h index 787c1a05174..76a9be90fa5 100644 --- a/src/mame/includes/speedbal.h +++ b/src/mame/includes/speedbal.h @@ -11,6 +11,8 @@ public: UINT8 *m_spriteram; size_t m_spriteram_size; DECLARE_WRITE8_MEMBER(speedbal_coincounter_w); + DECLARE_WRITE8_MEMBER(speedbal_foreground_videoram_w); + DECLARE_WRITE8_MEMBER(speedbal_background_videoram_w); }; @@ -18,5 +20,3 @@ public: VIDEO_START( speedbal ); SCREEN_UPDATE_IND16( speedbal ); -WRITE8_HANDLER( speedbal_foreground_videoram_w ); -WRITE8_HANDLER( speedbal_background_videoram_w ); diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h index b21826dc6f7..caf8244719a 100644 --- a/src/mame/includes/speedspn.h +++ b/src/mame/includes/speedspn.h @@ -12,6 +12,11 @@ public: DECLARE_READ8_MEMBER(speedspn_irq_ack_r); DECLARE_WRITE8_MEMBER(speedspn_banked_rom_change); DECLARE_WRITE8_MEMBER(speedspn_sound_w); + DECLARE_WRITE8_MEMBER(speedspn_vidram_w); + DECLARE_WRITE8_MEMBER(speedspn_attram_w); + DECLARE_READ8_MEMBER(speedspn_vidram_r); + DECLARE_WRITE8_MEMBER(speedspn_banked_vidram_change); + DECLARE_WRITE8_MEMBER(speedspn_global_display_w); }; @@ -20,9 +25,4 @@ public: VIDEO_START( speedspn ); SCREEN_UPDATE_IND16( speedspn ); -WRITE8_HANDLER( speedspn_vidram_w ); -WRITE8_HANDLER( speedspn_attram_w ); -READ8_HANDLER( speedspn_vidram_r ); -WRITE8_HANDLER( speedspn_banked_vidram_change ); -WRITE8_HANDLER( speedspn_global_display_w ); diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h index 15d243a7ced..b304b74dc85 100644 --- a/src/mame/includes/splash.h +++ b/src/mame/includes/splash.h @@ -44,12 +44,12 @@ public: DECLARE_WRITE8_MEMBER(msm1_interrupt_w); DECLARE_WRITE8_MEMBER(msm2_interrupt_w); DECLARE_WRITE8_MEMBER(msm2_data_w); + DECLARE_WRITE16_MEMBER(splash_vram_w); }; /*----------- defined in video/splash.c -----------*/ -WRITE16_HANDLER( splash_vram_w ); VIDEO_START( splash ); SCREEN_UPDATE_IND16( splash ); SCREEN_UPDATE_IND16( funystrp ); diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h index 0b90bfcafc1..70150083717 100644 --- a/src/mame/includes/sprcros2.h +++ b/src/mame/includes/sprcros2.h @@ -20,15 +20,15 @@ public: required_device<cpu_device> m_slave; DECLARE_WRITE8_MEMBER(sprcros2_m_port7_w); DECLARE_WRITE8_MEMBER(sprcros2_s_port3_w); + DECLARE_WRITE8_MEMBER(sprcros2_fgvideoram_w); + DECLARE_WRITE8_MEMBER(sprcros2_bgvideoram_w); + DECLARE_WRITE8_MEMBER(sprcros2_bgscrollx_w); + DECLARE_WRITE8_MEMBER(sprcros2_bgscrolly_w); }; /*----------- defined in video/sprcros2.c -----------*/ -WRITE8_HANDLER( sprcros2_fgvideoram_w ); -WRITE8_HANDLER( sprcros2_bgvideoram_w ); -WRITE8_HANDLER( sprcros2_bgscrollx_w ); -WRITE8_HANDLER( sprcros2_bgscrolly_w ); PALETTE_INIT( sprcros2 ); VIDEO_START( sprcros2 ); diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index f5dcdfd631f..0a259cc9fd4 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -48,6 +48,11 @@ public: DECLARE_WRITE8_MEMBER(sprint2_wram_w); DECLARE_WRITE8_MEMBER(sprint2_lamp1_w); DECLARE_WRITE8_MEMBER(sprint2_lamp2_w); + DECLARE_READ8_MEMBER(sprint2_collision1_r); + DECLARE_READ8_MEMBER(sprint2_collision2_r); + DECLARE_WRITE8_MEMBER(sprint2_collision_reset1_w); + DECLARE_WRITE8_MEMBER(sprint2_collision_reset2_w); + DECLARE_WRITE8_MEMBER(sprint2_video_ram_w); }; @@ -60,12 +65,7 @@ DISCRETE_SOUND_EXTERN( dominos ); /*----------- defined in video/sprint2.c -----------*/ -READ8_HANDLER( sprint2_collision1_r ); -READ8_HANDLER( sprint2_collision2_r ); -WRITE8_HANDLER( sprint2_collision_reset1_w ); -WRITE8_HANDLER( sprint2_collision_reset2_w ); -WRITE8_HANDLER( sprint2_video_ram_w ); PALETTE_INIT( sprint2 ); SCREEN_UPDATE_IND16( sprint2 ); diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h index 1622dd4bb48..d36d7fe55f3 100644 --- a/src/mame/includes/sprint4.h +++ b/src/mame/includes/sprint4.h @@ -23,6 +23,7 @@ public: DECLARE_WRITE8_MEMBER(sprint4_da_latch_w); DECLARE_WRITE8_MEMBER(sprint4_lamp_w); DECLARE_WRITE8_MEMBER(sprint4_lockout_w); + DECLARE_WRITE8_MEMBER(sprint4_video_ram_w); }; @@ -34,4 +35,3 @@ SCREEN_VBLANK( sprint4 ); VIDEO_START( sprint4 ); SCREEN_UPDATE_IND16( sprint4 ); -WRITE8_HANDLER( sprint4_video_ram_w ); diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h index 4f388ed8136..4668d1a3d04 100644 --- a/src/mame/includes/sprint8.h +++ b/src/mame/includes/sprint8.h @@ -24,6 +24,7 @@ public: DECLARE_READ8_MEMBER(sprint8_input_r); DECLARE_WRITE8_MEMBER(sprint8_lockout_w); DECLARE_WRITE8_MEMBER(sprint8_int_reset_w); + DECLARE_WRITE8_MEMBER(sprint8_video_ram_w); }; @@ -39,7 +40,6 @@ SCREEN_VBLANK( sprint8 ); VIDEO_START( sprint8 ); SCREEN_UPDATE_IND16( sprint8 ); -WRITE8_HANDLER( sprint8_video_ram_w ); /*----------- defined in audio/sprint8.c -----------*/ diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h index b3a1c06702d..87941b6ca6e 100644 --- a/src/mame/includes/srumbler.h +++ b/src/mame/includes/srumbler.h @@ -18,15 +18,15 @@ public: required_device<cpu_device> m_maincpu; required_device<buffered_spriteram8_device> m_spriteram; DECLARE_WRITE8_MEMBER(srumbler_bankswitch_w); + DECLARE_WRITE8_MEMBER(srumbler_foreground_w); + DECLARE_WRITE8_MEMBER(srumbler_background_w); + DECLARE_WRITE8_MEMBER(srumbler_4009_w); + DECLARE_WRITE8_MEMBER(srumbler_scroll_w); }; /*----------- defined in video/srumbler.c -----------*/ -WRITE8_HANDLER( srumbler_background_w ); -WRITE8_HANDLER( srumbler_foreground_w ); -WRITE8_HANDLER( srumbler_scroll_w ); -WRITE8_HANDLER( srumbler_4009_w ); VIDEO_START( srumbler ); SCREEN_UPDATE_IND16( srumbler ); diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h index bf9111f15de..5177ffd73da 100644 --- a/src/mame/includes/sshangha.h +++ b/src/mame/includes/sshangha.h @@ -35,6 +35,7 @@ public: DECLARE_WRITE16_MEMBER(paletteram16_xbgr_word_be_sprites_w); DECLARE_WRITE16_MEMBER(paletteram16_xbgr_word_be_tilelow_w); DECLARE_WRITE16_MEMBER(paletteram16_xbgr_word_be_tilehigh_w); + DECLARE_WRITE16_MEMBER(sshangha_video_w); }; @@ -43,4 +44,3 @@ public: VIDEO_START( sshangha ); SCREEN_UPDATE_RGB32( sshangha ); -WRITE16_HANDLER( sshangha_video_w ); diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index 809e11ef6cb..99223dab479 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -31,16 +31,16 @@ public: DECLARE_READ8_MEMBER(playmark_snd_command_r); DECLARE_WRITE8_MEMBER(playmark_oki_w); DECLARE_WRITE8_MEMBER(playmark_snd_control_w); + DECLARE_WRITE16_MEMBER(sslam_paletteram_w); + DECLARE_WRITE16_MEMBER(sslam_tx_tileram_w); + DECLARE_WRITE16_MEMBER(sslam_md_tileram_w); + DECLARE_WRITE16_MEMBER(sslam_bg_tileram_w); + DECLARE_WRITE16_MEMBER(powerbls_bg_tileram_w); }; /*----------- defined in video/sslam.c -----------*/ -WRITE16_HANDLER( sslam_paletteram_w ); -WRITE16_HANDLER( sslam_tx_tileram_w ); -WRITE16_HANDLER( sslam_md_tileram_w ); -WRITE16_HANDLER( sslam_bg_tileram_w ); -WRITE16_HANDLER( powerbls_bg_tileram_w ); VIDEO_START(sslam); VIDEO_START(powerbls); SCREEN_UPDATE_IND16(sslam); diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h index b4db1d46a2b..45676709743 100644 --- a/src/mame/includes/ssozumo.h +++ b/src/mame/includes/ssozumo.h @@ -18,18 +18,18 @@ public: UINT8 m_sound_nmi_mask; DECLARE_WRITE8_MEMBER(ssozumo_sh_command_w); DECLARE_WRITE8_MEMBER(sound_nmi_mask_w); + DECLARE_WRITE8_MEMBER(ssozumo_videoram_w); + DECLARE_WRITE8_MEMBER(ssozumo_colorram_w); + DECLARE_WRITE8_MEMBER(ssozumo_videoram2_w); + DECLARE_WRITE8_MEMBER(ssozumo_colorram2_w); + DECLARE_WRITE8_MEMBER(ssozumo_paletteram_w); + DECLARE_WRITE8_MEMBER(ssozumo_scroll_w); + DECLARE_WRITE8_MEMBER(ssozumo_flipscreen_w); }; /*----------- defined in video/ssozumo.c -----------*/ -WRITE8_HANDLER( ssozumo_videoram_w ); -WRITE8_HANDLER( ssozumo_colorram_w ); -WRITE8_HANDLER( ssozumo_videoram2_w ); -WRITE8_HANDLER( ssozumo_colorram2_w ); -WRITE8_HANDLER( ssozumo_paletteram_w ); -WRITE8_HANDLER( ssozumo_scroll_w ); -WRITE8_HANDLER( ssozumo_flipscreen_w ); PALETTE_INIT( ssozumo ); VIDEO_START( ssozumo ); diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h index 9f6fdb046a4..fddcef2fdf2 100644 --- a/src/mame/includes/sspeedr.h +++ b/src/mame/includes/sspeedr.h @@ -21,25 +21,25 @@ public: DECLARE_WRITE8_MEMBER(sspeedr_time_w); DECLARE_WRITE8_MEMBER(sspeedr_score_w); DECLARE_WRITE8_MEMBER(sspeedr_sound_w); + DECLARE_WRITE8_MEMBER(sspeedr_driver_horz_w); + DECLARE_WRITE8_MEMBER(sspeedr_driver_horz_2_w); + DECLARE_WRITE8_MEMBER(sspeedr_driver_vert_w); + DECLARE_WRITE8_MEMBER(sspeedr_driver_pic_w); + DECLARE_WRITE8_MEMBER(sspeedr_drones_horz_w); + DECLARE_WRITE8_MEMBER(sspeedr_drones_horz_2_w); + DECLARE_WRITE8_MEMBER(sspeedr_drones_mask_w); + DECLARE_WRITE8_MEMBER(sspeedr_drones_vert_w); + DECLARE_WRITE8_MEMBER(sspeedr_track_horz_w); + DECLARE_WRITE8_MEMBER(sspeedr_track_horz_2_w); + DECLARE_WRITE8_MEMBER(sspeedr_track_vert_w); + DECLARE_WRITE8_MEMBER(sspeedr_track_ice_w); }; /*----------- defined in video/sspeedr.c -----------*/ -WRITE8_HANDLER( sspeedr_driver_horz_w ); -WRITE8_HANDLER( sspeedr_driver_horz_2_w ); -WRITE8_HANDLER( sspeedr_driver_vert_w ); -WRITE8_HANDLER( sspeedr_driver_pic_w ); -WRITE8_HANDLER( sspeedr_drones_horz_w ); -WRITE8_HANDLER( sspeedr_drones_horz_2_w ); -WRITE8_HANDLER( sspeedr_drones_vert_w ); -WRITE8_HANDLER( sspeedr_drones_mask_w ); -WRITE8_HANDLER( sspeedr_track_horz_w ); -WRITE8_HANDLER( sspeedr_track_horz_2_w ); -WRITE8_HANDLER( sspeedr_track_vert_w ); -WRITE8_HANDLER( sspeedr_track_ice_w ); VIDEO_START( sspeedr ); SCREEN_UPDATE_IND16( sspeedr ); diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h index cb3f6154c00..55df5ab87fd 100644 --- a/src/mame/includes/ssrj.h +++ b/src/mame/includes/ssrj.h @@ -15,14 +15,14 @@ public: UINT8 *m_scrollram; UINT8 *m_buffer_spriteram; DECLARE_READ8_MEMBER(ssrj_wheel_r); + DECLARE_WRITE8_MEMBER(ssrj_vram1_w); + DECLARE_WRITE8_MEMBER(ssrj_vram2_w); + DECLARE_WRITE8_MEMBER(ssrj_vram4_w); }; /*----------- defined in video/ssrj.c -----------*/ -WRITE8_HANDLER(ssrj_vram1_w); -WRITE8_HANDLER(ssrj_vram2_w); -WRITE8_HANDLER(ssrj_vram4_w); VIDEO_START( ssrj ); SCREEN_UPDATE_IND16( ssrj ); diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h index 300e13edf6b..7f5c67f8831 100644 --- a/src/mame/includes/ssv.h +++ b/src/mame/includes/ssv.h @@ -84,14 +84,14 @@ public: DECLARE_WRITE16_MEMBER(eaglshot_trackball_w); DECLARE_READ16_MEMBER(eaglshot_gfxram_r); DECLARE_WRITE16_MEMBER(eaglshot_gfxram_w); + DECLARE_WRITE16_MEMBER(gdfs_tmapram_w); + DECLARE_READ16_MEMBER(ssv_vblank_r); + DECLARE_WRITE16_MEMBER(ssv_scroll_w); + DECLARE_WRITE16_MEMBER(paletteram16_xrgb_swap_word_w); }; /*----------- defined in video/ssv.c -----------*/ -READ16_HANDLER( ssv_vblank_r ); -WRITE16_HANDLER( ssv_scroll_w ); -WRITE16_HANDLER( paletteram16_xrgb_swap_word_w ); -WRITE16_HANDLER( gdfs_tmapram_w ); void ssv_enable_video(running_machine &machine, int enable); VIDEO_START( ssv ); diff --git a/src/mame/includes/st0016.h b/src/mame/includes/st0016.h index c1a6fde067f..988c1050b2b 100644 --- a/src/mame/includes/st0016.h +++ b/src/mame/includes/st0016.h @@ -15,6 +15,20 @@ public: DECLARE_WRITE32_MEMBER(latch32_w); DECLARE_READ8_MEMBER(latch8_r); DECLARE_WRITE8_MEMBER(latch8_w); + DECLARE_WRITE8_MEMBER(st0016_sprite_bank_w); + DECLARE_WRITE8_MEMBER(st0016_palette_bank_w); + DECLARE_WRITE8_MEMBER(st0016_character_bank_w); + DECLARE_READ8_MEMBER(st0016_sprite_ram_r); + DECLARE_WRITE8_MEMBER(st0016_sprite_ram_w); + DECLARE_READ8_MEMBER(st0016_sprite2_ram_r); + DECLARE_WRITE8_MEMBER(st0016_sprite2_ram_w); + DECLARE_READ8_MEMBER(st0016_palette_ram_r); + DECLARE_WRITE8_MEMBER(st0016_palette_ram_w); + DECLARE_READ8_MEMBER(st0016_character_ram_r); + DECLARE_WRITE8_MEMBER(st0016_character_ram_w); + DECLARE_READ8_MEMBER(st0016_vregs_r); + DECLARE_READ8_MEMBER(st0016_dma_r); + DECLARE_WRITE8_MEMBER(st0016_vregs_w); }; #define ISMACS (st0016_game&0x80) @@ -48,20 +62,6 @@ extern UINT8 macs_cart_slot; extern UINT32 st0016_game; extern UINT8 *st0016_charram; -READ8_HANDLER(st0016_dma_r); -WRITE8_HANDLER (st0016_sprite_bank_w); -WRITE8_HANDLER (st0016_palette_bank_w); -WRITE8_HANDLER (st0016_character_bank_w); -READ8_HANDLER (st0016_sprite_ram_r); -WRITE8_HANDLER (st0016_sprite_ram_w); -READ8_HANDLER (st0016_sprite2_ram_r); -WRITE8_HANDLER (st0016_sprite2_ram_w); -READ8_HANDLER (st0016_palette_ram_r); -WRITE8_HANDLER (st0016_palette_ram_w); -READ8_HANDLER (st0016_character_ram_r); -WRITE8_HANDLER (st0016_character_ram_w); -READ8_HANDLER (st0016_vregs_r); -WRITE8_HANDLER (st0016_vregs_w); void st0016_draw_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); VIDEO_START(st0016); diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h index 6ce55da9dc4..778b4c65dcd 100644 --- a/src/mame/includes/stactics.h +++ b/src/mame/includes/stactics.h @@ -39,6 +39,10 @@ public: DECLARE_READ8_MEMBER(vert_pos_r); DECLARE_READ8_MEMBER(horiz_pos_r); DECLARE_WRITE8_MEMBER(stactics_coin_lockout_w); + DECLARE_WRITE8_MEMBER(stactics_scroll_ram_w); + DECLARE_WRITE8_MEMBER(stactics_speed_latch_w); + DECLARE_WRITE8_MEMBER(stactics_shot_trigger_w); + DECLARE_WRITE8_MEMBER(stactics_shot_flag_clear_w); }; @@ -46,10 +50,6 @@ public: MACHINE_CONFIG_EXTERN( stactics_video ); -WRITE8_HANDLER( stactics_scroll_ram_w ); -WRITE8_HANDLER( stactics_speed_latch_w ); -WRITE8_HANDLER( stactics_shot_trigger_w ); -WRITE8_HANDLER( stactics_shot_flag_clear_w ); CUSTOM_INPUT( stactics_get_frame_count_d3 ); CUSTOM_INPUT( stactics_get_shot_standby ); CUSTOM_INPUT( stactics_get_not_shot_arrive ); diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h index e822da07f46..9bee223fe53 100644 --- a/src/mame/includes/stadhero.h +++ b/src/mame/includes/stadhero.h @@ -10,6 +10,7 @@ public: UINT16 *m_spriteram; DECLARE_READ16_MEMBER(stadhero_control_r); DECLARE_WRITE16_MEMBER(stadhero_control_w); + DECLARE_WRITE16_MEMBER(stadhero_pf1_data_w); }; @@ -18,4 +19,3 @@ public: VIDEO_START( stadhero ); SCREEN_UPDATE_IND16( stadhero ); -WRITE16_HANDLER( stadhero_pf1_data_w ); diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h index 09bf0506de2..e542c2a909f 100644 --- a/src/mame/includes/starcrus.h +++ b/src/mame/includes/starcrus.h @@ -36,23 +36,23 @@ public: int m_explode_sound_playing; int m_launch1_sound_playing; int m_launch2_sound_playing; + DECLARE_WRITE8_MEMBER(starcrus_s1_x_w); + DECLARE_WRITE8_MEMBER(starcrus_s1_y_w); + DECLARE_WRITE8_MEMBER(starcrus_s2_x_w); + DECLARE_WRITE8_MEMBER(starcrus_s2_y_w); + DECLARE_WRITE8_MEMBER(starcrus_p1_x_w); + DECLARE_WRITE8_MEMBER(starcrus_p1_y_w); + DECLARE_WRITE8_MEMBER(starcrus_p2_x_w); + DECLARE_WRITE8_MEMBER(starcrus_p2_y_w); + DECLARE_WRITE8_MEMBER(starcrus_ship_parm_1_w); + DECLARE_WRITE8_MEMBER(starcrus_ship_parm_2_w); + DECLARE_WRITE8_MEMBER(starcrus_proj_parm_1_w); + DECLARE_WRITE8_MEMBER(starcrus_proj_parm_2_w); + DECLARE_READ8_MEMBER(starcrus_coll_det_r); }; /*----------- defined in video/starcrus.c -----------*/ -WRITE8_HANDLER( starcrus_s1_x_w ); -WRITE8_HANDLER( starcrus_s1_y_w ); -WRITE8_HANDLER( starcrus_s2_x_w ); -WRITE8_HANDLER( starcrus_s2_y_w ); -WRITE8_HANDLER( starcrus_p1_x_w ); -WRITE8_HANDLER( starcrus_p1_y_w ); -WRITE8_HANDLER( starcrus_p2_x_w ); -WRITE8_HANDLER( starcrus_p2_y_w ); -WRITE8_HANDLER( starcrus_ship_parm_1_w ); -WRITE8_HANDLER( starcrus_ship_parm_2_w ); -WRITE8_HANDLER( starcrus_proj_parm_1_w ); -WRITE8_HANDLER( starcrus_proj_parm_2_w ); -READ8_HANDLER( starcrus_coll_det_r ); VIDEO_START( starcrus ); SCREEN_UPDATE_IND16( starcrus ); diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h index 7a2d5774315..d50b8a4e7cd 100644 --- a/src/mame/includes/starfire.h +++ b/src/mame/includes/starfire.h @@ -34,6 +34,10 @@ public: DECLARE_READ8_MEMBER(starfire_scratch_r); DECLARE_READ8_MEMBER(starfire_input_r); DECLARE_READ8_MEMBER(fireone_input_r); + DECLARE_WRITE8_MEMBER(starfire_colorram_w); + DECLARE_READ8_MEMBER(starfire_colorram_r); + DECLARE_WRITE8_MEMBER(starfire_videoram_w); + DECLARE_READ8_MEMBER(starfire_videoram_r); }; /*----------- defined in video/starfire.c -----------*/ @@ -41,8 +45,4 @@ public: SCREEN_UPDATE_RGB32( starfire ); VIDEO_START( starfire ); -WRITE8_HANDLER( starfire_videoram_w ); -READ8_HANDLER( starfire_videoram_r ); -WRITE8_HANDLER( starfire_colorram_w ); -READ8_HANDLER( starfire_colorram_r ); diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h index c291179d8c5..c35a318953c 100644 --- a/src/mame/includes/starshp1.h +++ b/src/mame/includes/starshp1.h @@ -63,16 +63,16 @@ public: DECLARE_WRITE8_MEMBER(starshp1_collision_reset_w); DECLARE_WRITE8_MEMBER(starshp1_analog_in_w); DECLARE_WRITE8_MEMBER(starshp1_misc_w); + DECLARE_READ8_MEMBER(starshp1_rng_r); + DECLARE_WRITE8_MEMBER(starshp1_ssadd_w); + DECLARE_WRITE8_MEMBER(starshp1_sspic_w); + DECLARE_WRITE8_MEMBER(starshp1_playfield_w); }; /*----------- defined in video/starshp1.c -----------*/ -READ8_HANDLER( starshp1_rng_r ); -WRITE8_HANDLER( starshp1_sspic_w ); -WRITE8_HANDLER( starshp1_ssadd_w ); -WRITE8_HANDLER( starshp1_playfield_w ); PALETTE_INIT( starshp1 ); SCREEN_UPDATE_IND16( starshp1 ); diff --git a/src/mame/includes/starwars.h b/src/mame/includes/starwars.h index 78e1a8af7b9..f65d63d2fad 100644 --- a/src/mame/includes/starwars.h +++ b/src/mame/includes/starwars.h @@ -42,27 +42,27 @@ public: DECLARE_WRITE8_MEMBER(irq_ack_w); DECLARE_READ8_MEMBER(esb_slapstic_r); DECLARE_WRITE8_MEMBER(esb_slapstic_w); + DECLARE_WRITE8_MEMBER(starwars_nstore_w); + DECLARE_WRITE8_MEMBER(starwars_out_w); + DECLARE_READ8_MEMBER(starwars_adc_r); + DECLARE_WRITE8_MEMBER(starwars_adc_select_w); + DECLARE_READ8_MEMBER(starwars_prng_r); + DECLARE_READ8_MEMBER(starwars_div_reh_r); + DECLARE_READ8_MEMBER(starwars_div_rel_r); + DECLARE_WRITE8_MEMBER(starwars_math_w); }; /*----------- defined in machine/starwars.c -----------*/ -WRITE8_HANDLER( starwars_nstore_w ); -WRITE8_HANDLER( starwars_out_w ); CUSTOM_INPUT( matrix_flag_r ); -READ8_HANDLER( starwars_adc_r ); -WRITE8_HANDLER( starwars_adc_select_w ); void starwars_mproc_init(running_machine &machine); void starwars_mproc_reset(running_machine &machine); -READ8_HANDLER( starwars_prng_r ); -READ8_HANDLER( starwars_div_reh_r ); -READ8_HANDLER( starwars_div_rel_r ); -WRITE8_HANDLER( starwars_math_w ); /*----------- defined in audio/starwars.c -----------*/ diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index 6c5c5224b44..30247749901 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -20,6 +20,17 @@ public: tilemap_t *m_bg_tilemap; tilemap_t *m_tx_tilemap; int m_sprite_base; + DECLARE_READ8_MEMBER(stfight_dsw_r); + DECLARE_READ8_MEMBER(stfight_coin_r); + DECLARE_WRITE8_MEMBER(stfight_coin_w); + DECLARE_WRITE8_MEMBER(stfight_e800_w); + DECLARE_WRITE8_MEMBER(stfight_fm_w); + DECLARE_READ8_MEMBER(stfight_fm_r); + DECLARE_WRITE8_MEMBER(stfight_bank_w); + DECLARE_WRITE8_MEMBER(stfight_text_char_w); + DECLARE_WRITE8_MEMBER(stfight_text_attr_w); + DECLARE_WRITE8_MEMBER(stfight_sprite_bank_w); + DECLARE_WRITE8_MEMBER(stfight_vh_latch_w); }; @@ -29,12 +40,6 @@ DRIVER_INIT( empcity ); DRIVER_INIT( stfight ); MACHINE_RESET( stfight ); INTERRUPT_GEN( stfight_vb_interrupt ); -READ8_HANDLER( stfight_dsw_r ); -WRITE8_HANDLER( stfight_fm_w ); -READ8_HANDLER( stfight_coin_r ); -WRITE8_HANDLER( stfight_coin_w ); -WRITE8_HANDLER( stfight_e800_w ); -READ8_HANDLER( stfight_fm_r ); void stfight_adpcm_int(device_t *device); WRITE8_DEVICE_HANDLER( stfight_adpcm_control_w ); @@ -42,9 +47,5 @@ WRITE8_DEVICE_HANDLER( stfight_adpcm_control_w ); /*----------- defined in video/stfight.c -----------*/ PALETTE_INIT( stfight ); -WRITE8_HANDLER( stfight_text_char_w ); -WRITE8_HANDLER( stfight_text_attr_w ); -WRITE8_HANDLER( stfight_vh_latch_w ); -WRITE8_HANDLER( stfight_sprite_bank_w ); VIDEO_START( stfight ); SCREEN_UPDATE_IND16( stfight ); diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index 7216da61183..552d0fbb3e0 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -21,6 +21,10 @@ public: UINT16 *m_spriteram; int m_sprxoffs; + DECLARE_WRITE16_MEMBER(stlforce_bg_videoram_w); + DECLARE_WRITE16_MEMBER(stlforce_mlow_videoram_w); + DECLARE_WRITE16_MEMBER(stlforce_mhigh_videoram_w); + DECLARE_WRITE16_MEMBER(stlforce_tx_videoram_w); }; @@ -28,7 +32,3 @@ public: VIDEO_START( stlforce ); SCREEN_UPDATE_IND16( stlforce ); -WRITE16_HANDLER( stlforce_tx_videoram_w ); -WRITE16_HANDLER( stlforce_mhigh_videoram_w ); -WRITE16_HANDLER( stlforce_mlow_videoram_w ); -WRITE16_HANDLER( stlforce_bg_videoram_w ); diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h index d2f1c9c20e2..1e707630587 100644 --- a/src/mame/includes/strnskil.h +++ b/src/mame/includes/strnskil.h @@ -21,13 +21,13 @@ public: DECLARE_READ8_MEMBER(pettanp_protection_r); DECLARE_READ8_MEMBER(banbam_protection_r); DECLARE_WRITE8_MEMBER(protection_w); + DECLARE_WRITE8_MEMBER(strnskil_videoram_w); + DECLARE_WRITE8_MEMBER(strnskil_scrl_ctrl_w); }; /*----------- defined in video/strnskil.c -----------*/ -WRITE8_HANDLER( strnskil_videoram_w ); -WRITE8_HANDLER( strnskil_scrl_ctrl_w ); PALETTE_INIT( strnskil ); VIDEO_START( strnskil ); diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h index f155ce6b762..d77ffc4b547 100644 --- a/src/mame/includes/subs.h +++ b/src/mame/includes/subs.h @@ -30,6 +30,14 @@ public: int m_steering_val2; int m_last_val_1; int m_last_val_2; + DECLARE_WRITE8_MEMBER(subs_steer_reset_w); + DECLARE_READ8_MEMBER(subs_control_r); + DECLARE_READ8_MEMBER(subs_coin_r); + DECLARE_READ8_MEMBER(subs_options_r); + DECLARE_WRITE8_MEMBER(subs_lamp1_w); + DECLARE_WRITE8_MEMBER(subs_lamp2_w); + DECLARE_WRITE8_MEMBER(subs_invert1_w); + DECLARE_WRITE8_MEMBER(subs_invert2_w); }; @@ -37,12 +45,6 @@ public: MACHINE_RESET( subs ); INTERRUPT_GEN( subs_interrupt ); -WRITE8_HANDLER( subs_steer_reset_w ); -READ8_HANDLER( subs_control_r ); -READ8_HANDLER( subs_coin_r ); -READ8_HANDLER( subs_options_r ); -WRITE8_HANDLER( subs_lamp1_w ); -WRITE8_HANDLER( subs_lamp2_w ); /*----------- defined in audio/subs.c -----------*/ @@ -61,5 +63,3 @@ DISCRETE_SOUND_EXTERN( subs ); SCREEN_UPDATE_IND16( subs_left ); SCREEN_UPDATE_IND16( subs_right ); -WRITE8_HANDLER( subs_invert1_w ); -WRITE8_HANDLER( subs_invert2_w ); diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h index 6deaeed9c2a..79d9323b8e5 100644 --- a/src/mame/includes/suna16.h +++ b/src/mame/includes/suna16.h @@ -22,16 +22,16 @@ public: DECLARE_WRITE8_MEMBER(bssoccer_pcm_1_bankswitch_w); DECLARE_WRITE8_MEMBER(bssoccer_pcm_2_bankswitch_w); DECLARE_WRITE8_MEMBER(uballoon_pcm_1_bankswitch_w); + DECLARE_WRITE16_MEMBER(suna16_flipscreen_w); + DECLARE_WRITE16_MEMBER(bestbest_flipscreen_w); + DECLARE_READ16_MEMBER(suna16_paletteram16_r); + DECLARE_WRITE16_MEMBER(suna16_paletteram16_w); }; /*----------- defined in video/suna16.c -----------*/ -WRITE16_HANDLER( suna16_flipscreen_w ); -WRITE16_HANDLER( bestbest_flipscreen_w ); -READ16_HANDLER ( suna16_paletteram16_r ); -WRITE16_HANDLER( suna16_paletteram16_w ); VIDEO_START( suna16 ); SCREEN_UPDATE_IND16( suna16 ); diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index a53f42d8755..cf101f9a312 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -74,6 +74,9 @@ public: DECLARE_READ8_MEMBER(banked_paletteram_r); DECLARE_WRITE8_MEMBER( brickzn_banked_paletteram_w ); + DECLARE_READ8_MEMBER(suna8_banked_spriteram_r); + DECLARE_WRITE8_MEMBER(suna8_spriteram_w); + DECLARE_WRITE8_MEMBER(suna8_banked_spriteram_w); }; @@ -87,10 +90,7 @@ SAMPLES_START( suna8_sh_start ); /*----------- defined in video/suna8.c -----------*/ -WRITE8_HANDLER( suna8_spriteram_w ); // for debug -WRITE8_HANDLER( suna8_banked_spriteram_w ); // for debug -READ8_HANDLER( suna8_banked_spriteram_r ); VIDEO_START( suna8_textdim0 ); VIDEO_START( suna8_textdim8 ); diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h index 571e43d5f8a..8fe578093b3 100644 --- a/src/mame/includes/superqix.h +++ b/src/mame/includes/superqix.h @@ -53,16 +53,16 @@ public: DECLARE_READ8_MEMBER(hotsmash_from_mcu_r); DECLARE_WRITE8_MEMBER(pbillian_z80_mcu_w); DECLARE_READ8_MEMBER(pbillian_from_mcu_r); + DECLARE_WRITE8_MEMBER(superqix_videoram_w); + DECLARE_WRITE8_MEMBER(superqix_bitmapram_w); + DECLARE_WRITE8_MEMBER(superqix_bitmapram2_w); + DECLARE_WRITE8_MEMBER(pbillian_0410_w); + DECLARE_WRITE8_MEMBER(superqix_0410_w); }; /*----------- defined in video/superqix.c -----------*/ -WRITE8_HANDLER( superqix_videoram_w ); -WRITE8_HANDLER( superqix_bitmapram_w ); -WRITE8_HANDLER( superqix_bitmapram2_w ); -WRITE8_HANDLER( pbillian_0410_w ); -WRITE8_HANDLER( superqix_0410_w ); VIDEO_START( pbillian ); SCREEN_UPDATE_IND16( pbillian ); diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h index c8a0ec49f12..d2681eb6605 100644 --- a/src/mame/includes/suprloco.h +++ b/src/mame/includes/suprloco.h @@ -11,6 +11,10 @@ public: UINT8 *m_spriteram; size_t m_spriteram_size; DECLARE_WRITE8_MEMBER(suprloco_soundport_w); + DECLARE_WRITE8_MEMBER(suprloco_videoram_w); + DECLARE_WRITE8_MEMBER(suprloco_scrollram_w); + DECLARE_WRITE8_MEMBER(suprloco_control_w); + DECLARE_READ8_MEMBER(suprloco_control_r); }; @@ -19,7 +23,3 @@ public: PALETTE_INIT( suprloco ); VIDEO_START( suprloco ); SCREEN_UPDATE_IND16( suprloco ); -WRITE8_HANDLER( suprloco_videoram_w ); -WRITE8_HANDLER( suprloco_scrollram_w ); -WRITE8_HANDLER( suprloco_control_w ); -READ8_HANDLER( suprloco_control_r ); diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h index 904681cf639..428e05bfd58 100644 --- a/src/mame/includes/suprnova.h +++ b/src/mame/includes/suprnova.h @@ -89,6 +89,11 @@ public: DECLARE_READ32_MEMBER(panicstr_speedup_r); DECLARE_READ32_MEMBER(sengekis_speedup_r); DECLARE_READ32_MEMBER(sengekij_speedup_r); + DECLARE_WRITE32_MEMBER(skns_pal_regs_w); + DECLARE_WRITE32_MEMBER(skns_palette_ram_w); + DECLARE_WRITE32_MEMBER(skns_tilemapA_w); + DECLARE_WRITE32_MEMBER(skns_tilemapB_w); + DECLARE_WRITE32_MEMBER(skns_v3_regs_w); }; @@ -101,11 +106,6 @@ void skns_draw_sprites( UINT8* gfx_source, size_t gfx_length, UINT32* sprite_regs ); -WRITE32_HANDLER ( skns_tilemapA_w ); -WRITE32_HANDLER ( skns_tilemapB_w ); -WRITE32_HANDLER ( skns_v3_regs_w ); -WRITE32_HANDLER ( skns_pal_regs_w ); -WRITE32_HANDLER ( skns_palette_ram_w ); VIDEO_START(skns); VIDEO_RESET(skns); SCREEN_VBLANK(skns); diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h index 124173f40bf..9abdda06d4c 100644 --- a/src/mame/includes/suprridr.h +++ b/src/mame/includes/suprridr.h @@ -24,6 +24,13 @@ public: DECLARE_WRITE8_MEMBER(sound_data_w); DECLARE_WRITE8_MEMBER(sound_irq_ack_w); DECLARE_WRITE8_MEMBER(coin_lock_w); + DECLARE_WRITE8_MEMBER(suprridr_flipx_w); + DECLARE_WRITE8_MEMBER(suprridr_flipy_w); + DECLARE_WRITE8_MEMBER(suprridr_fgdisable_w); + DECLARE_WRITE8_MEMBER(suprridr_fgscrolly_w); + DECLARE_WRITE8_MEMBER(suprridr_bgscrolly_w); + DECLARE_WRITE8_MEMBER(suprridr_bgram_w); + DECLARE_WRITE8_MEMBER(suprridr_fgram_w); }; @@ -32,14 +39,7 @@ public: VIDEO_START( suprridr ); PALETTE_INIT( suprridr ); -WRITE8_HANDLER( suprridr_flipx_w ); -WRITE8_HANDLER( suprridr_flipy_w ); -WRITE8_HANDLER( suprridr_fgdisable_w ); -WRITE8_HANDLER( suprridr_fgscrolly_w ); -WRITE8_HANDLER( suprridr_bgscrolly_w ); int suprridr_is_screen_flipped(running_machine &machine); -WRITE8_HANDLER( suprridr_fgram_w ); -WRITE8_HANDLER( suprridr_bgram_w ); SCREEN_UPDATE_IND16( suprridr ); diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index b6ea769ea72..ef39d43767d 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -35,14 +35,14 @@ public: DECLARE_READ16_MEMBER(pending_command_r); DECLARE_WRITE8_MEMBER(pending_command_clear_w); DECLARE_WRITE8_MEMBER(suprslam_sh_bankswitch_w); + DECLARE_WRITE16_MEMBER(suprslam_screen_videoram_w); + DECLARE_WRITE16_MEMBER(suprslam_bg_videoram_w); + DECLARE_WRITE16_MEMBER(suprslam_bank_w); }; /*----------- defined in video/suprslam.c -----------*/ -WRITE16_HANDLER( suprslam_screen_videoram_w ); -WRITE16_HANDLER( suprslam_bg_videoram_w ); -WRITE16_HANDLER( suprslam_bank_w ); VIDEO_START( suprslam ); SCREEN_UPDATE_IND16( suprslam ); diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index d7aabe1edff..804537726fb 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -40,6 +40,16 @@ public: DECLARE_READ8_MEMBER(nobb_inport23_r); DECLARE_WRITE8_MEMBER(nobb_outport24_w); DECLARE_READ8_MEMBER(nob_start_r); + DECLARE_WRITE8_MEMBER(system1_videomode_w); + DECLARE_READ8_MEMBER(system1_mixer_collision_r); + DECLARE_WRITE8_MEMBER(system1_mixer_collision_w); + DECLARE_WRITE8_MEMBER(system1_mixer_collision_reset_w); + DECLARE_READ8_MEMBER(system1_sprite_collision_r); + DECLARE_WRITE8_MEMBER(system1_sprite_collision_w); + DECLARE_WRITE8_MEMBER(system1_sprite_collision_reset_w); + DECLARE_READ8_MEMBER(system1_videoram_r); + DECLARE_WRITE8_MEMBER(system1_videoram_w); + DECLARE_WRITE8_MEMBER(system1_paletteram_w); }; @@ -48,20 +58,10 @@ public: VIDEO_START( system1 ); VIDEO_START( system2 ); -WRITE8_HANDLER( system1_videomode_w ); -WRITE8_HANDLER( system1_paletteram_w ); -READ8_HANDLER( system1_videoram_r ); -WRITE8_HANDLER( system1_videoram_w ); WRITE8_DEVICE_HANDLER( system1_videoram_bank_w ); -READ8_HANDLER( system1_mixer_collision_r ); -WRITE8_HANDLER( system1_mixer_collision_w ); -WRITE8_HANDLER( system1_mixer_collision_reset_w ); -READ8_HANDLER( system1_sprite_collision_r ); -WRITE8_HANDLER( system1_sprite_collision_w ); -WRITE8_HANDLER( system1_sprite_collision_reset_w ); SCREEN_UPDATE_IND16( system1 ); SCREEN_UPDATE_IND16( system2 ); diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h index ca8acce5292..56761d2aab6 100644 --- a/src/mame/includes/system16.h +++ b/src/mame/includes/system16.h @@ -136,6 +136,14 @@ public: DECLARE_WRITE8_MEMBER(shdancbl_msm5205_data_w); DECLARE_READ8_MEMBER(shdancbl_soundbank_r); DECLARE_WRITE8_MEMBER(shdancbl_bankctrl_w); + DECLARE_WRITE16_MEMBER(sys16_paletteram_w); + DECLARE_WRITE16_MEMBER(sys16_tileram_w); + DECLARE_WRITE16_MEMBER(sys16_textram_w); + DECLARE_WRITE16_MEMBER(s16a_bootleg_bgscrolly_w); + DECLARE_WRITE16_MEMBER(s16a_bootleg_bgscrollx_w); + DECLARE_WRITE16_MEMBER(s16a_bootleg_fgscrolly_w); + DECLARE_WRITE16_MEMBER(s16a_bootleg_fgscrollx_w); + DECLARE_WRITE16_MEMBER(s16a_bootleg_tilemapselect_w); }; /*----------- defined in video/system16.c -----------*/ @@ -146,15 +154,8 @@ extern VIDEO_START( s16a_bootleg_shinobi ); extern VIDEO_START( s16a_bootleg_passsht ); extern SCREEN_UPDATE_IND16( s16a_bootleg ); extern SCREEN_UPDATE_IND16( s16a_bootleg_passht4b ); -extern WRITE16_HANDLER( s16a_bootleg_tilemapselect_w ); -extern WRITE16_HANDLER( s16a_bootleg_bgscrolly_w ); -extern WRITE16_HANDLER( s16a_bootleg_bgscrollx_w ); -extern WRITE16_HANDLER( s16a_bootleg_fgscrolly_w ); -extern WRITE16_HANDLER( s16a_bootleg_fgscrollx_w ); /* video hardware */ -extern WRITE16_HANDLER( sys16_tileram_w ); -extern WRITE16_HANDLER( sys16_textram_w ); /* "normal" video hardware */ extern VIDEO_START( system16 ); diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h index 7a205c8dcaf..29839e2c728 100644 --- a/src/mame/includes/tagteam.h +++ b/src/mame/includes/tagteam.h @@ -13,19 +13,19 @@ public: DECLARE_WRITE8_MEMBER(sound_command_w); DECLARE_WRITE8_MEMBER(irq_clear_w); DECLARE_WRITE8_MEMBER(sound_nmi_mask_w); + DECLARE_WRITE8_MEMBER(tagteam_videoram_w); + DECLARE_WRITE8_MEMBER(tagteam_colorram_w); + DECLARE_READ8_MEMBER(tagteam_mirrorvideoram_r); + DECLARE_READ8_MEMBER(tagteam_mirrorcolorram_r); + DECLARE_WRITE8_MEMBER(tagteam_mirrorvideoram_w); + DECLARE_WRITE8_MEMBER(tagteam_mirrorcolorram_w); + DECLARE_WRITE8_MEMBER(tagteam_control_w); + DECLARE_WRITE8_MEMBER(tagteam_flipscreen_w); }; /*----------- defined in video/tagteam.c -----------*/ -WRITE8_HANDLER( tagteam_videoram_w ); -WRITE8_HANDLER( tagteam_colorram_w ); -READ8_HANDLER( tagteam_mirrorvideoram_r ); -WRITE8_HANDLER( tagteam_mirrorvideoram_w ); -READ8_HANDLER( tagteam_mirrorcolorram_r ); -WRITE8_HANDLER( tagteam_mirrorcolorram_w ); -WRITE8_HANDLER( tagteam_control_w ); -WRITE8_HANDLER( tagteam_flipscreen_w ); PALETTE_INIT( tagteam ); VIDEO_START( tagteam ); diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h index 8a403985e0f..4c25cb23515 100644 --- a/src/mame/includes/tail2nos.h +++ b/src/mame/includes/tail2nos.h @@ -28,6 +28,10 @@ public: device_t *m_audiocpu; device_t *m_k051316; DECLARE_WRITE16_MEMBER(sound_command_w); + DECLARE_WRITE16_MEMBER(tail2nos_bgvideoram_w); + DECLARE_READ16_MEMBER(tail2nos_zoomdata_r); + DECLARE_WRITE16_MEMBER(tail2nos_zoomdata_w); + DECLARE_WRITE16_MEMBER(tail2nos_gfxbank_w); }; @@ -35,10 +39,6 @@ public: extern void tail2nos_zoom_callback(running_machine &machine, int *code,int *color,int *flags); -WRITE16_HANDLER( tail2nos_bgvideoram_w ); -READ16_HANDLER( tail2nos_zoomdata_r ); -WRITE16_HANDLER( tail2nos_zoomdata_w ); -WRITE16_HANDLER( tail2nos_gfxbank_w ); VIDEO_START( tail2nos ); SCREEN_UPDATE_IND16( tail2nos ); diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index 5ec58e55928..0b32e42a7ba 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -52,18 +52,18 @@ public: DECLARE_READ16_MEMBER(pbobble_input_bypass_r); DECLARE_WRITE16_MEMBER(spacedxo_tc0220ioc_w); DECLARE_WRITE16_MEMBER(realpunc_output_w); + DECLARE_WRITE16_MEMBER(hitice_pixelram_w); + DECLARE_WRITE16_MEMBER(hitice_pixel_scroll_w); + DECLARE_WRITE16_MEMBER(realpunc_video_ctrl_w); + DECLARE_READ16_MEMBER(tc0180vcu_framebuffer_word_r); + DECLARE_WRITE16_MEMBER(tc0180vcu_framebuffer_word_w); }; /*----------- defined in video/taito_b.c -----------*/ -READ16_HANDLER( tc0180vcu_framebuffer_word_r ); -WRITE16_HANDLER( tc0180vcu_framebuffer_word_w ); -WRITE16_HANDLER( hitice_pixelram_w ); -WRITE16_HANDLER( hitice_pixel_scroll_w ); -WRITE16_HANDLER( realpunc_video_ctrl_w ); VIDEO_START( taitob_color_order0 ); VIDEO_START( taitob_color_order1 ); diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index 72fb22775a0..7f467a7f0ff 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -94,6 +94,9 @@ public: DECLARE_WRITE16_MEMBER(driveout_sound_command_w); DECLARE_WRITE16_MEMBER(cchip2_word_w); DECLARE_READ16_MEMBER(cchip2_word_r); + DECLARE_WRITE16_MEMBER(taitof2_sprite_extension_w); + DECLARE_WRITE16_MEMBER(taitof2_spritebank_w); + DECLARE_WRITE16_MEMBER(koshien_spritebank_w); }; /*----------- defined in video/taito_f2.c -----------*/ @@ -137,6 +140,3 @@ SCREEN_UPDATE_IND16( taitof2_deadconx ); SCREEN_UPDATE_IND16( taitof2_metalb ); SCREEN_UPDATE_IND16( taitof2_yesnoj ); -WRITE16_HANDLER( taitof2_spritebank_w ); -WRITE16_HANDLER( koshien_spritebank_w ); -WRITE16_HANDLER( taitof2_sprite_extension_w ); diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index 93500688ee8..fe2099678ed 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -201,6 +201,21 @@ public: DECLARE_WRITE16_MEMBER(f3_unk_w); DECLARE_READ32_MEMBER(bubsympb_oki_r); DECLARE_WRITE32_MEMBER(bubsympb_oki_w); + DECLARE_READ16_MEMBER(f3_pf_data_r); + DECLARE_WRITE16_MEMBER(f3_pf_data_w); + DECLARE_WRITE16_MEMBER(f3_control_0_w); + DECLARE_WRITE16_MEMBER(f3_control_1_w); + DECLARE_READ16_MEMBER(f3_spriteram_r); + DECLARE_WRITE16_MEMBER(f3_spriteram_w); + DECLARE_READ16_MEMBER(f3_videoram_r); + DECLARE_WRITE16_MEMBER(f3_videoram_w); + DECLARE_READ16_MEMBER(f3_vram_r); + DECLARE_WRITE16_MEMBER(f3_vram_w); + DECLARE_READ16_MEMBER(f3_pivot_r); + DECLARE_WRITE16_MEMBER(f3_pivot_w); + DECLARE_READ16_MEMBER(f3_lineram_r); + DECLARE_WRITE16_MEMBER(f3_lineram_w); + DECLARE_WRITE32_MEMBER(f3_palette_24bit_w); }; @@ -210,19 +225,4 @@ VIDEO_START( f3 ); SCREEN_UPDATE_RGB32( f3 ); SCREEN_VBLANK( f3 ); -WRITE16_HANDLER( f3_control_0_w ); -WRITE16_HANDLER( f3_control_1_w ); -WRITE32_HANDLER( f3_palette_24bit_w ); -WRITE16_HANDLER( f3_pf_data_w ); -WRITE16_HANDLER( f3_vram_w ); -WRITE16_HANDLER( f3_pivot_w ); -WRITE16_HANDLER( f3_lineram_w ); -WRITE16_HANDLER( f3_videoram_w ); -WRITE16_HANDLER( f3_spriteram_w ); -READ16_HANDLER( f3_pf_data_r ); -READ16_HANDLER( f3_vram_r ); -READ16_HANDLER( f3_pivot_r ); -READ16_HANDLER( f3_lineram_r ); -READ16_HANDLER( f3_videoram_r ); -READ16_HANDLER( f3_spriteram_r ); diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index 7d53e212fd6..89e525b20e0 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -91,6 +91,11 @@ public: DECLARE_READ8_MEMBER(horshoes_trackx_lo_r); DECLARE_READ8_MEMBER(horshoes_trackx_hi_r); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); + DECLARE_WRITE8_MEMBER(horshoes_bankg_w); + DECLARE_WRITE8_MEMBER(taitol_bankc_w); + DECLARE_READ8_MEMBER(taitol_bankc_r); + DECLARE_WRITE8_MEMBER(taitol_control_w); + DECLARE_READ8_MEMBER(taitol_control_r); }; /*----------- defined in video/taito_l.c -----------*/ @@ -112,8 +117,3 @@ void taitol_bg19_m(running_machine &machine, int offset); void taitol_char1a_m(running_machine &machine, int offset); void taitol_obj1b_m(running_machine &machine, int offset); -WRITE8_HANDLER( taitol_control_w ); -READ8_HANDLER( taitol_control_r ); -WRITE8_HANDLER( horshoes_bankg_w ); -WRITE8_HANDLER( taitol_bankc_w ); -READ8_HANDLER( taitol_bankc_r ); diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index c76259eead7..7023ccfd7d6 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -71,13 +71,13 @@ public: DECLARE_READ16_MEMBER(taitoz_msb_sound_r); DECLARE_WRITE8_MEMBER(taitoz_pancontrol); DECLARE_WRITE16_MEMBER(spacegun_pancontrol); + DECLARE_READ16_MEMBER(sci_spriteframe_r); + DECLARE_WRITE16_MEMBER(sci_spriteframe_w); + DECLARE_WRITE16_MEMBER(contcirc_out_w); }; /*----------- defined in video/taito_z.c -----------*/ -WRITE16_HANDLER( contcirc_out_w ); -READ16_HANDLER ( sci_spriteframe_r ); -WRITE16_HANDLER( sci_spriteframe_w ); VIDEO_START( taitoz ); diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index 7e68d5527b3..64f1dd5bdee 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -64,6 +64,15 @@ public: DECLARE_READ16_MEMBER(stick_input_r); DECLARE_READ16_MEMBER(stick2_input_r); DECLARE_WRITE8_MEMBER(sound_bankswitch_w); + DECLARE_WRITE16_MEMBER(dsp_flags_w); + DECLARE_WRITE16_MEMBER(dsp_x_eyecoord_w); + DECLARE_WRITE16_MEMBER(dsp_y_eyecoord_w); + DECLARE_WRITE16_MEMBER(dsp_z_eyecoord_w); + DECLARE_WRITE16_MEMBER(dsp_frustum_left_w); + DECLARE_WRITE16_MEMBER(dsp_frustum_bottom_w); + DECLARE_WRITE16_MEMBER(dsp_rasterize_w); + DECLARE_READ16_MEMBER(dsp_x_return_r); + DECLARE_READ16_MEMBER(dsp_y_return_r); }; @@ -72,13 +81,4 @@ public: SCREEN_UPDATE_IND16( taitoair ); VIDEO_START( taitoair ); -WRITE16_HANDLER( dsp_flags_w ); -WRITE16_HANDLER( dsp_x_eyecoord_w ); -WRITE16_HANDLER( dsp_y_eyecoord_w ); -WRITE16_HANDLER( dsp_z_eyecoord_w ); -WRITE16_HANDLER( dsp_rasterize_w ); -WRITE16_HANDLER( dsp_frustum_left_w ); -WRITE16_HANDLER( dsp_frustum_bottom_w ); -READ16_HANDLER( dsp_x_return_r ); -READ16_HANDLER( dsp_y_return_r ); diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index e3236c011a5..1c29ae8a2ef 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -98,15 +98,15 @@ public: DECLARE_READ16_MEMBER(taitojc_dsp_idle_skip_r); DECLARE_READ16_MEMBER(dendego2_dsp_idle_skip_r); DECLARE_WRITE16_MEMBER(dsp_idle_skip_w); + DECLARE_READ32_MEMBER(taitojc_tile_r); + DECLARE_READ32_MEMBER(taitojc_char_r); + DECLARE_WRITE32_MEMBER(taitojc_tile_w); + DECLARE_WRITE32_MEMBER(taitojc_char_w); }; /*----------- defined in video/taitojc.c -----------*/ -READ32_HANDLER(taitojc_tile_r); -WRITE32_HANDLER(taitojc_tile_w); -READ32_HANDLER(taitojc_char_r); -WRITE32_HANDLER(taitojc_char_w); void taitojc_clear_frame(running_machine &machine); void taitojc_render_polygons(running_machine &machine, UINT16 *polygon_fifo, int length); diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index fcb18d13e7b..637eeb00cf0 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -40,6 +40,26 @@ public: bitmap_ind16 m_sprite_layer_collbitmap2[3]; int m_draw_order[32][4]; DECLARE_WRITE8_MEMBER(taitosj_soundcommand_w); + DECLARE_WRITE8_MEMBER(taitosj_bankswitch_w); + DECLARE_READ8_MEMBER(taitosj_fake_data_r); + DECLARE_WRITE8_MEMBER(taitosj_fake_data_w); + DECLARE_READ8_MEMBER(taitosj_fake_status_r); + DECLARE_READ8_MEMBER(taitosj_mcu_data_r); + DECLARE_WRITE8_MEMBER(taitosj_mcu_data_w); + DECLARE_READ8_MEMBER(taitosj_mcu_status_r); + DECLARE_READ8_MEMBER(taitosj_68705_portA_r); + DECLARE_WRITE8_MEMBER(taitosj_68705_portA_w); + DECLARE_READ8_MEMBER(taitosj_68705_portB_r); + DECLARE_WRITE8_MEMBER(taitosj_68705_portB_w); + DECLARE_READ8_MEMBER(taitosj_68705_portC_r); + DECLARE_READ8_MEMBER(spacecr_prot_r); + DECLARE_WRITE8_MEMBER(alpine_protection_w); + DECLARE_WRITE8_MEMBER(alpinea_bankswitch_w); + DECLARE_READ8_MEMBER(alpine_port_2_r); + DECLARE_READ8_MEMBER(taitosj_gfxrom_r); + DECLARE_WRITE8_MEMBER(taitosj_characterram_w); + DECLARE_WRITE8_MEMBER(junglhbr_characterram_w); + DECLARE_WRITE8_MEMBER(taitosj_collision_reg_clear_w); }; @@ -47,31 +67,11 @@ public: MACHINE_START( taitosj ); MACHINE_RESET( taitosj ); -WRITE8_HANDLER( taitosj_bankswitch_w ); -READ8_HANDLER( taitosj_fake_data_r ); -READ8_HANDLER( taitosj_fake_status_r ); -WRITE8_HANDLER( taitosj_fake_data_w ); -READ8_HANDLER( taitosj_mcu_data_r ); -READ8_HANDLER( taitosj_mcu_status_r ); -WRITE8_HANDLER( taitosj_mcu_data_w ); -READ8_HANDLER( taitosj_68705_portA_r ); -READ8_HANDLER( taitosj_68705_portB_r ); -READ8_HANDLER( taitosj_68705_portC_r ); -WRITE8_HANDLER( taitosj_68705_portA_w ); -WRITE8_HANDLER( taitosj_68705_portB_w ); -READ8_HANDLER( spacecr_prot_r ); -WRITE8_HANDLER( alpine_protection_w ); -WRITE8_HANDLER( alpinea_bankswitch_w ); -READ8_HANDLER( alpine_port_2_r ); /*----------- defined in video/taitosj.c -----------*/ -READ8_HANDLER( taitosj_gfxrom_r ); -WRITE8_HANDLER( taitosj_characterram_w ); -WRITE8_HANDLER( junglhbr_characterram_w ); -WRITE8_HANDLER( taitosj_collision_reg_clear_w ); VIDEO_START( taitosj ); SCREEN_UPDATE_IND16( taitosj ); SCREEN_UPDATE_IND16( kikstart ); diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index bb8bf29443c..80beae35e22 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -42,6 +42,7 @@ public: DECLARE_READ8_MEMBER(tank8_collision_r); DECLARE_WRITE8_MEMBER(tank8_lockout_w); DECLARE_WRITE8_MEMBER(tank8_int_reset_w); + DECLARE_WRITE8_MEMBER(tank8_video_ram_w); }; @@ -62,6 +63,5 @@ SCREEN_VBLANK( tank8 ); VIDEO_START( tank8 ); SCREEN_UPDATE_IND16( tank8 ); -WRITE8_HANDLER( tank8_video_ram_w ); diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h index 7841c972287..ee5d89ddc38 100644 --- a/src/mame/includes/tankbatt.h +++ b/src/mame/includes/tankbatt.h @@ -22,12 +22,12 @@ public: DECLARE_WRITE8_MEMBER(tankbatt_irq_ack_w); DECLARE_WRITE8_MEMBER(tankbatt_coin_counter_w); DECLARE_WRITE8_MEMBER(tankbatt_coin_lockout_w); + DECLARE_WRITE8_MEMBER(tankbatt_videoram_w); }; /*----------- defined in video/tankbatt.c -----------*/ -WRITE8_HANDLER( tankbatt_videoram_w ); PALETTE_INIT( tankbatt ); VIDEO_START( tankbatt ); diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h index 5ffd849578d..12539f5c6a5 100644 --- a/src/mame/includes/tankbust.h +++ b/src/mame/includes/tankbust.h @@ -24,6 +24,14 @@ public: DECLARE_READ8_MEMBER(debug_output_area_r); DECLARE_READ8_MEMBER(read_from_unmapped_memory); DECLARE_READ8_MEMBER(some_changing_input); + DECLARE_WRITE8_MEMBER(tankbust_background_videoram_w); + DECLARE_READ8_MEMBER(tankbust_background_videoram_r); + DECLARE_WRITE8_MEMBER(tankbust_background_colorram_w); + DECLARE_READ8_MEMBER(tankbust_background_colorram_r); + DECLARE_WRITE8_MEMBER(tankbust_txtram_w); + DECLARE_READ8_MEMBER(tankbust_txtram_r); + DECLARE_WRITE8_MEMBER(tankbust_xscroll_w); + DECLARE_WRITE8_MEMBER(tankbust_yscroll_w); }; @@ -32,14 +40,6 @@ public: VIDEO_START( tankbust ); SCREEN_UPDATE_IND16( tankbust ); -WRITE8_HANDLER( tankbust_background_videoram_w ); -READ8_HANDLER( tankbust_background_videoram_r ); -WRITE8_HANDLER( tankbust_background_colorram_w ); -READ8_HANDLER( tankbust_background_colorram_r ); -WRITE8_HANDLER( tankbust_txtram_w ); -READ8_HANDLER( tankbust_txtram_r ); -WRITE8_HANDLER( tankbust_xscroll_w ); -WRITE8_HANDLER( tankbust_yscroll_w ); diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h index 91da10abbd7..211ba24313c 100644 --- a/src/mame/includes/taotaido.h +++ b/src/mame/includes/taotaido.h @@ -20,14 +20,14 @@ public: DECLARE_WRITE16_MEMBER(sound_command_w); DECLARE_WRITE8_MEMBER(pending_command_clear_w); DECLARE_WRITE8_MEMBER(taotaido_sh_bankswitch_w); + DECLARE_WRITE16_MEMBER(taotaido_sprite_character_bank_select_w); + DECLARE_WRITE16_MEMBER(taotaido_tileregs_w); + DECLARE_WRITE16_MEMBER(taotaido_bgvideoram_w); }; /*----------- defined in video/taotaido.c -----------*/ -WRITE16_HANDLER( taotaido_sprite_character_bank_select_w ); -WRITE16_HANDLER( taotaido_tileregs_w ); -WRITE16_HANDLER( taotaido_bgvideoram_w ); VIDEO_START( taotaido ); SCREEN_UPDATE_IND16( taotaido ); SCREEN_VBLANK( taotaido ); diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h index 1f50525ebb8..1424a185e69 100644 --- a/src/mame/includes/targeth.h +++ b/src/mame/includes/targeth.h @@ -14,11 +14,11 @@ public: required_device<cpu_device> m_maincpu; DECLARE_WRITE16_MEMBER(OKIM6295_bankswitch_w); DECLARE_WRITE16_MEMBER(targeth_coin_counter_w); + DECLARE_WRITE16_MEMBER(targeth_vram_w); }; /*----------- defined in video/targeth.c -----------*/ -WRITE16_HANDLER( targeth_vram_w ); VIDEO_START( targeth ); SCREEN_UPDATE_IND16( targeth ); diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index eca3f428a49..3827bcb36b2 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -59,30 +59,43 @@ public: DECLARE_READ16_MEMBER(cyclwarr_input_r); DECLARE_READ16_MEMBER(cyclwarr_input2_r); DECLARE_WRITE16_MEMBER(cyclwarr_sound_w); + DECLARE_READ16_MEMBER(apache3_bank_r); + DECLARE_WRITE16_MEMBER(apache3_bank_w); + DECLARE_WRITE16_MEMBER(apache3_z80_ctrl_w); + DECLARE_READ16_MEMBER(apache3_v30_v20_r); + DECLARE_WRITE16_MEMBER(apache3_v30_v20_w); + DECLARE_READ16_MEMBER(apache3_z80_r); + DECLARE_WRITE16_MEMBER(apache3_z80_w); + DECLARE_READ8_MEMBER(apache3_adc_r); + DECLARE_WRITE8_MEMBER(apache3_adc_w); + DECLARE_WRITE16_MEMBER(apache3_rotate_w); + DECLARE_READ16_MEMBER(roundup_v30_z80_r); + DECLARE_WRITE16_MEMBER(roundup_v30_z80_w); + DECLARE_WRITE16_MEMBER(roundup5_control_w); + DECLARE_WRITE16_MEMBER(roundup5_d0000_w); + DECLARE_WRITE16_MEMBER(roundup5_e0000_w); + DECLARE_READ16_MEMBER(cyclwarr_control_r); + DECLARE_WRITE16_MEMBER(cyclwarr_control_w); + DECLARE_READ16_MEMBER(tatsumi_v30_68000_r); + DECLARE_WRITE16_MEMBER(tatsumi_v30_68000_w); + DECLARE_WRITE16_MEMBER(tatsumi_sprite_control_w); + DECLARE_WRITE16_MEMBER(apache3_road_z_w); + DECLARE_WRITE8_MEMBER(apache3_road_x_w); + DECLARE_READ16_MEMBER(roundup5_vram_r); + DECLARE_WRITE16_MEMBER(roundup5_vram_w); + DECLARE_WRITE16_MEMBER(roundup5_palette_w); + DECLARE_WRITE16_MEMBER(apache3_palette_w); + DECLARE_WRITE16_MEMBER(roundup5_text_w); + DECLARE_READ16_MEMBER(cyclwarr_videoram0_r); + DECLARE_READ16_MEMBER(cyclwarr_videoram1_r); + DECLARE_WRITE16_MEMBER(cyclwarr_videoram0_w); + DECLARE_WRITE16_MEMBER(cyclwarr_videoram1_w); + DECLARE_WRITE16_MEMBER(roundup5_crt_w); }; /*----------- defined in machine/tatsumi.c -----------*/ -READ16_HANDLER( apache3_bank_r ); -WRITE16_HANDLER( apache3_bank_w ); -WRITE16_HANDLER( apache3_z80_ctrl_w ); -READ16_HANDLER( apache3_v30_v20_r ); -WRITE16_HANDLER( apache3_v30_v20_w ); -READ16_HANDLER( roundup_v30_z80_r ); -WRITE16_HANDLER( roundup_v30_z80_w ); -READ16_HANDLER( tatsumi_v30_68000_r ); -WRITE16_HANDLER( tatsumi_v30_68000_w ) ; -READ16_HANDLER( apache3_z80_r ); -WRITE16_HANDLER( apache3_z80_w ); -READ8_HANDLER( apache3_adc_r ); -WRITE8_HANDLER( apache3_adc_w ); -WRITE16_HANDLER( apache3_rotate_w ); -WRITE16_HANDLER( cyclwarr_control_w ); -READ16_HANDLER( cyclwarr_control_r ); -WRITE16_HANDLER( roundup5_control_w ); -WRITE16_HANDLER( roundup5_d0000_w ); -WRITE16_HANDLER( roundup5_e0000_w ); READ8_DEVICE_HANDLER(tatsumi_hack_ym2151_r); READ8_DEVICE_HANDLER(tatsumi_hack_oki_r); @@ -92,19 +105,6 @@ void tatsumi_reset(running_machine &machine); /*----------- defined in video/tatsumi.c -----------*/ -WRITE16_HANDLER( roundup5_palette_w ); -WRITE16_HANDLER( tatsumi_sprite_control_w ); -WRITE16_HANDLER( roundup5_text_w ); -WRITE16_HANDLER( roundup5_crt_w ); -READ16_HANDLER( cyclwarr_videoram0_r ); -WRITE16_HANDLER( cyclwarr_videoram0_w ); -READ16_HANDLER( cyclwarr_videoram1_r ); -WRITE16_HANDLER( cyclwarr_videoram1_w ); -READ16_HANDLER( roundup5_vram_r ); -WRITE16_HANDLER( roundup5_vram_w ); -WRITE16_HANDLER( apache3_palette_w ); -WRITE8_HANDLER( apache3_road_x_w ); -WRITE16_HANDLER( apache3_road_z_w ); VIDEO_START( apache3 ); diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h index edbcbc581d9..2996b23fe0e 100644 --- a/src/mame/includes/tbowl.h +++ b/src/mame/includes/tbowl.h @@ -29,23 +29,23 @@ public: DECLARE_WRITE8_MEMBER(tbowl_adpcm_start_w); DECLARE_WRITE8_MEMBER(tbowl_adpcm_end_w); DECLARE_WRITE8_MEMBER(tbowl_adpcm_vol_w); + DECLARE_WRITE8_MEMBER(tbowl_txvideoram_w); + DECLARE_WRITE8_MEMBER(tbowl_bg2videoram_w); + DECLARE_WRITE8_MEMBER(tbowl_bgxscroll_lo); + DECLARE_WRITE8_MEMBER(tbowl_bgxscroll_hi); + DECLARE_WRITE8_MEMBER(tbowl_bgyscroll_lo); + DECLARE_WRITE8_MEMBER(tbowl_bgyscroll_hi); + DECLARE_WRITE8_MEMBER(tbowl_bgvideoram_w); + DECLARE_WRITE8_MEMBER(tbowl_bg2xscroll_lo); + DECLARE_WRITE8_MEMBER(tbowl_bg2xscroll_hi); + DECLARE_WRITE8_MEMBER(tbowl_bg2yscroll_lo); + DECLARE_WRITE8_MEMBER(tbowl_bg2yscroll_hi); }; /*----------- defined in video/tbowl.c -----------*/ -WRITE8_HANDLER( tbowl_bg2videoram_w ); -WRITE8_HANDLER( tbowl_bgvideoram_w ); -WRITE8_HANDLER( tbowl_txvideoram_w ); -WRITE8_HANDLER( tbowl_bg2xscroll_lo ); -WRITE8_HANDLER( tbowl_bg2xscroll_hi ); -WRITE8_HANDLER( tbowl_bg2yscroll_lo ); -WRITE8_HANDLER( tbowl_bg2yscroll_hi ); -WRITE8_HANDLER( tbowl_bgxscroll_lo ); -WRITE8_HANDLER( tbowl_bgxscroll_hi ); -WRITE8_HANDLER( tbowl_bgyscroll_lo ); -WRITE8_HANDLER( tbowl_bgyscroll_hi ); VIDEO_START( tbowl ); SCREEN_UPDATE_IND16( tbowl_left ); diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index c0f41ba0208..56865c814ea 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -37,6 +37,11 @@ public: DECLARE_READ8_MEMBER(input0_r); DECLARE_READ8_MEMBER(input1_r); DECLARE_READ8_MEMBER(readFF); + DECLARE_WRITE8_MEMBER(tceptor_tile_ram_w); + DECLARE_WRITE8_MEMBER(tceptor_tile_attr_w); + DECLARE_WRITE8_MEMBER(tceptor_bg_ram_w); + DECLARE_WRITE8_MEMBER(tceptor_bg_scroll_w); + void tile_mark_dirty(int offset); }; @@ -49,8 +54,4 @@ SCREEN_UPDATE_IND16( tceptor_3d_left ); SCREEN_UPDATE_IND16( tceptor_3d_right ); SCREEN_VBLANK( tceptor ); -WRITE8_HANDLER( tceptor_tile_ram_w ); -WRITE8_HANDLER( tceptor_tile_attr_w ); -WRITE8_HANDLER( tceptor_bg_ram_w ); -WRITE8_HANDLER( tceptor_bg_scroll_w ); diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index d99fe3f8c9f..d27dcc7b862 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -25,17 +25,17 @@ public: DECLARE_READ8_MEMBER(tecmo_dswa_h_r); DECLARE_READ8_MEMBER(tecmo_dswb_l_r); DECLARE_READ8_MEMBER(tecmo_dswb_h_r); + DECLARE_WRITE8_MEMBER(tecmo_txvideoram_w); + DECLARE_WRITE8_MEMBER(tecmo_fgvideoram_w); + DECLARE_WRITE8_MEMBER(tecmo_bgvideoram_w); + DECLARE_WRITE8_MEMBER(tecmo_fgscroll_w); + DECLARE_WRITE8_MEMBER(tecmo_bgscroll_w); + DECLARE_WRITE8_MEMBER(tecmo_flipscreen_w); }; /*----------- defined in video/tecmo.c -----------*/ -WRITE8_HANDLER( tecmo_txvideoram_w ); -WRITE8_HANDLER( tecmo_fgvideoram_w ); -WRITE8_HANDLER( tecmo_bgvideoram_w ); -WRITE8_HANDLER( tecmo_fgscroll_w ); -WRITE8_HANDLER( tecmo_bgscroll_w ); -WRITE8_HANDLER( tecmo_flipscreen_w ); VIDEO_START( tecmo ); SCREEN_UPDATE_IND16( tecmo ); diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index 5b5407f82b2..431b9d8601a 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -26,24 +26,24 @@ public: UINT16 *m_spriteram; size_t m_spriteram_size; DECLARE_WRITE16_MEMBER(tecmo16_sound_command_w); + DECLARE_WRITE16_MEMBER(tecmo16_videoram_w); + DECLARE_WRITE16_MEMBER(tecmo16_colorram_w); + DECLARE_WRITE16_MEMBER(tecmo16_videoram2_w); + DECLARE_WRITE16_MEMBER(tecmo16_colorram2_w); + DECLARE_WRITE16_MEMBER(tecmo16_charram_w); + DECLARE_WRITE16_MEMBER(tecmo16_flipscreen_w); + DECLARE_WRITE16_MEMBER(tecmo16_scroll_x_w); + DECLARE_WRITE16_MEMBER(tecmo16_scroll_y_w); + DECLARE_WRITE16_MEMBER(tecmo16_scroll2_x_w); + DECLARE_WRITE16_MEMBER(tecmo16_scroll2_y_w); + DECLARE_WRITE16_MEMBER(tecmo16_scroll_char_x_w); + DECLARE_WRITE16_MEMBER(tecmo16_scroll_char_y_w); }; /*----------- defined in video/tecmo16.c -----------*/ -WRITE16_HANDLER( tecmo16_videoram_w ); -WRITE16_HANDLER( tecmo16_colorram_w ); -WRITE16_HANDLER( tecmo16_videoram2_w ); -WRITE16_HANDLER( tecmo16_colorram2_w ); -WRITE16_HANDLER( tecmo16_charram_w ); -WRITE16_HANDLER( tecmo16_flipscreen_w ); -WRITE16_HANDLER( tecmo16_scroll_x_w ); -WRITE16_HANDLER( tecmo16_scroll_y_w ); -WRITE16_HANDLER( tecmo16_scroll2_x_w ); -WRITE16_HANDLER( tecmo16_scroll2_y_w ); -WRITE16_HANDLER( tecmo16_scroll_char_x_w ); -WRITE16_HANDLER( tecmo16_scroll_char_y_w ); VIDEO_START( fstarfrc ); VIDEO_START( ginkun ); diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h index c9451b4c223..6626f04ef19 100644 --- a/src/mame/includes/tecmosys.h +++ b/src/mame/includes/tecmosys.h @@ -42,6 +42,18 @@ public: DECLARE_READ16_MEMBER(unk880000_r); DECLARE_WRITE8_MEMBER(tecmosys_z80_bank_w); DECLARE_WRITE8_MEMBER(tecmosys_oki_bank_w); + DECLARE_READ16_MEMBER(tecmosys_prot_status_r); + DECLARE_WRITE16_MEMBER(tecmosys_prot_status_w); + DECLARE_READ16_MEMBER(tecmosys_prot_data_r); + DECLARE_WRITE16_MEMBER(tecmosys_prot_data_w); + DECLARE_WRITE16_MEMBER(bg0_tilemap_w); + DECLARE_WRITE16_MEMBER(bg1_tilemap_w); + DECLARE_WRITE16_MEMBER(bg2_tilemap_w); + DECLARE_WRITE16_MEMBER(fg_tilemap_w); + DECLARE_WRITE16_MEMBER(tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w); + DECLARE_WRITE16_MEMBER(bg0_tilemap_lineram_w); + DECLARE_WRITE16_MEMBER(bg1_tilemap_lineram_w); + DECLARE_WRITE16_MEMBER(bg2_tilemap_lineram_w); }; @@ -49,22 +61,10 @@ public: void tecmosys_prot_init(running_machine &machine, int which); -READ16_HANDLER(tecmosys_prot_status_r); -WRITE16_HANDLER(tecmosys_prot_status_w); -READ16_HANDLER(tecmosys_prot_data_r); -WRITE16_HANDLER(tecmosys_prot_data_w); /*----------- defined in video/tecmosys.c -----------*/ -WRITE16_HANDLER( bg0_tilemap_w ); -WRITE16_HANDLER( bg1_tilemap_w ); -WRITE16_HANDLER( bg2_tilemap_w ); -WRITE16_HANDLER( fg_tilemap_w ); -WRITE16_HANDLER( tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w ); -WRITE16_HANDLER( bg0_tilemap_lineram_w ); -WRITE16_HANDLER( bg1_tilemap_lineram_w ); -WRITE16_HANDLER( bg2_tilemap_lineram_w ); SCREEN_UPDATE_RGB32(tecmosys); VIDEO_START(tecmosys); diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h index 19b6da2e6b6..d1f6da1b14d 100644 --- a/src/mame/includes/tehkanwc.h +++ b/src/mame/includes/tehkanwc.h @@ -25,20 +25,20 @@ public: DECLARE_WRITE8_MEMBER(tehkanwc_track_1_reset_w); DECLARE_WRITE8_MEMBER(sound_command_w); DECLARE_WRITE8_MEMBER(sound_answer_w); + DECLARE_WRITE8_MEMBER(tehkanwc_videoram_w); + DECLARE_WRITE8_MEMBER(tehkanwc_colorram_w); + DECLARE_WRITE8_MEMBER(tehkanwc_videoram2_w); + DECLARE_WRITE8_MEMBER(tehkanwc_scroll_x_w); + DECLARE_WRITE8_MEMBER(tehkanwc_scroll_y_w); + DECLARE_WRITE8_MEMBER(tehkanwc_flipscreen_x_w); + DECLARE_WRITE8_MEMBER(tehkanwc_flipscreen_y_w); + DECLARE_WRITE8_MEMBER(gridiron_led0_w); + DECLARE_WRITE8_MEMBER(gridiron_led1_w); }; /*----------- defined in video/tehkanwc.c -----------*/ -extern WRITE8_HANDLER( tehkanwc_videoram_w ); -extern WRITE8_HANDLER( tehkanwc_colorram_w ); -extern WRITE8_HANDLER( tehkanwc_videoram2_w ); -extern WRITE8_HANDLER( tehkanwc_scroll_x_w ); -extern WRITE8_HANDLER( tehkanwc_scroll_y_w ); -extern WRITE8_HANDLER( tehkanwc_flipscreen_x_w ); -extern WRITE8_HANDLER( tehkanwc_flipscreen_y_w ); -extern WRITE8_HANDLER( gridiron_led0_w ); -extern WRITE8_HANDLER( gridiron_led1_w ); extern VIDEO_START( tehkanwc ); extern SCREEN_UPDATE_IND16( tehkanwc ); diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h index 7df685ee8b9..b06c7e2bf01 100644 --- a/src/mame/includes/terracre.h +++ b/src/mame/includes/terracre.h @@ -19,16 +19,16 @@ public: DECLARE_READ8_MEMBER(soundlatch_clear_r); DECLARE_READ16_MEMBER(amazon_protection_r); DECLARE_WRITE16_MEMBER(amazon_protection_w); + DECLARE_WRITE16_MEMBER(amazon_background_w); + DECLARE_WRITE16_MEMBER(amazon_foreground_w); + DECLARE_WRITE16_MEMBER(amazon_flipscreen_w); + DECLARE_WRITE16_MEMBER(amazon_scrolly_w); + DECLARE_WRITE16_MEMBER(amazon_scrollx_w); }; /*----------- defined in video/terracre.c -----------*/ PALETTE_INIT( amazon ); -WRITE16_HANDLER( amazon_background_w ); -WRITE16_HANDLER( amazon_foreground_w ); -WRITE16_HANDLER( amazon_scrolly_w ); -WRITE16_HANDLER( amazon_scrollx_w ); -WRITE16_HANDLER( amazon_flipscreen_w ); VIDEO_START( amazon ); SCREEN_UPDATE_IND16( amazon ); diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index 0cf843a6e94..8bee9a87bc1 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -60,25 +60,25 @@ public: DECLARE_WRITE16_MEMBER(tetrisp2_systemregs_w); DECLARE_READ16_MEMBER(tetrisp2_nvram_r); DECLARE_WRITE16_MEMBER(tetrisp2_nvram_w); + DECLARE_WRITE16_MEMBER(tetrisp2_palette_w); + DECLARE_WRITE16_MEMBER(rocknms_sub_palette_w); + DECLARE_WRITE8_MEMBER(tetrisp2_priority_w); + DECLARE_WRITE8_MEMBER(rockn_priority_w); + DECLARE_WRITE16_MEMBER(rocknms_sub_priority_w); + DECLARE_READ16_MEMBER(nndmseal_priority_r); + DECLARE_READ8_MEMBER(tetrisp2_priority_r); + DECLARE_WRITE16_MEMBER(tetrisp2_vram_bg_w); + DECLARE_WRITE16_MEMBER(tetrisp2_vram_fg_w); + DECLARE_WRITE16_MEMBER(tetrisp2_vram_rot_w); + DECLARE_WRITE16_MEMBER(rocknms_sub_vram_bg_w); + DECLARE_WRITE16_MEMBER(rocknms_sub_vram_fg_w); + DECLARE_WRITE16_MEMBER(rocknms_sub_vram_rot_w); }; /*----------- defined in video/tetrisp2.c -----------*/ -WRITE16_HANDLER( tetrisp2_palette_w ); -WRITE16_HANDLER( rocknms_sub_palette_w ); -WRITE8_HANDLER( tetrisp2_priority_w ); -WRITE8_HANDLER( rockn_priority_w ); -READ8_HANDLER( tetrisp2_priority_r ); -WRITE16_HANDLER( rocknms_sub_priority_w ); -READ16_HANDLER( nndmseal_priority_r ); -WRITE16_HANDLER( tetrisp2_vram_bg_w ); -WRITE16_HANDLER( tetrisp2_vram_fg_w ); -WRITE16_HANDLER( tetrisp2_vram_rot_w ); -WRITE16_HANDLER( rocknms_sub_vram_bg_w ); -WRITE16_HANDLER( rocknms_sub_vram_fg_w ); -WRITE16_HANDLER( rocknms_sub_vram_rot_w ); VIDEO_START( tetrisp2 ); SCREEN_UPDATE_IND16( tetrisp2 ); diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h index 23957db938a..e0d2a19009e 100644 --- a/src/mame/includes/thedeep.h +++ b/src/mame/includes/thedeep.h @@ -38,13 +38,13 @@ public: DECLARE_WRITE8_MEMBER(thedeep_to_main_w); DECLARE_WRITE8_MEMBER(thedeep_p3_w); DECLARE_READ8_MEMBER(thedeep_p0_r); + DECLARE_WRITE8_MEMBER(thedeep_vram_0_w); + DECLARE_WRITE8_MEMBER(thedeep_vram_1_w); }; /*----------- defined in video/thedeep.c -----------*/ -WRITE8_HANDLER( thedeep_vram_0_w ); -WRITE8_HANDLER( thedeep_vram_1_w ); PALETTE_INIT( thedeep ); VIDEO_START( thedeep ); diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h index 6b62dbc9caf..cf10bd81eaa 100644 --- a/src/mame/includes/thepit.h +++ b/src/mame/includes/thepit.h @@ -23,6 +23,12 @@ public: DECLARE_WRITE8_MEMBER(thepit_sound_enable_w); DECLARE_WRITE8_MEMBER(nmi_mask_w); DECLARE_READ8_MEMBER(rtriv_question_r); + DECLARE_WRITE8_MEMBER(thepit_videoram_w); + DECLARE_WRITE8_MEMBER(thepit_colorram_w); + DECLARE_WRITE8_MEMBER(thepit_flip_screen_x_w); + DECLARE_WRITE8_MEMBER(thepit_flip_screen_y_w); + DECLARE_WRITE8_MEMBER(intrepid_graphics_bank_w); + DECLARE_READ8_MEMBER(thepit_input_port_0_r); }; @@ -32,9 +38,3 @@ PALETTE_INIT( thepit ); PALETTE_INIT( suprmous ); VIDEO_START( thepit ); SCREEN_UPDATE_IND16( thepit ); -WRITE8_HANDLER( thepit_videoram_w ); -WRITE8_HANDLER( thepit_colorram_w ); -WRITE8_HANDLER( thepit_flip_screen_x_w ); -WRITE8_HANDLER( thepit_flip_screen_y_w ); -READ8_HANDLER( thepit_input_port_0_r ); -WRITE8_HANDLER( intrepid_graphics_bank_w ); diff --git a/src/mame/includes/thief.h b/src/mame/includes/thief.h index 848f5be7da9..9136bb12ac2 100644 --- a/src/mame/includes/thief.h +++ b/src/mame/includes/thief.h @@ -19,22 +19,22 @@ public: coprocessor_t m_coprocessor; DECLARE_WRITE8_MEMBER(thief_input_select_w); DECLARE_READ8_MEMBER(thief_io_r); + DECLARE_READ8_MEMBER(thief_context_ram_r); + DECLARE_WRITE8_MEMBER(thief_context_ram_w); + DECLARE_WRITE8_MEMBER(thief_context_bank_w); + DECLARE_WRITE8_MEMBER(thief_video_control_w); + DECLARE_WRITE8_MEMBER(thief_color_map_w); + DECLARE_WRITE8_MEMBER(thief_color_plane_w); + DECLARE_READ8_MEMBER(thief_videoram_r); + DECLARE_WRITE8_MEMBER(thief_videoram_w); + DECLARE_WRITE8_MEMBER(thief_blit_w); + DECLARE_READ8_MEMBER(thief_coprocessor_r); + DECLARE_WRITE8_MEMBER(thief_coprocessor_w); }; /*----------- defined in video/thief.c -----------*/ -READ8_HANDLER( thief_context_ram_r ); -WRITE8_HANDLER( thief_context_ram_w ); -WRITE8_HANDLER( thief_context_bank_w ); -WRITE8_HANDLER( thief_video_control_w ); -WRITE8_HANDLER( thief_color_map_w ); -WRITE8_HANDLER( thief_color_plane_w ); -READ8_HANDLER( thief_videoram_r ); -WRITE8_HANDLER( thief_videoram_w ); -WRITE8_HANDLER( thief_blit_w ); -READ8_HANDLER( thief_coprocessor_r ); -WRITE8_HANDLER( thief_coprocessor_w ); VIDEO_START( thief ); SCREEN_UPDATE_IND16( thief ); diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h index 240c2254e57..7d66e6ef8a7 100644 --- a/src/mame/includes/thoop2.h +++ b/src/mame/includes/thoop2.h @@ -13,11 +13,11 @@ public: DECLARE_WRITE16_MEMBER(OKIM6295_bankswitch_w); DECLARE_WRITE16_MEMBER(thoop2_coin_w); DECLARE_READ16_MEMBER(DS5002FP_R); + DECLARE_WRITE16_MEMBER(thoop2_vram_w); }; /*----------- defined in video/thoop2.c -----------*/ -WRITE16_HANDLER( thoop2_vram_w ); VIDEO_START( thoop2 ); SCREEN_UPDATE_IND16( thoop2 ); diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index 05d5682c8b8..1bc06158e12 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -19,6 +19,15 @@ public: tilemap_t *m_bg_tilemap2; rgb_t *m_palette; DECLARE_WRITE8_MEMBER(tiamc1_control_w); + DECLARE_WRITE8_MEMBER(tiamc1_videoram_w); + DECLARE_WRITE8_MEMBER(tiamc1_bankswitch_w); + DECLARE_WRITE8_MEMBER(tiamc1_sprite_x_w); + DECLARE_WRITE8_MEMBER(tiamc1_sprite_y_w); + DECLARE_WRITE8_MEMBER(tiamc1_sprite_a_w); + DECLARE_WRITE8_MEMBER(tiamc1_sprite_n_w); + DECLARE_WRITE8_MEMBER(tiamc1_bg_vshift_w); + DECLARE_WRITE8_MEMBER(tiamc1_bg_hshift_w); + DECLARE_WRITE8_MEMBER(tiamc1_palette_w); }; @@ -37,12 +46,3 @@ PALETTE_INIT( tiamc1 ); VIDEO_START( tiamc1 ); SCREEN_UPDATE_IND16( tiamc1 ); -WRITE8_HANDLER( tiamc1_palette_w ); -WRITE8_HANDLER( tiamc1_videoram_w ); -WRITE8_HANDLER( tiamc1_bankswitch_w ); -WRITE8_HANDLER( tiamc1_sprite_x_w ); -WRITE8_HANDLER( tiamc1_sprite_y_w ); -WRITE8_HANDLER( tiamc1_sprite_a_w ); -WRITE8_HANDLER( tiamc1_sprite_n_w ); -WRITE8_HANDLER( tiamc1_bg_vshift_w ); -WRITE8_HANDLER( tiamc1_bg_hshift_w ); diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h index c0703be1c2a..11deee794b1 100644 --- a/src/mame/includes/tigeroad.h +++ b/src/mame/includes/tigeroad.h @@ -15,13 +15,13 @@ public: required_device<buffered_spriteram16_device> m_spriteram; DECLARE_WRITE16_MEMBER(f1dream_control_w); DECLARE_WRITE16_MEMBER(tigeroad_soundcmd_w); + DECLARE_WRITE16_MEMBER(tigeroad_videoram_w); + DECLARE_WRITE16_MEMBER(tigeroad_videoctrl_w); + DECLARE_WRITE16_MEMBER(tigeroad_scroll_w); }; /*----------- defined in video/tigeroad.c -----------*/ -WRITE16_HANDLER( tigeroad_videoram_w ); -WRITE16_HANDLER( tigeroad_videoctrl_w ); -WRITE16_HANDLER( tigeroad_scroll_w ); VIDEO_START( tigeroad ); SCREEN_UPDATE_IND16( tigeroad ); diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h index d848b050274..a163ddb97ec 100644 --- a/src/mame/includes/timelimt.h +++ b/src/mame/includes/timelimt.h @@ -16,6 +16,11 @@ public: size_t m_spriteram_size; DECLARE_WRITE8_MEMBER(nmi_enable_w); DECLARE_WRITE8_MEMBER(sound_reset_w); + DECLARE_WRITE8_MEMBER(timelimt_videoram_w); + DECLARE_WRITE8_MEMBER(timelimt_bg_videoram_w); + DECLARE_WRITE8_MEMBER(timelimt_scroll_x_lsb_w); + DECLARE_WRITE8_MEMBER(timelimt_scroll_x_msb_w); + DECLARE_WRITE8_MEMBER(timelimt_scroll_y_w); }; @@ -25,8 +30,3 @@ VIDEO_START( timelimt ); PALETTE_INIT( timelimt ); SCREEN_UPDATE_IND16( timelimt ); -WRITE8_HANDLER( timelimt_videoram_w ); -WRITE8_HANDLER( timelimt_bg_videoram_w ); -WRITE8_HANDLER( timelimt_scroll_y_w ); -WRITE8_HANDLER( timelimt_scroll_x_msb_w ); -WRITE8_HANDLER( timelimt_scroll_x_lsb_w ); diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index b9d898ec364..a085acc8eeb 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -27,15 +27,15 @@ public: DECLARE_WRITE8_MEMBER(timeplt_nmi_enable_w); DECLARE_WRITE8_MEMBER(timeplt_coin_counter_w); DECLARE_READ8_MEMBER(psurge_protection_r); + DECLARE_WRITE8_MEMBER(timeplt_videoram_w); + DECLARE_WRITE8_MEMBER(timeplt_colorram_w); + DECLARE_WRITE8_MEMBER(timeplt_flipscreen_w); + DECLARE_READ8_MEMBER(timeplt_scanline_r); }; /*----------- defined in video/timeplt.c -----------*/ -READ8_HANDLER( timeplt_scanline_r ); -WRITE8_HANDLER( timeplt_videoram_w ); -WRITE8_HANDLER( timeplt_colorram_w ); -WRITE8_HANDLER( timeplt_flipscreen_w ); PALETTE_INIT( timeplt ); VIDEO_START( timeplt ); diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index 93c5e524ee5..59d431fd7cd 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -95,6 +95,19 @@ public: DECLARE_WRITE16_MEMBER(tmnt2_1c0800_w); DECLARE_READ8_MEMBER(k054539_ctrl_r); DECLARE_WRITE8_MEMBER(k054539_ctrl_w); + DECLARE_WRITE16_MEMBER(tmnt_paletteram_word_w); + DECLARE_WRITE16_MEMBER(tmnt_0a0000_w); + DECLARE_WRITE16_MEMBER(punkshot_0a0020_w); + DECLARE_WRITE16_MEMBER(lgtnfght_0a0018_w); + DECLARE_WRITE16_MEMBER(blswhstl_700300_w); + DECLARE_READ16_MEMBER(glfgreat_rom_r); + DECLARE_WRITE16_MEMBER(glfgreat_122000_w); + DECLARE_WRITE16_MEMBER(ssriders_eeprom_w); + DECLARE_WRITE16_MEMBER(ssriders_1c0300_w); + DECLARE_WRITE16_MEMBER(prmrsocr_122000_w); + DECLARE_READ16_MEMBER(prmrsocr_rom_r); + DECLARE_WRITE16_MEMBER(tmnt_priority_w); + DECLARE_READ16_MEMBER(glfgreat_ball_r); }; @@ -113,19 +126,6 @@ extern void lgtnfght_sprite_callback(running_machine &machine, int *code,int *co extern void blswhstl_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask); extern void prmrsocr_sprite_callback(running_machine &machine, int *code,int *color,int *priority_mask); -WRITE16_HANDLER( tmnt_paletteram_word_w ); -WRITE16_HANDLER( tmnt_0a0000_w ); -WRITE16_HANDLER( punkshot_0a0020_w ); -WRITE16_HANDLER( lgtnfght_0a0018_w ); -WRITE16_HANDLER( blswhstl_700300_w ); -READ16_HANDLER( glfgreat_rom_r ); -WRITE16_HANDLER( glfgreat_122000_w ); -WRITE16_HANDLER( ssriders_eeprom_w ); -WRITE16_HANDLER( ssriders_1c0300_w ); -WRITE16_HANDLER( prmrsocr_122000_w ); -WRITE16_HANDLER( tmnt_priority_w ); -READ16_HANDLER( glfgreat_ball_r ); -READ16_HANDLER( prmrsocr_rom_r ); VIDEO_START( cuebrick ); VIDEO_START( mia ); diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h index 5f8525ce559..c673df1d26f 100644 --- a/src/mame/includes/tnzs.h +++ b/src/mame/includes/tnzs.h @@ -55,19 +55,26 @@ public: DECLARE_WRITE8_MEMBER(tnzsb_sound_command_w); DECLARE_WRITE8_MEMBER(jpopnics_palette_w); DECLARE_WRITE8_MEMBER(jpopnics_subbankswitch_w); + DECLARE_READ8_MEMBER(tnzs_port1_r); + DECLARE_READ8_MEMBER(tnzs_port2_r); + DECLARE_WRITE8_MEMBER(tnzs_port2_w); + DECLARE_READ8_MEMBER(arknoid2_sh_f000_r); + DECLARE_READ8_MEMBER(tnzs_mcu_r); + DECLARE_WRITE8_MEMBER(tnzs_mcu_w); + DECLARE_WRITE8_MEMBER(tnzs_bankswitch_w); + DECLARE_WRITE8_MEMBER(tnzs_bankswitch1_w); + DECLARE_READ8_MEMBER(mcu_tnzs_r); + DECLARE_WRITE8_MEMBER(mcu_tnzs_w); + DECLARE_READ8_MEMBER(mcu_arknoid2_r); + DECLARE_WRITE8_MEMBER(mcu_arknoid2_w); + DECLARE_READ8_MEMBER(mcu_extrmatn_r); + DECLARE_WRITE8_MEMBER(mcu_extrmatn_w); + DECLARE_WRITE8_MEMBER(tnzs_sync_kludge_w); }; /*----------- defined in machine/tnzs.c -----------*/ -READ8_HANDLER( tnzs_port1_r ); -READ8_HANDLER( tnzs_port2_r ); -WRITE8_HANDLER( tnzs_port2_w ); -READ8_HANDLER( arknoid2_sh_f000_r ); -READ8_HANDLER( tnzs_mcu_r ); -WRITE8_HANDLER( tnzs_mcu_w ); -WRITE8_HANDLER( tnzs_bankswitch_w ); -WRITE8_HANDLER( tnzs_bankswitch1_w ); INTERRUPT_GEN( arknoid2_interrupt ); DRIVER_INIT( plumpop ); diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index 9c9cfebb6d1..176b13ff50a 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -84,30 +84,53 @@ public: // an empty tile, so that we can safely disable tiles UINT8 m_empty_tile[8*8]; + DECLARE_WRITE16_MEMBER(toaplan1_intenable_w); + DECLARE_WRITE16_MEMBER(demonwld_dsp_addrsel_w); + DECLARE_READ16_MEMBER(demonwld_dsp_r); + DECLARE_WRITE16_MEMBER(demonwld_dsp_w); + DECLARE_WRITE16_MEMBER(demonwld_dsp_bio_w); + DECLARE_READ16_MEMBER(demonwld_BIO_r); + DECLARE_WRITE16_MEMBER(demonwld_dsp_ctrl_w); + DECLARE_READ16_MEMBER(samesame_port_6_word_r); + DECLARE_READ16_MEMBER(vimana_system_port_r); + DECLARE_READ16_MEMBER(vimana_mcu_r); + DECLARE_WRITE16_MEMBER(vimana_mcu_w); + DECLARE_READ16_MEMBER(toaplan1_shared_r); + DECLARE_WRITE16_MEMBER(toaplan1_shared_w); + DECLARE_WRITE16_MEMBER(toaplan1_reset_sound); + DECLARE_WRITE8_MEMBER(rallybik_coin_w); + DECLARE_WRITE8_MEMBER(toaplan1_coin_w); + DECLARE_WRITE16_MEMBER(samesame_coin_w); + DECLARE_READ16_MEMBER(toaplan1_frame_done_r); + DECLARE_WRITE16_MEMBER(toaplan1_tile_offsets_w); + DECLARE_WRITE16_MEMBER(rallybik_bcu_flipscreen_w); + DECLARE_WRITE16_MEMBER(toaplan1_bcu_flipscreen_w); + DECLARE_WRITE16_MEMBER(toaplan1_fcu_flipscreen_w); + DECLARE_READ16_MEMBER(toaplan1_spriteram_offs_r); + DECLARE_WRITE16_MEMBER(toaplan1_spriteram_offs_w); + DECLARE_READ16_MEMBER(toaplan1_colorram1_r); + DECLARE_WRITE16_MEMBER(toaplan1_colorram1_w); + DECLARE_READ16_MEMBER(toaplan1_colorram2_r); + DECLARE_WRITE16_MEMBER(toaplan1_colorram2_w); + DECLARE_READ16_MEMBER(toaplan1_spriteram16_r); + DECLARE_WRITE16_MEMBER(toaplan1_spriteram16_w); + DECLARE_READ16_MEMBER(toaplan1_spritesizeram16_r); + DECLARE_WRITE16_MEMBER(toaplan1_spritesizeram16_w); + DECLARE_WRITE16_MEMBER(toaplan1_bcu_control_w); + DECLARE_READ16_MEMBER(toaplan1_tileram_offs_r); + DECLARE_WRITE16_MEMBER(toaplan1_tileram_offs_w); + DECLARE_READ16_MEMBER(toaplan1_tileram16_r); + DECLARE_READ16_MEMBER(rallybik_tileram16_r); + DECLARE_WRITE16_MEMBER(toaplan1_tileram16_w); + DECLARE_READ16_MEMBER(toaplan1_scroll_regs_r); + DECLARE_WRITE16_MEMBER(toaplan1_scroll_regs_w); }; /*----------- defined in machine/toaplan1.c -----------*/ INTERRUPT_GEN( toaplan1_interrupt ); -WRITE16_HANDLER( toaplan1_intenable_w ); -READ16_HANDLER ( toaplan1_shared_r ); -WRITE16_HANDLER( toaplan1_shared_w ); -WRITE16_HANDLER( toaplan1_reset_sound ); -WRITE16_HANDLER( demonwld_dsp_addrsel_w ); -READ16_HANDLER ( demonwld_dsp_r ); -WRITE16_HANDLER( demonwld_dsp_w ); -WRITE16_HANDLER( demonwld_dsp_bio_w ); -WRITE16_HANDLER( demonwld_dsp_ctrl_w ); -READ16_HANDLER ( demonwld_BIO_r ); -READ16_HANDLER ( samesame_port_6_word_r ); -READ16_HANDLER ( vimana_system_port_r ); -READ16_HANDLER ( vimana_mcu_r ); -WRITE16_HANDLER( vimana_mcu_w ); - -WRITE8_HANDLER( rallybik_coin_w ); -WRITE8_HANDLER( toaplan1_coin_w ); -WRITE16_HANDLER( samesame_coin_w ); + MACHINE_RESET( toaplan1 ); MACHINE_RESET( demonwld ); @@ -121,31 +144,8 @@ void vimana_driver_savestate(running_machine &machine); /*----------- defined in video/toaplan1.c -----------*/ -READ16_HANDLER ( toaplan1_frame_done_r ); -WRITE16_HANDLER( toaplan1_bcu_control_w ); -WRITE16_HANDLER( rallybik_bcu_flipscreen_w ); -WRITE16_HANDLER( toaplan1_bcu_flipscreen_w ); -WRITE16_HANDLER( toaplan1_fcu_flipscreen_w ); - -READ16_HANDLER ( rallybik_tileram16_r ); -READ16_HANDLER ( toaplan1_tileram16_r ); -WRITE16_HANDLER( toaplan1_tileram16_w ); -READ16_HANDLER ( toaplan1_spriteram16_r ); -WRITE16_HANDLER( toaplan1_spriteram16_w ); -READ16_HANDLER ( toaplan1_spritesizeram16_r ); -WRITE16_HANDLER( toaplan1_spritesizeram16_w ); -READ16_HANDLER ( toaplan1_colorram1_r ); -WRITE16_HANDLER( toaplan1_colorram1_w ); -READ16_HANDLER ( toaplan1_colorram2_r ); -WRITE16_HANDLER( toaplan1_colorram2_w ); - -READ16_HANDLER ( toaplan1_scroll_regs_r ); -WRITE16_HANDLER( toaplan1_scroll_regs_w ); -WRITE16_HANDLER( toaplan1_tile_offsets_w ); -READ16_HANDLER ( toaplan1_tileram_offs_r ); -WRITE16_HANDLER( toaplan1_tileram_offs_w ); -READ16_HANDLER ( toaplan1_spriteram_offs_r ); -WRITE16_HANDLER( toaplan1_spriteram_offs_w ); + + SCREEN_VBLANK( rallybik ); SCREEN_VBLANK( toaplan1 ); diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index 97f23719966..9a210ec262f 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -89,6 +89,13 @@ public: DECLARE_WRITE8_MEMBER(batrider_clear_nmi_w); DECLARE_READ16_MEMBER(bbakraid_eeprom_r); DECLARE_WRITE16_MEMBER(bbakraid_eeprom_w); + DECLARE_WRITE16_MEMBER(toaplan2_txvideoram16_w); + DECLARE_WRITE16_MEMBER(toaplan2_txvideoram16_offs_w); + DECLARE_WRITE16_MEMBER(toaplan2_txscrollram16_w); + DECLARE_WRITE16_MEMBER(toaplan2_tx_gfxram16_w); + DECLARE_WRITE16_MEMBER(batrider_textdata_dma_w); + DECLARE_WRITE16_MEMBER(batrider_unknown_dma_w); + DECLARE_WRITE16_MEMBER(batrider_objectbank_w); }; /*----------- defined in video/toaplan2.c -----------*/ @@ -109,11 +116,4 @@ SCREEN_UPDATE_IND16( batsugun ); SCREEN_VBLANK( toaplan2 ); /* non-vdp text layer */ -WRITE16_HANDLER( toaplan2_txvideoram16_w ); -WRITE16_HANDLER( toaplan2_txvideoram16_offs_w ); -WRITE16_HANDLER( toaplan2_txscrollram16_w ); -WRITE16_HANDLER( toaplan2_tx_gfxram16_w ); - -WRITE16_HANDLER( batrider_textdata_dma_w ); -WRITE16_HANDLER( batrider_unknown_dma_w ); -WRITE16_HANDLER( batrider_objectbank_w ); + diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index aabc2021016..07afd6d4c54 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -20,6 +20,10 @@ public: DECLARE_WRITE16_MEMBER(tokib_soundcommand16_w); DECLARE_READ16_MEMBER(pip16_r); DECLARE_WRITE8_MEMBER(toki_adpcm_data_w); + DECLARE_WRITE16_MEMBER(toki_control_w); + DECLARE_WRITE16_MEMBER(toki_foreground_videoram16_w); + DECLARE_WRITE16_MEMBER(toki_background1_videoram16_w); + DECLARE_WRITE16_MEMBER(toki_background2_videoram16_w); }; @@ -28,7 +32,3 @@ public: VIDEO_START( toki ); SCREEN_UPDATE_IND16( toki ); SCREEN_UPDATE_IND16( tokib ); -WRITE16_HANDLER( toki_background1_videoram16_w ); -WRITE16_HANDLER( toki_background2_videoram16_w ); -WRITE16_HANDLER( toki_control_w ); -WRITE16_HANDLER( toki_foreground_videoram16_w ); diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h index 9f3c85e7f63..f8eb316f153 100644 --- a/src/mame/includes/toypop.h +++ b/src/mame/includes/toypop.h @@ -28,16 +28,16 @@ public: DECLARE_WRITE8_MEMBER(toypop_m68000_assert_w); DECLARE_WRITE16_MEMBER(toypop_m68000_interrupt_enable_w); DECLARE_WRITE16_MEMBER(toypop_m68000_interrupt_disable_w); + DECLARE_WRITE8_MEMBER(toypop_videoram_w); + DECLARE_WRITE8_MEMBER(toypop_palettebank_w); + DECLARE_WRITE16_MEMBER(toypop_flipscreen_w); + DECLARE_READ16_MEMBER(toypop_merged_background_r); + DECLARE_WRITE16_MEMBER(toypop_merged_background_w); }; /*----------- defined in video/toypop.c -----------*/ -WRITE8_HANDLER( toypop_videoram_w ); -READ16_HANDLER( toypop_merged_background_r ); -WRITE16_HANDLER( toypop_merged_background_w ); -WRITE8_HANDLER( toypop_palettebank_w ); -WRITE16_HANDLER( toypop_flipscreen_w ); VIDEO_START( toypop ); SCREEN_UPDATE_IND16( toypop ); PALETTE_INIT( toypop ); diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h index a2c7ec14882..f4fc3f10277 100644 --- a/src/mame/includes/tp84.h +++ b/src/mame/includes/tp84.h @@ -23,13 +23,13 @@ public: DECLARE_WRITE8_MEMBER(tp84_filter_w); DECLARE_WRITE8_MEMBER(tp84_sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(sub_irq_mask_w); + DECLARE_WRITE8_MEMBER(tp84_spriteram_w); + DECLARE_READ8_MEMBER(tp84_scanline_r); }; /*----------- defined in video/tp84.c -----------*/ -WRITE8_HANDLER( tp84_spriteram_w ); -READ8_HANDLER( tp84_scanline_r ); PALETTE_INIT( tp84 ); VIDEO_START( tp84 ); diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index f9b0afc5c12..cc3bd1c0a9c 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -34,15 +34,15 @@ public: DECLARE_WRITE8_MEMBER(questions_bank_w); DECLARE_WRITE8_MEMBER(irq_mask_w); DECLARE_WRITE8_MEMBER(yieartf_nmi_mask_w); + DECLARE_WRITE8_MEMBER(trackfld_videoram_w); + DECLARE_WRITE8_MEMBER(trackfld_colorram_w); + DECLARE_WRITE8_MEMBER(trackfld_flipscreen_w); + DECLARE_WRITE8_MEMBER(atlantol_gfxbank_w); }; /*----------- defined in video/trackfld.c -----------*/ -WRITE8_HANDLER( trackfld_videoram_w ); -WRITE8_HANDLER( trackfld_colorram_w ); -WRITE8_HANDLER( trackfld_flipscreen_w ); -WRITE8_HANDLER( atlantol_gfxbank_w ); PALETTE_INIT( trackfld ); VIDEO_START( trackfld ); diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h index 58ad881bbaa..47ddd8e9f6a 100644 --- a/src/mame/includes/travrusa.h +++ b/src/mame/includes/travrusa.h @@ -12,14 +12,14 @@ public: /* video-related */ tilemap_t* m_bg_tilemap; int m_scrollx[2]; + DECLARE_WRITE8_MEMBER(travrusa_videoram_w); + DECLARE_WRITE8_MEMBER(travrusa_scroll_x_low_w); + DECLARE_WRITE8_MEMBER(travrusa_scroll_x_high_w); + DECLARE_WRITE8_MEMBER(travrusa_flipscreen_w); }; /*----------- defined in video/travrusa.c -----------*/ -WRITE8_HANDLER( travrusa_videoram_w ); -WRITE8_HANDLER( travrusa_scroll_x_low_w ); -WRITE8_HANDLER( travrusa_scroll_x_high_w ); -WRITE8_HANDLER( travrusa_flipscreen_w ); PALETTE_INIT( travrusa ); PALETTE_INIT( shtrider ); diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h index 682bdd2046a..f159bed1b17 100644 --- a/src/mame/includes/trucocl.h +++ b/src/mame/includes/trucocl.h @@ -12,13 +12,13 @@ public: UINT8 m_irq_mask; DECLARE_WRITE8_MEMBER(irq_enable_w); + DECLARE_WRITE8_MEMBER(trucocl_videoram_w); + DECLARE_WRITE8_MEMBER(trucocl_colorram_w); }; /*----------- defined in video/trucocl.c -----------*/ -WRITE8_HANDLER( trucocl_videoram_w ); -WRITE8_HANDLER( trucocl_colorram_w ); PALETTE_INIT( trucocl ); VIDEO_START( trucocl ); SCREEN_UPDATE_IND16( trucocl ); diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h index 67fbbb5a0c5..ce24ab840d1 100644 --- a/src/mame/includes/tryout.h +++ b/src/mame/includes/tryout.h @@ -17,16 +17,16 @@ public: DECLARE_WRITE8_MEMBER(tryout_sound_w); DECLARE_WRITE8_MEMBER(tryout_sound_irq_ack_w); DECLARE_WRITE8_MEMBER(tryout_bankswitch_w); + DECLARE_READ8_MEMBER(tryout_vram_r); + DECLARE_WRITE8_MEMBER(tryout_videoram_w); + DECLARE_WRITE8_MEMBER(tryout_vram_w); + DECLARE_WRITE8_MEMBER(tryout_vram_bankswitch_w); + DECLARE_WRITE8_MEMBER(tryout_flipscreen_w); }; /*----------- defined in video/tryout.c -----------*/ -READ8_HANDLER( tryout_vram_r ); -WRITE8_HANDLER( tryout_videoram_w ); -WRITE8_HANDLER( tryout_vram_w ); -WRITE8_HANDLER( tryout_vram_bankswitch_w ); -WRITE8_HANDLER( tryout_flipscreen_w ); PALETTE_INIT( tryout ); VIDEO_START( tryout ); diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h index 3c0b67ae680..3d4e75d9f91 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -39,22 +39,22 @@ public: DECLARE_READ8_MEMBER(vsgongf_a006_r); DECLARE_READ8_MEMBER(vsgongf_a100_r); DECLARE_WRITE8_MEMBER(vsgongf_sound_command_w); + DECLARE_WRITE8_MEMBER(tsamurai_scrolly_w); + DECLARE_WRITE8_MEMBER(tsamurai_scrollx_w); + DECLARE_WRITE8_MEMBER(tsamurai_bgcolor_w); + DECLARE_WRITE8_MEMBER(tsamurai_textbank1_w); + DECLARE_WRITE8_MEMBER(tsamurai_textbank2_w); + DECLARE_WRITE8_MEMBER(tsamurai_bg_videoram_w); + DECLARE_WRITE8_MEMBER(tsamurai_fg_videoram_w); + DECLARE_WRITE8_MEMBER(tsamurai_fg_colorram_w); + DECLARE_WRITE8_MEMBER(vsgongf_color_w); }; /*----------- defined in video/tsamurai.c -----------*/ -WRITE8_HANDLER( vsgongf_color_w ); -WRITE8_HANDLER( tsamurai_bgcolor_w ); -WRITE8_HANDLER( tsamurai_textbank1_w ); -WRITE8_HANDLER( tsamurai_textbank2_w ); -WRITE8_HANDLER( tsamurai_scrolly_w ); -WRITE8_HANDLER( tsamurai_scrollx_w ); -WRITE8_HANDLER( tsamurai_bg_videoram_w ); -WRITE8_HANDLER( tsamurai_fg_videoram_w ); -WRITE8_HANDLER( tsamurai_fg_colorram_w ); VIDEO_START( tsamurai ); SCREEN_UPDATE_IND16( tsamurai ); diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index 814e55ac03c..5171f95562c 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -48,6 +48,14 @@ public: DECLARE_READ8_MEMBER(rjammer_soundlatch_r); DECLARE_WRITE8_MEMBER(rjammer_voice_input_w); DECLARE_WRITE8_MEMBER(rjammer_voice_intensity_control_w); + DECLARE_WRITE8_MEMBER(tubep_textram_w); + DECLARE_WRITE8_MEMBER(tubep_background_romselect_w); + DECLARE_WRITE8_MEMBER(tubep_colorproms_A4_line_w); + DECLARE_WRITE8_MEMBER(tubep_background_a000_w); + DECLARE_WRITE8_MEMBER(tubep_background_c000_w); + DECLARE_WRITE8_MEMBER(tubep_sprite_control_w); + DECLARE_WRITE8_MEMBER(rjammer_background_LS377_w); + DECLARE_WRITE8_MEMBER(rjammer_background_page_w); }; @@ -62,14 +70,6 @@ VIDEO_START( tubep ); VIDEO_RESET( tubep ); -extern WRITE8_HANDLER( tubep_textram_w ); -extern WRITE8_HANDLER( rjammer_background_LS377_w ); -extern WRITE8_HANDLER( rjammer_background_page_w ); -extern WRITE8_HANDLER( tubep_colorproms_A4_line_w ); -extern WRITE8_HANDLER( tubep_background_romselect_w ); -extern WRITE8_HANDLER( tubep_background_a000_w ); -extern WRITE8_HANDLER( tubep_background_c000_w ); -extern WRITE8_HANDLER( tubep_sprite_control_w ); diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h index 04a845b154f..e7fa323eff3 100644 --- a/src/mame/includes/tumbleb.h +++ b/src/mame/includes/tumbleb.h @@ -48,22 +48,22 @@ public: DECLARE_READ8_MEMBER(prot_io_r); DECLARE_WRITE8_MEMBER(prot_io_w); DECLARE_READ16_MEMBER(bcstory_1a0_read); + DECLARE_WRITE16_MEMBER(bcstory_tilebank_w); + DECLARE_WRITE16_MEMBER(chokchok_tilebank_w); + DECLARE_WRITE16_MEMBER(wlstar_tilebank_w); + DECLARE_WRITE16_MEMBER(suprtrio_tilebank_w); + DECLARE_WRITE16_MEMBER(tumblepb_pf1_data_w); + DECLARE_WRITE16_MEMBER(tumblepb_pf2_data_w); + DECLARE_WRITE16_MEMBER(fncywld_pf1_data_w); + DECLARE_WRITE16_MEMBER(fncywld_pf2_data_w); + DECLARE_WRITE16_MEMBER(tumblepb_control_0_w); + DECLARE_WRITE16_MEMBER(pangpang_pf1_data_w); + DECLARE_WRITE16_MEMBER(pangpang_pf2_data_w); }; /*----------- defined in video/tumbleb.c -----------*/ -WRITE16_HANDLER( tumblepb_pf1_data_w ); -WRITE16_HANDLER( tumblepb_pf2_data_w ); -WRITE16_HANDLER( fncywld_pf1_data_w ); -WRITE16_HANDLER( fncywld_pf2_data_w ); -WRITE16_HANDLER( tumblepb_control_0_w ); -WRITE16_HANDLER( pangpang_pf1_data_w ); -WRITE16_HANDLER( pangpang_pf2_data_w ); -WRITE16_HANDLER( bcstory_tilebank_w ); -WRITE16_HANDLER( suprtrio_tilebank_w ); -WRITE16_HANDLER( chokchok_tilebank_w ); -WRITE16_HANDLER( wlstar_tilebank_w ); VIDEO_START( tumblepb ); VIDEO_START( fncywld ); diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index 715ae966c97..cbe6b8f0840 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -12,12 +12,12 @@ public: bitmap_ind16 m_tmpbitmap; DECLARE_WRITE8_MEMBER(tunhunt_control_w); DECLARE_READ8_MEMBER(tunhunt_button_r); + DECLARE_WRITE8_MEMBER(tunhunt_videoram_w); }; /*----------- defined in video/tunhunt.c -----------*/ -WRITE8_HANDLER( tunhunt_videoram_w ); PALETTE_INIT( tunhunt ); VIDEO_START( tunhunt ); diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index ec5dab7ee8d..080b7d854ca 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -88,6 +88,8 @@ public: DECLARE_READ8_MEMBER(buckrog_cpu2_command_r); DECLARE_READ8_MEMBER(buckrog_port_2_r); DECLARE_READ8_MEMBER(buckrog_port_3_r); + DECLARE_WRITE8_MEMBER(turbo_videoram_w); + DECLARE_WRITE8_MEMBER(buckrog_bitmap_w); }; @@ -122,5 +124,3 @@ PALETTE_INIT( buckrog ); VIDEO_START( buckrog ); SCREEN_UPDATE_IND16( buckrog ); -WRITE8_HANDLER( turbo_videoram_w ); -WRITE8_HANDLER( buckrog_bitmap_w ); diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h index 311e9ba35df..c432e659b71 100644 --- a/src/mame/includes/tutankhm.h +++ b/src/mame/includes/tutankhm.h @@ -24,12 +24,12 @@ public: DECLARE_WRITE8_MEMBER(tutankhm_bankselect_w); DECLARE_WRITE8_MEMBER(sound_mute_w); DECLARE_WRITE8_MEMBER(tutankhm_coin_counter_w); + DECLARE_WRITE8_MEMBER(tutankhm_flip_screen_x_w); + DECLARE_WRITE8_MEMBER(tutankhm_flip_screen_y_w); }; /*----------- defined in video/tutankhm.c -----------*/ -WRITE8_HANDLER( tutankhm_flip_screen_x_w ); -WRITE8_HANDLER( tutankhm_flip_screen_y_w ); SCREEN_UPDATE_RGB32( tutankhm ); diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index 075cd18707a..c6e93f22b67 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -41,6 +41,11 @@ public: DECLARE_READ16_MEMBER(cuebrickj_nvram_r); DECLARE_WRITE16_MEMBER(cuebrickj_nvram_w); DECLARE_WRITE16_MEMBER(cuebrickj_nvram_bank_w); + DECLARE_WRITE16_MEMBER(twin16_text_ram_w); + DECLARE_WRITE16_MEMBER(twin16_paletteram_word_w); + DECLARE_WRITE16_MEMBER(fround_gfx_bank_w); + DECLARE_WRITE16_MEMBER(twin16_video_register_w); + DECLARE_READ16_MEMBER(twin16_sprite_status_r); }; @@ -51,11 +56,6 @@ int twin16_spriteram_process_enable( running_machine &machine ); /*----------- defined in video/twin16.c -----------*/ -WRITE16_HANDLER( twin16_text_ram_w ); -WRITE16_HANDLER( twin16_paletteram_word_w ); -WRITE16_HANDLER( fround_gfx_bank_w ); -WRITE16_HANDLER( twin16_video_register_w ); -READ16_HANDLER( twin16_sprite_status_r ); VIDEO_START( twin16 ); SCREEN_UPDATE_IND16( twin16 ); diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index d3286dd6e7d..c0dab619c13 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -51,6 +51,47 @@ public: tilemap_t *m_fg_tilemap; tilemap_t *m_tx_tilemap; required_device<buffered_spriteram16_device> m_spriteram; + DECLARE_WRITE16_MEMBER(twincobr_dsp_addrsel_w); + DECLARE_READ16_MEMBER(twincobr_dsp_r); + DECLARE_WRITE16_MEMBER(twincobr_dsp_w); + DECLARE_WRITE16_MEMBER(wardner_dsp_addrsel_w); + DECLARE_READ16_MEMBER(wardner_dsp_r); + DECLARE_WRITE16_MEMBER(wardner_dsp_w); + DECLARE_WRITE16_MEMBER(twincobr_dsp_bio_w); + DECLARE_READ16_MEMBER(fsharkbt_dsp_r); + DECLARE_WRITE16_MEMBER(fsharkbt_dsp_w); + DECLARE_READ16_MEMBER(twincobr_BIO_r); + DECLARE_WRITE16_MEMBER(twincobr_control_w); + DECLARE_WRITE8_MEMBER(wardner_control_w); + DECLARE_READ16_MEMBER(twincobr_sharedram_r); + DECLARE_WRITE16_MEMBER(twincobr_sharedram_w); + DECLARE_WRITE16_MEMBER(fshark_coin_dsp_w); + DECLARE_WRITE8_MEMBER(twincobr_coin_w); + DECLARE_WRITE8_MEMBER(wardner_coin_dsp_w); + DECLARE_WRITE16_MEMBER(twincobr_txoffs_w); + DECLARE_READ16_MEMBER(twincobr_txram_r); + DECLARE_WRITE16_MEMBER(twincobr_txram_w); + DECLARE_WRITE16_MEMBER(twincobr_bgoffs_w); + DECLARE_READ16_MEMBER(twincobr_bgram_r); + DECLARE_WRITE16_MEMBER(twincobr_bgram_w); + DECLARE_WRITE16_MEMBER(twincobr_fgoffs_w); + DECLARE_READ16_MEMBER(twincobr_fgram_r); + DECLARE_WRITE16_MEMBER(twincobr_fgram_w); + DECLARE_WRITE16_MEMBER(twincobr_txscroll_w); + DECLARE_WRITE16_MEMBER(twincobr_bgscroll_w); + DECLARE_WRITE16_MEMBER(twincobr_fgscroll_w); + DECLARE_WRITE16_MEMBER(twincobr_exscroll_w); + DECLARE_WRITE8_MEMBER(wardner_txlayer_w); + DECLARE_WRITE8_MEMBER(wardner_bglayer_w); + DECLARE_WRITE8_MEMBER(wardner_fglayer_w); + DECLARE_WRITE8_MEMBER(wardner_txscroll_w); + DECLARE_WRITE8_MEMBER(wardner_bgscroll_w); + DECLARE_WRITE8_MEMBER(wardner_fgscroll_w); + DECLARE_WRITE8_MEMBER(wardner_exscroll_w); + DECLARE_READ8_MEMBER(wardner_videoram_r); + DECLARE_WRITE8_MEMBER(wardner_videoram_w); + DECLARE_READ8_MEMBER(wardner_sprite_r); + DECLARE_WRITE8_MEMBER(wardner_sprite_w); }; @@ -63,23 +104,6 @@ void wardner_restore_bank(running_machine &machine); INTERRUPT_GEN( twincobr_interrupt ); INTERRUPT_GEN( wardner_interrupt ); -WRITE16_HANDLER( twincobr_dsp_addrsel_w ); -READ16_HANDLER( twincobr_dsp_r ); -WRITE16_HANDLER( twincobr_dsp_w ); -WRITE16_HANDLER( twincobr_dsp_bio_w ); -READ16_HANDLER ( twincobr_BIO_r ); -WRITE16_HANDLER( twincobr_control_w ); -READ16_HANDLER( twincobr_sharedram_r ); -WRITE16_HANDLER( twincobr_sharedram_w ); -WRITE8_HANDLER( twincobr_coin_w ); -READ16_HANDLER( fsharkbt_dsp_r ); -WRITE16_HANDLER( fsharkbt_dsp_w ); -WRITE16_HANDLER( fshark_coin_dsp_w ); -WRITE16_HANDLER( wardner_dsp_addrsel_w ); -READ16_HANDLER( wardner_dsp_r ); -WRITE16_HANDLER( wardner_dsp_w ); -WRITE8_HANDLER( wardner_control_w ); -WRITE8_HANDLER( wardner_coin_dsp_w ); MACHINE_RESET( twincobr ); MACHINE_RESET( fsharkbt ); @@ -97,30 +121,6 @@ extern const mc6845_interface twincobr_mc6845_intf; extern void twincobr_flipscreen(running_machine &machine, int flip); extern void twincobr_display(running_machine &machine, int enable); -READ16_HANDLER( twincobr_txram_r ); -READ16_HANDLER( twincobr_bgram_r ); -READ16_HANDLER( twincobr_fgram_r ); -WRITE16_HANDLER( twincobr_txram_w ); -WRITE16_HANDLER( twincobr_bgram_w ); -WRITE16_HANDLER( twincobr_fgram_w ); -WRITE16_HANDLER( twincobr_txscroll_w ); -WRITE16_HANDLER( twincobr_bgscroll_w ); -WRITE16_HANDLER( twincobr_fgscroll_w ); -WRITE16_HANDLER( twincobr_exscroll_w ); -WRITE16_HANDLER( twincobr_txoffs_w ); -WRITE16_HANDLER( twincobr_bgoffs_w ); -WRITE16_HANDLER( twincobr_fgoffs_w ); -WRITE8_HANDLER( wardner_videoram_w ); -READ8_HANDLER( wardner_videoram_r ); -WRITE8_HANDLER( wardner_bglayer_w ); -WRITE8_HANDLER( wardner_fglayer_w ); -WRITE8_HANDLER( wardner_txlayer_w ); -WRITE8_HANDLER( wardner_bgscroll_w ); -WRITE8_HANDLER( wardner_fgscroll_w ); -WRITE8_HANDLER( wardner_txscroll_w ); -WRITE8_HANDLER( wardner_exscroll_w ); -READ8_HANDLER( wardner_sprite_r ); -WRITE8_HANDLER( wardner_sprite_w ); VIDEO_START( toaplan0 ); diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h index 12bc99d93e7..ea0cd59aa4b 100644 --- a/src/mame/includes/tx1.h +++ b/src/mame/includes/tx1.h @@ -120,23 +120,33 @@ public: UINT8 *m_obj_bmp; UINT8 *m_rod_bmp; bitmap_ind16 *m_bitmap; + DECLARE_READ16_MEMBER(tx1_math_r); + DECLARE_WRITE16_MEMBER(tx1_math_w); + DECLARE_READ16_MEMBER(tx1_spcs_rom_r); + DECLARE_READ16_MEMBER(tx1_spcs_ram_r); + DECLARE_WRITE16_MEMBER(tx1_spcs_ram_w); + DECLARE_READ16_MEMBER(buggyboy_math_r); + DECLARE_WRITE16_MEMBER(buggyboy_math_w); + DECLARE_READ16_MEMBER(buggyboy_spcs_rom_r); + DECLARE_WRITE16_MEMBER(buggyboy_spcs_ram_w); + DECLARE_READ16_MEMBER(buggyboy_spcs_ram_r); + DECLARE_READ16_MEMBER(tx1_crtc_r); + DECLARE_WRITE16_MEMBER(tx1_crtc_w); + DECLARE_WRITE16_MEMBER(tx1_bankcs_w); + DECLARE_WRITE16_MEMBER(tx1_slincs_w); + DECLARE_WRITE16_MEMBER(tx1_slock_w); + DECLARE_WRITE16_MEMBER(tx1_scolst_w); + DECLARE_WRITE16_MEMBER(tx1_flgcs_w); + DECLARE_WRITE16_MEMBER(buggyboy_gas_w); + DECLARE_WRITE16_MEMBER(buggyboy_sky_w); + DECLARE_WRITE16_MEMBER(buggyboy_scolst_w); }; /*----------- defined in machine/tx1.c -----------*/ -READ16_HANDLER( tx1_spcs_rom_r ); -READ16_HANDLER( tx1_spcs_ram_r ); -WRITE16_HANDLER( tx1_spcs_ram_w ); -READ16_HANDLER( tx1_math_r ); -WRITE16_HANDLER( tx1_math_w ); MACHINE_RESET( tx1 ); -READ16_HANDLER( buggyboy_spcs_rom_r ); -READ16_HANDLER( buggyboy_spcs_ram_r ); -WRITE16_HANDLER( buggyboy_spcs_ram_w ); -READ16_HANDLER( buggyboy_math_r ); -WRITE16_HANDLER( buggyboy_math_w ); MACHINE_RESET( buggyboy ); /*----------- defined in audio/tx1.c -----------*/ @@ -156,8 +166,6 @@ DECLARE_LEGACY_SOUND_DEVICE(TX1, tx1_sound); /*----------- defined in video/tx1.c -----------*/ -READ16_HANDLER( tx1_crtc_r ); -WRITE16_HANDLER( tx1_crtc_w ); PALETTE_INIT( tx1 ); VIDEO_START( tx1 ); @@ -165,11 +173,6 @@ SCREEN_UPDATE_IND16( tx1_left ); SCREEN_UPDATE_IND16( tx1_middle ); SCREEN_UPDATE_IND16( tx1_right ); SCREEN_VBLANK( tx1 ); -WRITE16_HANDLER( tx1_slincs_w ); -WRITE16_HANDLER( tx1_slock_w ); -WRITE16_HANDLER( tx1_scolst_w ); -WRITE16_HANDLER( tx1_bankcs_w ); -WRITE16_HANDLER( tx1_flgcs_w ); PALETTE_INIT( buggyboy ); VIDEO_START( buggyboy ); @@ -180,6 +183,3 @@ SCREEN_VBLANK( buggyboy ); VIDEO_START( buggybjr ); SCREEN_UPDATE_IND16( buggybjr ); -WRITE16_HANDLER( buggyboy_gas_w ); -WRITE16_HANDLER( buggyboy_sky_w ); -WRITE16_HANDLER( buggyboy_scolst_w ); diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h index 60d6df45d08..1c179b645c7 100644 --- a/src/mame/includes/ultraman.h +++ b/src/mame/includes/ultraman.h @@ -29,6 +29,7 @@ public: device_t *m_k051960; DECLARE_WRITE16_MEMBER(sound_cmd_w); DECLARE_WRITE16_MEMBER(sound_irq_trigger_w); + DECLARE_WRITE16_MEMBER(ultraman_gfxctrl_w); }; @@ -40,7 +41,6 @@ extern void ultraman_zoom_callback_0(running_machine &machine, int *code,int *co extern void ultraman_zoom_callback_1(running_machine &machine, int *code,int *color,int *flags); extern void ultraman_zoom_callback_2(running_machine &machine, int *code,int *color,int *flags); -WRITE16_HANDLER( ultraman_gfxctrl_w ); VIDEO_START( ultraman ); SCREEN_UPDATE_IND16( ultraman ); diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index 9c342f135b8..1536759e34a 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -27,6 +27,7 @@ public: DECLARE_WRITE8_MEMBER(ultratnk_led_1_w); DECLARE_WRITE8_MEMBER(ultratnk_led_2_w); DECLARE_WRITE8_MEMBER(ultratnk_lockout_w); + DECLARE_WRITE8_MEMBER(ultratnk_video_ram_w); }; @@ -37,4 +38,3 @@ VIDEO_START( ultratnk ); SCREEN_UPDATE_IND16( ultratnk ); SCREEN_VBLANK( ultratnk ); -WRITE8_HANDLER( ultratnk_video_ram_w ); diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index 3d2fbe6093c..28ea81cd6d8 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -24,16 +24,16 @@ public: DECLARE_READ32_MEMBER(zeropnt2_guny_1_msb_r); DECLARE_WRITE32_MEMBER(zeropnt2_sound_bank_w); DECLARE_WRITE32_MEMBER(zeropnt2_leds_w); + DECLARE_WRITE16_MEMBER(unico_palette_w); + DECLARE_WRITE32_MEMBER(unico_palette32_w); + DECLARE_WRITE16_MEMBER(unico_vram_w); + DECLARE_WRITE32_MEMBER(unico_vram32_w); }; /*----------- defined in video/unico.c -----------*/ -WRITE16_HANDLER( unico_vram_w ); -WRITE16_HANDLER( unico_palette_w ); -WRITE32_HANDLER( unico_vram32_w ); -WRITE32_HANDLER( unico_palette32_w ); VIDEO_START( unico ); SCREEN_UPDATE_IND16( unico ); diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h index 9468691e997..97093ed512e 100644 --- a/src/mame/includes/usgames.h +++ b/src/mame/includes/usgames.h @@ -10,13 +10,13 @@ public: DECLARE_WRITE8_MEMBER(usgames_rombank_w); DECLARE_WRITE8_MEMBER(lamps1_w); DECLARE_WRITE8_MEMBER(lamps2_w); + DECLARE_WRITE8_MEMBER(usgames_videoram_w); + DECLARE_WRITE8_MEMBER(usgames_charram_w); }; /*----------- defined in video/usgames.c -----------*/ -WRITE8_HANDLER( usgames_videoram_w ); -WRITE8_HANDLER( usgames_charram_w ); VIDEO_START( usgames ); PALETTE_INIT( usgames ); SCREEN_UPDATE_IND16( usgames ); diff --git a/src/mame/includes/vaportra.h b/src/mame/includes/vaportra.h index b7dc5627e4b..4cd2bd83279 100644 --- a/src/mame/includes/vaportra.h +++ b/src/mame/includes/vaportra.h @@ -31,14 +31,14 @@ public: DECLARE_WRITE16_MEMBER(vaportra_sound_w); DECLARE_READ16_MEMBER(vaportra_control_r); DECLARE_READ8_MEMBER(vaportra_soundlatch_r); + DECLARE_WRITE16_MEMBER(vaportra_priority_w); + DECLARE_WRITE16_MEMBER(vaportra_palette_24bit_rg_w); + DECLARE_WRITE16_MEMBER(vaportra_palette_24bit_b_w); }; /*----------- defined in video/vaportra.c -----------*/ -WRITE16_HANDLER( vaportra_priority_w ); -WRITE16_HANDLER( vaportra_palette_24bit_rg_w ); -WRITE16_HANDLER( vaportra_palette_24bit_b_w ); SCREEN_UPDATE_IND16( vaportra ); diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index 762974b6c5c..6c8b019ffb5 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -27,16 +27,16 @@ public: DECLARE_WRITE8_MEMBER(vastar_sharedram_w); DECLARE_WRITE8_MEMBER(flip_screen_w); DECLARE_WRITE8_MEMBER(nmi_mask_w); + DECLARE_WRITE8_MEMBER(vastar_fgvideoram_w); + DECLARE_WRITE8_MEMBER(vastar_bg1videoram_w); + DECLARE_WRITE8_MEMBER(vastar_bg2videoram_w); + DECLARE_READ8_MEMBER(vastar_bg1videoram_r); + DECLARE_READ8_MEMBER(vastar_bg2videoram_r); }; /*----------- defined in video/vastar.c -----------*/ -WRITE8_HANDLER( vastar_bg1videoram_w ); -WRITE8_HANDLER( vastar_bg2videoram_w ); -WRITE8_HANDLER( vastar_fgvideoram_w ); -READ8_HANDLER( vastar_bg1videoram_r ); -READ8_HANDLER( vastar_bg2videoram_r ); VIDEO_START( vastar ); SCREEN_UPDATE_IND16( vastar ); diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h index 2ab7b257442..f96434914d8 100644 --- a/src/mame/includes/vball.h +++ b/src/mame/includes/vball.h @@ -22,6 +22,9 @@ public: DECLARE_WRITE8_MEMBER(cpu_sound_command_w); DECLARE_WRITE8_MEMBER(vb_scrollx_hi_w); DECLARE_WRITE8_MEMBER(vb_scrollx_lo_w); + DECLARE_WRITE8_MEMBER(vb_videoram_w); + DECLARE_READ8_MEMBER(vb_attrib_r); + DECLARE_WRITE8_MEMBER(vb_attrib_w); }; @@ -31,6 +34,4 @@ VIDEO_START( vb ); SCREEN_UPDATE_IND16( vb ); void vb_bgprombank_w(running_machine &machine, int bank); void vb_spprombank_w(running_machine &machine, int bank); -WRITE8_HANDLER( vb_attrib_w ); -WRITE8_HANDLER( vb_videoram_w ); void vb_mark_all_dirty(running_machine &machine); diff --git a/src/mame/includes/vectrex.h b/src/mame/includes/vectrex.h index e40564276d4..18978bee8f5 100644 --- a/src/mame/includes/vectrex.h +++ b/src/mame/includes/vectrex.h @@ -61,6 +61,10 @@ public: attotime m_vector_start_time; UINT8 m_cb2; void (*vector_add_point_function) (running_machine &, int, int, rgb_t, int); + DECLARE_WRITE8_MEMBER(vectrex_psg_port_w); + DECLARE_READ8_MEMBER(vectrex_via_r); + DECLARE_WRITE8_MEMBER(vectrex_via_w); + DECLARE_WRITE8_MEMBER(raaspec_led_w); }; @@ -74,7 +78,6 @@ void vectrex_configuration(running_machine &machine); READ8_DEVICE_HANDLER (vectrex_via_pa_r); READ8_DEVICE_HANDLER(vectrex_via_pb_r ); void vectrex_via_irq (device_t *device, int level); -WRITE8_HANDLER ( vectrex_psg_port_w ); DRIVER_INIT( vectrex ); @@ -92,10 +95,7 @@ SCREEN_UPDATE_RGB32( vectrex ); VIDEO_START( raaspec ); -WRITE8_HANDLER ( raaspec_led_w ); -READ8_HANDLER ( vectrex_via_r ); -WRITE8_HANDLER ( vectrex_via_w ); void vectrex_add_point_stereo (running_machine &machine, int x, int y, rgb_t color, int intensity); void vectrex_add_point (running_machine &machine, int x, int y, rgb_t color, int intensity); diff --git a/src/mame/includes/vertigo.h b/src/mame/includes/vertigo.h index 2949e53e80b..b7202b21990 100644 --- a/src/mame/includes/vertigo.h +++ b/src/mame/includes/vertigo.h @@ -98,6 +98,13 @@ public: vector_generator m_vgen; UINT16 *m_vectorrom; microcode m_mc[MC_LENGTH]; + DECLARE_READ16_MEMBER(vertigo_io_convert); + DECLARE_READ16_MEMBER(vertigo_io_adc); + DECLARE_READ16_MEMBER(vertigo_coin_r); + DECLARE_WRITE16_MEMBER(vertigo_wsot_w); + DECLARE_WRITE16_MEMBER(vertigo_audio_w); + DECLARE_READ16_MEMBER(vertigo_sio_r); + DECLARE_WRITE16_MEMBER(vertigo_motor_w); }; @@ -107,13 +114,6 @@ void vertigo_update_irq(device_t *device); extern const struct pit8253_config vertigo_pit8254_config; -READ16_HANDLER( vertigo_io_convert ); -READ16_HANDLER( vertigo_io_adc ); -READ16_HANDLER( vertigo_coin_r ); -READ16_HANDLER( vertigo_sio_r ); -WRITE16_HANDLER( vertigo_audio_w ); -WRITE16_HANDLER( vertigo_motor_w ); -WRITE16_HANDLER( vertigo_wsot_w ); INTERRUPT_GEN( vertigo_interrupt ); MACHINE_START( vertigo ); diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index 8b8ec52dfae..d369a610080 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -63,6 +63,7 @@ public: DECLARE_WRITE8_MEMBER(nsub_io_w); DECLARE_READ8_MEMBER(invinco_io_r); DECLARE_WRITE8_MEMBER(invinco_io_w); + DECLARE_WRITE8_MEMBER(vicdual_palette_bank_w); }; @@ -73,7 +74,6 @@ int vicdual_is_cabinet_color(running_machine &machine); /*----------- defined in video/vicdual.c -----------*/ -WRITE8_HANDLER( vicdual_palette_bank_w ); SCREEN_UPDATE_RGB32( vicdual_bw ); SCREEN_UPDATE_RGB32( vicdual_color ); diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h index 066f0f3ccf4..0afb1ca61d3 100644 --- a/src/mame/includes/victory.h +++ b/src/mame/includes/victory.h @@ -55,6 +55,9 @@ public: UINT8 m_video_control; struct micro_t m_micro; DECLARE_WRITE8_MEMBER(lamp_control_w); + DECLARE_WRITE8_MEMBER(victory_paletteram_w); + DECLARE_READ8_MEMBER(victory_video_control_r); + DECLARE_WRITE8_MEMBER(victory_video_control_w); }; @@ -64,6 +67,3 @@ VIDEO_START( victory ); SCREEN_UPDATE_IND16( victory ); INTERRUPT_GEN( victory_vblank_interrupt ); -READ8_HANDLER( victory_video_control_r ); -WRITE8_HANDLER( victory_video_control_w ); -WRITE8_HANDLER( victory_paletteram_w ); diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index bb62e4f959d..ce830043b19 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -31,6 +31,8 @@ public: tilemap_t* m_bg_tilemap; DECLARE_READ8_MEMBER(videopin_misc_r); DECLARE_WRITE8_MEMBER(videopin_led_w); + DECLARE_WRITE8_MEMBER(videopin_ball_w); + DECLARE_WRITE8_MEMBER(videopin_video_ram_w); }; @@ -41,8 +43,6 @@ DISCRETE_SOUND_EXTERN( videopin ); /*----------- defined in video/videopin.c -----------*/ -WRITE8_HANDLER( videopin_video_ram_w ); -WRITE8_HANDLER( videopin_ball_w ); VIDEO_START( videopin ); SCREEN_UPDATE_IND16( videopin ); diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h index 1a368e0ad7a..187683f25d8 100644 --- a/src/mame/includes/vigilant.h +++ b/src/mame/includes/vigilant.h @@ -18,6 +18,10 @@ public: DECLARE_WRITE8_MEMBER(vigilant_bank_select_w); DECLARE_WRITE8_MEMBER(vigilant_out2_w); DECLARE_WRITE8_MEMBER(kikcubic_coin_w); + DECLARE_WRITE8_MEMBER(vigilant_paletteram_w); + DECLARE_WRITE8_MEMBER(vigilant_horiz_scroll_w); + DECLARE_WRITE8_MEMBER(vigilant_rear_horiz_scroll_w); + DECLARE_WRITE8_MEMBER(vigilant_rear_color_w); }; @@ -25,9 +29,5 @@ public: VIDEO_START( vigilant ); VIDEO_RESET( vigilant ); -WRITE8_HANDLER( vigilant_paletteram_w ); -WRITE8_HANDLER( vigilant_horiz_scroll_w ); -WRITE8_HANDLER( vigilant_rear_horiz_scroll_w ); -WRITE8_HANDLER( vigilant_rear_color_w ); SCREEN_UPDATE_IND16( vigilant ); SCREEN_UPDATE_IND16( kikcubic ); diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h index f01370a1c71..ee5a517c267 100644 --- a/src/mame/includes/volfied.h +++ b/src/mame/includes/volfied.h @@ -29,6 +29,17 @@ public: device_t *m_maincpu; device_t *m_audiocpu; device_t *m_pc090oj; + DECLARE_WRITE16_MEMBER(volfied_cchip_ctrl_w); + DECLARE_WRITE16_MEMBER(volfied_cchip_bank_w); + DECLARE_WRITE16_MEMBER(volfied_cchip_ram_w); + DECLARE_READ16_MEMBER(volfied_cchip_ctrl_r); + DECLARE_READ16_MEMBER(volfied_cchip_ram_r); + DECLARE_READ16_MEMBER(volfied_video_ram_r); + DECLARE_WRITE16_MEMBER(volfied_video_ram_w); + DECLARE_WRITE16_MEMBER(volfied_video_ctrl_w); + DECLARE_READ16_MEMBER(volfied_video_ctrl_r); + DECLARE_WRITE16_MEMBER(volfied_video_mask_w); + DECLARE_WRITE16_MEMBER(volfied_sprite_ctrl_w); }; @@ -37,22 +48,11 @@ public: void volfied_cchip_init(running_machine &machine); void volfied_cchip_reset(running_machine &machine); -READ16_HANDLER( volfied_cchip_ctrl_r ); -READ16_HANDLER( volfied_cchip_ram_r ); -WRITE16_HANDLER( volfied_cchip_ctrl_w ); -WRITE16_HANDLER( volfied_cchip_bank_w ); -WRITE16_HANDLER( volfied_cchip_ram_w ); /*----------- defined in video/volfied.c -----------*/ -WRITE16_HANDLER( volfied_sprite_ctrl_w ); -WRITE16_HANDLER( volfied_video_ram_w ); -WRITE16_HANDLER( volfied_video_ctrl_w ); -WRITE16_HANDLER( volfied_video_mask_w ); -READ16_HANDLER( volfied_video_ram_r ); -READ16_HANDLER( volfied_video_ctrl_r ); SCREEN_UPDATE_IND16( volfied ); VIDEO_START( volfied ); diff --git a/src/mame/includes/vsnes.h b/src/mame/includes/vsnes.h index e958a1b9e50..68171b7594b 100644 --- a/src/mame/includes/vsnes.h +++ b/src/mame/includes/vsnes.h @@ -40,6 +40,35 @@ public: DECLARE_WRITE8_MEMBER(vsnes_coin_counter_w); DECLARE_READ8_MEMBER(vsnes_coin_counter_r); DECLARE_WRITE8_MEMBER(vsnes_coin_counter_1_w); + DECLARE_WRITE8_MEMBER(vsnes_in0_w); + DECLARE_READ8_MEMBER(vsnes_in0_r); + DECLARE_READ8_MEMBER(vsnes_in1_r); + DECLARE_WRITE8_MEMBER(vsnes_in0_1_w); + DECLARE_READ8_MEMBER(vsnes_in0_1_r); + DECLARE_READ8_MEMBER(vsnes_in1_1_r); + DECLARE_READ8_MEMBER(gun_in0_r); + DECLARE_WRITE8_MEMBER(vsnes_nt0_w); + DECLARE_WRITE8_MEMBER(vsnes_nt1_w); + DECLARE_READ8_MEMBER(vsnes_nt0_r); + DECLARE_READ8_MEMBER(vsnes_nt1_r); + DECLARE_WRITE8_MEMBER(vsnormal_vrom_banking); + DECLARE_WRITE8_MEMBER(gun_in0_w); + DECLARE_WRITE8_MEMBER(vskonami_rom_banking); + DECLARE_WRITE8_MEMBER(vsgshoe_gun_in0_w); + DECLARE_WRITE8_MEMBER(drmario_rom_banking); + DECLARE_WRITE8_MEMBER(vsvram_rom_banking); + DECLARE_WRITE8_MEMBER(mapper4_w); + DECLARE_READ8_MEMBER(rbi_hack_r); + DECLARE_READ8_MEMBER(supxevs_read_prot_1_r); + DECLARE_READ8_MEMBER(supxevs_read_prot_2_r); + DECLARE_READ8_MEMBER(supxevs_read_prot_3_r); + DECLARE_READ8_MEMBER(supxevs_read_prot_4_r); + DECLARE_READ8_MEMBER(tko_security_r); + DECLARE_WRITE8_MEMBER(mapper68_rom_banking); + DECLARE_WRITE8_MEMBER(set_bnglngby_irq_w); + DECLARE_READ8_MEMBER(set_bnglngby_irq_r); + DECLARE_WRITE8_MEMBER(vsdual_vrom_banking); + void v_set_mirroring(int ppu, int mirroring); }; @@ -78,9 +107,3 @@ DRIVER_INIT( vsgshoe ); DRIVER_INIT( vsfdf ); DRIVER_INIT( vsdual ); -READ8_HANDLER( vsnes_in0_r ); -READ8_HANDLER( vsnes_in1_r ); -READ8_HANDLER( vsnes_in0_1_r ); -READ8_HANDLER( vsnes_in1_1_r ); -WRITE8_HANDLER( vsnes_in0_w ); -WRITE8_HANDLER( vsnes_in0_1_w ); diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h index d6e9e4006a7..a452a68759d 100644 --- a/src/mame/includes/vulgus.h +++ b/src/mame/includes/vulgus.h @@ -13,15 +13,15 @@ public: tilemap_t *m_bg_tilemap; UINT8 *m_spriteram; size_t m_spriteram_size; + DECLARE_WRITE8_MEMBER(vulgus_fgvideoram_w); + DECLARE_WRITE8_MEMBER(vulgus_bgvideoram_w); + DECLARE_WRITE8_MEMBER(vulgus_c804_w); + DECLARE_WRITE8_MEMBER(vulgus_palette_bank_w); }; /*----------- defined in video/vulgus.c -----------*/ -WRITE8_HANDLER( vulgus_fgvideoram_w ); -WRITE8_HANDLER( vulgus_bgvideoram_w ); -WRITE8_HANDLER( vulgus_c804_w ); -WRITE8_HANDLER( vulgus_palette_bank_w ); VIDEO_START( vulgus ); PALETTE_INIT( vulgus ); diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h index 7866167c27a..33184cff325 100644 --- a/src/mame/includes/warpwarp.h +++ b/src/mame/includes/warpwarp.h @@ -23,6 +23,8 @@ public: DECLARE_READ8_MEMBER(warpwarp_sw_r); DECLARE_WRITE8_MEMBER(warpwarp_out0_w); DECLARE_WRITE8_MEMBER(warpwarp_out3_w); + DECLARE_WRITE8_MEMBER(geebee_videoram_w); + DECLARE_WRITE8_MEMBER(warpwarp_videoram_w); }; @@ -35,8 +37,6 @@ VIDEO_START( geebee ); VIDEO_START( navarone ); VIDEO_START( warpwarp ); SCREEN_UPDATE_IND16( geebee ); -WRITE8_HANDLER( warpwarp_videoram_w ); -WRITE8_HANDLER( geebee_videoram_w ); /*----------- defined in audio/geebee.c -----------*/ diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h index e93ec322921..280f8a1417b 100644 --- a/src/mame/includes/wc90.h +++ b/src/mame/includes/wc90.h @@ -27,6 +27,9 @@ public: DECLARE_WRITE8_MEMBER(wc90_bankswitch_w); DECLARE_WRITE8_MEMBER(wc90_bankswitch1_w); DECLARE_WRITE8_MEMBER(wc90_sound_command_w); + DECLARE_WRITE8_MEMBER(wc90_bgvideoram_w); + DECLARE_WRITE8_MEMBER(wc90_fgvideoram_w); + DECLARE_WRITE8_MEMBER(wc90_txvideoram_w); }; @@ -34,7 +37,4 @@ public: VIDEO_START( wc90 ); VIDEO_START( wc90t ); -WRITE8_HANDLER( wc90_fgvideoram_w ); -WRITE8_HANDLER( wc90_bgvideoram_w ); -WRITE8_HANDLER( wc90_txvideoram_w ); SCREEN_UPDATE_IND16( wc90 ); diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h index 2c28c9a1311..74863e2485c 100644 --- a/src/mame/includes/wc90b.h +++ b/src/mame/includes/wc90b.h @@ -23,6 +23,9 @@ public: DECLARE_WRITE8_MEMBER(wc90b_bankswitch1_w); DECLARE_WRITE8_MEMBER(wc90b_sound_command_w); DECLARE_WRITE8_MEMBER(adpcm_data_w); + DECLARE_WRITE8_MEMBER(wc90b_bgvideoram_w); + DECLARE_WRITE8_MEMBER(wc90b_fgvideoram_w); + DECLARE_WRITE8_MEMBER(wc90b_txvideoram_w); }; @@ -31,6 +34,3 @@ public: VIDEO_START( wc90b ); SCREEN_UPDATE_IND16( wc90b ); -WRITE8_HANDLER( wc90b_bgvideoram_w ); -WRITE8_HANDLER( wc90b_fgvideoram_w ); -WRITE8_HANDLER( wc90b_txvideoram_w ); diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index 98efc797826..ec1fbb142c1 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -48,16 +48,16 @@ public: DECLARE_WRITE16_MEMBER(hotchase_soundlatch_w); DECLARE_WRITE8_MEMBER(hotchase_sound_control_w); DECLARE_WRITE16_MEMBER(wecleman_soundlatch_w); + DECLARE_WRITE16_MEMBER(wecleman_txtram_w); + DECLARE_WRITE16_MEMBER(wecleman_pageram_w); + DECLARE_WRITE16_MEMBER(wecleman_videostatus_w); + DECLARE_WRITE16_MEMBER(hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w); + DECLARE_WRITE16_MEMBER(wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w); }; /*----------- defined in video/wecleman.c -----------*/ -WRITE16_HANDLER( hotchase_paletteram16_SBGRBBBBGGGGRRRR_word_w ); -WRITE16_HANDLER( wecleman_paletteram16_SSSSBBBBGGGGRRRR_word_w ); -WRITE16_HANDLER( wecleman_videostatus_w ); -WRITE16_HANDLER( wecleman_pageram_w ); -WRITE16_HANDLER( wecleman_txtram_w ); SCREEN_UPDATE_RGB32( wecleman ); VIDEO_START( wecleman ); SCREEN_UPDATE_IND16( hotchase ); diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h index 929fd38d9aa..5a74642e938 100644 --- a/src/mame/includes/welltris.h +++ b/src/mame/includes/welltris.h @@ -20,17 +20,18 @@ public: DECLARE_WRITE8_MEMBER(welltris_sh_bankswitch_w); DECLARE_WRITE16_MEMBER(sound_command_w); DECLARE_WRITE8_MEMBER(pending_command_clear_w); + DECLARE_READ16_MEMBER(welltris_spriteram_r); + DECLARE_WRITE16_MEMBER(welltris_spriteram_w); + DECLARE_WRITE16_MEMBER(welltris_palette_bank_w); + DECLARE_WRITE16_MEMBER(welltris_gfxbank_w); + DECLARE_WRITE16_MEMBER(welltris_scrollreg_w); + DECLARE_WRITE16_MEMBER(welltris_charvideoram_w); + void setbank(int num, int bank); }; /*----------- defined in video/welltris.c -----------*/ -//READ16_HANDLER( welltris_spriteram_r ); -WRITE16_HANDLER( welltris_spriteram_w ); -WRITE16_HANDLER( welltris_palette_bank_w ); -WRITE16_HANDLER( welltris_gfxbank_w ); -WRITE16_HANDLER( welltris_charvideoram_w ); -WRITE16_HANDLER( welltris_scrollreg_w ); VIDEO_START( welltris ); SCREEN_UPDATE_IND16( welltris ); diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index 78d7c1e7b4f..3a8d47cbf1e 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -53,16 +53,16 @@ public: DECLARE_WRITE8_MEMBER(sound_bankswitch_w); DECLARE_WRITE16_MEMBER(wgp_sound_w); DECLARE_READ16_MEMBER(wgp_sound_r); + DECLARE_READ16_MEMBER(wgp_pivram_word_r); + DECLARE_WRITE16_MEMBER(wgp_pivram_word_w); + DECLARE_READ16_MEMBER(wgp_piv_ctrl_word_r); + DECLARE_WRITE16_MEMBER(wgp_piv_ctrl_word_w); }; /*----------- defined in video/wgp.c -----------*/ -READ16_HANDLER ( wgp_pivram_word_r ); -WRITE16_HANDLER( wgp_pivram_word_w ); -READ16_HANDLER ( wgp_piv_ctrl_word_r ); -WRITE16_HANDLER( wgp_piv_ctrl_word_w ); VIDEO_START( wgp ); VIDEO_START( wgp2 ); diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index 3d26a5fd705..c2f5ce90595 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -40,6 +40,31 @@ public: tilemap_t *m_bg_tilemap; UINT16 m_tilemap_xscroll; UINT8 m_williams2_fg_color; + DECLARE_WRITE8_MEMBER(williams_vram_select_w); + DECLARE_WRITE8_MEMBER(williams2_bank_select_w); + DECLARE_WRITE8_MEMBER(williams_cmos_w); + DECLARE_WRITE8_MEMBER(bubbles_cmos_w); + DECLARE_WRITE8_MEMBER(williams_watchdog_reset_w); + DECLARE_WRITE8_MEMBER(williams2_watchdog_reset_w); + DECLARE_WRITE8_MEMBER(williams2_7segment_w); + DECLARE_WRITE8_MEMBER(defender_video_control_w); + DECLARE_WRITE8_MEMBER(defender_bank_select_w); + DECLARE_READ8_MEMBER(mayday_protection_r); + DECLARE_WRITE8_MEMBER(sinistar_vram_select_w); + DECLARE_WRITE8_MEMBER(blaster_vram_select_w); + DECLARE_WRITE8_MEMBER(blaster_bank_select_w); + DECLARE_WRITE8_MEMBER(williams2_paletteram_w); + DECLARE_WRITE8_MEMBER(williams2_fg_select_w); + DECLARE_READ8_MEMBER(williams_video_counter_r); + DECLARE_READ8_MEMBER(williams2_video_counter_r); + DECLARE_WRITE8_MEMBER(williams2_bg_select_w); + DECLARE_WRITE8_MEMBER(williams2_tileram_w); + DECLARE_WRITE8_MEMBER(williams2_xscroll_low_w); + DECLARE_WRITE8_MEMBER(williams2_xscroll_high_w); + DECLARE_WRITE8_MEMBER(blaster_remap_select_w); + DECLARE_WRITE8_MEMBER(blaster_video_control_w); + DECLARE_WRITE8_MEMBER(williams_blitter_w); + DECLARE_WRITE8_MEMBER(williams2_blit_window_enable_w); }; @@ -98,25 +123,12 @@ MACHINE_START( joust2 ); MACHINE_RESET( joust2 ); /* banking */ -WRITE8_HANDLER( defender_bank_select_w ); -WRITE8_HANDLER( williams_vram_select_w ); -WRITE8_HANDLER( sinistar_vram_select_w ); -WRITE8_HANDLER( blaster_bank_select_w ); -WRITE8_HANDLER( blaster_vram_select_w ); -WRITE8_HANDLER( williams2_bank_select_w ); /* misc */ -WRITE8_HANDLER( williams_cmos_w ); -WRITE8_HANDLER( bubbles_cmos_w ); -WRITE8_HANDLER( williams_watchdog_reset_w ); -WRITE8_HANDLER( williams2_watchdog_reset_w ); -WRITE8_HANDLER( williams2_7segment_w ); CUSTOM_INPUT( williams_mux_r ); /* Mayday protection */ -READ8_HANDLER( mayday_protection_r ); -WRITE8_HANDLER( defender_video_control_w ); /*----------- defined in video/williams.c -----------*/ @@ -128,11 +140,6 @@ WRITE8_HANDLER( defender_video_control_w ); #define WILLIAMS_TILEMAP_TSHOOT 1 /* IC79 is a 74LS157 selector jumpered to be enabled */ #define WILLIAMS_TILEMAP_JOUST2 2 /* IC79 is a 74LS157 selector jumpered to be disabled */ -WRITE8_HANDLER( williams_blitter_w ); -WRITE8_HANDLER( blaster_remap_select_w ); -WRITE8_HANDLER( blaster_video_control_w ); -READ8_HANDLER( williams_video_counter_r ); -READ8_HANDLER( williams2_video_counter_r ); VIDEO_START( williams ); VIDEO_START( blaster ); @@ -143,10 +150,3 @@ SCREEN_UPDATE_RGB32( blaster ); SCREEN_UPDATE_RGB32( williams2 ); -WRITE8_HANDLER( williams2_tileram_w ); -WRITE8_HANDLER( williams2_paletteram_w ); -WRITE8_HANDLER( williams2_fg_select_w ); -WRITE8_HANDLER( williams2_bg_select_w ); -WRITE8_HANDLER( williams2_xscroll_low_w ); -WRITE8_HANDLER( williams2_xscroll_high_w ); -WRITE8_HANDLER( williams2_blit_window_enable_w ); diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h index fe41087b08c..24014d3ef7c 100644 --- a/src/mame/includes/wiping.h +++ b/src/mame/includes/wiping.h @@ -17,12 +17,12 @@ public: DECLARE_WRITE8_MEMBER(subcpu_reset_w); DECLARE_WRITE8_MEMBER(main_irq_mask_w); DECLARE_WRITE8_MEMBER(sound_irq_mask_w); + DECLARE_WRITE8_MEMBER(wiping_flipscreen_w); }; /*----------- defined in video/wiping.c -----------*/ -WRITE8_HANDLER( wiping_flipscreen_w ); PALETTE_INIT( wiping ); SCREEN_UPDATE_IND16( wiping ); diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h index 7ce6c8c3fb5..cf17ce1ce22 100644 --- a/src/mame/includes/wiz.h +++ b/src/mame/includes/wiz.h @@ -28,16 +28,16 @@ public: DECLARE_WRITE8_MEMBER(wiz_coin_counter_w); DECLARE_WRITE8_MEMBER(wiz_main_nmi_mask_w); DECLARE_WRITE8_MEMBER(wiz_sound_nmi_mask_w); + DECLARE_WRITE8_MEMBER(wiz_palettebank_w); + DECLARE_WRITE8_MEMBER(wiz_bgcolor_w); + DECLARE_WRITE8_MEMBER(wiz_char_bank_select_w); + DECLARE_WRITE8_MEMBER(wiz_flipx_w); + DECLARE_WRITE8_MEMBER(wiz_flipy_w); }; /*----------- defined in video/wiz.c -----------*/ -WRITE8_HANDLER( wiz_char_bank_select_w ); -WRITE8_HANDLER( wiz_palettebank_w ); -WRITE8_HANDLER( wiz_bgcolor_w ); -WRITE8_HANDLER( wiz_flipx_w ); -WRITE8_HANDLER( wiz_flipy_w ); VIDEO_START( wiz ); PALETTE_INIT( wiz ); diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h index a510b6cecc2..df9865350ca 100644 --- a/src/mame/includes/wolfpack.h +++ b/src/mame/includes/wolfpack.h @@ -35,6 +35,18 @@ public: DECLARE_WRITE8_MEMBER(wolfpack_attract_w); DECLARE_WRITE8_MEMBER(wolfpack_credit_w); DECLARE_WRITE8_MEMBER(wolfpack_coldetres_w); + DECLARE_WRITE8_MEMBER(wolfpack_ship_size_w); + DECLARE_WRITE8_MEMBER(wolfpack_video_invert_w); + DECLARE_WRITE8_MEMBER(wolfpack_ship_reflect_w); + DECLARE_WRITE8_MEMBER(wolfpack_pt_pos_select_w); + DECLARE_WRITE8_MEMBER(wolfpack_pt_horz_w); + DECLARE_WRITE8_MEMBER(wolfpack_pt_pic_w); + DECLARE_WRITE8_MEMBER(wolfpack_ship_h_w); + DECLARE_WRITE8_MEMBER(wolfpack_torpedo_pic_w); + DECLARE_WRITE8_MEMBER(wolfpack_ship_h_precess_w); + DECLARE_WRITE8_MEMBER(wolfpack_ship_pic_w); + DECLARE_WRITE8_MEMBER(wolfpack_torpedo_h_w); + DECLARE_WRITE8_MEMBER(wolfpack_torpedo_v_w); }; @@ -45,15 +57,3 @@ SCREEN_UPDATE_IND16( wolfpack ); VIDEO_START( wolfpack ); SCREEN_VBLANK( wolfpack ); -WRITE8_HANDLER( wolfpack_video_invert_w ); -WRITE8_HANDLER( wolfpack_ship_reflect_w ); -WRITE8_HANDLER( wolfpack_pt_pos_select_w ); -WRITE8_HANDLER( wolfpack_pt_horz_w ); -WRITE8_HANDLER( wolfpack_pt_pic_w ); -WRITE8_HANDLER( wolfpack_ship_h_w ); -WRITE8_HANDLER( wolfpack_torpedo_pic_w ); -WRITE8_HANDLER( wolfpack_ship_size_w ); -WRITE8_HANDLER( wolfpack_ship_h_precess_w ); -WRITE8_HANDLER( wolfpack_ship_pic_w ); -WRITE8_HANDLER( wolfpack_torpedo_h_w ); -WRITE8_HANDLER( wolfpack_torpedo_v_w ); diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h index 3eac64288fc..963ed676ceb 100644 --- a/src/mame/includes/wrally.h +++ b/src/mame/includes/wrally.h @@ -11,16 +11,16 @@ public: UINT16 *m_spriteram; DECLARE_READ8_MEMBER(dallas_share_r); DECLARE_WRITE8_MEMBER(dallas_share_w); + DECLARE_WRITE16_MEMBER(wrally_vram_w); + DECLARE_WRITE16_MEMBER(wrally_flipscreen_w); + DECLARE_WRITE16_MEMBER(OKIM6295_bankswitch_w); + DECLARE_WRITE16_MEMBER(wrally_coin_counter_w); + DECLARE_WRITE16_MEMBER(wrally_coin_lockout_w); }; /*----------- defined in machine/wrally.c -----------*/ -WRITE16_HANDLER( wrally_vram_w ); -WRITE16_HANDLER( wrally_flipscreen_w ); -WRITE16_HANDLER( OKIM6295_bankswitch_w ); -WRITE16_HANDLER( wrally_coin_counter_w ); -WRITE16_HANDLER( wrally_coin_lockout_w ); /*----------- defined in video/wrally.c -----------*/ diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index 9306c018e93..f1c94e11c71 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -16,6 +16,8 @@ public: DECLARE_WRITE16_MEMBER(wwfsstar_soundwrite); DECLARE_WRITE16_MEMBER(wwfsstar_flipscreen_w); DECLARE_WRITE16_MEMBER(wwfsstar_irqack_w); + DECLARE_WRITE16_MEMBER(wwfsstar_fg0_videoram_w); + DECLARE_WRITE16_MEMBER(wwfsstar_bg0_videoram_w); }; @@ -23,5 +25,3 @@ public: VIDEO_START( wwfsstar ); SCREEN_UPDATE_IND16( wwfsstar ); -WRITE16_HANDLER( wwfsstar_fg0_videoram_w ); -WRITE16_HANDLER( wwfsstar_bg0_videoram_w ); diff --git a/src/mame/includes/wwfwfest.h b/src/mame/includes/wwfwfest.h index 935592ac329..19223750fd5 100644 --- a/src/mame/includes/wwfwfest.h +++ b/src/mame/includes/wwfwfest.h @@ -29,6 +29,9 @@ public: DECLARE_READ16_MEMBER(wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_r); DECLARE_WRITE16_MEMBER(wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_w); DECLARE_WRITE16_MEMBER(wwfwfest_soundwrite); + DECLARE_WRITE16_MEMBER(wwfwfest_fg0_videoram_w); + DECLARE_WRITE16_MEMBER(wwfwfest_bg0_videoram_w); + DECLARE_WRITE16_MEMBER(wwfwfest_bg1_videoram_w); }; @@ -37,6 +40,3 @@ public: VIDEO_START( wwfwfest ); VIDEO_START( wwfwfstb ); SCREEN_UPDATE_IND16( wwfwfest ); -WRITE16_HANDLER( wwfwfest_fg0_videoram_w ); -WRITE16_HANDLER( wwfwfest_bg0_videoram_w ); -WRITE16_HANDLER( wwfwfest_bg1_videoram_w ); diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h index 00e595d81d0..5ecb73904b0 100644 --- a/src/mame/includes/xain.h +++ b/src/mame/includes/xain.h @@ -49,6 +49,14 @@ public: DECLARE_WRITE8_MEMBER(xain_68705_port_c_w); DECLARE_WRITE8_MEMBER(xain_68705_ddr_c_w); DECLARE_READ8_MEMBER(mcu_comm_reset_r); + DECLARE_WRITE8_MEMBER(xain_bgram0_w); + DECLARE_WRITE8_MEMBER(xain_bgram1_w); + DECLARE_WRITE8_MEMBER(xain_charram_w); + DECLARE_WRITE8_MEMBER(xain_scrollxP0_w); + DECLARE_WRITE8_MEMBER(xain_scrollyP0_w); + DECLARE_WRITE8_MEMBER(xain_scrollxP1_w); + DECLARE_WRITE8_MEMBER(xain_scrollyP1_w); + DECLARE_WRITE8_MEMBER(xain_flipscreen_w); }; @@ -56,11 +64,3 @@ public: SCREEN_UPDATE_IND16( xain ); VIDEO_START( xain ); -WRITE8_HANDLER( xain_scrollxP0_w ); -WRITE8_HANDLER( xain_scrollyP0_w ); -WRITE8_HANDLER( xain_scrollxP1_w ); -WRITE8_HANDLER( xain_scrollyP1_w ); -WRITE8_HANDLER( xain_charram_w ); -WRITE8_HANDLER( xain_bgram0_w ); -WRITE8_HANDLER( xain_bgram1_w ); -WRITE8_HANDLER( xain_flipscreen_w ); diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h index 41dccbff25f..01531d1a6da 100644 --- a/src/mame/includes/xorworld.h +++ b/src/mame/includes/xorworld.h @@ -9,12 +9,12 @@ public: UINT16 *m_spriteram; DECLARE_WRITE16_MEMBER(xorworld_irq2_ack_w); DECLARE_WRITE16_MEMBER(xorworld_irq6_ack_w); + DECLARE_WRITE16_MEMBER(xorworld_videoram16_w); }; /*----------- defined in video/xorworld.c -----------*/ -WRITE16_HANDLER( xorworld_videoram16_w ); PALETTE_INIT( xorworld ); VIDEO_START( xorworld ); diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h index 5db6f1872b7..e335a4deb60 100644 --- a/src/mame/includes/xxmissio.h +++ b/src/mame/includes/xxmissio.h @@ -16,6 +16,10 @@ public: DECLARE_WRITE8_MEMBER(xxmissio_bank_sel_w); DECLARE_WRITE8_MEMBER(xxmissio_status_m_w); DECLARE_WRITE8_MEMBER(xxmissio_status_s_w); + DECLARE_WRITE8_MEMBER(xxmissio_flipscreen_w); + DECLARE_WRITE8_MEMBER(xxmissio_bgram_w); + DECLARE_READ8_MEMBER(xxmissio_bgram_r); + DECLARE_WRITE8_MEMBER(xxmissio_paletteram_w); }; @@ -26,9 +30,5 @@ SCREEN_UPDATE_IND16( xxmissio ); WRITE8_DEVICE_HANDLER( xxmissio_scroll_x_w ); WRITE8_DEVICE_HANDLER( xxmissio_scroll_y_w ); -WRITE8_HANDLER( xxmissio_flipscreen_w ); -READ8_HANDLER( xxmissio_bgram_r ); -WRITE8_HANDLER( xxmissio_bgram_w ); -WRITE8_HANDLER( xxmissio_paletteram_w ); diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h index 6a3a620d622..12309f82ec8 100644 --- a/src/mame/includes/xyonix.h +++ b/src/mame/includes/xyonix.h @@ -14,12 +14,12 @@ public: DECLARE_WRITE8_MEMBER(xyonix_irqack_w); DECLARE_READ8_MEMBER(xyonix_io_r); DECLARE_WRITE8_MEMBER(xyonix_io_w); + DECLARE_WRITE8_MEMBER(xyonix_vidram_w); }; /*----------- defined in video/xyonix.c -----------*/ PALETTE_INIT( xyonix ); -WRITE8_HANDLER( xyonix_vidram_w ); VIDEO_START(xyonix); SCREEN_UPDATE_IND16(xyonix); diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h index 0e4c1fc60d3..73bf324e4ba 100644 --- a/src/mame/includes/yiear.h +++ b/src/mame/includes/yiear.h @@ -15,13 +15,13 @@ public: UINT8 m_yiear_nmi_enable; UINT8 m_yiear_irq_enable; + DECLARE_WRITE8_MEMBER(yiear_videoram_w); + DECLARE_WRITE8_MEMBER(yiear_control_w); }; /*----------- defined in video/yiear.c -----------*/ -WRITE8_HANDLER( yiear_videoram_w ); -WRITE8_HANDLER( yiear_control_w ); PALETTE_INIT( yiear ); VIDEO_START( yiear ); diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index b19c58606cd..df3e0bfef47 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -30,13 +30,13 @@ public: device_t *m_audiocpu; DECLARE_WRITE16_MEMBER(yunsun16_sound_bank_w); DECLARE_WRITE16_MEMBER(magicbub_sound_command_w); + DECLARE_WRITE16_MEMBER(yunsun16_vram_0_w); + DECLARE_WRITE16_MEMBER(yunsun16_vram_1_w); }; /*----------- defined in video/yunsun16.c -----------*/ -WRITE16_HANDLER( yunsun16_vram_0_w ); -WRITE16_HANDLER( yunsun16_vram_1_w ); VIDEO_START( yunsun16 ); SCREEN_UPDATE_IND16( yunsun16 ); diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index 0cdbfd8bc0c..ef453d84bcf 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -29,15 +29,15 @@ public: UINT8 m_videoram[0x4000]; DECLARE_WRITE8_MEMBER(yunsung8_bankswitch_w); DECLARE_WRITE8_MEMBER(yunsung8_adpcm_w); + DECLARE_WRITE8_MEMBER(yunsung8_videobank_w); + DECLARE_READ8_MEMBER(yunsung8_videoram_r); + DECLARE_WRITE8_MEMBER(yunsung8_videoram_w); + DECLARE_WRITE8_MEMBER(yunsung8_flipscreen_w); }; /*----------- defined in video/yunsung8.c -----------*/ -WRITE8_HANDLER( yunsung8_videobank_w ); -READ8_HANDLER ( yunsung8_videoram_r ); -WRITE8_HANDLER( yunsung8_videoram_w ); -WRITE8_HANDLER( yunsung8_flipscreen_w ); VIDEO_START( yunsung8 ); SCREEN_UPDATE_IND16( yunsung8 ); diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h index 53924726824..12864a676d3 100644 --- a/src/mame/includes/zac2650.h +++ b/src/mame/includes/zac2650.h @@ -12,15 +12,15 @@ public: int m_CollisionSprite; tilemap_t *m_bg_tilemap; DECLARE_WRITE8_MEMBER(tinvader_sound_w); + DECLARE_WRITE8_MEMBER(tinvader_videoram_w); + DECLARE_READ8_MEMBER(zac_s2636_r); + DECLARE_WRITE8_MEMBER(zac_s2636_w); + DECLARE_READ8_MEMBER(tinvader_port_0_r); }; /*----------- defined in video/zac2650.c -----------*/ -WRITE8_HANDLER( tinvader_videoram_w ); -READ8_HANDLER( zac_s2636_r ); -WRITE8_HANDLER( zac_s2636_w ); -READ8_HANDLER( tinvader_port_0_r ); VIDEO_START( tinvader ); SCREEN_UPDATE_IND16( tinvader ); diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h index 09b13eb8e4f..1f26ad1da25 100644 --- a/src/mame/includes/zaccaria.h +++ b/src/mame/includes/zaccaria.h @@ -23,6 +23,10 @@ public: DECLARE_READ8_MEMBER(zaccaria_prot2_r); DECLARE_WRITE8_MEMBER(coin_w); DECLARE_WRITE8_MEMBER(nmi_mask_w); + DECLARE_WRITE8_MEMBER(zaccaria_videoram_w); + DECLARE_WRITE8_MEMBER(zaccaria_attributes_w); + DECLARE_WRITE8_MEMBER(zaccaria_flip_screen_x_w); + DECLARE_WRITE8_MEMBER(zaccaria_flip_screen_y_w); }; @@ -30,8 +34,4 @@ public: PALETTE_INIT( zaccaria ); VIDEO_START( zaccaria ); -WRITE8_HANDLER( zaccaria_videoram_w ); -WRITE8_HANDLER( zaccaria_attributes_w ); -WRITE8_HANDLER( zaccaria_flip_screen_x_w ); -WRITE8_HANDLER( zaccaria_flip_screen_y_w ); SCREEN_UPDATE_IND16( zaccaria ); diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index d4cd06ca59c..cc1497e4f7b 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -38,6 +38,16 @@ public: DECLARE_READ8_MEMBER(razmataz_counter_r); DECLARE_WRITE8_MEMBER(zaxxon_coin_counter_w); DECLARE_WRITE8_MEMBER(zaxxon_coin_enable_w); + DECLARE_WRITE8_MEMBER(zaxxon_flipscreen_w); + DECLARE_WRITE8_MEMBER(zaxxon_fg_color_w); + DECLARE_WRITE8_MEMBER(zaxxon_bg_position_w); + DECLARE_WRITE8_MEMBER(zaxxon_bg_color_w); + DECLARE_WRITE8_MEMBER(zaxxon_bg_enable_w); + DECLARE_WRITE8_MEMBER(congo_fg_bank_w); + DECLARE_WRITE8_MEMBER(congo_color_bank_w); + DECLARE_WRITE8_MEMBER(zaxxon_videoram_w); + DECLARE_WRITE8_MEMBER(congo_colorram_w); + DECLARE_WRITE8_MEMBER(congo_sprite_custom_w); }; @@ -56,18 +66,8 @@ MACHINE_CONFIG_EXTERN( congo_samples ); /*----------- defined in video/zaxxon.c -----------*/ -WRITE8_HANDLER( zaxxon_flipscreen_w ); -WRITE8_HANDLER( zaxxon_fg_color_w ); -WRITE8_HANDLER( zaxxon_bg_position_w ); -WRITE8_HANDLER( zaxxon_bg_color_w ); -WRITE8_HANDLER( zaxxon_bg_enable_w ); -WRITE8_HANDLER( zaxxon_videoram_w ); -WRITE8_HANDLER( congo_colorram_w ); -WRITE8_HANDLER( congo_fg_bank_w ); -WRITE8_HANDLER( congo_color_bank_w ); -WRITE8_HANDLER( congo_sprite_custom_w ); PALETTE_INIT( zaxxon ); |