summaryrefslogtreecommitdiffstats
path: root/src/mame/includes
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes')
-rw-r--r--src/mame/includes/raiden.h10
-rw-r--r--src/mame/includes/rampart.h2
-rw-r--r--src/mame/includes/rbisland.h12
-rw-r--r--src/mame/includes/redalert.h2
-rw-r--r--src/mame/includes/redclash.h12
-rw-r--r--src/mame/includes/relief.h6
-rw-r--r--src/mame/includes/renegade.h24
-rw-r--r--src/mame/includes/retofinv.h14
-rw-r--r--src/mame/includes/rltennis.h8
-rw-r--r--src/mame/includes/rm380z.h26
-rw-r--r--src/mame/includes/rmnimbus.h26
-rw-r--r--src/mame/includes/rockrage.h10
-rw-r--r--src/mame/includes/rocnrope.h6
-rw-r--r--src/mame/includes/rollerg.h10
-rw-r--r--src/mame/includes/rollrace.h18
-rw-r--r--src/mame/includes/rpunch.h2
-rw-r--r--src/mame/includes/runaway.h12
-rw-r--r--src/mame/includes/rungun.h27
18 files changed, 109 insertions, 118 deletions
diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h
index 8d9a2c57a8a..d31d30558a6 100644
--- a/src/mame/includes/raiden.h
+++ b/src/mame/includes/raiden.h
@@ -54,7 +54,7 @@ protected:
uint32_t screen_update_common(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, uint16_t *scrollregs);
- DECLARE_WRITE16_MEMBER(raiden_text_w);
+ void raiden_text_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
void common_video_start();
@@ -73,9 +73,9 @@ protected:
tilemap_t *m_fg_layer;
tilemap_t *m_tx_layer;
- DECLARE_WRITE16_MEMBER(raiden_background_w);
- DECLARE_WRITE16_MEMBER(raiden_foreground_w);
- DECLARE_WRITE8_MEMBER(raiden_control_w);
+ void raiden_background_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void raiden_foreground_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void raiden_control_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_back_tile_info);
TILE_GET_INFO_MEMBER(get_fore_tile_info);
@@ -113,7 +113,7 @@ private:
uint32_t screen_update_raidenb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_WRITE8_MEMBER(raidenb_control_w);
+ void raidenb_control_w(uint8_t data);
void raidenb_layer_enable_w(uint16_t data);
void raidenb_layer_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
diff --git a/src/mame/includes/rampart.h b/src/mame/includes/rampart.h
index c4c125aee8b..7ee6c0eff43 100644
--- a/src/mame/includes/rampart.h
+++ b/src/mame/includes/rampart.h
@@ -42,7 +42,7 @@ protected:
private:
TIMER_DEVICE_CALLBACK_MEMBER(scanline_interrupt);
void scanline_int_ack_w(uint16_t data);
- DECLARE_WRITE16_MEMBER(latch_w);
+ void latch_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
uint32_t screen_update_rampart(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void rampart_bitmap_render(bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/rbisland.h b/src/mame/includes/rbisland.h
index 878aebefd4c..1e8a64d130c 100644
--- a/src/mame/includes/rbisland.h
+++ b/src/mame/includes/rbisland.h
@@ -45,15 +45,9 @@ protected:
virtual void machine_start() override;
private:
- DECLARE_WRITE16_MEMBER(jumping_sound_w);
- DECLARE_READ8_MEMBER(jumping_latch_r);
- DECLARE_WRITE16_MEMBER(rbisland_cchip_ctrl_w);
- DECLARE_WRITE16_MEMBER(rbisland_cchip_bank_w);
- DECLARE_WRITE16_MEMBER(rbisland_cchip_ram_w);
- DECLARE_READ16_MEMBER(rbisland_cchip_ctrl_r);
- DECLARE_READ16_MEMBER(rbisland_cchip_ram_r);
- DECLARE_WRITE16_MEMBER(rbisland_spritectrl_w);
- DECLARE_WRITE16_MEMBER(jumping_spritectrl_w);
+ void jumping_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint8_t jumping_latch_r();
+ void jumping_spritectrl_w(offs_t offset, uint16_t data);
void bankswitch_w(uint8_t data);
void counters_w(uint8_t data);
DECLARE_VIDEO_START(jumping);
diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h
index 12d72f6b3d7..3d017355cde 100644
--- a/src/mame/includes/redalert.h
+++ b/src/mame/includes/redalert.h
@@ -113,7 +113,7 @@ private:
void get_redalert_pens(pen_t *pens);
void get_panther_pens(pen_t *pens);
void get_demoneye_pens(pen_t *pens);
- WRITE8_MEMBER(demoneye_bitmap_layer_w);
+ void demoneye_bitmap_layer_w(offs_t offset, uint8_t data);
void demoneye_bitmap_ypos_w(u8 data);
virtual void sound_start() override;
diff --git a/src/mame/includes/redclash.h b/src/mame/includes/redclash.h
index 7c71f7d1767..1ccbbabcb2d 100644
--- a/src/mame/includes/redclash.h
+++ b/src/mame/includes/redclash.h
@@ -44,12 +44,12 @@ protected:
private:
DECLARE_WRITE_LINE_MEMBER(screen_vblank);
- DECLARE_WRITE8_MEMBER(videoram_w);
- DECLARE_WRITE8_MEMBER(gfxbank_w);
- DECLARE_WRITE8_MEMBER(flipscreen_w);
- DECLARE_WRITE8_MEMBER(irqack_w);
- DECLARE_WRITE8_MEMBER(star_reset_w);
- template <unsigned B> DECLARE_WRITE8_MEMBER(star_w);
+ void videoram_w(offs_t offset, uint8_t data);
+ void gfxbank_w(uint8_t data);
+ void flipscreen_w(uint8_t data);
+ void irqack_w(uint8_t data);
+ void star_reset_w(uint8_t data);
+ template <unsigned B> void star_w(uint8_t data);
void palette(palette_device &palette) const;
TILE_GET_INFO_MEMBER(get_fg_tile_info);
diff --git a/src/mame/includes/relief.h b/src/mame/includes/relief.h
index fe9a12ac0de..94d584ebeb0 100644
--- a/src/mame/includes/relief.h
+++ b/src/mame/includes/relief.h
@@ -38,9 +38,9 @@ public:
private:
virtual void machine_reset() override;
virtual void video_start() override;
- DECLARE_READ16_MEMBER(special_port2_r);
- DECLARE_WRITE16_MEMBER(audio_control_w);
- DECLARE_WRITE16_MEMBER(audio_volume_w);
+ uint16_t special_port2_r();
+ void audio_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void audio_volume_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
TILE_GET_INFO_MEMBER(get_playfield_tile_info);
TILE_GET_INFO_MEMBER(get_playfield2_tile_info);
uint32_t screen_update_relief(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h
index ab79fbcc395..aedfbf4e18a 100644
--- a/src/mame/includes/renegade.h
+++ b/src/mame/includes/renegade.h
@@ -69,18 +69,18 @@ private:
tilemap_t *m_bg_tilemap;
tilemap_t *m_fg_tilemap;
- DECLARE_READ8_MEMBER(mcu_reset_r);
- DECLARE_WRITE8_MEMBER(bankswitch_w);
- DECLARE_WRITE8_MEMBER(irq_ack_w);
- DECLARE_WRITE8_MEMBER(nmi_ack_w);
- DECLARE_WRITE8_MEMBER(fg_videoram_w);
- DECLARE_WRITE8_MEMBER(bg_videoram_w);
- DECLARE_WRITE8_MEMBER(flipscreen_w);
- DECLARE_WRITE8_MEMBER(scroll_lsb_w);
- DECLARE_WRITE8_MEMBER(scroll_msb_w);
- DECLARE_WRITE8_MEMBER(adpcm_start_w);
- DECLARE_WRITE8_MEMBER(adpcm_addr_w);
- DECLARE_WRITE8_MEMBER(adpcm_stop_w);
+ uint8_t mcu_reset_r();
+ void bankswitch_w(uint8_t data);
+ void irq_ack_w(uint8_t data);
+ void nmi_ack_w(uint8_t data);
+ void fg_videoram_w(offs_t offset, uint8_t data);
+ void bg_videoram_w(offs_t offset, uint8_t data);
+ void flipscreen_w(uint8_t data);
+ void scroll_lsb_w(uint8_t data);
+ void scroll_msb_w(uint8_t data);
+ void adpcm_start_w(uint8_t data);
+ void adpcm_addr_w(uint8_t data);
+ void adpcm_stop_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(adpcm_int);
TILE_GET_INFO_MEMBER(get_bg_tilemap_info);
diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h
index 46cd3264881..b78ddab6c4b 100644
--- a/src/mame/includes/retofinv.h
+++ b/src/mame/includes/retofinv.h
@@ -38,16 +38,16 @@ protected:
virtual void video_start() override;
private:
- DECLARE_WRITE8_MEMBER(cpu2_m6000_w);
- DECLARE_READ8_MEMBER(cpu0_mf800_r);
+ void cpu2_m6000_w(uint8_t data);
+ uint8_t cpu0_mf800_r();
DECLARE_WRITE_LINE_MEMBER(irq0_ack_w);
DECLARE_WRITE_LINE_MEMBER(irq1_ack_w);
- DECLARE_WRITE8_MEMBER(coincounter_w);
+ void coincounter_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(coinlockout_w);
- DECLARE_READ8_MEMBER(mcu_status_r);
- DECLARE_WRITE8_MEMBER(bg_videoram_w);
- DECLARE_WRITE8_MEMBER(fg_videoram_w);
- DECLARE_WRITE8_MEMBER(gfx_ctrl_w);
+ uint8_t mcu_status_r();
+ void bg_videoram_w(offs_t offset, uint8_t data);
+ void fg_videoram_w(offs_t offset, uint8_t data);
+ void gfx_ctrl_w(offs_t offset, uint8_t data);
TILEMAP_MAPPER_MEMBER(tilemap_scan);
TILE_GET_INFO_MEMBER(bg_get_tile_info);
diff --git a/src/mame/includes/rltennis.h b/src/mame/includes/rltennis.h
index 29ca7c09eb6..c7cb7c485ca 100644
--- a/src/mame/includes/rltennis.h
+++ b/src/mame/includes/rltennis.h
@@ -39,10 +39,10 @@ private:
std::unique_ptr<bitmap_ind16> m_tmp_bitmap[RLT_NUM_BITMAPS];
emu_timer *m_timer;
- DECLARE_READ16_MEMBER(io_r);
- DECLARE_WRITE16_MEMBER(snd1_w);
- DECLARE_WRITE16_MEMBER(snd2_w);
- DECLARE_WRITE16_MEMBER(blitter_w);
+ uint16_t io_r();
+ void snd1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void snd2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void blitter_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/rm380z.h b/src/mame/includes/rm380z.h
index 71726340dbe..dcf493fa1f2 100644
--- a/src/mame/includes/rm380z.h
+++ b/src/mame/includes/rm380z.h
@@ -115,24 +115,24 @@ private:
optional_device<floppy_connector> m_floppy0;
optional_device<floppy_connector> m_floppy1;
- DECLARE_WRITE8_MEMBER( port_write );
- DECLARE_READ8_MEMBER( port_read );
- DECLARE_WRITE8_MEMBER( port_write_1b00 );
- DECLARE_READ8_MEMBER( port_read_1b00 );
+ void port_write(offs_t offset, uint8_t data);
+ uint8_t port_read(offs_t offset);
+ void port_write_1b00(offs_t offset, uint8_t data);
+ uint8_t port_read_1b00(offs_t offset);
- DECLARE_READ8_MEMBER( videoram_read );
- DECLARE_WRITE8_MEMBER( videoram_write );
+ uint8_t videoram_read(offs_t offset);
+ void videoram_write(offs_t offset, uint8_t data);
uint8_t hiram[0x1000];
- DECLARE_READ8_MEMBER( hiram_read );
- DECLARE_WRITE8_MEMBER( hiram_write );
+ uint8_t hiram_read(offs_t offset);
+ void hiram_write(offs_t offset, uint8_t data);
- DECLARE_READ8_MEMBER( rm380z_portlow_r );
- DECLARE_WRITE8_MEMBER( rm380z_portlow_w );
- DECLARE_READ8_MEMBER( rm380z_porthi_r );
- DECLARE_WRITE8_MEMBER( rm380z_porthi_w );
+ uint8_t rm380z_portlow_r();
+ void rm380z_portlow_w(offs_t offset, uint8_t data);
+ uint8_t rm380z_porthi_r();
+ void rm380z_porthi_w(offs_t offset, uint8_t data);
- DECLARE_WRITE8_MEMBER(disk_0_control);
+ void disk_0_control(uint8_t data);
void keyboard_put(u8 data);
diff --git a/src/mame/includes/rmnimbus.h b/src/mame/includes/rmnimbus.h
index c93d72f53f2..66cd1cd3f51 100644
--- a/src/mame/includes/rmnimbus.h
+++ b/src/mame/includes/rmnimbus.h
@@ -127,27 +127,27 @@ private:
uint8_t m_eeprom_bits;
uint8_t m_eeprom_state;
- DECLARE_READ8_MEMBER(nimbus_mcu_r);
- DECLARE_WRITE8_MEMBER(nimbus_mcu_w);
- DECLARE_READ8_MEMBER(scsi_r);
- DECLARE_WRITE8_MEMBER(scsi_w);
- DECLARE_WRITE8_MEMBER(fdc_ctl_w);
+ uint8_t nimbus_mcu_r();
+ void nimbus_mcu_w(uint8_t data);
+ uint8_t scsi_r(offs_t offset);
+ void scsi_w(offs_t offset, uint8_t data);
+ void fdc_ctl_w(uint8_t data);
uint8_t nimbus_pc8031_r(offs_t offset);
void nimbus_pc8031_w(offs_t offset, uint8_t data);
- DECLARE_READ8_MEMBER(nimbus_pc8031_iou_r);
- DECLARE_WRITE8_MEMBER(nimbus_pc8031_iou_w);
+ uint8_t nimbus_pc8031_iou_r(offs_t offset);
+ void nimbus_pc8031_iou_w(offs_t offset, uint8_t data);
uint8_t nimbus_pc8031_port1_r();
void nimbus_pc8031_port1_w(uint8_t data);
uint8_t nimbus_pc8031_port3_r();
void nimbus_pc8031_port3_w(uint8_t data);
- DECLARE_READ8_MEMBER(nimbus_iou_r);
- DECLARE_WRITE8_MEMBER(nimbus_iou_w);
+ uint8_t nimbus_iou_r(offs_t offset);
+ void nimbus_iou_w(offs_t offset, uint8_t data);
void nimbus_sound_ay8910_porta_w(uint8_t data);
void nimbus_sound_ay8910_portb_w(uint8_t data);
- DECLARE_READ8_MEMBER(nimbus_mouse_js_r);
- DECLARE_WRITE8_MEMBER(nimbus_mouse_js_w);
- DECLARE_READ16_MEMBER(nimbus_video_io_r);
- DECLARE_WRITE16_MEMBER(nimbus_video_io_w);
+ uint8_t nimbus_mouse_js_r();
+ void nimbus_mouse_js_w(uint8_t data);
+ uint16_t nimbus_video_io_r(offs_t offset, uint16_t mem_mask = ~0);
+ void nimbus_video_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h
index a4692101516..10674d46d15 100644
--- a/src/mame/includes/rockrage.h
+++ b/src/mame/includes/rockrage.h
@@ -51,11 +51,11 @@ private:
/* video-related */
int m_vreg;
- DECLARE_WRITE8_MEMBER(rockrage_bankswitch_w);
- DECLARE_WRITE8_MEMBER(rockrage_sh_irqtrigger_w);
- DECLARE_WRITE8_MEMBER(rockrage_vreg_w);
- DECLARE_READ8_MEMBER(rockrage_VLM5030_busy_r);
- DECLARE_WRITE8_MEMBER(rockrage_speech_w);
+ void rockrage_bankswitch_w(uint8_t data);
+ void rockrage_sh_irqtrigger_w(uint8_t data);
+ void rockrage_vreg_w(uint8_t data);
+ uint8_t rockrage_VLM5030_busy_r();
+ void rockrage_speech_w(uint8_t data);
virtual void machine_start() override;
virtual void machine_reset() override;
void rockrage_palette(palette_device &palette) const;
diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h
index d640ec125ba..205ad0dc2ad 100644
--- a/src/mame/includes/rocnrope.h
+++ b/src/mame/includes/rocnrope.h
@@ -41,12 +41,12 @@ private:
tilemap_t *m_bg_tilemap;
uint8_t m_irq_mask;
- DECLARE_WRITE8_MEMBER(rocnrope_interrupt_vector_w);
+ void rocnrope_interrupt_vector_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(irq_mask_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w);
- DECLARE_WRITE8_MEMBER(rocnrope_videoram_w);
- DECLARE_WRITE8_MEMBER(rocnrope_colorram_w);
+ void rocnrope_videoram_w(offs_t offset, uint8_t data);
+ void rocnrope_colorram_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(flip_screen_w);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h
index 24a8cfadf8e..a26c07dd43a 100644
--- a/src/mame/includes/rollerg.h
+++ b/src/mame/includes/rollerg.h
@@ -46,11 +46,11 @@ private:
required_device<k05324x_device> m_k053244;
required_device<k051316_device> m_k051316;
required_device<k053252_device> m_k053252;
- DECLARE_WRITE8_MEMBER(rollerg_0010_w);
- DECLARE_READ8_MEMBER(rollerg_k051316_r);
- DECLARE_WRITE8_MEMBER(soundirq_w);
- DECLARE_WRITE8_MEMBER(sound_arm_nmi_w);
- DECLARE_READ8_MEMBER(pip_r);
+ void rollerg_0010_w(uint8_t data);
+ uint8_t rollerg_k051316_r(offs_t offset);
+ void soundirq_w(uint8_t data);
+ void sound_arm_nmi_w(uint8_t data);
+ uint8_t pip_r();
DECLARE_WRITE_LINE_MEMBER(rollerg_irq_ack_w);
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h
index 5cc4bb668f5..804f5c73de0 100644
--- a/src/mame/includes/rollrace.h
+++ b/src/mame/includes/rollrace.h
@@ -49,22 +49,22 @@ private:
uint8_t m_nmi_mask;
uint8_t m_sound_nmi_mask;
- DECLARE_READ8_MEMBER(fake_d800_r);
- DECLARE_WRITE8_MEMBER(fake_d800_w);
+ uint8_t fake_d800_r();
+ void fake_d800_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(nmi_mask_w);
- DECLARE_WRITE8_MEMBER(sound_nmi_mask_w);
+ void sound_nmi_mask_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w);
DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w);
DECLARE_WRITE_LINE_MEMBER(charbank_0_w);
DECLARE_WRITE_LINE_MEMBER(charbank_1_w);
- DECLARE_WRITE8_MEMBER(bkgpen_w);
+ void bkgpen_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(spritebank_w);
- DECLARE_WRITE8_MEMBER(backgroundpage_w);
- DECLARE_WRITE8_MEMBER(backgroundcolor_w);
- DECLARE_WRITE8_MEMBER(flipy_w);
+ void backgroundpage_w(uint8_t data);
+ void backgroundcolor_w(uint8_t data);
+ void flipy_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(flipx_w);
- DECLARE_WRITE8_MEMBER(vram_w);
- DECLARE_WRITE8_MEMBER(cram_w);
+ void vram_w(offs_t offset, uint8_t data);
+ void cram_w(offs_t offset, uint8_t data);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
void tilemap_refresh_flip();
diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h
index 5a48cd47d48..1186c758a4d 100644
--- a/src/mame/includes/rpunch.h
+++ b/src/mame/includes/rpunch.h
@@ -71,7 +71,7 @@ private:
void videoram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
void videoreg_w(offs_t offset, u16 data, u16 mem_mask = ~0);
void scrollreg_w(offs_t offset, u16 data, u16 mem_mask = ~0);
- DECLARE_WRITE8_MEMBER(gga_w);
+ void gga_w(offs_t offset, u8 data);
void gga_data_w(offs_t offset, u8 data);
void sprite_ctrl_w(offs_t offset, u8 data);
void upd_control_w(u8 data);
diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h
index d1686e9e1a6..a02da7ba5d2 100644
--- a/src/mame/includes/runaway.h
+++ b/src/mame/includes/runaway.h
@@ -28,13 +28,13 @@ public:
void runaway(machine_config &config);
private:
- DECLARE_READ8_MEMBER(runaway_input_r);
- DECLARE_WRITE8_MEMBER(runaway_irq_ack_w);
- DECLARE_READ8_MEMBER(earom_read);
- DECLARE_WRITE8_MEMBER(earom_write);
+ uint8_t runaway_input_r(offs_t offset);
+ void runaway_irq_ack_w(uint8_t data);
+ uint8_t earom_read();
+ void earom_write(offs_t offset, uint8_t data);
void earom_control_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(runaway_paletteram_w);
- DECLARE_WRITE8_MEMBER(runaway_video_ram_w);
+ void runaway_paletteram_w(offs_t offset, uint8_t data);
+ void runaway_video_ram_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER(tile_bank_w);
uint8_t runaway_pot_r(offs_t offset);
TILE_GET_INFO_MEMBER(runaway_get_tile_info);
diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h
index 9e8b6424e82..8ae9c19910d 100644
--- a/src/mame/includes/rungun.h
+++ b/src/mame/includes/rungun.h
@@ -89,24 +89,21 @@ private:
bool m_single_screen_mode;
uint8_t m_video_mux_bank;
- DECLARE_READ16_MEMBER(sysregs_r);
- DECLARE_WRITE16_MEMBER(sysregs_w);
- DECLARE_WRITE16_MEMBER(sound_cmd1_w);
- DECLARE_WRITE16_MEMBER(sound_cmd2_w);
- DECLARE_WRITE16_MEMBER(sound_irq_w);
- DECLARE_READ16_MEMBER(sound_status_msb_r);
- DECLARE_WRITE8_MEMBER(sound_status_w);
- DECLARE_WRITE8_MEMBER(sound_ctrl_w);
- DECLARE_READ16_MEMBER(ttl_ram_r);
- DECLARE_WRITE16_MEMBER(ttl_ram_w);
- DECLARE_READ16_MEMBER(psac2_videoram_r);
- DECLARE_WRITE16_MEMBER(psac2_videoram_w);
- DECLARE_READ8_MEMBER(k53936_rom_r);
+ uint16_t sysregs_r(offs_t offset, uint16_t mem_mask = ~0);
+ void sysregs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void sound_irq_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ void sound_status_w(uint8_t data);
+ void sound_ctrl_w(uint8_t data);
+ uint16_t ttl_ram_r(offs_t offset);
+ void ttl_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t psac2_videoram_r(offs_t offset);
+ void psac2_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint8_t k53936_rom_r(offs_t offset);
TILE_GET_INFO_MEMBER(ttl_get_tile_info);
TILE_GET_INFO_MEMBER(get_rng_936_tile_info);
DECLARE_WRITE_LINE_MEMBER(k054539_nmi_gen);
- DECLARE_READ16_MEMBER(palette_read);
- DECLARE_WRITE16_MEMBER(palette_write);
+ uint16_t palette_read(offs_t offset);
+ void palette_write(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
K055673_CB_MEMBER(sprite_callback);