diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2020-06-08 17:17:27 +0200 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2020-06-08 17:17:27 +0200 |
commit | 65d282d19ed5985d8e9925cdf5cb168e5f4aa09d (patch) | |
tree | cb0f2d561c22d547fe398839cbcfb36341512ad4 /src/mame/includes | |
parent | ddc7ec4db26d6cc88330a96006643878dc42ce8c (diff) |
drivers starting with c and d: completed read* and write* macros removal (nw)
Diffstat (limited to 'src/mame/includes')
82 files changed, 1021 insertions, 1028 deletions
diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index c3f3a6d8ddf..b091dbc4f60 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -49,21 +49,21 @@ public: int m_sound_command2; // common - DECLARE_WRITE16_MEMBER(flipscreen_w); - DECLARE_WRITE16_MEMBER(background_videoram_w); - DECLARE_WRITE16_MEMBER(text_videoram_w); + void flipscreen_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void background_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void text_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // cabal specific void sound_irq_trigger_word_w(offs_t, u16 data, u16 mem_mask); // cabalbl specific - DECLARE_WRITE16_MEMBER(cabalbl_sndcmd_w); - DECLARE_WRITE16_MEMBER(cabalbl_sound_irq_trigger_word_w); - DECLARE_READ8_MEMBER(cabalbl_snd2_r); - DECLARE_READ8_MEMBER(cabalbl_snd1_r); - DECLARE_WRITE8_MEMBER(cabalbl_coin_w); - DECLARE_WRITE8_MEMBER(cabalbl_1_adpcm_w); - DECLARE_WRITE8_MEMBER(cabalbl_2_adpcm_w); + void cabalbl_sndcmd_w(offs_t offset, uint16_t data); + void cabalbl_sound_irq_trigger_word_w(uint16_t data); + uint8_t cabalbl_snd2_r(); + uint8_t cabalbl_snd1_r(); + void cabalbl_coin_w(uint8_t data); + void cabalbl_1_adpcm_w(uint8_t data); + void cabalbl_2_adpcm_w(uint8_t data); void init_cabal(); DECLARE_MACHINE_START(cabalbl); diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h index 071555e0e30..20ac1c23ba2 100644 --- a/src/mame/includes/calomega.h +++ b/src/mame/includes/calomega.h @@ -49,8 +49,8 @@ protected: virtual void video_start() override; private: - DECLARE_WRITE8_MEMBER(calomega_videoram_w); - DECLARE_WRITE8_MEMBER(calomega_colorram_w); + void calomega_videoram_w(offs_t offset, uint8_t data); + void calomega_colorram_w(offs_t offset, uint8_t data); uint8_t s903_mux_port_r(); void s903_mux_w(uint8_t data); uint8_t s905_mux_port_r(); diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index 440db879b0d..f54b2002a85 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -44,15 +44,15 @@ public: void canyon(machine_config &config); protected: - DECLARE_READ8_MEMBER(canyon_switches_r); - DECLARE_READ8_MEMBER(canyon_options_r); - DECLARE_WRITE8_MEMBER(output_latch_w); - DECLARE_WRITE8_MEMBER(canyon_videoram_w); + uint8_t canyon_switches_r(offs_t offset); + uint8_t canyon_options_r(offs_t offset); + void output_latch_w(offs_t offset, uint8_t data); + void canyon_videoram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); void canyon_palette(palette_device &palette) const; uint32_t screen_update_canyon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER(canyon_motor_w); - DECLARE_WRITE8_MEMBER(canyon_explode_w); + void canyon_motor_w(offs_t offset, uint8_t data); + void canyon_explode_w(uint8_t data); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_bombs( bitmap_ind16 &bitmap, const rectangle &cliprect ); diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h index 98e3c539a12..74b2f787de0 100644 --- a/src/mame/includes/capbowl.h +++ b/src/mame/includes/capbowl.h @@ -55,19 +55,19 @@ public: emu_timer *m_update_timer; // common - DECLARE_READ8_MEMBER(track_0_r); - DECLARE_READ8_MEMBER(track_1_r); - DECLARE_WRITE8_MEMBER(track_reset_w); - DECLARE_WRITE8_MEMBER(sndcmd_w); - DECLARE_WRITE8_MEMBER(tms34061_w); - DECLARE_READ8_MEMBER(tms34061_r); + uint8_t track_0_r(); + uint8_t track_1_r(); + void track_reset_w(uint8_t data); + void sndcmd_w(uint8_t data); + void tms34061_w(offs_t offset, uint8_t data); + uint8_t tms34061_r(offs_t offset); // capbowl specific - DECLARE_WRITE8_MEMBER(capbowl_rom_select_w); + void capbowl_rom_select_w(uint8_t data); // bowlrama specific - DECLARE_WRITE8_MEMBER(bowlrama_blitter_w); - DECLARE_READ8_MEMBER(bowlrama_blitter_r); + void bowlrama_blitter_w(offs_t offset, uint8_t data); + uint8_t bowlrama_blitter_r(offs_t offset); void init_capbowl(); virtual void machine_start() override; diff --git a/src/mame/includes/carpolo.h b/src/mame/includes/carpolo.h index 05ad10fb525..2cee3be3776 100644 --- a/src/mame/includes/carpolo.h +++ b/src/mame/includes/carpolo.h @@ -99,20 +99,20 @@ private: std::unique_ptr<bitmap_ind16> m_sprite_goal_collision_bitmap2; std::unique_ptr<bitmap_ind16> m_sprite_border_collision_bitmap; - DECLARE_READ8_MEMBER(ball_screen_collision_cause_r); - DECLARE_READ8_MEMBER(car_ball_collision_x_r); - DECLARE_READ8_MEMBER(car_ball_collision_y_r); - DECLARE_READ8_MEMBER(car_car_collision_cause_r); - DECLARE_READ8_MEMBER(car_goal_collision_cause_r); - DECLARE_READ8_MEMBER(car_ball_collision_cause_r); - DECLARE_READ8_MEMBER(car_border_collision_cause_r); - DECLARE_READ8_MEMBER(interrupt_cause_r); - DECLARE_WRITE8_MEMBER(ball_screen_interrupt_clear_w); - DECLARE_WRITE8_MEMBER(car_car_interrupt_clear_w); - DECLARE_WRITE8_MEMBER(car_goal_interrupt_clear_w); - DECLARE_WRITE8_MEMBER(car_ball_interrupt_clear_w); - DECLARE_WRITE8_MEMBER(car_border_interrupt_clear_w); - DECLARE_WRITE8_MEMBER(timer_interrupt_clear_w); + uint8_t ball_screen_collision_cause_r(); + uint8_t car_ball_collision_x_r(); + uint8_t car_ball_collision_y_r(); + uint8_t car_car_collision_cause_r(); + uint8_t car_goal_collision_cause_r(); + uint8_t car_ball_collision_cause_r(); + uint8_t car_border_collision_cause_r(); + uint8_t interrupt_cause_r(); + void ball_screen_interrupt_clear_w(uint8_t data); + void car_car_interrupt_clear_w(uint8_t data); + void car_goal_interrupt_clear_w(uint8_t data); + void car_ball_interrupt_clear_w(uint8_t data); + void car_border_interrupt_clear_w(uint8_t data); + void timer_interrupt_clear_w(uint8_t data); void carpolo_palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank); diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index fdc500074ff..c6c1e95c1b6 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -39,17 +39,17 @@ public: /* misc */ uint8_t m_rambank; - DECLARE_WRITE8_MEMBER(cbasebal_bankswitch_w); - 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); + void cbasebal_bankswitch_w(uint8_t data); + uint8_t bankedram_r(offs_t offset); + void bankedram_w(offs_t offset, uint8_t data); + void cbasebal_coinctrl_w(uint8_t data); + void cbasebal_textram_w(offs_t offset, uint8_t data); + uint8_t cbasebal_textram_r(offs_t offset); + void cbasebal_scrollram_w(offs_t offset, uint8_t data); + uint8_t cbasebal_scrollram_r(offs_t offset); + void cbasebal_gfxctrl_w(uint8_t data); + void cbasebal_scrollx_w(offs_t offset, uint8_t data); + void cbasebal_scrolly_w(offs_t offset, uint8_t data); void init_cbasebal(); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index 9cbaad33aa5..f67243d9115 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -36,20 +36,20 @@ public: void ccastles(machine_config &config); protected: - DECLARE_WRITE8_MEMBER(irq_ack_w); - DECLARE_READ8_MEMBER(leta_r); - DECLARE_WRITE8_MEMBER(nvram_recall_w); + void irq_ack_w(uint8_t data); + uint8_t leta_r(offs_t offset); + void nvram_recall_w(uint8_t data); DECLARE_WRITE_LINE_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); + uint8_t nvram_r(address_space &space, offs_t offset); + void nvram_w(offs_t offset, uint8_t data); + void ccastles_hscroll_w(uint8_t data); + void ccastles_vscroll_w(uint8_t data); + void ccastles_video_control_w(offs_t offset, uint8_t data); + void ccastles_paletteram_w(offs_t offset, uint8_t data); + void ccastles_videoram_w(offs_t offset, uint8_t data); + uint8_t ccastles_bitmode_r(); + void ccastles_bitmode_w(uint8_t data); + void ccastles_bitmode_addr_w(offs_t offset, uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/includes/cchasm.h b/src/mame/includes/cchasm.h index 8fbcfeeb673..b4f20542a0e 100644 --- a/src/mame/includes/cchasm.h +++ b/src/mame/includes/cchasm.h @@ -58,14 +58,14 @@ public: int m_ycenter; emu_timer *m_refresh_end_timer; - DECLARE_WRITE16_MEMBER(led_w); - DECLARE_WRITE16_MEMBER(refresh_control_w); - DECLARE_WRITE8_MEMBER(reset_coin_flag_w); - DECLARE_READ8_MEMBER(coin_sound_r); - DECLARE_READ8_MEMBER(soundlatch2_r); - DECLARE_WRITE8_MEMBER(soundlatch4_w); - DECLARE_WRITE16_MEMBER(io_w); - DECLARE_READ16_MEMBER(io_r); + void led_w(offs_t offset, uint16_t data); + void refresh_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void reset_coin_flag_w(uint8_t data); + uint8_t coin_sound_r(); + uint8_t soundlatch2_r(); + void soundlatch4_w(uint8_t data); + void io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t io_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(ctc_timer_1_w); DECLARE_WRITE_LINE_MEMBER(ctc_timer_2_w); diff --git a/src/mame/includes/cdi.h b/src/mame/includes/cdi.h index c0c91c6dbc7..a77b8390b27 100644 --- a/src/mame/includes/cdi.h +++ b/src/mame/includes/cdi.h @@ -61,8 +61,8 @@ private: void cdimono2_mem(address_map &map); void cdi070_cpuspace(address_map &map); - DECLARE_READ16_MEMBER(dvc_r); - DECLARE_WRITE16_MEMBER(dvc_w); + uint16_t dvc_r(offs_t offset, uint16_t mem_mask = ~0); + void dvc_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); required_shared_ptr<uint16_t> m_planea; optional_device<cdislave_hle_device> m_slave_hle; diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index 15e5f462a4c..4d6a0f2d1ac 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -82,39 +82,39 @@ private: tilemap_t *m_bg_tilemap; // drivers/centiped.cpp - DECLARE_WRITE8_MEMBER(irq_ack_w); - DECLARE_READ8_MEMBER(centiped_IN0_r); - DECLARE_READ8_MEMBER(centiped_IN2_r); - DECLARE_READ8_MEMBER(milliped_IN1_r); - DECLARE_READ8_MEMBER(milliped_IN2_r); + void irq_ack_w(uint8_t data); + uint8_t centiped_IN0_r(); + uint8_t centiped_IN2_r(); + uint8_t milliped_IN1_r(); + uint8_t milliped_IN2_r(); DECLARE_WRITE_LINE_MEMBER(input_select_w); DECLARE_WRITE_LINE_MEMBER(control_select_w); - DECLARE_READ8_MEMBER(mazeinv_input_r); - DECLARE_WRITE8_MEMBER(mazeinv_input_select_w); - DECLARE_READ8_MEMBER(bullsdrt_data_port_r); + uint8_t mazeinv_input_r(); + void mazeinv_input_select_w(offs_t offset, uint8_t data); + uint8_t bullsdrt_data_port_r(); DECLARE_WRITE_LINE_MEMBER(coin_counter_left_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_center_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_right_w); DECLARE_WRITE_LINE_MEMBER(bullsdrt_coin_count_w); - DECLARE_READ8_MEMBER(earom_read); - DECLARE_WRITE8_MEMBER(earom_write); + uint8_t earom_read(); + void earom_write(offs_t offset, uint8_t data); void earom_control_w(uint8_t data); uint8_t caterplr_unknown_r(); - DECLARE_WRITE8_MEMBER(caterplr_AY8910_w); - DECLARE_READ8_MEMBER(caterplr_AY8910_r); - DECLARE_READ8_MEMBER(multiped_eeprom_r); - DECLARE_WRITE8_MEMBER(multiped_eeprom_w); - DECLARE_WRITE8_MEMBER(multiped_prgbank_w); + void caterplr_AY8910_w(offs_t offset, uint8_t data); + uint8_t caterplr_AY8910_r(offs_t offset); + uint8_t multiped_eeprom_r(); + void multiped_eeprom_w(offs_t offset, uint8_t data); + void multiped_prgbank_w(uint8_t data); // video/centiped.cpp - DECLARE_WRITE8_MEMBER(centiped_videoram_w); + void centiped_videoram_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(flip_screen_w); - DECLARE_WRITE8_MEMBER(multiped_gfxbank_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); + void multiped_gfxbank_w(uint8_t data); + void bullsdrt_tilesbank_w(offs_t offset, uint8_t data); + void bullsdrt_sprites_bank_w(uint8_t data); + void centiped_paletteram_w(offs_t offset, uint8_t data); + void milliped_paletteram_w(offs_t offset, uint8_t data); + void mazeinv_paletteram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(centiped_get_tile_info); TILE_GET_INFO_MEMBER(warlords_get_tile_info); TILE_GET_INFO_MEMBER(milliped_get_tile_info); diff --git a/src/mame/includes/cgc7900.h b/src/mame/includes/cgc7900.h index 035892acb00..554d4605f52 100644 --- a/src/mame/includes/cgc7900.h +++ b/src/mame/includes/cgc7900.h @@ -61,20 +61,20 @@ public: required_device<palette_device> m_palette; required_device<screen_device> m_screen; required_memory_region m_char_rom; - required_shared_ptr<uint16_t> m_chrom_ram; - required_shared_ptr<uint16_t> m_plane_ram; - required_shared_ptr<uint16_t> m_clut_ram; - required_shared_ptr<uint16_t> m_overlay_ram; - required_shared_ptr<uint16_t> m_roll_bitmap; - required_shared_ptr<uint16_t> m_pan_x; - required_shared_ptr<uint16_t> m_pan_y; - required_shared_ptr<uint16_t> m_zoom; - required_shared_ptr<uint16_t> m_blink_select; - required_shared_ptr<uint16_t> m_plane_select; - required_shared_ptr<uint16_t> m_plane_switch; - required_shared_ptr<uint16_t> m_color_status_fg; - required_shared_ptr<uint16_t> m_color_status_bg; - required_shared_ptr<uint16_t> m_roll_overlay; + required_shared_ptr<u16> m_chrom_ram; + required_shared_ptr<u16> m_plane_ram; + required_shared_ptr<u16> m_clut_ram; + required_shared_ptr<u16> m_overlay_ram; + required_shared_ptr<u16> m_roll_bitmap; + required_shared_ptr<u16> m_pan_x; + required_shared_ptr<u16> m_pan_y; + required_shared_ptr<u16> m_zoom; + required_shared_ptr<u16> m_blink_select; + required_shared_ptr<u16> m_plane_select; + required_shared_ptr<u16> m_plane_switch; + required_shared_ptr<u16> m_color_status_fg; + required_shared_ptr<u16> m_color_status_bg; + required_shared_ptr<u16> m_roll_overlay; required_device<i8251_device> m_i8251_0; required_device<i8251_device> m_i8251_1; @@ -82,20 +82,20 @@ public: virtual void machine_reset() override; void cgc7900_palette(palette_device &palette) const; - uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - - DECLARE_READ16_MEMBER( keyboard_r ); - DECLARE_WRITE16_MEMBER( keyboard_w ); - DECLARE_WRITE16_MEMBER( interrupt_mask_w ); - DECLARE_READ16_MEMBER( disk_data_r ); - DECLARE_WRITE16_MEMBER( disk_data_w ); - DECLARE_READ16_MEMBER( disk_status_r ); - DECLARE_WRITE16_MEMBER( disk_command_w ); - DECLARE_READ16_MEMBER( z_mode_r ); - DECLARE_WRITE16_MEMBER( z_mode_w ); - DECLARE_WRITE16_MEMBER( color_status_w ); - DECLARE_READ16_MEMBER( sync_r ); - DECLARE_READ16_MEMBER( unmapped_r ); + u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + + u16 keyboard_r(); + void keyboard_w(u16 data); + void interrupt_mask_w(u16 data); + u16 disk_data_r(); + void disk_data_w(u16 data); + u16 disk_status_r(); + void disk_command_w(u16 data); + u16 z_mode_r(); + void z_mode_w(u16 data); + void color_status_w(u16 data); + u16 sync_r(); + u16 unmapped_r(); template <unsigned N> DECLARE_WRITE_LINE_MEMBER(irq) { irq_encoder(N, state); } @@ -104,7 +104,7 @@ public: void draw_overlay(screen_device *screen, bitmap_rgb32 &bitmap); /* interrupt state */ - uint16_t m_int_mask, m_int_active; + u16 m_int_mask, m_int_active; /* video state */ rgb_t m_clut[256]; diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index 37245d4f931..9c5daaae3ae 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -44,15 +44,15 @@ public: uint8_t m_flip_x; uint8_t m_flip_y; - DECLARE_WRITE8_MEMBER(coinlock_w); - DECLARE_READ8_MEMBER(gfxmode_r); - DECLARE_WRITE8_MEMBER(gfxmode_w); - DECLARE_WRITE8_MEMBER(txram_w); - DECLARE_WRITE8_MEMBER(attrram_w); + void coinlock_w(uint8_t data); + uint8_t gfxmode_r(); + void gfxmode_w(uint8_t data); + void txram_w(offs_t offset, uint8_t data); + void attrram_w(offs_t offset, uint8_t data); void unknown_port_1_w(uint8_t data); void unknown_port_2_w(uint8_t data); void unknown_port_3_w(uint8_t data); - DECLARE_READ8_MEMBER(mcu_status_r); + uint8_t mcu_status_r(); TILE_GET_INFO_MEMBER(get_tx_tile_info); virtual void machine_start() override; diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index 7d9bda9d32c..917c80d9ab7 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -52,11 +52,11 @@ public: protected: // handlers DECLARE_WRITE_LINE_MEMBER(irq_enable_w); - DECLARE_READ8_MEMBER(champbja_protection_r); + uint8_t champbja_protection_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(vblank_irq); - DECLARE_WRITE8_MEMBER(tilemap_w); + void tilemap_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(gfxbank_w); DECLARE_WRITE_LINE_MEMBER(palette_bank_w); DECLARE_WRITE_LINE_MEMBER(flipscreen_w); diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index 619ca9b5457..54c7c7c6d56 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -54,27 +54,27 @@ public: int m_dir_31; /* devices */ - DECLARE_READ8_MEMBER(mcu_r); - DECLARE_WRITE8_MEMBER(mcu_w); + uint8_t mcu_r(); + void mcu_w(uint8_t data); void changela_68705_port_a_w(uint8_t data); void changela_68705_port_c_w(uint8_t data); - DECLARE_READ8_MEMBER(changela_24_r); - DECLARE_READ8_MEMBER(changela_25_r); - DECLARE_READ8_MEMBER(changela_30_r); - DECLARE_READ8_MEMBER(changela_31_r); - DECLARE_READ8_MEMBER(changela_2c_r); - DECLARE_READ8_MEMBER(changela_2d_r); + uint8_t changela_24_r(); + uint8_t changela_25_r(); + uint8_t changela_30_r(); + uint8_t changela_31_r(); + uint8_t changela_2c_r(); + uint8_t changela_2d_r(); DECLARE_WRITE_LINE_MEMBER(mcu_pc_0_w); DECLARE_WRITE_LINE_MEMBER(collision_reset_0_w); DECLARE_WRITE_LINE_MEMBER(collision_reset_1_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_2_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); + void changela_colors_w(offs_t offset, uint8_t data); + void changela_mem_device_select_w(uint8_t data); + void changela_mem_device_w(offs_t offset, uint8_t data); + uint8_t changela_mem_device_r(offs_t offset); + void changela_slope_rom_addr_hi_w(uint8_t data); + void changela_slope_rom_addr_lo_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/includes/channelf.h b/src/mame/includes/channelf.h index d28b2dcb026..37b9390eda8 100644 --- a/src/mame/includes/channelf.h +++ b/src/mame/includes/channelf.h @@ -29,14 +29,14 @@ public: , m_cart(*this, "cartslot") { } - DECLARE_READ8_MEMBER(port_0_r); - DECLARE_READ8_MEMBER(port_1_r); - DECLARE_READ8_MEMBER(port_4_r); - DECLARE_READ8_MEMBER(port_5_r); - DECLARE_WRITE8_MEMBER(port_0_w); - DECLARE_WRITE8_MEMBER(port_1_w); - DECLARE_WRITE8_MEMBER(port_4_w); - DECLARE_WRITE8_MEMBER(port_5_w); + uint8_t port_0_r(); + uint8_t port_1_r(); + uint8_t port_4_r(); + uint8_t port_5_r(); + void port_0_w(uint8_t data); + void port_1_w(uint8_t data); + void port_4_w(uint8_t data); + void port_5_w(uint8_t data); uint8_t *m_p_videoram; uint8_t m_latch[6]; uint8_t m_val_reg; diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index 0992ecbf486..66a1afc2823 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -41,8 +41,8 @@ protected: virtual void video_start() override; private: - DECLARE_WRITE8_MEMBER(port_40_w); - DECLARE_WRITE8_MEMBER(port_80_w); + void port_40_w(uint8_t data); + void port_80_w(uint8_t data); INTERRUPT_GEN_MEMBER(vblank_irq); diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h index 6eea620bec3..0775d127f94 100644 --- a/src/mame/includes/chqflag.h +++ b/src/mame/includes/chqflag.h @@ -34,13 +34,13 @@ public: { } - template<int Chip> DECLARE_READ8_MEMBER(k051316_ramrom_r); - DECLARE_WRITE8_MEMBER(chqflag_bankswitch_w); - DECLARE_WRITE8_MEMBER(chqflag_vreg_w); - DECLARE_WRITE8_MEMBER(select_analog_ctrl_w); - DECLARE_READ8_MEMBER(analog_read_r); - DECLARE_WRITE8_MEMBER(k007232_bankswitch_w); - DECLARE_WRITE8_MEMBER(k007232_extvolume_w); + template<int Chip> uint8_t k051316_ramrom_r(offs_t offset); + void chqflag_bankswitch_w(uint8_t data); + void chqflag_vreg_w(uint8_t data); + void select_analog_ctrl_w(uint8_t data); + uint8_t analog_read_r(); + void k007232_bankswitch_w(uint8_t data); + void k007232_extvolume_w(uint8_t data); void volume_callback0(uint8_t data); void volume_callback1(uint8_t data); DECLARE_WRITE_LINE_MEMBER(background_brt_w); diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h index 241b4672cab..02642938f5e 100644 --- a/src/mame/includes/cinemat.h +++ b/src/mame/includes/cinemat.h @@ -69,13 +69,13 @@ public: rgb_t m_vector_color; int16_t m_lastx; int16_t m_lasty; - DECLARE_READ8_MEMBER(inputs_r); - DECLARE_READ8_MEMBER(switches_r); - DECLARE_READ8_MEMBER(coin_input_r); + uint8_t inputs_r(offs_t offset); + uint8_t switches_r(offs_t offset); + uint8_t coin_input_r(); WRITE_LINE_MEMBER(coin_reset_w); WRITE_LINE_MEMBER(mux_select_w); - DECLARE_READ8_MEMBER(speedfrk_wheel_r); - DECLARE_READ8_MEMBER(speedfrk_gear_r); + uint8_t speedfrk_wheel_r(offs_t offset); + uint8_t speedfrk_gear_r(offs_t offset); virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w); uint8_t joystick_read(); DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); @@ -182,7 +182,7 @@ public: protected: virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w) override; - DECLARE_READ8_MEMBER(sundance_inputs_r); + uint8_t sundance_inputs_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(sundance_sound0_w); DECLARE_WRITE_LINE_MEMBER(sundance_sound1_w); DECLARE_WRITE_LINE_MEMBER(sundance_sound2_w); @@ -229,7 +229,7 @@ public: protected: virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w) override; - DECLARE_READ8_MEMBER(boxingb_dial_r); + uint8_t boxingb_dial_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(boxingb_sound0_w); DECLARE_WRITE_LINE_MEMBER(boxingb_sound1_w); DECLARE_WRITE_LINE_MEMBER(boxingb_sound2_w); @@ -282,9 +282,9 @@ public: protected: virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w) override; - DECLARE_READ8_MEMBER(qb3_frame_r); - DECLARE_WRITE8_MEMBER(qb3_ram_bank_w); - DECLARE_WRITE8_MEMBER(qb3_sound_fifo_w); + uint8_t qb3_frame_r(); + void qb3_ram_bank_w(uint8_t data); + void qb3_sound_fifo_w(uint8_t data); virtual void sound_reset() override; diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index 892d803c7af..a4af97a1f9f 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -59,14 +59,14 @@ public: bool m_irq_mask; - DECLARE_READ8_MEMBER(circusc_sh_timer_r); - DECLARE_WRITE8_MEMBER(circusc_sh_irqtrigger_w); + uint8_t circusc_sh_timer_r(); + void circusc_sh_irqtrigger_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w); - DECLARE_WRITE8_MEMBER(circusc_sound_w); + void circusc_sound_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(irq_mask_w); - DECLARE_WRITE8_MEMBER(circusc_videoram_w); - DECLARE_WRITE8_MEMBER(circusc_colorram_w); + void circusc_videoram_w(offs_t offset, uint8_t data); + void circusc_colorram_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(flipscreen_w); DECLARE_WRITE_LINE_MEMBER(spritebank_w); void init_circusc(); diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h index b2ff49d017f..105f4b39b7d 100644 --- a/src/mame/includes/cischeat.h +++ b/src/mame/includes/cischeat.h @@ -42,37 +42,37 @@ public: , m_leds(*this, "led%u", 0U) {} - DECLARE_WRITE16_MEMBER(scudhamm_motor_command_w); - DECLARE_WRITE16_MEMBER(scudhamm_leds_w); - DECLARE_WRITE16_MEMBER(scudhamm_enable_w); - DECLARE_WRITE16_MEMBER(scudhamm_oki_bank_w); - DECLARE_WRITE16_MEMBER(bigrun_soundbank_w); - DECLARE_READ16_MEMBER(scudhamm_motor_status_r); - DECLARE_READ16_MEMBER(scudhamm_motor_pos_r); + void scudhamm_motor_command_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void scudhamm_leds_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void scudhamm_enable_w(uint16_t data); + void scudhamm_oki_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void bigrun_soundbank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t scudhamm_motor_status_r(); + uint16_t scudhamm_motor_pos_r(); uint8_t scudhamm_analog_r(); - DECLARE_READ16_MEMBER(bigrun_ip_select_r); - DECLARE_WRITE16_MEMBER(leds_out_w); - DECLARE_WRITE16_MEMBER(unknown_out_w); - DECLARE_WRITE16_MEMBER(motor_out_w); - DECLARE_WRITE16_MEMBER(wheel_out_w); - DECLARE_WRITE16_MEMBER(ip_select_w); - DECLARE_WRITE16_MEMBER(ip_select_plus1_w); - DECLARE_WRITE16_MEMBER(bigrun_comms_w); - DECLARE_WRITE16_MEMBER(active_layers_w); - DECLARE_READ16_MEMBER(cischeat_ip_select_r); - DECLARE_WRITE16_MEMBER(cischeat_soundlatch_w); - DECLARE_WRITE16_MEMBER(cischeat_comms_w); - DECLARE_READ16_MEMBER(f1gpstar_wheel_r); - DECLARE_READ16_MEMBER(f1gpstr2_ioready_r); - DECLARE_READ16_MEMBER(wildplt_xy_r); - DECLARE_READ16_MEMBER(wildplt_mux_r); - DECLARE_WRITE16_MEMBER(wildplt_mux_w); - DECLARE_WRITE16_MEMBER(f1gpstar_motor_w); - DECLARE_WRITE16_MEMBER(f1gpstar_soundint_w); - DECLARE_WRITE16_MEMBER(f1gpstar_comms_w); - DECLARE_WRITE16_MEMBER(f1gpstr2_io_w); - DECLARE_WRITE16_MEMBER(cischeat_soundbank_1_w); - DECLARE_WRITE16_MEMBER(cischeat_soundbank_2_w); + uint16_t bigrun_ip_select_r(); + void leds_out_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void unknown_out_w(uint16_t data); + void motor_out_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void wheel_out_w(uint16_t data); + void ip_select_w(uint16_t data); + void ip_select_plus1_w(uint16_t data); + void bigrun_comms_w(uint16_t data); + void active_layers_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t cischeat_ip_select_r(); + void cischeat_soundlatch_w(uint16_t data); + void cischeat_comms_w(uint16_t data); + uint16_t f1gpstar_wheel_r(); + uint16_t f1gpstr2_ioready_r(); + uint16_t wildplt_xy_r(); + uint16_t wildplt_mux_r(); + void wildplt_mux_w(uint16_t data); + void f1gpstar_motor_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void f1gpstar_soundint_w(uint16_t data); + void f1gpstar_comms_w(uint16_t data); + void f1gpstr2_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cischeat_soundbank_1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cischeat_soundbank_2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); DECLARE_WRITE_LINE_MEMBER(sound_irq); void init_cischeat(); void init_bigrun(); @@ -165,10 +165,10 @@ public: m_armold = 0; } - DECLARE_READ16_MEMBER(motor_status_r); - DECLARE_WRITE16_MEMBER(motor_command_w); + uint16_t motor_status_r(); + void motor_command_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint8_t analog_r(); - DECLARE_WRITE16_MEMBER(output_w); + void output_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void armchmp2(machine_config &config); void armchmp2_map(address_map &map); @@ -193,7 +193,7 @@ public: std::unique_ptr<uint16_t[]> m_allocated_spriteram; void wildplt_map(address_map &map); void wildplt(machine_config &config); - DECLARE_WRITE16_MEMBER(sprite_dma_w); + void sprite_dma_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); protected: virtual void video_start() override; @@ -224,12 +224,12 @@ public: void init_captflag(); private: - DECLARE_WRITE16_MEMBER(motor_command_right_w); - DECLARE_WRITE16_MEMBER(motor_command_left_w); + void motor_command_right_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void motor_command_left_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void motor_move(int side, uint16_t data); - DECLARE_WRITE16_MEMBER(oki_bank_w); + void oki_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE16_MEMBER(leds_w); + void leds_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TIMER_DEVICE_CALLBACK_MEMBER(captflag_scanline); diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index 575107088a3..246424f4fe7 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -43,11 +43,11 @@ public: required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; - 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); + uint8_t citycon_in_r(); + uint8_t citycon_irq_ack_r(); + void citycon_videoram_w(offs_t offset, uint8_t data); + void citycon_linecolor_w(offs_t offset, uint8_t data); + void citycon_background_w(uint8_t data); void init_citycon(); TILEMAP_MAPPER_MEMBER(citycon_scan); TILE_GET_INFO_MEMBER(get_fg_tile_info); diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h index 42f7c8e3cd5..0ea34881c72 100644 --- a/src/mame/includes/cloak.h +++ b/src/mame/includes/cloak.h @@ -33,15 +33,15 @@ public: protected: DECLARE_WRITE_LINE_MEMBER(coin_counter_l_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_r_w); - DECLARE_WRITE8_MEMBER(cloak_custom_w); - 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); + void cloak_custom_w(uint8_t data); + void cloak_irq_reset_0_w(uint8_t data); + void cloak_irq_reset_1_w(uint8_t data); + void cloak_nvram_enable_w(uint8_t data); + void cloak_paletteram_w(offs_t offset, uint8_t data); + void cloak_clearbmp_w(uint8_t data); + uint8_t graph_processor_r(offs_t offset); + void graph_processor_w(offs_t offset, uint8_t data); + void cloak_videoram_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(cocktail_w); void set_current_bitmap_videoram_pointer(); void adjust_xy(int offset); diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h index bdbafab66c2..42548c2d434 100644 --- a/src/mame/includes/cloud9.h +++ b/src/mame/includes/cloud9.h @@ -35,15 +35,15 @@ public: void cloud9(machine_config &config); protected: - DECLARE_WRITE8_MEMBER(irq_ack_w); - DECLARE_READ8_MEMBER(leta_r); - DECLARE_WRITE8_MEMBER(nvram_recall_w); - DECLARE_WRITE8_MEMBER(nvram_store_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); + void irq_ack_w(uint8_t data); + uint8_t leta_r(offs_t offset); + void nvram_recall_w(uint8_t data); + void nvram_store_w(uint8_t data); + void cloud9_paletteram_w(offs_t offset, uint8_t data); + void cloud9_videoram_w(offs_t offset, uint8_t data); + uint8_t cloud9_bitmode_r(); + void cloud9_bitmode_w(uint8_t data); + void cloud9_bitmode_addr_w(offs_t offset, uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h index 82a8b23df83..946873909f8 100644 --- a/src/mame/includes/clshroad.h +++ b/src/mame/includes/clshroad.h @@ -40,12 +40,12 @@ public: tilemap_t *m_tilemap_0b; tilemap_t *m_tilemap_1; - DECLARE_READ8_MEMBER(input_r); + uint8_t input_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(main_irq_mask_w); DECLARE_WRITE_LINE_MEMBER(sound_irq_mask_w); DECLARE_WRITE_LINE_MEMBER(flipscreen_w); - DECLARE_WRITE8_MEMBER(vram_0_w); - DECLARE_WRITE8_MEMBER(vram_1_w); + void vram_0_w(offs_t offset, uint8_t data); + void vram_1_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info_0a); TILE_GET_INFO_MEMBER(get_tile_info_0b); diff --git a/src/mame/includes/cninja.h b/src/mame/includes/cninja.h index 28174d7ccc7..707fcf561d2 100644 --- a/src/mame/includes/cninja.h +++ b/src/mame/includes/cninja.h @@ -57,7 +57,7 @@ public: uint16_t m_priority; - template<int Chip> DECLARE_WRITE16_MEMBER(cninja_pf_control_w); + template<int Chip> void cninja_pf_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void sound_bankswitch_w(uint8_t data); void cninjabl2_oki_bank_w(uint8_t data); void init_mutantf(); @@ -83,19 +83,19 @@ public: DECOSPR_PRIORITY_CB_MEMBER(pri_callback); u16 robocop2_mix_callback(u16 p, u16 p2); - DECLARE_READ16_MEMBER( edrandy_protection_region_6_146_r ); - DECLARE_WRITE16_MEMBER( edrandy_protection_region_6_146_w ); - DECLARE_READ16_MEMBER( edrandy_protection_region_8_146_r ); - DECLARE_WRITE16_MEMBER( edrandy_protection_region_8_146_w ); + uint16_t edrandy_protection_region_6_146_r(offs_t offset); + void edrandy_protection_region_6_146_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t edrandy_protection_region_8_146_r(offs_t offset); + void edrandy_protection_region_8_146_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_READ16_MEMBER( mutantf_protection_region_0_146_r ); - DECLARE_WRITE16_MEMBER( mutantf_protection_region_0_146_w ); - DECLARE_READ16_MEMBER( cninja_protection_region_0_104_r ); - DECLARE_WRITE16_MEMBER( cninja_protection_region_0_104_w ); + uint16_t mutantf_protection_region_0_146_r(offs_t offset); + void mutantf_protection_region_0_146_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t cninja_protection_region_0_104_r(offs_t offset); + void cninja_protection_region_0_104_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_READ16_MEMBER(cninjabl2_sprite_dma_r); - DECLARE_WRITE16_MEMBER(robocop2_priority_w); - DECLARE_READ16_MEMBER(mutantf_71_r); + uint16_t cninjabl2_sprite_dma_r(); + void robocop2_priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t mutantf_71_r(); void cninjabl(machine_config &config); void edrandy(machine_config &config); void cninja(machine_config &config); diff --git a/src/mame/includes/coleco.h b/src/mame/includes/coleco.h index b5f47d5180a..01c3bb55e56 100644 --- a/src/mame/includes/coleco.h +++ b/src/mame/includes/coleco.h @@ -43,11 +43,11 @@ public: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER( cart_r ); - DECLARE_READ8_MEMBER( paddle_1_r ); - DECLARE_READ8_MEMBER( paddle_2_r ); - DECLARE_WRITE8_MEMBER( paddle_off_w ); - DECLARE_WRITE8_MEMBER( paddle_on_w ); + uint8_t cart_r(offs_t offset); + uint8_t paddle_1_r(); + uint8_t paddle_2_r(); + void paddle_off_w(uint8_t data); + void paddle_on_w(uint8_t data); TIMER_CALLBACK_MEMBER(paddle_d7reset_callback); TIMER_CALLBACK_MEMBER(paddle_irqreset_callback); @@ -117,13 +117,11 @@ public: void bit90(machine_config &config); - DECLARE_READ8_MEMBER( bankswitch_u4_r ); - DECLARE_READ8_MEMBER( bankswitch_u3_r ); - DECLARE_READ8_MEMBER( keyboard_r ); - DECLARE_WRITE8_MEMBER( u32_w ); + uint8_t bankswitch_u4_r(address_space &space); + uint8_t bankswitch_u3_r(address_space &space); + uint8_t keyboard_r(address_space &space); + void u32_w(uint8_t data); - uint8_t m_keyselect; - uint8_t m_unknown; protected: required_memory_bank m_bank; required_ioport_array<8> m_io_keyboard; @@ -131,6 +129,9 @@ protected: private: void bit90_map(address_map &map); void bit90_io_map(address_map &map); + + uint8_t m_keyselect; + uint8_t m_unknown; }; #endif diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index 3fc18a36bd9..0f4ac2db76c 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -78,30 +78,30 @@ public: optional_ioport_array<4> m_track_ports; - DECLARE_WRITE8_MEMBER(combatsc_vreg_w); - DECLARE_READ8_MEMBER(combatscb_io_r); - DECLARE_WRITE8_MEMBER(combatscb_priority_w); - DECLARE_WRITE8_MEMBER(combatsc_bankselect_w); - DECLARE_WRITE8_MEMBER(combatscb_io_w); - DECLARE_WRITE8_MEMBER(combatscb_bankselect_w); - DECLARE_WRITE8_MEMBER(combatsc_coin_counter_w); - DECLARE_READ8_MEMBER(trackball_r); - DECLARE_WRITE8_MEMBER(protection_w); - DECLARE_READ8_MEMBER(protection_r); - DECLARE_READ8_MEMBER(unk_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); - DECLARE_READ8_MEMBER(combatsc_busy_r); - DECLARE_WRITE8_MEMBER(combatsc_play_w); - DECLARE_WRITE8_MEMBER(combatsc_voice_reset_w); + void combatsc_vreg_w(uint8_t data); + uint8_t combatscb_io_r(offs_t offset); + void combatscb_priority_w(uint8_t data); + void combatsc_bankselect_w(uint8_t data); + void combatscb_io_w(offs_t offset, uint8_t data); + void combatscb_bankselect_w(address_space &space, uint8_t data); + void combatsc_coin_counter_w(uint8_t data); + uint8_t trackball_r(offs_t offset); + void protection_w(offs_t offset, uint8_t data); + uint8_t protection_r(offs_t offset); + uint8_t unk_r(); + void protection_clock_w(uint8_t data); + void combatsc_sh_irqtrigger_w(uint8_t data); + uint8_t combatsc_video_r(offs_t offset); + void combatsc_video_w(offs_t offset, uint8_t data); + void combatsc_pf_control_w(offs_t offset, uint8_t data); + uint8_t combatsc_scrollram_r(offs_t offset); + void combatsc_scrollram_w(offs_t offset, uint8_t data); + uint8_t combatsc_busy_r(); + void combatsc_play_w(uint8_t data); + void combatsc_voice_reset_w(uint8_t data); void combatsc_portA_w(uint8_t data); - DECLARE_WRITE8_MEMBER(combatscb_msm_w); - DECLARE_WRITE8_MEMBER(combatscb_sound_irq_ack); + void combatscb_msm_w(uint8_t data); + void combatscb_sound_irq_ack(uint8_t data); void init_combatsc(); TILE_GET_INFO_MEMBER(get_tile_info0); TILE_GET_INFO_MEMBER(get_tile_info1); diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index e0810e7494d..57756047162 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -37,13 +37,13 @@ public: void commando(machine_config &config); protected: - 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); + void commando_videoram_w(offs_t offset, uint8_t data); + void commando_colorram_w(offs_t offset, uint8_t data); + void commando_videoram2_w(offs_t offset, uint8_t data); + void commando_colorram2_w(offs_t offset, uint8_t data); + void commando_scrollx_w(offs_t offset, uint8_t data); + void commando_scrolly_w(offs_t offset, uint8_t data); + void commando_c804_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void machine_start() override; diff --git a/src/mame/includes/comx35.h b/src/mame/includes/comx35.h index 2ea2d0fcee7..e5dc36ed3ac 100644 --- a/src/mame/includes/comx35.h +++ b/src/mame/includes/comx35.h @@ -67,11 +67,11 @@ public: void check_interrupt(); - DECLARE_READ8_MEMBER( mem_r ); - DECLARE_WRITE8_MEMBER( mem_w ); - DECLARE_READ8_MEMBER( io_r ); - DECLARE_WRITE8_MEMBER( io_w ); - DECLARE_WRITE8_MEMBER( cdp1869_w ); + uint8_t mem_r(offs_t offset); + void mem_w(offs_t offset, uint8_t data); + uint8_t io_r(offs_t offset); + void io_w(offs_t offset, uint8_t data); + void cdp1869_w(offs_t offset, uint8_t data); DECLARE_READ_LINE_MEMBER( clear_r ); DECLARE_READ_LINE_MEMBER( ef2_r ); DECLARE_READ_LINE_MEMBER( ef4_r ); diff --git a/src/mame/includes/concept.h b/src/mame/includes/concept.h index 84d39e3f397..6df7630a23c 100644 --- a/src/mame/includes/concept.h +++ b/src/mame/includes/concept.h @@ -57,8 +57,8 @@ private: uint8_t m_pending_interrupts; bool m_clock_enable; uint8_t m_clock_address; - DECLARE_READ8_MEMBER(io_r); - DECLARE_WRITE8_MEMBER(io_w); + uint8_t io_r(offs_t offset); + void io_w(offs_t offset, uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index a24cd8e5252..5ec2cde2f89 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -61,18 +61,18 @@ public: required_device<cpu_device> m_audiocpu; required_device<k007121_device> m_k007121_1; required_device<k007121_device> m_k007121_2; - DECLARE_WRITE8_MEMBER(contra_bankswitch_w); - DECLARE_WRITE8_MEMBER(contra_sh_irqtrigger_w); - DECLARE_WRITE8_MEMBER(sirq_clear_w); - DECLARE_WRITE8_MEMBER(contra_coin_counter_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); + void contra_bankswitch_w(uint8_t data); + void contra_sh_irqtrigger_w(uint8_t data); + void sirq_clear_w(uint8_t data); + void contra_coin_counter_w(uint8_t data); + void contra_fg_vram_w(offs_t offset, uint8_t data); + void contra_fg_cram_w(offs_t offset, uint8_t data); + void contra_bg_vram_w(offs_t offset, uint8_t data); + void contra_bg_cram_w(offs_t offset, uint8_t data); + void contra_text_vram_w(offs_t offset, uint8_t data); + void contra_text_cram_w(offs_t offset, uint8_t data); + void contra_K007121_ctrl_0_w(offs_t offset, uint8_t data); + void contra_K007121_ctrl_1_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_tx_tile_info); diff --git a/src/mame/includes/coolpool.h b/src/mame/includes/coolpool.h index c9b9dcdbfcf..989d44a75fb 100644 --- a/src/mame/includes/coolpool.h +++ b/src/mame/includes/coolpool.h @@ -52,18 +52,18 @@ public: uint8_t m_nvram_write_enable; bool m_old_cmd; uint8_t m_same_cmd_count; - DECLARE_WRITE16_MEMBER(nvram_thrash_w); - DECLARE_WRITE16_MEMBER(nvram_data_w); - DECLARE_WRITE16_MEMBER(nvram_thrash_data_w); - DECLARE_WRITE16_MEMBER(amerdart_misc_w); + void nvram_thrash_w(offs_t offset, uint16_t data); + void nvram_data_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void nvram_thrash_data_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void amerdart_misc_w(uint16_t data); DECLARE_READ_LINE_MEMBER(amerdart_dsp_bio_line_r); - DECLARE_READ16_MEMBER(amerdart_trackball_r); - DECLARE_WRITE16_MEMBER(coolpool_misc_w); + uint16_t amerdart_trackball_r(offs_t offset); + void coolpool_misc_w(uint16_t data); uint16_t dsp_bio_line_r(); uint16_t dsp_hold_line_r(); - DECLARE_READ16_MEMBER(dsp_rom_r); - DECLARE_WRITE16_MEMBER(dsp_romaddr_w); - DECLARE_READ16_MEMBER(coolpool_input_r); + uint16_t dsp_rom_r(); + void dsp_romaddr_w(offs_t offset, uint16_t data); + uint16_t coolpool_input_r(offs_t offset); TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg); TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg); TMS340X0_SCANLINE_RGB32_CB_MEMBER(amerdart_scanline); diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index 76617d41940..09c58b6adda 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -51,17 +51,13 @@ public: required_device<palette_device> m_palette; required_device<generic_latch_8_device> m_soundlatch; - DECLARE_WRITE8_MEMBER(cop01_sound_command_w); - DECLARE_READ8_MEMBER(cop01_sound_command_r); - 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); - DECLARE_WRITE8_MEMBER(prot_address_w); - DECLARE_WRITE8_MEMBER(prot_data_w); - DECLARE_READ8_MEMBER(prot_data_r); + void cop01_sound_command_w(uint8_t data); + uint8_t cop01_sound_command_r(); + void cop01_irq_ack_w(uint8_t data); + uint8_t cop01_sound_irq_ack_w(); + void cop01_background_w(offs_t offset, uint8_t data); + void cop01_foreground_w(offs_t offset, uint8_t data); + void cop01_vreg_w(offs_t offset, uint8_t data); template <int Mask> DECLARE_READ_LINE_MEMBER(mightguy_area_r); void init_mightguy(); TILE_GET_INFO_MEMBER(get_bg_tile_info); diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index 5b5c0785e8f..418a7d6b92a 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -43,8 +43,8 @@ protected: void copsnrob_audio(machine_config &config); void main_map(address_map &map); - DECLARE_READ8_MEMBER(copsnrob_misc_r); - DECLARE_WRITE8_MEMBER(copsnrob_misc2_w); + uint8_t copsnrob_misc_r(); + void copsnrob_misc2_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(one_start_w); uint32_t screen_update_copsnrob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index 7d4c6edddf1..4f7a9e8b5be 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -68,19 +68,19 @@ public: required_device<screen_device> m_screen; required_device<palette_device> m_palette; - DECLARE_WRITE8_MEMBER(panic_sound_output_w); - DECLARE_WRITE8_MEMBER(panic_sound_output2_w); - DECLARE_WRITE8_MEMBER(cosmicg_output_w); - DECLARE_WRITE8_MEMBER(cosmica_sound_output_w); - DECLARE_WRITE8_MEMBER(dac_w); - DECLARE_READ8_MEMBER(cosmica_pixel_clock_r); - DECLARE_READ8_MEMBER(cosmicg_port_0_r); - DECLARE_READ8_MEMBER(cosmicg_port_1_r); - 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); + void panic_sound_output_w(offs_t offset, uint8_t data); + void panic_sound_output2_w(offs_t offset, uint8_t data); + void cosmicg_output_w(offs_t offset, uint8_t data); + void cosmica_sound_output_w(offs_t offset, uint8_t data); + void dac_w(uint8_t data); + uint8_t cosmica_pixel_clock_r(); + uint8_t cosmicg_port_0_r(offs_t offset); + uint8_t cosmicg_port_1_r(offs_t offset); + uint8_t magspot_coinage_dip_r(offs_t offset); + uint8_t nomnlnd_port_0_1_r(offs_t offset); + void flip_screen_w(uint8_t data); + void cosmic_color_register_w(offs_t offset, uint8_t data); + void cosmic_background_enable_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(panic_coin_inserted); DECLARE_INPUT_CHANGED_MEMBER(cosmica_coin_inserted); DECLARE_INPUT_CHANGED_MEMBER(cosmicg_coin_inserted); diff --git a/src/mame/includes/cosmicos.h b/src/mame/includes/cosmicos.h index 3d17661440f..de67ba76e37 100644 --- a/src/mame/includes/cosmicos.h +++ b/src/mame/includes/cosmicos.h @@ -59,17 +59,17 @@ public: m_leds(*this, "led%u", 0U) { } - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - DECLARE_READ8_MEMBER( video_off_r ); - DECLARE_READ8_MEMBER( video_on_r ); - DECLARE_WRITE8_MEMBER( audio_latch_w ); - DECLARE_READ8_MEMBER( hex_keyboard_r ); - DECLARE_WRITE8_MEMBER( hex_keylatch_w ); - DECLARE_READ8_MEMBER( reset_counter_r ); - DECLARE_WRITE8_MEMBER( segment_w ); - DECLARE_READ8_MEMBER( data_r ); - DECLARE_WRITE8_MEMBER( display_w ); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); + uint8_t video_off_r(); + uint8_t video_on_r(); + void audio_latch_w(uint8_t data); + uint8_t hex_keyboard_r(); + void hex_keylatch_w(uint8_t data); + uint8_t reset_counter_r(); + void segment_w(uint8_t data); + uint8_t data_r(); + void display_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( dmaout_w ); DECLARE_WRITE_LINE_MEMBER( efx_w ); DECLARE_READ_LINE_MEMBER( wait_r ); diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 58fa58bd266..c4265f9ec5f 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -171,37 +171,37 @@ protected: DECLARE_MACHINE_START(ganbare); DECLARE_MACHINE_RESET(cps); - DECLARE_READ16_MEMBER(cps1_dsw_r); - DECLARE_READ16_MEMBER(cps1_in1_r); - DECLARE_READ16_MEMBER(cps1_in2_r); - DECLARE_READ16_MEMBER(cps1_in3_r); - DECLARE_WRITE16_MEMBER(cps1_coinctrl_w); - DECLARE_WRITE16_MEMBER(cpsq_coinctrl2_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(cps1_soundlatch_w); - DECLARE_WRITE16_MEMBER(cps1_soundlatch2_w); - DECLARE_WRITE8_MEMBER(cps1_snd_bankswitch_w); - DECLARE_WRITE8_MEMBER(cps1_oki_pin7_w); - DECLARE_READ16_MEMBER(qsound_rom_r); - DECLARE_READ16_MEMBER(qsound_sharedram1_r); - DECLARE_WRITE16_MEMBER(qsound_sharedram1_w); - DECLARE_READ16_MEMBER(qsound_sharedram2_r); - DECLARE_WRITE16_MEMBER(qsound_sharedram2_w); - DECLARE_WRITE8_MEMBER(qsound_banksw_w); - DECLARE_READ16_MEMBER(ganbare_ram_r); - DECLARE_WRITE16_MEMBER(ganbare_ram_w); - DECLARE_READ16_MEMBER(cps1_hack_dsw_r); - DECLARE_READ16_MEMBER(sf2rb_prot_r); - DECLARE_READ16_MEMBER(sf2rb2_prot_r); - DECLARE_READ16_MEMBER(sf2dongb_prot_r); - DECLARE_READ16_MEMBER(sf2ceblp_prot_r); - DECLARE_WRITE16_MEMBER(sf2ceblp_prot_w); - DECLARE_WRITE16_MEMBER(sf2m3_layer_w); - DECLARE_READ16_MEMBER(dinohunt_sound_r); - DECLARE_WRITE16_MEMBER(varthb2_cps_a_w); + uint16_t cps1_dsw_r(offs_t offset); + uint16_t cps1_in1_r(); + uint16_t cps1_in2_r(); + uint16_t cps1_in3_r(); + void cps1_coinctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cpsq_coinctrl2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cps1_cps_a_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t cps1_cps_b_r(offs_t offset); + void cps1_cps_b_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cps1_gfxram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cps1_soundlatch_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cps1_soundlatch2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cps1_snd_bankswitch_w(uint8_t data); + void cps1_oki_pin7_w(uint8_t data); + uint16_t qsound_rom_r(offs_t offset); + uint16_t qsound_sharedram1_r(offs_t offset); + void qsound_sharedram1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t qsound_sharedram2_r(offs_t offset); + void qsound_sharedram2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void qsound_banksw_w(uint8_t data); + uint16_t ganbare_ram_r(offs_t offset, uint16_t mem_mask = ~0); + void ganbare_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t cps1_hack_dsw_r(offs_t offset); + uint16_t sf2rb_prot_r(offs_t offset); + uint16_t sf2rb2_prot_r(offs_t offset); + uint16_t sf2dongb_prot_r(offs_t offset); + uint16_t sf2ceblp_prot_r(); + void sf2ceblp_prot_w(uint16_t data); + void sf2m3_layer_w(offs_t offset, uint16_t data); + uint16_t dinohunt_sound_r(); + void varthb2_cps_a_w(offs_t offset, uint16_t data); TILEMAP_MAPPER_MEMBER(tilemap0_scan); TILEMAP_MAPPER_MEMBER(tilemap1_scan); @@ -345,22 +345,22 @@ public: private: void init_digital_volume(); - DECLARE_READ16_MEMBER(gigaman2_dummyqsound_r); - DECLARE_WRITE16_MEMBER(gigaman2_dummyqsound_w); + uint16_t gigaman2_dummyqsound_r(offs_t offset); + void gigaman2_dummyqsound_w(offs_t offset, uint16_t data); void gigaman2_gfx_reorder(); - DECLARE_WRITE16_MEMBER(cps2_eeprom_port_w); - DECLARE_READ16_MEMBER(cps2_qsound_volume_r); - DECLARE_READ16_MEMBER(kludge_r); - DECLARE_READ16_MEMBER(joy_or_paddle_r); - DECLARE_READ16_MEMBER(joy_or_paddle_ecofghtr_r); + void cps2_eeprom_port_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t cps2_qsound_volume_r(); + uint16_t kludge_r(); + uint16_t joy_or_paddle_r(); + uint16_t joy_or_paddle_ecofghtr_r(); TIMER_DEVICE_CALLBACK_MEMBER(cps2_interrupt); TIMER_CALLBACK_MEMBER(cps2_update_digital_volume); - 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); + void cps2_objram_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t cps2_objram1_r(offs_t offset); + uint16_t cps2_objram2_r(offs_t offset); + void cps2_objram1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void cps2_objram2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void unshuffle(uint64_t *buf, int len); void cps2_gfx_decode(); diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h index 75dcb438616..3b1977a993a 100644 --- a/src/mame/includes/cps3.h +++ b/src/mame/includes/cps3.h @@ -139,30 +139,30 @@ private: u16 m_lastb2; u8* m_user5; - DECLARE_READ8_MEMBER(ssram_r); - DECLARE_WRITE8_MEMBER(ssram_w); - DECLARE_WRITE8_MEMBER(ssregs_w); - DECLARE_WRITE32_MEMBER(sh2cache_ram_w); - DECLARE_WRITE32_MEMBER(cram_bank_w); - DECLARE_READ32_MEMBER(cram_data_r); - DECLARE_WRITE32_MEMBER(cram_data_w); - DECLARE_READ32_MEMBER(gfxflash_r); - DECLARE_WRITE32_MEMBER(gfxflash_w); - DECLARE_READ32_MEMBER(flash1_r); - DECLARE_READ32_MEMBER(flash2_r); - DECLARE_WRITE32_MEMBER(flash1_w); - DECLARE_WRITE32_MEMBER(flash2_w); - DECLARE_WRITE32_MEMBER(cram_gfxflash_bank_w); - DECLARE_READ16_MEMBER(dma_status_r); - DECLARE_READ16_MEMBER(dev_dipsw_r); - DECLARE_READ32_MEMBER(eeprom_r); - DECLARE_WRITE32_MEMBER(eeprom_w); - DECLARE_WRITE32_MEMBER(palettedma_w); - DECLARE_WRITE32_MEMBER(characterdma_w); - DECLARE_READ16_MEMBER(colourram_r); - DECLARE_WRITE16_MEMBER(colourram_w); - DECLARE_WRITE16_MEMBER(outport_w); - DECLARE_WRITE16_MEMBER(spritedma_w); + u8 ssram_r(offs_t offset); + void ssram_w(offs_t offset, u8 data); + void ssregs_w(offs_t offset, u8 data); + void sh2cache_ram_w(offs_t offset, u32 data, u32 mem_mask = ~0); + void cram_bank_w(offs_t offset, u32 data, u32 mem_mask = ~0); + u32 cram_data_r(offs_t offset); + void cram_data_w(offs_t offset, u32 data, u32 mem_mask = ~0); + u32 gfxflash_r(offs_t offset, u32 mem_mask = ~0); + void gfxflash_w(offs_t offset, u32 data, u32 mem_mask = ~0); + u32 flash1_r(offs_t offset, u32 mem_mask = ~0); + u32 flash2_r(offs_t offset, u32 mem_mask = ~0); + void flash1_w(offs_t offset, u32 data, u32 mem_mask = ~0); + void flash2_w(offs_t offset, u32 data, u32 mem_mask = ~0); + void cram_gfxflash_bank_w(offs_t offset, u32 data, u32 mem_mask = ~0); + u16 dma_status_r(); + u16 dev_dipsw_r(); + u32 eeprom_r(offs_t offset, u32 mem_mask = ~0); + void eeprom_w(offs_t offset, u32 data, u32 mem_mask = ~0); + void palettedma_w(offs_t offset, u32 data, u32 mem_mask = ~0); + void characterdma_w(offs_t offset, u32 data, u32 mem_mask = ~0); + u16 colourram_r(offs_t offset); + void colourram_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void outport_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void spritedma_w(offs_t offset, u16 data, u16 mem_mask = ~0); SH2_DMA_KLUDGE_CB(dma_callback); void draw_fg_layer(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h index 46509e6a8e9..d52a2229761 100644 --- a/src/mame/includes/crbaloon.h +++ b/src/mame/includes/crbaloon.h @@ -46,11 +46,11 @@ public: uint8_t m_collision_address_clear; tilemap_t *m_bg_tilemap; uint8_t m_irq_mask; - 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); + void pc3092_w(offs_t offset, uint8_t data); + uint8_t pc3259_r(offs_t offset); + void port_sound_w(uint8_t data); + void crbaloon_videoram_w(offs_t offset, uint8_t data); + void crbaloon_colorram_w(offs_t offset, uint8_t data); DECLARE_CUSTOM_INPUT_MEMBER(pc3092_r); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void machine_reset() override; @@ -58,9 +58,9 @@ public: void crbaloon_palette(palette_device &palette) const; uint32_t screen_update_crbaloon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); - DECLARE_WRITE8_MEMBER(crbaloon_audio_set_music_freq); - DECLARE_WRITE8_MEMBER(crbaloon_audio_set_music_enable); - DECLARE_WRITE8_MEMBER(crbaloon_audio_set_laugh_enable); + void crbaloon_audio_set_music_freq(uint8_t data); + void crbaloon_audio_set_music_enable(uint8_t data); + void crbaloon_audio_set_laugh_enable(uint8_t data); uint16_t crbaloon_get_collision_address(); void crbaloon_set_clear_collision_address(int _crbaloon_collision_address_clear); void draw_sprite_and_check_collision(bitmap_ind16 &bitmap); diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h index 34f2ea93be2..4b95ca4ea8f 100644 --- a/src/mame/includes/crgolf.h +++ b/src/mame/includes/crgolf.h @@ -55,21 +55,21 @@ public: required_device<cpu_device> m_audiocpu; optional_device<msm5205_device> m_msm; required_device<palette_device> m_palette; - DECLARE_WRITE8_MEMBER(rom_bank_select_w); - DECLARE_READ8_MEMBER(switch_input_r); - DECLARE_READ8_MEMBER(analog_input_r); - DECLARE_WRITE8_MEMBER(switch_input_select_w); - DECLARE_WRITE8_MEMBER(unknown_w); + void rom_bank_select_w(uint8_t data); + uint8_t switch_input_r(); + uint8_t analog_input_r(); + void switch_input_select_w(uint8_t data); + void unknown_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(color_select_w); DECLARE_WRITE_LINE_MEMBER(screen_flip_w); DECLARE_WRITE_LINE_MEMBER(screen_select_w); DECLARE_WRITE_LINE_MEMBER(screena_enable_w); DECLARE_WRITE_LINE_MEMBER(screenb_enable_w); - DECLARE_WRITE8_MEMBER(crgolfhi_sample_w); - DECLARE_READ8_MEMBER(unk_sub_02_r); - DECLARE_READ8_MEMBER(unk_sub_05_r); - DECLARE_READ8_MEMBER(unk_sub_07_r); - DECLARE_WRITE8_MEMBER(unk_sub_0c_w); + void crgolfhi_sample_w(offs_t offset, uint8_t data); + uint8_t unk_sub_02_r(); + uint8_t unk_sub_05_r(); + uint8_t unk_sub_07_r(); + void unk_sub_0c_w(uint8_t data); void init_crgolfhi(); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h index cfd2bd1c04c..6c32182f3e2 100644 --- a/src/mame/includes/crimfght.h +++ b/src/mame/includes/crimfght.h @@ -45,10 +45,10 @@ public: required_device<generic_latch_8_device> m_soundlatch; required_memory_bank m_rombank; - DECLARE_WRITE8_MEMBER(crimfght_coin_w); - DECLARE_WRITE8_MEMBER(sound_w); - DECLARE_READ8_MEMBER(k052109_051960_r); - DECLARE_WRITE8_MEMBER(k052109_051960_w); + void crimfght_coin_w(uint8_t data); + void sound_w(uint8_t data); + uint8_t k052109_051960_r(offs_t offset); + void k052109_051960_w(offs_t offset, uint8_t data); IRQ_CALLBACK_MEMBER(audiocpu_irq_ack); void ym2151_ct_w(uint8_t data); virtual void machine_start() override; diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index 8bead5943f1..0f89130b31f 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -57,11 +57,11 @@ public: uint32_t crshrace_tile_callback( uint32_t code ); /* devices */ - DECLARE_WRITE8_MEMBER(crshrace_sh_bankswitch_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); + void crshrace_sh_bankswitch_w(uint8_t data); + void crshrace_videoram1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void crshrace_videoram2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void crshrace_roz_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void crshrace_gfxctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void init_crshrace2(); void init_crshrace(); TILE_GET_INFO_MEMBER(get_tile_info1); diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index c4eba96d595..3acc02031c1 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -61,35 +61,35 @@ public: protected: DECLARE_WRITE_LINE_MEMBER(write_s2650_flag); // used by galaxia_state - DECLARE_READ8_MEMBER(huncholy_prot_r); - DECLARE_READ8_MEMBER(superbik_prot_r); - DECLARE_READ8_MEMBER(hero_prot_r); + uint8_t huncholy_prot_r(offs_t offset); + uint8_t superbik_prot_r(); + uint8_t hero_prot_r(offs_t offset); DECLARE_READ_LINE_MEMBER(speech_rom_read_bit); DECLARE_WRITE_LINE_MEMBER(cvs_slave_cpu_interrupt); - DECLARE_READ8_MEMBER(cvs_input_r); - DECLARE_WRITE8_MEMBER(cvs_speech_rom_address_lo_w); - DECLARE_WRITE8_MEMBER(cvs_speech_rom_address_hi_w); - DECLARE_READ8_MEMBER(cvs_speech_command_r); - DECLARE_WRITE8_MEMBER(audio_command_w); - DECLARE_READ8_MEMBER(cvs_video_or_color_ram_r); - DECLARE_WRITE8_MEMBER(cvs_video_or_color_ram_w); - DECLARE_READ8_MEMBER(cvs_bullet_ram_or_palette_r); - DECLARE_WRITE8_MEMBER(cvs_bullet_ram_or_palette_w); - DECLARE_READ8_MEMBER(cvs_s2636_0_or_character_ram_r); - DECLARE_WRITE8_MEMBER(cvs_s2636_0_or_character_ram_w); - DECLARE_READ8_MEMBER(cvs_s2636_1_or_character_ram_r); - 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); + uint8_t cvs_input_r(offs_t offset); + void cvs_speech_rom_address_lo_w(uint8_t data); + void cvs_speech_rom_address_hi_w(uint8_t data); + uint8_t cvs_speech_command_r(); + void audio_command_w(uint8_t data); + uint8_t cvs_video_or_color_ram_r(offs_t offset); + void cvs_video_or_color_ram_w(offs_t offset, uint8_t data); + uint8_t cvs_bullet_ram_or_palette_r(offs_t offset); + void cvs_bullet_ram_or_palette_w(offs_t offset, uint8_t data); + uint8_t cvs_s2636_0_or_character_ram_r(offs_t offset); + void cvs_s2636_0_or_character_ram_w(offs_t offset, uint8_t data); + uint8_t cvs_s2636_1_or_character_ram_r(offs_t offset); + void cvs_s2636_1_or_character_ram_w(offs_t offset, uint8_t data); + uint8_t cvs_s2636_2_or_character_ram_r(offs_t offset); + void cvs_s2636_2_or_character_ram_w(offs_t offset, uint8_t data); + void cvs_video_fx_w(uint8_t data); + uint8_t cvs_collision_r(); + uint8_t cvs_collision_clear(); + void cvs_scroll_w(uint8_t data); DECLARE_READ_LINE_MEMBER(tms_clock_r); - DECLARE_WRITE8_MEMBER(cvs_4_bit_dac_data_w); - DECLARE_WRITE8_MEMBER(cvs_unknown_w); - DECLARE_WRITE8_MEMBER(cvs_tms5110_ctl_w); - DECLARE_WRITE8_MEMBER(cvs_tms5110_pdc_w); + void cvs_4_bit_dac_data_w(offs_t offset, uint8_t data); + void cvs_unknown_w(offs_t offset, uint8_t data); + void cvs_tms5110_ctl_w(offs_t offset, uint8_t data); + void cvs_tms5110_pdc_w(offs_t offset, uint8_t data); DECLARE_VIDEO_START(cvs); void cvs_palette(palette_device &palette) const; uint32_t screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/cxhumax.h b/src/mame/includes/cxhumax.h index a72a39ea63f..627d5107814 100644 --- a/src/mame/includes/cxhumax.h +++ b/src/mame/includes/cxhumax.h @@ -47,77 +47,77 @@ public: required_shared_ptr<uint32_t> m_ram; required_device<generic_terminal_device> m_terminal; - DECLARE_WRITE32_MEMBER ( flash_w ); - DECLARE_READ32_MEMBER ( flash_r ); - - DECLARE_WRITE32_MEMBER ( cx_hsx_w ); - DECLARE_READ32_MEMBER ( cx_hsx_r ); - - DECLARE_WRITE32_MEMBER ( cx_romdescr_w ); - DECLARE_READ32_MEMBER ( cx_romdescr_r ); - DECLARE_WRITE32_MEMBER ( cx_isaromdescr_w ); - DECLARE_READ32_MEMBER ( cx_isaromdescr_r ); - DECLARE_WRITE32_MEMBER ( cx_isadescr_w ); - DECLARE_READ32_MEMBER ( cx_isadescr_r ); - DECLARE_WRITE32_MEMBER ( cx_rommap_w ); - DECLARE_READ32_MEMBER ( cx_rommap_r ); - DECLARE_WRITE32_MEMBER ( cx_rommode_w ); - DECLARE_READ32_MEMBER ( cx_rommode_r ); - DECLARE_WRITE32_MEMBER ( cx_xoemask_w ); - DECLARE_READ32_MEMBER ( cx_xoemask_r ); - DECLARE_WRITE32_MEMBER ( cx_pci_w ); - DECLARE_READ32_MEMBER ( cx_pci_r ); - DECLARE_WRITE32_MEMBER ( cx_extdesc_w ); - DECLARE_READ32_MEMBER ( cx_extdesc_r ); - - DECLARE_WRITE32_MEMBER ( cx_remap_w ); - DECLARE_WRITE32_MEMBER ( cx_scratch_w ); - DECLARE_READ32_MEMBER ( cx_scratch_r ); - - DECLARE_WRITE32_MEMBER ( cx_timers_w ); - DECLARE_READ32_MEMBER ( cx_timers_r ); - - DECLARE_WRITE32_MEMBER ( cx_uart2_w ); - DECLARE_READ32_MEMBER ( cx_uart2_r ); - - DECLARE_WRITE32_MEMBER ( cx_pll_w ); - DECLARE_READ32_MEMBER ( cx_pll_r ); - DECLARE_WRITE32_MEMBER ( cx_clkdiv_w ); - DECLARE_READ32_MEMBER ( cx_clkdiv_r ); - DECLARE_WRITE32_MEMBER ( cx_pllprescale_w ); - DECLARE_READ32_MEMBER ( cx_pllprescale_r ); - - DECLARE_WRITE32_MEMBER ( cx_chipcontrol_w ); - DECLARE_READ32_MEMBER ( cx_chipcontrol_r ); - - DECLARE_WRITE32_MEMBER ( cx_intctrl_w ); - DECLARE_READ32_MEMBER ( cx_intctrl_r ); - - DECLARE_WRITE32_MEMBER ( cx_ss_w ); - DECLARE_READ32_MEMBER ( cx_ss_r ); - - DECLARE_WRITE32_MEMBER ( cx_i2c0_w ); - DECLARE_READ32_MEMBER ( cx_i2c0_r ); - DECLARE_WRITE32_MEMBER ( cx_i2c1_w ); - DECLARE_READ32_MEMBER ( cx_i2c1_r ); - DECLARE_WRITE32_MEMBER ( cx_i2c2_w ); - DECLARE_READ32_MEMBER ( cx_i2c2_r ); - - DECLARE_WRITE32_MEMBER ( cx_mc_cfg_w ); - DECLARE_READ32_MEMBER ( cx_mc_cfg_r ); - - DECLARE_WRITE32_MEMBER ( cx_drm0_w ); - DECLARE_READ32_MEMBER ( cx_drm0_r ); - DECLARE_WRITE32_MEMBER ( cx_drm1_w ); - DECLARE_READ32_MEMBER ( cx_drm1_r ); - - DECLARE_WRITE32_MEMBER ( cx_hdmi_w ); - DECLARE_READ32_MEMBER ( cx_hdmi_r ); - - DECLARE_WRITE32_MEMBER ( cx_gxa_w ); - DECLARE_READ32_MEMBER ( cx_gxa_r ); - - DECLARE_READ32_MEMBER ( dummy_flash_r ); + void flash_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t flash_r(offs_t offset, uint32_t mem_mask = ~0); + + void cx_hsx_w(offs_t offset, uint32_t data); + uint32_t cx_hsx_r(offs_t offset); + + void cx_romdescr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_romdescr_r(offs_t offset); + void cx_isaromdescr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_isaromdescr_r(offs_t offset); + void cx_isadescr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_isadescr_r(offs_t offset); + void cx_rommap_w(offs_t offset, uint32_t data); + uint32_t cx_rommap_r(offs_t offset); + void cx_rommode_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_rommode_r(offs_t offset); + void cx_xoemask_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_xoemask_r(offs_t offset); + void cx_pci_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_pci_r(offs_t offset); + void cx_extdesc_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_extdesc_r(offs_t offset); + + void cx_remap_w(offs_t offset, uint32_t data); + void cx_scratch_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_scratch_r(offs_t offset); + + void cx_timers_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_timers_r(offs_t offset); + + void cx_uart2_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_uart2_r(offs_t offset); + + void cx_pll_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_pll_r(offs_t offset); + void cx_clkdiv_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_clkdiv_r(offs_t offset); + void cx_pllprescale_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_pllprescale_r(offs_t offset); + + void cx_chipcontrol_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_chipcontrol_r(offs_t offset); + + void cx_intctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_intctrl_r(offs_t offset); + + void cx_ss_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_ss_r(offs_t offset); + + void cx_i2c0_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_i2c0_r(offs_t offset); + void cx_i2c1_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_i2c1_r(offs_t offset); + void cx_i2c2_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_i2c2_r(offs_t offset); + + void cx_mc_cfg_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_mc_cfg_r(offs_t offset); + + void cx_drm0_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_drm0_r(offs_t offset); + void cx_drm1_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_drm1_r(offs_t offset); + + void cx_hdmi_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_hdmi_r(offs_t offset); + + void cx_gxa_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t cx_gxa_r(offs_t offset); + + uint32_t dummy_flash_r(); uint32_t m_romdescr_reg; uint32_t m_isaromdescr_regs[0x0C/4]; diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index 392bc655ec8..26525a1cabb 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -69,7 +69,7 @@ public: void cyberbal2p(machine_config &config); protected: - DECLARE_READ16_MEMBER(sound_state_r); + uint16_t sound_state_r(); virtual void machine_reset() override; virtual void video_start() override; @@ -111,7 +111,7 @@ public: void cyberbalt(machine_config &config); protected: - DECLARE_WRITE16_MEMBER(p2_reset_w); + void p2_reset_w(uint16_t data); TILE_GET_INFO_MEMBER(get_alpha2_tile_info); TILE_GET_INFO_MEMBER(get_playfield2_tile_info); diff --git a/src/mame/includes/cybiko.h b/src/mame/includes/cybiko.h index d3328dbed76..e82bc7f27d6 100644 --- a/src/mame/includes/cybiko.h +++ b/src/mame/includes/cybiko.h @@ -51,23 +51,23 @@ public: , m_debug_serial(*this, "debug_serial") { } - DECLARE_WRITE16_MEMBER(serflash_w); - DECLARE_READ16_MEMBER(clock_r); - DECLARE_WRITE16_MEMBER(clock_w); - DECLARE_READ16_MEMBER(xtclock_r); - DECLARE_WRITE16_MEMBER(xtclock_w); - DECLARE_READ16_MEMBER(xtpower_r); - DECLARE_READ16_MEMBER(adc1_r); - DECLARE_READ16_MEMBER(adc2_r); - DECLARE_READ16_MEMBER(port0_r); + void serflash_w(uint16_t data); + uint16_t clock_r(); + void clock_w(uint16_t data); + uint16_t xtclock_r(); + void xtclock_w(uint16_t data); + uint16_t xtpower_r(); + uint16_t adc1_r(); + uint16_t adc2_r(); + uint16_t port0_r(); - DECLARE_READ16_MEMBER(cybiko_lcd_r); - DECLARE_WRITE16_MEMBER(cybiko_lcd_w); - DECLARE_READ16_MEMBER(cybikov1_key_r); - DECLARE_READ16_MEMBER(cybikov2_key_r); - DECLARE_READ16_MEMBER(cybikoxt_key_r); - DECLARE_WRITE16_MEMBER(cybiko_usb_w); - int cybiko_key_r( offs_t offset, int mem_mask); + uint16_t cybiko_lcd_r(offs_t offset, uint16_t mem_mask = ~0); + void cybiko_lcd_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t cybikov1_key_r(offs_t offset, uint16_t mem_mask = ~0); + uint16_t cybikov2_key_r(offs_t offset, uint16_t mem_mask = ~0); + uint16_t cybikoxt_key_r(offs_t offset, uint16_t mem_mask = ~0); + void cybiko_usb_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + int cybiko_key_r(offs_t offset, int mem_mask); required_device<h8_device> m_maincpu; required_device<hd66421_device> m_crtc; diff --git a/src/mame/includes/cybstorm.h b/src/mame/includes/cybstorm.h index c734e67d985..05aa4bcace2 100644 --- a/src/mame/includes/cybstorm.h +++ b/src/mame/includes/cybstorm.h @@ -37,8 +37,8 @@ protected: virtual void machine_start() override; virtual void video_start() override; - DECLARE_READ32_MEMBER(special_port1_r); - DECLARE_WRITE32_MEMBER(latch_w); + uint32_t special_port1_r(); + void latch_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); TILE_GET_INFO_MEMBER(get_alpha_tile_info); TILE_GET_INFO_MEMBER(get_playfield_tile_info); diff --git a/src/mame/includes/dai.h b/src/mame/includes/dai.h index dbb16e37288..ac99048d192 100644 --- a/src/mame/includes/dai.h +++ b/src/mame/includes/dai.h @@ -55,13 +55,13 @@ private: uint8_t m_cassette_motor[2]; uint8_t m_keyboard_scan_mask; unsigned short m_4_colours_palette[4]; - DECLARE_WRITE8_MEMBER(dai_stack_interrupt_circuit_w); - DECLARE_READ8_MEMBER(dai_io_discrete_devices_r); - DECLARE_WRITE8_MEMBER(dai_io_discrete_devices_w); - DECLARE_READ8_MEMBER(dai_amd9511_r); - DECLARE_WRITE8_MEMBER(dai_amd9511_w); - DECLARE_READ8_MEMBER(dai_pit_r); - DECLARE_WRITE8_MEMBER(dai_pit_w); + void dai_stack_interrupt_circuit_w(uint8_t data); + uint8_t dai_io_discrete_devices_r(offs_t offset); + void dai_io_discrete_devices_w(offs_t offset, uint8_t data); + uint8_t dai_amd9511_r(); + void dai_amd9511_w(offs_t offset, uint8_t data); + uint8_t dai_pit_r(offs_t offset); + void dai_pit_w(offs_t offset, uint8_t data); uint8_t dai_keyboard_r(); void dai_keyboard_w(uint8_t data); void dai_palette(palette_device &palette) const; diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index 1516ec41c17..019fcfc9bc7 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -60,8 +60,8 @@ private: tilemap_t *m_fgtilemap; tilemap_t *m_txtilemap; - DECLARE_WRITE8_MEMBER(hw_w); - DECLARE_WRITE8_MEMBER(tx_vram_w); + void hw_w(uint8_t data); + void tx_vram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_bgtile_info); TILE_GET_INFO_MEMBER(get_fgtile_info); diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h index 068f494de04..ea5ec8eed56 100644 --- a/src/mame/includes/darkseal.h +++ b/src/mame/includes/darkseal.h @@ -35,9 +35,9 @@ public: void init_darkseal(); private: - DECLARE_WRITE16_MEMBER(irq_ack_w); - DECLARE_WRITE16_MEMBER(palette_w); - DECLARE_WRITE16_MEMBER(palette_ext_w); + void irq_ack_w(uint16_t data); + void palette_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void palette_ext_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void update_palette(int offset); diff --git a/src/mame/includes/dassault.h b/src/mame/includes/dassault.h index 0d40debec59..c81ea54563b 100644 --- a/src/mame/includes/dassault.h +++ b/src/mame/includes/dassault.h @@ -55,12 +55,12 @@ private: uint16_t m_priority; - DECLARE_WRITE16_MEMBER(priority_w); - DECLARE_WRITE16_MEMBER(main_irq_ack_w); - DECLARE_WRITE16_MEMBER(sub_irq_ack_w); - DECLARE_READ16_MEMBER(dassault_control_r); - DECLARE_WRITE16_MEMBER(dassault_control_w); - DECLARE_READ16_MEMBER(dassault_sub_control_r); + void priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void main_irq_ack_w(uint16_t data); + void sub_irq_ack_w(uint16_t data); + uint16_t dassault_control_r(offs_t offset); + void dassault_control_w(uint16_t data); + uint16_t dassault_sub_control_r(); void sound_bankswitch_w(uint8_t data); virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h index 3f2b7b99de6..9a3f5689c38 100644 --- a/src/mame/includes/dbz.h +++ b/src/mame/includes/dbz.h @@ -75,11 +75,11 @@ private: required_ioport m_dsw2; - 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); + void dbzcontrol_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void dbz_sound_command_w(uint16_t data); + void dbz_sound_cause_nmi(uint16_t data); + void dbz_bg2_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void dbz_bg1_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); DECLARE_WRITE_LINE_MEMBER(dbz_irq2_ack_w); TILE_GET_INFO_MEMBER(get_dbz_bg2_tile_info); TILE_GET_INFO_MEMBER(get_dbz_bg1_tile_info); diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h index 3ef2fc51cf1..4a6e8208601 100644 --- a/src/mame/includes/dc.h +++ b/src/mame/includes/dc.h @@ -59,29 +59,29 @@ class dc_state : public driver_device virtual void machine_reset() override; TIMER_CALLBACK_MEMBER(g2_dma_irq); TIMER_CALLBACK_MEMBER(ch2_dma_irq); - DECLARE_READ32_MEMBER(dc_aica_reg_r); - DECLARE_WRITE32_MEMBER(dc_aica_reg_w); - DECLARE_READ32_MEMBER(dc_arm_aica_r); - DECLARE_WRITE32_MEMBER(dc_arm_aica_w); + uint32_t dc_aica_reg_r(offs_t offset, uint32_t mem_mask = ~0); + void dc_aica_reg_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t dc_arm_aica_r(offs_t offset); + void dc_arm_aica_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); void g2_dma_execute(address_space &space, int channel); inline int decode_reg32_64(uint32_t offset, uint64_t mem_mask, uint64_t *shift); inline int decode_reg3216_64(uint32_t offset, uint64_t mem_mask, uint64_t *shift); int dc_compute_interrupt_level(); void dc_update_interrupt_status(); inline int decode_reg_64(uint32_t offset, uint64_t mem_mask, uint64_t *shift); - DECLARE_READ64_MEMBER( dc_sysctrl_r ); - DECLARE_WRITE64_MEMBER( dc_sysctrl_w ); - DECLARE_READ64_MEMBER( dc_gdrom_r ); - DECLARE_WRITE64_MEMBER( dc_gdrom_w ); - DECLARE_READ64_MEMBER( dc_g2_ctrl_r ); - DECLARE_WRITE64_MEMBER( dc_g2_ctrl_w ); - DECLARE_READ64_MEMBER( dc_modem_r ); - DECLARE_WRITE64_MEMBER( dc_modem_w ); + uint64_t dc_sysctrl_r(offs_t offset, uint64_t mem_mask = ~0); + void dc_sysctrl_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t dc_gdrom_r(offs_t offset, uint64_t mem_mask = ~0); + void dc_gdrom_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t dc_g2_ctrl_r(offs_t offset, uint64_t mem_mask = ~0); + void dc_g2_ctrl_w(address_space &space, offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t dc_modem_r(offs_t offset, uint64_t mem_mask = ~0); + void dc_modem_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); void g1_irq(uint8_t data); void pvr_irq(uint8_t data); void maple_irq(uint8_t data); - DECLARE_READ16_MEMBER( soundram_r ); - DECLARE_WRITE16_MEMBER( soundram_w ); + uint16_t soundram_r(offs_t offset); + void soundram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); DECLARE_WRITE_LINE_MEMBER(aica_irq); DECLARE_WRITE_LINE_MEMBER(sh4_aica_irq); DECLARE_WRITE_LINE_MEMBER(external_irq); diff --git a/src/mame/includes/dccons.h b/src/mame/includes/dccons.h index 8ed88874c64..02a829f0b31 100644 --- a/src/mame/includes/dccons.h +++ b/src/mame/includes/dccons.h @@ -30,13 +30,11 @@ public: void init_dcjp(); void init_tream(); - DECLARE_READ64_MEMBER(dcus_idle_skip_r); - DECLARE_READ64_MEMBER(dcjp_idle_skip_r); + uint64_t dcus_idle_skip_r(); + uint64_t dcjp_idle_skip_r(); - DECLARE_READ64_MEMBER(dc_pdtra_r); - DECLARE_WRITE64_MEMBER(dc_pdtra_w); - DECLARE_READ64_MEMBER(dc_arm_r); - DECLARE_WRITE64_MEMBER(dc_arm_w); + uint64_t dc_pdtra_r(); + void dc_pdtra_w(uint64_t data); DECLARE_WRITE_LINE_MEMBER(aica_irq); DECLARE_WRITE_LINE_MEMBER(sh4_aica_irq); DECLARE_WRITE_LINE_MEMBER(ata_interrupt); @@ -44,10 +42,10 @@ public: TIMER_CALLBACK_MEMBER( atapi_xfer_end ); void dreamcast_atapi_init(); - DECLARE_READ32_MEMBER( dc_mess_g1_ctrl_r ); - DECLARE_WRITE32_MEMBER( dc_mess_g1_ctrl_w ); - DECLARE_READ8_MEMBER( dc_flash_r ); - DECLARE_WRITE8_MEMBER( dc_flash_w ); + uint32_t dc_mess_g1_ctrl_r(offs_t offset); + void dc_mess_g1_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint8_t dc_flash_r(offs_t offset); + void dc_flash_w(offs_t offset, uint8_t data); static void gdrom_config(device_t *device); void dc_base(machine_config &config); diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index a3fa7728da1..fc9e190e7af 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -77,16 +77,16 @@ private: required_device<bsmt2000_device> m_bsmt; required_device<generic_latch_8_device> m_soundlatch; - DECLARE_WRITE16_MEMBER(eeprom_control_w); - DECLARE_READ8_MEMBER(sound_status_r); - DECLARE_WRITE8_MEMBER(sound_control_w); - DECLARE_WRITE8_MEMBER(bsmt_data_w); - DECLARE_WRITE16_MEMBER(blitter_color_w); - DECLARE_WRITE16_MEMBER(blitter_xparam_w); - DECLARE_WRITE16_MEMBER(blitter_yparam_w); - DECLARE_WRITE16_MEMBER(blitter_vidparam_w); - DECLARE_WRITE16_MEMBER(blitter_unknown_w); - DECLARE_READ16_MEMBER(blitter_vidparam_r); + void eeprom_control_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u8 sound_status_r(); + void sound_control_w(u8 data); + void bsmt_data_w(offs_t offset, u8 data); + void blitter_color_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void blitter_xparam_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void blitter_yparam_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void blitter_vidparam_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void blitter_unknown_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 blitter_vidparam_r(offs_t offset); void dcheese_palette(palette_device &palette) const; u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(vblank); diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h index cb1c099b149..a4040e52b2d 100644 --- a/src/mame/includes/dcon.h +++ b/src/mame/includes/dcon.h @@ -54,11 +54,11 @@ private: void layer_en_w(uint16_t data); void layer_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - DECLARE_WRITE16_MEMBER(gfxbank_w); - DECLARE_WRITE16_MEMBER(background_w); - DECLARE_WRITE16_MEMBER(foreground_w); - DECLARE_WRITE16_MEMBER(midground_w); - DECLARE_WRITE16_MEMBER(text_w); + void gfxbank_w(uint16_t data); + void background_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void foreground_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void midground_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void text_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILE_GET_INFO_MEMBER(get_back_tile_info); TILE_GET_INFO_MEMBER(get_fore_tile_info); diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index 915ef446637..ed424d3bdad 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -65,14 +65,14 @@ private: required_device<palette_device> m_palette; required_device<ay8912_device> 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); + uint8_t dday_countdown_timer_r(); + void dday_bgvideoram_w(offs_t offset, uint8_t data); + void dday_fgvideoram_w(offs_t offset, uint8_t data); + void dday_textvideoram_w(offs_t offset, uint8_t data); + void dday_colorram_w(offs_t offset, uint8_t data); + uint8_t dday_colorram_r(offs_t offset); + void dday_sl_control_w(uint8_t data); + void dday_control_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_text_tile_info); diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index f5031bde663..117d0c4e1d4 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -96,8 +96,8 @@ protected: int m_m5205_clk; #endif - DECLARE_WRITE8_MEMBER(ddragon_bgvideoram_w); - DECLARE_WRITE8_MEMBER(ddragon_fgvideoram_w); + void ddragon_bgvideoram_w(offs_t offset, uint8_t data); + void ddragon_fgvideoram_w(offs_t offset, uint8_t data); TILEMAP_MAPPER_MEMBER(background_scan); @@ -137,16 +137,16 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(ddragon_scanline); - DECLARE_WRITE8_MEMBER(ddragon_bankswitch_w); - DECLARE_READ8_MEMBER(ddragon_interrupt_r); - DECLARE_WRITE8_MEMBER(ddragon_interrupt_w); - DECLARE_WRITE8_MEMBER(ddragon2_sub_irq_ack_w); - DECLARE_WRITE8_MEMBER(ddragon2_sub_irq_w); + void ddragon_bankswitch_w(uint8_t data); + uint8_t ddragon_interrupt_r(offs_t offset); + void ddragon_interrupt_w(offs_t offset, uint8_t data); + void ddragon2_sub_irq_ack_w(uint8_t data); + void ddragon2_sub_irq_w(uint8_t data); void sub_port6_w(uint8_t data); - DECLARE_READ8_MEMBER(ddragon_comram_r); - DECLARE_WRITE8_MEMBER(ddragon_comram_w); - DECLARE_WRITE8_MEMBER(dd_adpcm_w); - DECLARE_READ8_MEMBER(dd_adpcm_status_r); + uint8_t ddragon_comram_r(offs_t offset); + void ddragon_comram_w(offs_t offset, uint8_t data); + void dd_adpcm_w(offs_t offset, uint8_t data); + uint8_t dd_adpcm_status_r(); void ddragonba_port_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(dd_adpcm_int_1); DECLARE_WRITE_LINE_MEMBER(dd_adpcm_int_2); @@ -178,9 +178,9 @@ public: void init_darktowr(); private: - DECLARE_READ8_MEMBER(darktowr_mcu_bank_r); - DECLARE_WRITE8_MEMBER(darktowr_mcu_bank_w); - DECLARE_WRITE8_MEMBER(darktowr_bankswitch_w); + uint8_t darktowr_mcu_bank_r(offs_t offset); + void darktowr_mcu_bank_w(offs_t offset, uint8_t data); + void darktowr_bankswitch_w(uint8_t data); void mcu_port_a_w(offs_t offset, uint8_t data); void darktowr_map(address_map &map); @@ -206,7 +206,7 @@ public: void init_toffy(); private: - DECLARE_WRITE8_MEMBER(toffy_bankswitch_w); + void toffy_bankswitch_w(uint8_t data); void toffy_map(address_map &map); }; diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index 579d4f51b31..13355d261c7 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -82,10 +82,10 @@ protected: required_device<okim6295_device> m_oki; required_device<screen_device> m_screen; - 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); + void ddragon3_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t ddragon3_scroll_r(offs_t offset); + void ddragon3_bg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void ddragon3_fg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -94,10 +94,10 @@ protected: virtual void video_start() override; private: - DECLARE_WRITE16_MEMBER(ddragon3_vreg_w); - DECLARE_WRITE16_MEMBER(irq6_ack_w); - DECLARE_WRITE16_MEMBER(irq5_ack_w); - DECLARE_WRITE8_MEMBER(oki_bankswitch_w); + void ddragon3_vreg_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void irq6_ack_w(uint16_t data); + void irq5_ack_w(uint16_t data); + void oki_bankswitch_w(uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); virtual void machine_start() override; @@ -137,15 +137,15 @@ private: required_shared_ptr<uint16_t> m_paletteram; required_ioport_array<2> m_dsw; tilemap_t *m_fg0_tilemap; - DECLARE_WRITE16_MEMBER(wwfwfest_fg0_videoram_w); + void wwfwfest_fg0_videoram_w(offs_t offset, uint16_t data); //required_device<buffered_spriteram16_device> m_spriteram; - DECLARE_WRITE8_MEMBER(wwfwfest_priority_w); - DECLARE_WRITE16_MEMBER(wwfwfest_irq_ack_w); - DECLARE_WRITE16_MEMBER(wwfwfest_flipscreen_w); - DECLARE_READ16_MEMBER(wwfwfest_paletteram_r); - DECLARE_WRITE16_MEMBER(wwfwfest_paletteram_w); - DECLARE_WRITE16_MEMBER(wwfwfest_soundwrite); + void wwfwfest_priority_w(uint8_t data); + void wwfwfest_irq_ack_w(offs_t offset, uint16_t data); + void wwfwfest_flipscreen_w(uint16_t data); + uint16_t wwfwfest_paletteram_r(offs_t offset); + void wwfwfest_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void wwfwfest_soundwrite(uint16_t data); TILE_GET_INFO_MEMBER(get_fg0_tile_info); diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index 1b72fc0e5c3..d40df1f9228 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -65,16 +65,16 @@ private: required_device<filter_rc_device> m_filter3; required_device<gfxdecode_device> m_gfxdecode; - DECLARE_WRITE8_MEMBER(ddribble_bankswitch_w); - DECLARE_READ8_MEMBER(ddribble_sharedram_r); - DECLARE_WRITE8_MEMBER(ddribble_sharedram_w); - 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); + void ddribble_bankswitch_w(uint8_t data); + uint8_t ddribble_sharedram_r(offs_t offset); + void ddribble_sharedram_w(offs_t offset, uint8_t data); + uint8_t ddribble_snd_sharedram_r(offs_t offset); + void ddribble_snd_sharedram_w(offs_t offset, uint8_t data); + void ddribble_coin_counter_w(uint8_t data); + void K005885_0_w(offs_t offset, uint8_t data); + void K005885_1_w(offs_t offset, uint8_t data); + void ddribble_fg_videoram_w(offs_t offset, uint8_t data); + void ddribble_bg_videoram_w(offs_t offset, uint8_t data); uint8_t ddribble_vlm5030_busy_r(); void ddribble_vlm5030_ctrl_w(uint8_t data); TILEMAP_MAPPER_MEMBER(tilemap_scan); diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index 2ee6c6aa4b8..22562f751e9 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -37,7 +37,7 @@ public: void init_deadang(); void init_ghunter(); - DECLARE_WRITE16_MEMBER(foreground_w); + void foreground_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILEMAP_MAPPER_MEMBER(bg_scan); TILE_GET_INFO_MEMBER(get_pf1_tile_info); @@ -67,8 +67,8 @@ protected: tilemap_t *m_pf1_layer; tilemap_t *m_text_layer; - DECLARE_WRITE16_MEMBER(text_w); - DECLARE_WRITE16_MEMBER(bank_w); + void text_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void sound_decrypted_opcodes_map(address_map &map); void sound_map(address_map &map); @@ -79,8 +79,8 @@ protected: optional_device<seibu_adpcm_device> m_adpcm1; optional_device<seibu_adpcm_device> m_adpcm2; - DECLARE_READ16_MEMBER(ghunter_trackball_low_r); - DECLARE_READ16_MEMBER(ghunter_trackball_high_r); + uint16_t ghunter_trackball_low_r(); + uint16_t ghunter_trackball_high_r(); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -107,7 +107,7 @@ protected: private: TILE_GET_INFO_MEMBER(get_popnrun_text_tile_info); - DECLARE_WRITE16_MEMBER(popnrun_text_w); + void popnrun_text_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void popnrun_main_map(address_map &map); void popnrun_sub_map(address_map &map); void popnrun_sound_map(address_map &map); diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index 35409944e54..db134ddfd58 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -80,9 +80,9 @@ protected: uint16_t *m_buffered_spriteram; uint16_t m_pri; - DECLARE_READ16_MEMBER(dec0_controls_r); - DECLARE_READ16_MEMBER(slyspy_controls_r); - DECLARE_WRITE16_MEMBER(priority_w); + uint16_t dec0_controls_r(offs_t offset); + uint16_t slyspy_controls_r(offs_t offset); + void priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); DECLARE_VIDEO_START(dec0_nodma); DECLARE_VIDEO_START(slyspy); @@ -115,28 +115,28 @@ private: int m_hippodrm_lsb; uint8_t m_i8751_ports[4]; - DECLARE_WRITE16_MEMBER(dec0_control_w); - DECLARE_WRITE16_MEMBER(midres_sound_w); - DECLARE_READ16_MEMBER(slyspy_protection_r); - DECLARE_WRITE16_MEMBER(slyspy_state_w); - DECLARE_READ16_MEMBER(slyspy_state_r); - DECLARE_READ16_MEMBER(midres_controls_r); - DECLARE_READ8_MEMBER(hippodrm_prot_r); - DECLARE_WRITE8_MEMBER(hippodrm_prot_w); + void dec0_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void midres_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t slyspy_protection_r(offs_t offset); + void slyspy_state_w(uint16_t data); + uint16_t slyspy_state_r(); + uint16_t midres_controls_r(offs_t offset); + uint8_t hippodrm_prot_r(offs_t offset); + void hippodrm_prot_w(offs_t offset, uint8_t data); uint8_t dec0_mcu_port0_r(); void dec0_mcu_port0_w(uint8_t data); void dec0_mcu_port1_w(uint8_t data); void dec0_mcu_port2_w(uint8_t data); void dec0_mcu_port3_w(uint8_t data); - 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_READ16_MEMBER(ffantasybl_242024_r); + uint16_t hippodrm_68000_share_r(offs_t offset); + void hippodrm_68000_share_w(offs_t offset, uint16_t data); + void sprite_mirror_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t robocop_68000_share_r(offs_t offset); + void robocop_68000_share_w(offs_t offset, uint16_t data); + uint16_t ffantasybl_242024_r(); - DECLARE_READ8_MEMBER(slyspy_sound_state_r); - DECLARE_READ8_MEMBER(slyspy_sound_state_reset_r); + uint8_t slyspy_sound_state_r(); + uint8_t slyspy_sound_state_reset_r(); virtual void machine_start() override; DECLARE_MACHINE_RESET(slyspy); @@ -196,14 +196,14 @@ private: bool m_adpcm_toggle[2]; uint16_t m_automat_scroll_regs[4]; - DECLARE_WRITE16_MEMBER(automat_control_w); - DECLARE_READ16_MEMBER( automat_palette_r ); - DECLARE_WRITE16_MEMBER( automat_palette_w ); - DECLARE_WRITE16_MEMBER( automat_scroll_w ) + void automat_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t automat_palette_r(offs_t offset); + void automat_palette_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void automat_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { COMBINE_DATA(&m_automat_scroll_regs[offset]); } - DECLARE_WRITE8_MEMBER(sound_bankswitch_w); + void sound_bankswitch_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(msm1_vclk_cb); DECLARE_WRITE_LINE_MEMBER(msm2_vclk_cb); diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index f1d4f14c79d..dedea1a1171 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -127,26 +127,26 @@ private: emu_timer *m_i8751_timer; emu_timer *m_m6502_timer; - DECLARE_WRITE8_MEMBER(dec8_mxc06_karn_buffer_spriteram_w); - DECLARE_READ8_MEMBER(i8751_h_r); - DECLARE_READ8_MEMBER(i8751_l_r); - DECLARE_WRITE8_MEMBER(i8751_reset_w); - DECLARE_READ8_MEMBER(gondo_player_1_r); - DECLARE_READ8_MEMBER(gondo_player_2_r); - DECLARE_WRITE8_MEMBER(dec8_i8751_w); - DECLARE_WRITE8_MEMBER(dec8_bank_w); + void dec8_mxc06_karn_buffer_spriteram_w(uint8_t data); + uint8_t i8751_h_r(); + uint8_t i8751_l_r(); + void i8751_reset_w(uint8_t data); + uint8_t gondo_player_1_r(offs_t offset); + uint8_t gondo_player_2_r(offs_t offset); + void dec8_i8751_w(offs_t offset, uint8_t data); + void dec8_bank_w(uint8_t data); void ghostb_bank_w(uint8_t data); - DECLARE_WRITE8_MEMBER(csilver_control_w); - DECLARE_WRITE8_MEMBER(dec8_sound_w); - DECLARE_WRITE8_MEMBER(csilver_adpcm_data_w); - DECLARE_WRITE8_MEMBER(csilver_sound_bank_w); - DECLARE_WRITE8_MEMBER(main_irq_on_w); - DECLARE_WRITE8_MEMBER(main_irq_off_w); - DECLARE_WRITE8_MEMBER(main_firq_off_w); - DECLARE_WRITE8_MEMBER(sub_irq_on_w); - DECLARE_WRITE8_MEMBER(sub_irq_off_w); - DECLARE_WRITE8_MEMBER(sub_firq_off_w); - DECLARE_WRITE8_MEMBER(flip_screen_w); + void csilver_control_w(uint8_t data); + void dec8_sound_w(uint8_t data); + void csilver_adpcm_data_w(uint8_t data); + void csilver_sound_bank_w(uint8_t data); + void main_irq_on_w(uint8_t data); + void main_irq_off_w(uint8_t data); + void main_firq_off_w(uint8_t data); + void sub_irq_on_w(uint8_t data); + void sub_irq_off_w(uint8_t data); + void sub_firq_off_w(uint8_t data); + void flip_screen_w(uint8_t data); uint8_t i8751_port0_r(); void i8751_port0_w(uint8_t data); uint8_t i8751_port1_r(); @@ -155,18 +155,18 @@ private: void shackled_mcu_to_main_w(uint8_t data); void srdarwin_mcu_to_main_w(uint8_t data); void csilver_mcu_to_main_w(uint8_t data); - 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); - DECLARE_READ8_MEMBER(csilver_adpcm_reset_r); + void dec8_bg_data_w(offs_t offset, uint8_t data); + uint8_t dec8_bg_data_r(offs_t offset); + void dec8_videoram_w(offs_t offset, uint8_t data); + void srdarwin_videoram_w(offs_t offset, uint8_t data); + void dec8_scroll2_w(offs_t offset, uint8_t data); + void srdarwin_control_w(offs_t offset, uint8_t data); + void lastmisn_control_w(uint8_t data); + void shackled_control_w(uint8_t data); + void lastmisn_scrollx_w(uint8_t data); + void lastmisn_scrolly_w(uint8_t data); + void gondo_scroll_w(offs_t offset, uint8_t data); + uint8_t csilver_adpcm_reset_r(); TILE_GET_INFO_MEMBER(get_cobracom_fix_tile_info); TILE_GET_INFO_MEMBER(get_ghostb_fix_tile_info); TILE_GET_INFO_MEMBER(get_oscar_fix_tile_info); @@ -198,7 +198,7 @@ private: uint32_t screen_update_cobracom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_dec8); DECLARE_WRITE_LINE_MEMBER(oscar_coin_irq); - DECLARE_WRITE8_MEMBER(oscar_coin_clear_w); + void oscar_coin_clear_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(shackled_coin_irq); void srdarwin_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &primap); void gondo_colpri_cb(u32 &colour, u32 &pri_mask); diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index 8f6d2baca09..1a1bbd34669 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -146,7 +146,7 @@ public: private: required_ioport_array<2> m_io_in; -// DECLARE_WRITE32_MEMBER(sound_w); +// void sound_w(u32 data); u32 unk_status_r(); virtual void video_start() override; diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index 4df1ba20ee6..4eca0a33e09 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -72,23 +72,23 @@ private: std::unique_ptr<u16[]> m_spriteram_spare; std::unique_ptr<u16[]> m_buffered_spriteram; - DECLARE_READ32_MEMBER(mlc_440008_r); - DECLARE_READ32_MEMBER(mlc_44001c_r); - DECLARE_WRITE32_MEMBER(mlc_44001c_w); - - DECLARE_READ32_MEMBER(mlc_200000_r); - DECLARE_READ32_MEMBER(mlc_200004_r); - DECLARE_READ32_MEMBER(mlc_200070_r); - DECLARE_READ32_MEMBER(mlc_20007c_r); - DECLARE_READ32_MEMBER(mlc_scanline_r); - DECLARE_WRITE32_MEMBER(irq_ram_w); - DECLARE_READ32_MEMBER(avengrgs_speedup_r); - DECLARE_WRITE32_MEMBER(eeprom_w); - DECLARE_READ32_MEMBER(spriteram_r); - DECLARE_WRITE32_MEMBER(spriteram_w); - - DECLARE_READ16_MEMBER( sh96_protection_region_0_146_r ); - DECLARE_WRITE16_MEMBER( sh96_protection_region_0_146_w ); + u32 mlc_440008_r(); + u32 mlc_44001c_r(offs_t offset); + void mlc_44001c_w(u32 data); + + u32 mlc_200000_r(); + u32 mlc_200004_r(); + u32 mlc_200070_r(); + u32 mlc_20007c_r(); + u32 mlc_scanline_r(); + void irq_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + u32 avengrgs_speedup_r(); + void eeprom_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + u32 spriteram_r(offs_t offset, uint32_t mem_mask = ~0); + void spriteram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + + u16 sh96_protection_region_0_146_r(offs_t offset); + void sh96_protection_region_0_146_w(offs_t offset, u16 data, u16 mem_mask = ~0); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_mlc); diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h index df5b855a856..41c29721431 100644 --- a/src/mame/includes/decocass.h +++ b/src/mame/includes/decocass.h @@ -65,8 +65,8 @@ protected: required_device<upi41_cpu_device> m_mcu; /* dongles-related */ - read8_delegate m_dongle_r; // TODO: why isn't this a virtual method? - write8_delegate m_dongle_w; // TODO: why isn't this a virtual method? + read8sm_delegate m_dongle_r; // TODO: why isn't this a virtual method? + write8sm_delegate m_dongle_w; // TODO: why isn't this a virtual method? virtual void machine_start() override; virtual void machine_reset() override; @@ -148,28 +148,28 @@ private: void decocass_palette(palette_device &palette) const; uint32_t screen_update_decocass(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER(decocass_coin_counter_w); - DECLARE_WRITE8_MEMBER(decocass_sound_command_w); - DECLARE_READ8_MEMBER(decocass_sound_command_main_r); - DECLARE_READ8_MEMBER(decocass_sound_data_r); - DECLARE_READ8_MEMBER(decocass_sound_ack_r); - DECLARE_WRITE8_MEMBER(decocass_sound_data_w); - DECLARE_READ8_MEMBER(decocass_sound_command_r); - DECLARE_WRITE8_MEMBER(decocass_sound_nmi_enable_w); - DECLARE_READ8_MEMBER(decocass_sound_nmi_enable_r); - DECLARE_READ8_MEMBER(decocass_sound_data_ack_reset_r); - DECLARE_WRITE8_MEMBER(decocass_sound_data_ack_reset_w); - DECLARE_WRITE8_MEMBER(decocass_nmi_reset_w); - DECLARE_WRITE8_MEMBER(decocass_quadrature_decoder_reset_w); - DECLARE_WRITE8_MEMBER(decocass_adc_w); - DECLARE_READ8_MEMBER(decocass_input_r); - - DECLARE_WRITE8_MEMBER(decocass_reset_w); - - DECLARE_READ8_MEMBER(decocass_e5xx_r); - DECLARE_WRITE8_MEMBER(decocass_e5xx_w); - DECLARE_WRITE8_MEMBER(decocass_de0091_w); - DECLARE_WRITE8_MEMBER(decocass_e900_w); + void decocass_coin_counter_w(uint8_t data); + void decocass_sound_command_w(uint8_t data); + uint8_t decocass_sound_command_main_r(); + uint8_t decocass_sound_data_r(); + uint8_t decocass_sound_ack_r(); + void decocass_sound_data_w(uint8_t data); + uint8_t decocass_sound_command_r(); + void decocass_sound_nmi_enable_w(uint8_t data); + uint8_t decocass_sound_nmi_enable_r(); + uint8_t decocass_sound_data_ack_reset_r(); + void decocass_sound_data_ack_reset_w(uint8_t data); + void decocass_nmi_reset_w(uint8_t data); + void decocass_quadrature_decoder_reset_w(uint8_t data); + void decocass_adc_w(uint8_t data); + uint8_t decocass_input_r(offs_t offset); + + void decocass_reset_w(offs_t offset, uint8_t data); + + uint8_t decocass_e5xx_r(offs_t offset); + void decocass_e5xx_w(offs_t offset, uint8_t data); + void decocass_de0091_w(offs_t offset, uint8_t data); + void decocass_e900_w(uint8_t data); void i8041_p1_w(uint8_t data); @@ -179,35 +179,35 @@ private: void decocass_machine_state_save_init(); - DECLARE_WRITE8_MEMBER(decocass_paletteram_w); - DECLARE_WRITE8_MEMBER(decocass_charram_w); - DECLARE_WRITE8_MEMBER(decocass_fgvideoram_w); - DECLARE_WRITE8_MEMBER(decocass_colorram_w); - DECLARE_WRITE8_MEMBER(decocass_bgvideoram_w); - DECLARE_WRITE8_MEMBER(decocass_tileram_w); - DECLARE_WRITE8_MEMBER(decocass_objectram_w); - - DECLARE_WRITE8_MEMBER(decocass_watchdog_count_w); - DECLARE_WRITE8_MEMBER(decocass_watchdog_flip_w); - DECLARE_WRITE8_MEMBER(decocass_color_missiles_w); - DECLARE_WRITE8_MEMBER(decocass_mode_set_w); - DECLARE_WRITE8_MEMBER(decocass_color_center_bot_w); - DECLARE_WRITE8_MEMBER(decocass_back_h_shift_w); - DECLARE_WRITE8_MEMBER(decocass_back_vl_shift_w); - DECLARE_WRITE8_MEMBER(decocass_back_vr_shift_w); - DECLARE_WRITE8_MEMBER(decocass_part_h_shift_w); - DECLARE_WRITE8_MEMBER(decocass_part_v_shift_w); - DECLARE_WRITE8_MEMBER(decocass_center_h_shift_space_w); - DECLARE_WRITE8_MEMBER(decocass_center_v_shift_w); + void decocass_paletteram_w(offs_t offset, uint8_t data); + void decocass_charram_w(offs_t offset, uint8_t data); + void decocass_fgvideoram_w(offs_t offset, uint8_t data); + void decocass_colorram_w(offs_t offset, uint8_t data); + void decocass_bgvideoram_w(offs_t offset, uint8_t data); + void decocass_tileram_w(offs_t offset, uint8_t data); + void decocass_objectram_w(offs_t offset, uint8_t data); + + void decocass_watchdog_count_w(uint8_t data); + void decocass_watchdog_flip_w(uint8_t data); + void decocass_color_missiles_w(uint8_t data); + void decocass_mode_set_w(uint8_t data); + void decocass_color_center_bot_w(uint8_t data); + void decocass_back_h_shift_w(uint8_t data); + void decocass_back_vl_shift_w(uint8_t data); + void decocass_back_vr_shift_w(uint8_t data); + void decocass_part_h_shift_w(uint8_t data); + void decocass_part_v_shift_w(uint8_t data); + void decocass_center_h_shift_space_w(uint8_t data); + void decocass_center_v_shift_w(uint8_t data); void decocass_video_state_save_init(); - DECLARE_WRITE8_MEMBER(mirrorvideoram_w); - DECLARE_WRITE8_MEMBER(mirrorcolorram_w); - DECLARE_READ8_MEMBER(mirrorvideoram_r); - DECLARE_READ8_MEMBER(mirrorcolorram_r); - DECLARE_READ8_MEMBER(cdsteljn_input_r); - DECLARE_WRITE8_MEMBER(cdsteljn_mux_w); + void mirrorvideoram_w(offs_t offset, uint8_t data); + void mirrorcolorram_w(offs_t offset, uint8_t data); + uint8_t mirrorvideoram_r(offs_t offset); + uint8_t mirrorcolorram_r(offs_t offset); + uint8_t cdsteljn_input_r(offs_t offset); + void cdsteljn_mux_w(uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(decocass_audio_nmi_gen); void decocass_map(address_map &map); void decocass_sound_map(address_map &map); @@ -276,7 +276,7 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER(decocass_type1_r); + uint8_t decocass_type1_r(offs_t offset); /* dongle type #1 */ uint32_t m_type1_inmap; @@ -297,8 +297,8 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER(decocass_type2_r); - DECLARE_WRITE8_MEMBER(decocass_type2_w); + uint8_t decocass_type2_r(offs_t offset); + void decocass_type2_w(offs_t offset, uint8_t data); /* dongle type #2: status of the latches */ int32_t m_type2_d2_latch; /* latched 8041-STATUS D2 value */ @@ -350,8 +350,8 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER(decocass_type3_r); - DECLARE_WRITE8_MEMBER(decocass_type3_w); + uint8_t decocass_type3_r(offs_t offset); + void decocass_type3_w(offs_t offset, uint8_t data); /* dongle type #3: status and patches */ int32_t m_type3_ctrs; /* 12 bit counter stage */ @@ -375,8 +375,8 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER(decocass_type4_r); - DECLARE_WRITE8_MEMBER(decocass_type4_w); + uint8_t decocass_type4_r(offs_t offset); + void decocass_type4_w(offs_t offset, uint8_t data); /* dongle type #4: status */ int32_t m_type4_ctrs; /* latched PROM address (E5x0 LSB, E5x1 MSB) */ @@ -397,8 +397,8 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER(decocass_type5_r); - DECLARE_WRITE8_MEMBER(decocass_type5_w); + uint8_t decocass_type5_r(offs_t offset); + void decocass_type5_w(offs_t offset, uint8_t data); /* dongle type #5: status */ int32_t m_type5_latch; /* latched enable PROM (1100xxxx written to E5x1) */ @@ -418,7 +418,7 @@ private: //virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER(decocass_nodong_r); + uint8_t decocass_nodong_r(offs_t offset); }; @@ -435,8 +435,8 @@ private: virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_READ8_MEMBER(decocass_widel_r); - DECLARE_WRITE8_MEMBER(decocass_widel_w); + uint8_t decocass_widel_r(offs_t offset); + void decocass_widel_w(offs_t offset, uint8_t data); /* dongle type widel: status */ int32_t m_widel_ctrs; /* latched PROM address (E5x0 LSB, E5x1 MSB) */ diff --git a/src/mame/includes/dgn_beta.h b/src/mame/includes/dgn_beta.h index b5e66e5512f..9b906c2f93d 100644 --- a/src/mame/includes/dgn_beta.h +++ b/src/mame/includes/dgn_beta.h @@ -105,23 +105,23 @@ public: void dgnbeta(machine_config &config); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_b0_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_b1_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_b2_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_b3_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_b4_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_b5_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_b6_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_b7_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_b8_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_b9_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_bA_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_bB_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_bC_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_bD_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_bE_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_bF_w); - DECLARE_WRITE8_MEMBER(dgnbeta_ram_bG_w); + void dgnbeta_ram_b0_w(offs_t offset, uint8_t data); + void dgnbeta_ram_b1_w(offs_t offset, uint8_t data); + void dgnbeta_ram_b2_w(offs_t offset, uint8_t data); + void dgnbeta_ram_b3_w(offs_t offset, uint8_t data); + void dgnbeta_ram_b4_w(offs_t offset, uint8_t data); + void dgnbeta_ram_b5_w(offs_t offset, uint8_t data); + void dgnbeta_ram_b6_w(offs_t offset, uint8_t data); + void dgnbeta_ram_b7_w(offs_t offset, uint8_t data); + void dgnbeta_ram_b8_w(offs_t offset, uint8_t data); + void dgnbeta_ram_b9_w(offs_t offset, uint8_t data); + void dgnbeta_ram_bA_w(offs_t offset, uint8_t data); + void dgnbeta_ram_bB_w(offs_t offset, uint8_t data); + void dgnbeta_ram_bC_w(offs_t offset, uint8_t data); + void dgnbeta_ram_bD_w(offs_t offset, uint8_t data); + void dgnbeta_ram_bE_w(offs_t offset, uint8_t data); + void dgnbeta_ram_bF_w(offs_t offset, uint8_t data); + void dgnbeta_ram_bG_w(offs_t offset, uint8_t data); private: DECLARE_FLOPPY_FORMATS(floppy_formats); @@ -218,15 +218,15 @@ private: DECLARE_WRITE_LINE_MEMBER(dgnbeta_fdc_drq_w); DECLARE_WRITE_LINE_MEMBER(dgnbeta_vsync_changed); /* 74HC670 4x4bit colour ram */ - DECLARE_WRITE8_MEMBER(dgnbeta_colour_ram_w); + void dgnbeta_colour_ram_w(offs_t offset, uint8_t data); // Page IO at FE00 - DECLARE_READ8_MEMBER(dgn_beta_page_r); - DECLARE_WRITE8_MEMBER(dgn_beta_page_w); + uint8_t dgn_beta_page_r(offs_t offset); + void dgn_beta_page_w(offs_t offset, uint8_t data); MC6845_UPDATE_ROW(crtc_update_row); /* WD2797 FDC */ - DECLARE_READ8_MEMBER(dgnbeta_wd2797_r); - DECLARE_WRITE8_MEMBER(dgnbeta_wd2797_w); + uint8_t dgnbeta_wd2797_r(offs_t offset); + void dgnbeta_wd2797_w(offs_t offset, uint8_t data); void dgnbeta_vid_set_gctrl(int data); void UpdateBanks(int first, int last); diff --git a/src/mame/includes/dietgo.h b/src/mame/includes/dietgo.h index d27dd420bb0..7a6196eb70f 100644 --- a/src/mame/includes/dietgo.h +++ b/src/mame/includes/dietgo.h @@ -49,8 +49,8 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECO16IC_BANK_CB_MEMBER(bank_callback); - DECLARE_READ16_MEMBER( dietgo_protection_region_0_104_r ); - DECLARE_WRITE16_MEMBER( dietgo_protection_region_0_104_w ); + uint16_t dietgo_protection_region_0_104_r(offs_t offset); + void dietgo_protection_region_0_104_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); void decrypted_opcodes_map(address_map &map); void dietgo_map(address_map &map); void sound_map(address_map &map); diff --git a/src/mame/includes/digdug.h b/src/mame/includes/digdug.h index 95b1be0892a..11b061a204f 100644 --- a/src/mame/includes/digdug.h +++ b/src/mame/includes/digdug.h @@ -40,13 +40,13 @@ private: void digdug_palette(palette_device &palette) const; uint32_t screen_update_digdug(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE8_MEMBER(digdug_videoram_w); + void digdug_videoram_w(offs_t offset, uint8_t data); void bg_select_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(tx_color_mode_w); DECLARE_WRITE_LINE_MEMBER(bg_disable_w); - DECLARE_READ8_MEMBER(earom_read); - DECLARE_WRITE8_MEMBER(earom_write); + uint8_t earom_read(); + void earom_write(offs_t offset, uint8_t data); void earom_control_w(uint8_t data); virtual void machine_start() override; diff --git a/src/mame/includes/divebomb.h b/src/mame/includes/divebomb.h index 8ad9025236a..7c144f67d3b 100644 --- a/src/mame/includes/divebomb.h +++ b/src/mame/includes/divebomb.h @@ -76,15 +76,15 @@ private: TILE_GET_INFO_MEMBER(get_fg_tile_info); - DECLARE_READ8_MEMBER(fgcpu_comm_flags_r); - DECLARE_WRITE8_MEMBER(fgram_w); + uint8_t fgcpu_comm_flags_r(); + void fgram_w(offs_t offset, uint8_t data); - DECLARE_WRITE8_MEMBER(spritecpu_port00_w); + void spritecpu_port00_w(uint8_t data); - DECLARE_WRITE8_MEMBER(rozcpu_bank_w); - template<int Chip> DECLARE_WRITE8_MEMBER(rozcpu_wrap_enable_w); - template<int Chip> DECLARE_WRITE8_MEMBER(rozcpu_enable_w); - DECLARE_WRITE8_MEMBER(rozcpu_pal_w); + void rozcpu_bank_w(uint8_t data); + template<int Chip> void rozcpu_wrap_enable_w(uint8_t data); + template<int Chip> void rozcpu_enable_w(uint8_t data); + void rozcpu_pal_w(uint8_t data); void divebomb_fgcpu_iomap(address_map &map); void divebomb_fgcpu_map(address_map &map); void divebomb_rozcpu_iomap(address_map &map); diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index 8f8646a88d7..448e6de113e 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -86,12 +86,12 @@ private: required_device<generic_latch_8_device> m_slavelatch; required_device<generic_latch_8_device> m_beastlatch; - DECLARE_READ8_MEMBER(beast_status_r); - DECLARE_WRITE8_MEMBER(trigger_nmi_on_mastercpu); - DECLARE_WRITE8_MEMBER(mastercpu_bankswitch_w); - DECLARE_WRITE8_MEMBER(slavecpu_bankswitch_w); - DECLARE_WRITE8_MEMBER(coin_count_w); - DECLARE_WRITE8_MEMBER(soundcpu_bankswitch_w); + uint8_t beast_status_r(); + void trigger_nmi_on_mastercpu(uint8_t data); + void mastercpu_bankswitch_w(uint8_t data); + void slavecpu_bankswitch_w(uint8_t data); + void coin_count_w(uint8_t data); + void soundcpu_bankswitch_w(uint8_t data); uint8_t beast_p0_r(); void beast_p0_w(uint8_t data); uint8_t beast_p1_r(); @@ -100,10 +100,10 @@ private: void beast_p2_w(uint8_t data); uint8_t beast_p3_r(); void beast_p3_w(uint8_t data); - DECLARE_WRITE8_MEMBER(djboy_scrollx_w); - DECLARE_WRITE8_MEMBER(djboy_scrolly_w); - DECLARE_WRITE8_MEMBER(djboy_videoram_w); - DECLARE_WRITE8_MEMBER(djboy_paletteram_w); + void djboy_scrollx_w(uint8_t data); + void djboy_scrolly_w(uint8_t data); + void djboy_videoram_w(offs_t offset, uint8_t data); + void djboy_paletteram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h index 0c5c35abf5d..61ae69a3ba9 100644 --- a/src/mame/includes/djmain.h +++ b/src/mame/includes/djmain.h @@ -47,23 +47,23 @@ public: void init_bmclubmx(); private: - DECLARE_WRITE32_MEMBER(sndram_bank_w); - DECLARE_READ32_MEMBER(sndram_r); - DECLARE_WRITE32_MEMBER(sndram_w); - DECLARE_READ32_MEMBER(obj_ctrl_r); - DECLARE_WRITE32_MEMBER(obj_ctrl_w); - DECLARE_READ32_MEMBER(obj_rom_r); - DECLARE_WRITE32_MEMBER(v_ctrl_w); - DECLARE_READ32_MEMBER(v_rom_r); - DECLARE_READ8_MEMBER(inp1_r); - DECLARE_READ8_MEMBER(inp2_r); - DECLARE_READ32_MEMBER(turntable_r); - DECLARE_WRITE32_MEMBER(turntable_select_w); - DECLARE_WRITE32_MEMBER(light_ctrl_1_w); - DECLARE_WRITE32_MEMBER(light_ctrl_2_w); - DECLARE_WRITE32_MEMBER(unknown590000_w); - DECLARE_WRITE32_MEMBER(unknown802000_w); - DECLARE_WRITE32_MEMBER(unknownc02000_w); + void sndram_bank_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t sndram_r(offs_t offset, uint32_t mem_mask = ~0); + void sndram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t obj_ctrl_r(offs_t offset); + void obj_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t obj_rom_r(offs_t offset, uint32_t mem_mask = ~0); + void v_ctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t v_rom_r(offs_t offset, uint32_t mem_mask = ~0); + uint8_t inp1_r(offs_t offset); + uint8_t inp2_r(offs_t offset); + uint32_t turntable_r(offs_t offset, uint32_t mem_mask = ~0); + void turntable_select_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void light_ctrl_1_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void light_ctrl_2_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void unknown590000_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void unknown802000_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void unknownc02000_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); uint32_t screen_update_djmain(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vb_interrupt); diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 456fdd43d69..d91a7ef830f 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -263,34 +263,34 @@ private: int16_t m_rev_map[0x200]; uint8_t hb_dma_read_byte(offs_t offset); void hb_dma_write_byte(offs_t offset, uint8_t data); - DECLARE_WRITE8_MEMBER(dkong3_coin_counter_w); - DECLARE_READ8_MEMBER(dkong_in2_r); - DECLARE_READ8_MEMBER(epos_decrypt_rom); - DECLARE_WRITE8_MEMBER(s2650_data_w); + void dkong3_coin_counter_w(offs_t offset, uint8_t data); + uint8_t dkong_in2_r(offs_t offset); + uint8_t epos_decrypt_rom(offs_t offset); + void s2650_data_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(s2650_fo_w); - DECLARE_READ8_MEMBER(s2650_port0_r); - DECLARE_READ8_MEMBER(s2650_port1_r); - DECLARE_WRITE8_MEMBER(dkong3_2a03_reset_w); - DECLARE_READ8_MEMBER(strtheat_inputport_0_r); - DECLARE_READ8_MEMBER(strtheat_inputport_1_r); - DECLARE_WRITE8_MEMBER(nmi_mask_w); - DECLARE_WRITE8_MEMBER(dk_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); + uint8_t s2650_port0_r(); + uint8_t s2650_port1_r(); + void dkong3_2a03_reset_w(uint8_t data); + uint8_t strtheat_inputport_0_r(); + uint8_t strtheat_inputport_1_r(); + void nmi_mask_w(uint8_t data); + void dk_braze_a15_w(uint8_t data); + void dkong_videoram_w(offs_t offset, uint8_t data); + void dkongjr_gfxbank_w(uint8_t data); + void dkong3_gfxbank_w(uint8_t data); + void dkong_palettebank_w(offs_t offset, uint8_t data); + void radarscp_grid_enable_w(uint8_t data); + void radarscp_grid_color_w(uint8_t data); + void dkong_flipscreen_w(uint8_t data); + void dkong_spritebank_w(uint8_t data); void dkong_voice_w(uint8_t data); - DECLARE_WRITE8_MEMBER(dkong_audio_irq_w); + void dkong_audio_irq_w(uint8_t data); uint8_t p8257_ctl_r(); void p8257_ctl_w(uint8_t data); - DECLARE_WRITE8_MEMBER(p8257_drq_w); - DECLARE_WRITE8_MEMBER(dkong_z80dma_rdy_w); - DECLARE_READ8_MEMBER(braze_eeprom_r); - DECLARE_WRITE8_MEMBER(braze_eeprom_w); + void p8257_drq_w(uint8_t data); + void dkong_z80dma_rdy_w(uint8_t data); + uint8_t braze_eeprom_r(); + void braze_eeprom_w(uint8_t data); TILE_GET_INFO_MEMBER(dkong_bg_tile_info); TILE_GET_INFO_MEMBER(radarscp1_bg_tile_info); DECLARE_MACHINE_START(dkong2b); @@ -312,8 +312,6 @@ private: uint8_t dkong_voice_status_r(); uint8_t dkong_tune_r(offs_t offset); void dkong_p1_w(uint8_t data); - DECLARE_READ8_MEMBER(sound_t0_r); - DECLARE_READ8_MEMBER(sound_t1_r); uint32_t screen_update_dkong(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_pestplce(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_spclforc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/dm7000.h b/src/mame/includes/dm7000.h index 34e92ef5c35..508513d365c 100644 --- a/src/mame/includes/dm7000.h +++ b/src/mame/includes/dm7000.h @@ -25,30 +25,30 @@ private: required_device<ppc4xx_device> m_maincpu; required_device<generic_terminal_device> m_terminal; - DECLARE_WRITE8_MEMBER ( dm7000_iic0_w ); - DECLARE_READ8_MEMBER ( dm7000_iic0_r ); - DECLARE_WRITE8_MEMBER ( dm7000_iic1_w ); - DECLARE_READ8_MEMBER ( dm7000_iic1_r ); + void dm7000_iic0_w(offs_t offset, uint8_t data); + uint8_t dm7000_iic0_r(offs_t offset); + void dm7000_iic1_w(offs_t offset, uint8_t data); + uint8_t dm7000_iic1_r(offs_t offset); - DECLARE_WRITE8_MEMBER ( dm7000_scc0_w ); - DECLARE_READ8_MEMBER ( dm7000_scc0_r ); + void dm7000_scc0_w(offs_t offset, uint8_t data); + uint8_t dm7000_scc0_r(offs_t offset); void kbd_put(u8 data); uint8_t m_scc0_lcr; uint8_t m_scc0_lsr; uint8_t m_term_data; - DECLARE_WRITE8_MEMBER ( dm7000_gpio0_w ); - DECLARE_READ8_MEMBER ( dm7000_gpio0_r ); + void dm7000_gpio0_w(offs_t offset, uint8_t data); + uint8_t dm7000_gpio0_r(offs_t offset); - DECLARE_WRITE8_MEMBER ( dm7000_scp0_w ); - DECLARE_READ8_MEMBER ( dm7000_scp0_r ); + void dm7000_scp0_w(offs_t offset, uint8_t data); + uint8_t dm7000_scp0_r(offs_t offset); - DECLARE_WRITE16_MEMBER ( dm7000_enet_w ); - DECLARE_READ16_MEMBER ( dm7000_enet_r ); + void dm7000_enet_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t dm7000_enet_r(offs_t offset); - DECLARE_READ32_MEMBER( dcr_r ); - DECLARE_WRITE32_MEMBER( dcr_w ); + uint32_t dcr_r(offs_t offset); + void dcr_w(offs_t offset, uint32_t data); uint16_t m_enet_regs[32]; diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index b099ad6ef67..b58fe16c7a4 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -72,17 +72,17 @@ private: uint8_t m_buffer0[9]; uint8_t m_buffer1[9]; - 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(inputs_flipscreen_r); - DECLARE_WRITE8_MEMBER(flipscreen_w); - DECLARE_READ8_MEMBER(idsoccer_adpcm_status_r); - DECLARE_WRITE8_MEMBER(idsoccer_adpcm_w); + uint8_t docastle_shared0_r(offs_t offset); + uint8_t docastle_shared1_r(offs_t offset); + void docastle_shared0_w(offs_t offset, uint8_t data); + void docastle_shared1_w(offs_t offset, uint8_t data); + void docastle_nmitrigger_w(uint8_t data); + void docastle_videoram_w(offs_t offset, uint8_t data); + void docastle_colorram_w(offs_t offset, uint8_t data); + uint8_t inputs_flipscreen_r(offs_t offset); + void flipscreen_w(offs_t offset, uint8_t data); + uint8_t idsoccer_adpcm_status_r(); + void idsoccer_adpcm_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); void docastle_palette(palette_device &palette) const; DECLARE_VIDEO_START(dorunrun); diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index 1c41ad924ef..1b8cfb99265 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -65,17 +65,17 @@ private: int m_soundlatch; int m_last_snd_ctrl; - DECLARE_WRITE8_MEMBER(subirqtrigger_w); - DECLARE_WRITE8_MEMBER(sub_irqack_w); - DECLARE_WRITE8_MEMBER(soundlatch_w); - DECLARE_WRITE8_MEMBER(soundcontrol_w); - DECLARE_WRITE8_MEMBER(plane_select_w); - DECLARE_READ8_MEMBER(bitmapram_r); - DECLARE_WRITE8_MEMBER(internal_bitmapram_w); - DECLARE_WRITE8_MEMBER(bitmapram_w); - DECLARE_WRITE8_MEMBER(bgvideoram_w); - DECLARE_WRITE8_MEMBER(scroll_w); - DECLARE_WRITE8_MEMBER(_1800_w); + void subirqtrigger_w(uint8_t data); + void sub_irqack_w(uint8_t data); + void soundlatch_w(uint8_t data); + void soundcontrol_w(uint8_t data); + void plane_select_w(uint8_t data); + uint8_t bitmapram_r(offs_t offset); + void internal_bitmapram_w(offs_t offset, uint8_t data); + void bitmapram_w(offs_t offset, uint8_t data); + void bgvideoram_w(offs_t offset, uint8_t data); + void scroll_w(offs_t offset, uint8_t data); + void _1800_w(uint8_t data); TILE_GET_INFO_MEMBER(get_tile_info); diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index 1ca05f7c273..f2440d851ed 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -53,9 +53,9 @@ public: private: void speed1_w(uint8_t data); void speed2_w(uint8_t data); - DECLARE_READ8_MEMBER(dragrace_input_r); - DECLARE_READ8_MEMBER(dragrace_steering_r); - DECLARE_READ8_MEMBER(dragrace_scanline_r); + uint8_t dragrace_input_r(offs_t offset); + uint8_t dragrace_steering_r(); + uint8_t dragrace_scanline_r(); TILE_GET_INFO_MEMBER(get_tile_info); void dragrace_palette(palette_device &palette) const; uint32_t screen_update_dragrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index 03628b4f4a8..89f86a924b8 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -59,10 +59,10 @@ private: required_shared_ptr<uint16_t> m_spriteram; /* devices */ - DECLARE_WRITE16_MEMBER(coin_w); - DECLARE_WRITE16_MEMBER(fg_videoram_w); - DECLARE_WRITE16_MEMBER(bg_videoram_w); - DECLARE_WRITE16_MEMBER(md_videoram_w); + void coin_w(uint16_t data); + void fg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void bg_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void md_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_md_tile_info); @@ -111,8 +111,8 @@ private: uint8_t m_pic16c5x_port0; uint8_t m_oki_bank[2]; - DECLARE_WRITE8_MEMBER(snd_command_w); - DECLARE_WRITE8_MEMBER(snd_flag_w); + void snd_command_w(uint8_t data); + void snd_flag_w(uint8_t data); uint8_t pic16c5x_port0_r(); uint8_t snd_command_r(); uint8_t snd_flag_r(); diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index b4ede40f7ac..c539caf45c8 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -42,9 +42,9 @@ private: /* devices */ required_device<msm5205_device> m_msm; - DECLARE_WRITE8_MEMBER(nmi_enable_w); - DECLARE_WRITE8_MEMBER(pcm_set_w); - DECLARE_WRITE8_MEMBER(drmicro_videoram_w); + void nmi_enable_w(uint8_t data); + void pcm_set_w(uint8_t data); + void drmicro_videoram_w(offs_t offset, uint8_t data); TILE_GET_INFO_MEMBER(get_bg1_tile_info); TILE_GET_INFO_MEMBER(get_bg2_tile_info); virtual void machine_start() override; diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h index a0d3e1f0010..d3c852d88e9 100644 --- a/src/mame/includes/dynax.h +++ b/src/mame/includes/dynax.h @@ -102,11 +102,11 @@ protected: DECLARE_VIDEO_START(hnoridur); - DECLARE_WRITE8_MEMBER(dynax_vblank_ack_w); + void dynax_vblank_ack_w(uint8_t data); void dynax_blit_dest_w(uint8_t data); void dynax_blit_romregion_w(uint8_t data); - DECLARE_WRITE8_MEMBER(dynax_extra_scrollx_w); - DECLARE_WRITE8_MEMBER(dynax_extra_scrolly_w); + void dynax_extra_scrollx_w(uint8_t data); + void dynax_extra_scrolly_w(uint8_t data); void hanamai_copylayer(bitmap_ind16 &bitmap, const rectangle &cliprect, int i ); @@ -116,51 +116,51 @@ protected: void htengoku_banked_map(address_map &map); private: - DECLARE_WRITE8_MEMBER(jantouki_vblank_ack_w); + void jantouki_vblank_ack_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(jantouki_blitter_ack_w); DECLARE_WRITE_LINE_MEMBER(jantouki_blitter_irq_w); DECLARE_WRITE_LINE_MEMBER(jantouki_blitter2_ack_w); DECLARE_WRITE_LINE_MEMBER(jantouki_blitter2_irq_w); - DECLARE_WRITE8_MEMBER(jantouki_sound_vblank_ack_w); + void jantouki_sound_vblank_ack_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(coincounter_0_w); DECLARE_WRITE_LINE_MEMBER(coincounter_1_w); - DECLARE_READ8_MEMBER(ret_ff); - DECLARE_READ8_MEMBER(hanamai_keyboard_0_r); - DECLARE_READ8_MEMBER(hanamai_keyboard_1_r); - DECLARE_WRITE8_MEMBER(hanamai_keyboard_w); - DECLARE_WRITE8_MEMBER(dynax_rombank_w); - DECLARE_WRITE8_MEMBER(jantouki_sound_rombank_w); - DECLARE_WRITE8_MEMBER(cdracula_sound_rombank_w); - DECLARE_WRITE8_MEMBER(hnoridur_rombank_w); - DECLARE_WRITE8_MEMBER(hnoridur_palbank_w); - DECLARE_WRITE8_MEMBER(hnoridur_palette_lo_w); - DECLARE_WRITE8_MEMBER(hnoridur_palette_hi_w); + uint8_t ret_ff(); + uint8_t hanamai_keyboard_0_r(); + uint8_t hanamai_keyboard_1_r(); + void hanamai_keyboard_w(uint8_t data); + void dynax_rombank_w(uint8_t data); + void jantouki_sound_rombank_w(uint8_t data); + void cdracula_sound_rombank_w(uint8_t data); + void hnoridur_rombank_w(uint8_t data); + void hnoridur_palbank_w(uint8_t data); + void hnoridur_palette_lo_w(offs_t offset, uint8_t data); + void hnoridur_palette_hi_w(offs_t offset, uint8_t data); void hnoridur_palette_update(offs_t offset); - DECLARE_WRITE8_MEMBER(nanajign_palette_lo_w); - DECLARE_WRITE8_MEMBER(nanajign_palette_hi_w); + void nanajign_palette_lo_w(offs_t offset, uint8_t data); + void nanajign_palette_hi_w(offs_t offset, uint8_t data); void nanajign_palette_update(offs_t offset); - DECLARE_WRITE8_MEMBER(adpcm_data_w); + void adpcm_data_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(hjingi_lockout_w); DECLARE_WRITE_LINE_MEMBER(hjingi_hopper_w); uint8_t hjingi_hopper_bit(); - DECLARE_READ8_MEMBER(hjingi_keyboard_0_r); - DECLARE_READ8_MEMBER(hjingi_keyboard_1_r); - DECLARE_WRITE8_MEMBER(yarunara_input_w); - DECLARE_READ8_MEMBER(yarunara_input_r); - DECLARE_WRITE8_MEMBER(yarunara_rombank_w); - DECLARE_WRITE8_MEMBER(yarunara_blit_romregion_w); - DECLARE_READ8_MEMBER(jantouki_soundlatch_ack_r); - DECLARE_WRITE8_MEMBER(jantouki_soundlatch_w); - DECLARE_READ8_MEMBER(jantouki_blitter_busy_r); - DECLARE_WRITE8_MEMBER(jantouki_rombank_w); - DECLARE_READ8_MEMBER(jantouki_soundlatch_status_r); - DECLARE_READ8_MEMBER(mjelctrn_keyboard_1_r); - DECLARE_READ8_MEMBER(mjelctrn_dsw_r); - DECLARE_WRITE8_MEMBER(tenkai_ipsel_w); - DECLARE_WRITE8_MEMBER(tenkai_ip_w); - DECLARE_READ8_MEMBER(tenkai_ip_r); - DECLARE_READ8_MEMBER(tenkai_palette_r); - DECLARE_WRITE8_MEMBER(tenkai_palette_w); + uint8_t hjingi_keyboard_0_r(); + uint8_t hjingi_keyboard_1_r(); + void yarunara_input_w(offs_t offset, uint8_t data); + uint8_t yarunara_input_r(offs_t offset); + void yarunara_rombank_w(uint8_t data); + void yarunara_blit_romregion_w(uint8_t data); + uint8_t jantouki_soundlatch_ack_r(); + void jantouki_soundlatch_w(uint8_t data); + uint8_t jantouki_blitter_busy_r(); + void jantouki_rombank_w(uint8_t data); + uint8_t jantouki_soundlatch_status_r(); + uint8_t mjelctrn_keyboard_1_r(); + uint8_t mjelctrn_dsw_r(); + void tenkai_ipsel_w(offs_t offset, uint8_t data); + void tenkai_ip_w(uint8_t data); + uint8_t tenkai_ip_r(offs_t offset); + uint8_t tenkai_palette_r(offs_t offset); + void tenkai_palette_w(offs_t offset, uint8_t data); uint8_t tenkai_p3_r(); void tenkai_p3_w(uint8_t data); void tenkai_p4_w(uint8_t data); @@ -171,32 +171,32 @@ private: uint8_t tenkai_p8_r(); DECLARE_WRITE_LINE_MEMBER(tenkai_6c_w); DECLARE_WRITE_LINE_MEMBER(tenkai_70_w); - DECLARE_WRITE8_MEMBER(tenkai_blit_romregion_w); - DECLARE_READ8_MEMBER(gekisha_keyboard_0_r); - DECLARE_READ8_MEMBER(gekisha_keyboard_1_r); - DECLARE_WRITE8_MEMBER(gekisha_hopper_w); + void tenkai_blit_romregion_w(uint8_t data); + uint8_t gekisha_keyboard_0_r(); + uint8_t gekisha_keyboard_1_r(); + void gekisha_hopper_w(offs_t offset, uint8_t data); void gekisha_p4_w(uint8_t data); - //DECLARE_WRITE8_MEMBER(dynax_blit_pen_w); - DECLARE_WRITE8_MEMBER(dynax_blit2_dest_w); - DECLARE_WRITE8_MEMBER(tenkai_blit_dest_w); - DECLARE_WRITE8_MEMBER(mjembase_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(mjembase_blit_palette23_w); - DECLARE_WRITE8_MEMBER(dynax_blit_palette67_w); + //void dynax_blit_pen_w(uint8_t data); + void dynax_blit2_dest_w(uint8_t data); + void tenkai_blit_dest_w(uint8_t data); + void mjembase_blit_dest_w(uint8_t data); + void dynax_blit_backpen_w(uint8_t data); + void dynax_blit_palette01_w(uint8_t data); + void tenkai_blit_palette01_w(uint8_t data); + void dynax_blit_palette45_w(uint8_t data); + void dynax_blit_palette23_w(uint8_t data); + void tenkai_blit_palette23_w(uint8_t data); + void mjembase_blit_palette23_w(uint8_t data); + void dynax_blit_palette67_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(blit_palbank_w); DECLARE_WRITE_LINE_MEMBER(blit2_palbank_w); DECLARE_WRITE_LINE_MEMBER(mjdialq2_blit_dest0_w); DECLARE_WRITE_LINE_MEMBER(mjdialq2_blit_dest1_w); - DECLARE_WRITE8_MEMBER(dynax_layer_enable_w); - DECLARE_WRITE8_MEMBER(jantouki_layer_enable_w); + void dynax_layer_enable_w(uint8_t data); + void jantouki_layer_enable_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(mjdialq2_layer0_enable_w); DECLARE_WRITE_LINE_MEMBER(mjdialq2_layer1_enable_w); - DECLARE_WRITE8_MEMBER(dynax_blit2_romregion_w); + void dynax_blit2_romregion_w(uint8_t data); void hanamai_blit_pixel_w(offs_t offset, uint8_t data); void cdracula_blit_pixel_w(offs_t offset, uint8_t data); void drgpunch_blit_pixel_w(offs_t offset, uint8_t data); @@ -207,9 +207,9 @@ private: void dynax_blit2_scrolly_w(uint8_t data); void tenkai_blit_scrollx_w(uint8_t data); void tenkai_blit_scrolly_w(uint8_t data); - DECLARE_WRITE8_MEMBER(hanamai_priority_w); - DECLARE_WRITE8_MEMBER(tenkai_priority_w); - DECLARE_WRITE8_MEMBER(mjembase_priority_w); + void hanamai_priority_w(uint8_t data); + void tenkai_priority_w(uint8_t data); + void mjembase_priority_w(uint8_t data); uint32_t screen_update_hanamai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_hnoridur(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -228,7 +228,7 @@ private: DECLARE_WRITE_LINE_MEMBER(adpcm_int_cpu1); DECLARE_MACHINE_RESET(adpcm); - DECLARE_WRITE8_MEMBER(adpcm_reset_w); + void adpcm_reset_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(adpcm_reset_kludge_w); void tenkai_dswsel_w(uint8_t data); uint8_t tenkai_dsw_r(); diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h index 1f4b6298894..49f963c366a 100644 --- a/src/mame/includes/dynduke.h +++ b/src/mame/includes/dynduke.h @@ -55,11 +55,11 @@ private: int m_old_back; int m_old_fore; - DECLARE_WRITE16_MEMBER(background_w); - DECLARE_WRITE16_MEMBER(foreground_w); - DECLARE_WRITE16_MEMBER(text_w); - DECLARE_WRITE16_MEMBER(gfxbank_w); - DECLARE_WRITE16_MEMBER(control_w); + void background_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void foreground_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void text_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void gfxbank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h index e10c6e46856..63c01123ac2 100644 --- a/src/mame/includes/vicdual.h +++ b/src/mame/includes/vicdual.h @@ -154,7 +154,7 @@ protected: TIMER_CALLBACK_MEMBER( frogs_croak_callback ); /*----------- defined in audio/depthch.cpp -----------*/ - DECLARE_WRITE8_MEMBER( depthch_audio_w ); + void depthch_audio_w(uint8_t data); /*----------- defined in audio/invinco.cpp -----------*/ DECLARE_WRITE8_MEMBER( invinco_audio_w ); @@ -281,8 +281,8 @@ protected: DECLARE_WRITE8_MEMBER(carnival_io_w); /*----------- defined in audio/carnival.cpp -----------*/ - DECLARE_WRITE8_MEMBER( carnival_audio_1_w ); - DECLARE_WRITE8_MEMBER( carnival_audio_2_w ); + void carnival_audio_1_w(uint8_t data); + void carnival_audio_2_w(uint8_t data); DECLARE_READ_LINE_MEMBER( carnival_music_port_t1_r ); void carnivala_music_port_1_w(uint8_t data); void carnivala_music_port_2_w(uint8_t data); |