summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/emu/cpu/psx/dma.h4
-rw-r--r--src/emu/cpu/psx/irq.h4
-rw-r--r--src/emu/cpu/psx/mdec.h4
-rw-r--r--src/emu/cpu/psx/psx.h8
-rw-r--r--src/emu/cpu/psx/rcnt.h4
-rw-r--r--src/emu/cpu/psx/sio.h4
-rw-r--r--src/emu/machine/m6m80011ap.h10
-rw-r--r--src/emu/machine/s3520cf.h10
-rw-r--r--src/emu/video/m50458.h6
-rw-r--r--src/emu/video/mb90082.h2
-rw-r--r--src/emu/video/psx.h4
-rw-r--r--src/mame/audio/midway.h2
-rw-r--r--src/mame/includes/archimds.h4
-rw-r--r--src/mame/includes/segaxbd.h28
-rw-r--r--src/mame/includes/segaybd.h14
-rw-r--r--src/mess/audio/mos7360.h4
-rw-r--r--src/mess/drivers/a5105.c2
-rw-r--r--src/mess/drivers/geneve.c10
-rw-r--r--src/mess/drivers/h19.c14
-rw-r--r--src/mess/drivers/tm990189.c2
-rw-r--r--src/mess/includes/atarist.h18
-rw-r--r--src/mess/includes/dgn_beta.h34
-rw-r--r--src/mess/includes/next.h56
-rw-r--r--src/mess/includes/px8.h16
-rw-r--r--src/mess/includes/studio2.h8
-rw-r--r--src/mess/includes/super80.h30
-rw-r--r--src/mess/includes/tiki100.h18
-rw-r--r--src/mess/machine/coco_multi.h2
-rw-r--r--src/mess/machine/ieee488.h4
-rw-r--r--src/mess/video/ef9345.h4
30 files changed, 165 insertions, 165 deletions
diff --git a/src/emu/cpu/psx/dma.h b/src/emu/cpu/psx/dma.h
index 20d45a2b879..4aec268472a 100644
--- a/src/emu/cpu/psx/dma.h
+++ b/src/emu/cpu/psx/dma.h
@@ -37,8 +37,8 @@ public:
void install_read_handler( int n_channel, psx_dma_read_delegate p_fn_dma_read );
void install_write_handler( int n_channel, psx_dma_read_delegate p_fn_dma_write );
- WRITE32_MEMBER( write );
- READ32_MEMBER( read );
+ DECLARE_WRITE32_MEMBER( write );
+ DECLARE_READ32_MEMBER( read );
protected:
virtual void device_start();
diff --git a/src/emu/cpu/psx/irq.h b/src/emu/cpu/psx/irq.h
index 103a7386964..f05d2e8d1c9 100644
--- a/src/emu/cpu/psx/irq.h
+++ b/src/emu/cpu/psx/irq.h
@@ -31,8 +31,8 @@ class psxirq_device : public device_t
public:
psxirq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- READ32_MEMBER( read );
- WRITE32_MEMBER( write );
+ DECLARE_READ32_MEMBER( read );
+ DECLARE_WRITE32_MEMBER( write );
void set( UINT32 bitmask );
diff --git a/src/emu/cpu/psx/mdec.h b/src/emu/cpu/psx/mdec.h
index d4dc2379c63..8d5de675fa2 100644
--- a/src/emu/cpu/psx/mdec.h
+++ b/src/emu/cpu/psx/mdec.h
@@ -24,8 +24,8 @@ class psxmdec_device : public device_t
public:
psxmdec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- WRITE32_MEMBER( write );
- READ32_MEMBER( read );
+ DECLARE_WRITE32_MEMBER( write );
+ DECLARE_READ32_MEMBER( read );
void dma_write( UINT32 n_address, INT32 n_size );
void dma_read( UINT32 n_address, INT32 n_size );
diff --git a/src/emu/cpu/psx/psx.h b/src/emu/cpu/psx/psx.h
index 2770d004e26..1a0c978ba5a 100644
--- a/src/emu/cpu/psx/psx.h
+++ b/src/emu/cpu/psx/psx.h
@@ -125,10 +125,10 @@ public:
psxcpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// public interfaces
- WRITE32_MEMBER( biu_w );
- READ32_MEMBER( biu_r );
- WRITE32_MEMBER( berr_w );
- READ32_MEMBER( berr_r );
+ DECLARE_WRITE32_MEMBER( biu_w );
+ DECLARE_READ32_MEMBER( biu_r );
+ DECLARE_WRITE32_MEMBER( berr_w );
+ DECLARE_READ32_MEMBER( berr_r );
static psxcpu_device *getcpu( device_t &device, const char *cputag );
static void install_sio_handler( device_t &device, const char *cputag, int n_port, psx_sio_handler p_f_sio_handler );
diff --git a/src/emu/cpu/psx/rcnt.h b/src/emu/cpu/psx/rcnt.h
index f2e454cfd66..e2cb483cbb9 100644
--- a/src/emu/cpu/psx/rcnt.h
+++ b/src/emu/cpu/psx/rcnt.h
@@ -37,8 +37,8 @@ class psxrcnt_device : public device_t
public:
psxrcnt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- WRITE32_MEMBER( write );
- READ32_MEMBER( read );
+ DECLARE_WRITE32_MEMBER( write );
+ DECLARE_READ32_MEMBER( read );
protected:
virtual void device_start();
diff --git a/src/emu/cpu/psx/sio.h b/src/emu/cpu/psx/sio.h
index b925e05854a..c611e15003d 100644
--- a/src/emu/cpu/psx/sio.h
+++ b/src/emu/cpu/psx/sio.h
@@ -69,8 +69,8 @@ public:
void install_handler( int n_port, psx_sio_handler p_f_sio_handler );
- WRITE32_MEMBER( write );
- READ32_MEMBER( read );
+ DECLARE_WRITE32_MEMBER( write );
+ DECLARE_READ32_MEMBER( read );
void input( int n_port, int n_mask, int n_data );
diff --git a/src/emu/machine/m6m80011ap.h b/src/emu/machine/m6m80011ap.h
index f84e7f59e12..df47d451436 100644
--- a/src/emu/machine/m6m80011ap.h
+++ b/src/emu/machine/m6m80011ap.h
@@ -45,11 +45,11 @@ public:
m6m80011ap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// I/O operations
- READ_LINE_MEMBER( read_bit );
- READ_LINE_MEMBER( ready_line );
- WRITE_LINE_MEMBER( set_cs_line );
- WRITE_LINE_MEMBER( set_clock_line );
- WRITE_LINE_MEMBER( write_bit );
+ DECLARE_READ_LINE_MEMBER( read_bit );
+ DECLARE_READ_LINE_MEMBER( ready_line );
+ DECLARE_WRITE_LINE_MEMBER( set_cs_line );
+ DECLARE_WRITE_LINE_MEMBER( set_clock_line );
+ DECLARE_WRITE_LINE_MEMBER( write_bit );
protected:
// device-level overrides
diff --git a/src/emu/machine/s3520cf.h b/src/emu/machine/s3520cf.h
index 73a2b0a6e40..54724077144 100644
--- a/src/emu/machine/s3520cf.h
+++ b/src/emu/machine/s3520cf.h
@@ -44,11 +44,11 @@ public:
s3520cf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// I/O operations
- READ_LINE_MEMBER( read_bit );
- WRITE_LINE_MEMBER( set_dir_line );
- WRITE_LINE_MEMBER( set_cs_line );
- WRITE_LINE_MEMBER( set_clock_line );
- WRITE_LINE_MEMBER( write_bit );
+ DECLARE_READ_LINE_MEMBER( read_bit );
+ DECLARE_WRITE_LINE_MEMBER( set_dir_line );
+ DECLARE_WRITE_LINE_MEMBER( set_cs_line );
+ DECLARE_WRITE_LINE_MEMBER( set_clock_line );
+ DECLARE_WRITE_LINE_MEMBER( write_bit );
void timer_callback();
protected:
diff --git a/src/emu/video/m50458.h b/src/emu/video/m50458.h
index 0699c777222..ceef5480fb3 100644
--- a/src/emu/video/m50458.h
+++ b/src/emu/video/m50458.h
@@ -52,9 +52,9 @@ public:
m50458_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// I/O operations
- WRITE_LINE_MEMBER( write_bit );
- WRITE_LINE_MEMBER( set_cs_line );
- WRITE_LINE_MEMBER( set_clock_line );
+ DECLARE_WRITE_LINE_MEMBER( write_bit );
+ DECLARE_WRITE_LINE_MEMBER( set_cs_line );
+ DECLARE_WRITE_LINE_MEMBER( set_clock_line );
DECLARE_WRITE16_MEMBER(vreg_120_w);
DECLARE_WRITE16_MEMBER(vreg_121_w);
DECLARE_WRITE16_MEMBER(vreg_122_w);
diff --git a/src/emu/video/mb90082.h b/src/emu/video/mb90082.h
index 7799ab79684..0b03a5310da 100644
--- a/src/emu/video/mb90082.h
+++ b/src/emu/video/mb90082.h
@@ -41,7 +41,7 @@ public:
// I/O operations
DECLARE_WRITE8_MEMBER( write );
- WRITE_LINE_MEMBER( set_cs_line );
+ DECLARE_WRITE_LINE_MEMBER( set_cs_line );
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
virtual const rom_entry *device_rom_region() const;
diff --git a/src/emu/video/psx.h b/src/emu/video/psx.h
index a88acb5dd3e..27073fa9b6c 100644
--- a/src/emu/video/psx.h
+++ b/src/emu/video/psx.h
@@ -181,8 +181,8 @@ public:
virtual machine_config_constructor device_mconfig_additions() const;
UINT32 update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- WRITE32_MEMBER( write );
- READ32_MEMBER( read );
+ DECLARE_WRITE32_MEMBER( write );
+ DECLARE_READ32_MEMBER( read );
void dma_read( UINT32 n_address, INT32 n_size );
void dma_write( UINT32 n_address, INT32 n_size );
void lightgun_set( int, int );
diff --git a/src/mame/audio/midway.h b/src/mame/audio/midway.h
index 5dbda8de501..60e10fc0308 100644
--- a/src/mame/audio/midway.h
+++ b/src/mame/audio/midway.h
@@ -111,7 +111,7 @@ public:
// internal communications
INTERRUPT_GEN_MEMBER(clock_14024);
- READ8_MEMBER(irq_clear);
+ DECLARE_READ8_MEMBER(irq_clear);
DECLARE_WRITE8_MEMBER(status_w);
DECLARE_READ8_MEMBER(data_r);
DECLARE_WRITE8_MEMBER(porta0_w);
diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h
index fb286898e31..4726eeb3b62 100644
--- a/src/mame/includes/archimds.h
+++ b/src/mame/includes/archimds.h
@@ -86,8 +86,8 @@ private:
void vidc_dynamic_res_change();
void latch_timer_cnt(int tmr);
void a310_set_timer(int tmr);
- READ32_MEMBER(ioc_ctrl_r);
- WRITE32_MEMBER(ioc_ctrl_w);
+ DECLARE_READ32_MEMBER(ioc_ctrl_r);
+ DECLARE_WRITE32_MEMBER(ioc_ctrl_w);
UINT32 *m_archimedes_memc_physmem;
UINT32 m_memc_pagesize;
diff --git a/src/mame/includes/segaxbd.h b/src/mame/includes/segaxbd.h
index 6c98a504b4e..5bf7455931e 100644
--- a/src/mame/includes/segaxbd.h
+++ b/src/mame/includes/segaxbd.h
@@ -75,27 +75,27 @@ public:
void sound_data_w(UINT8 data);
// YM2151 chip callbacks
- WRITE_LINE_MEMBER( sound_cpu_irq );
+ DECLARE_WRITE_LINE_MEMBER( sound_cpu_irq );
// main CPU read/write handlers
- READ16_MEMBER( adc_r );
- WRITE16_MEMBER( adc_w );
+ DECLARE_READ16_MEMBER( adc_r );
+ DECLARE_WRITE16_MEMBER( adc_w );
UINT16 iochip_r(int which, int port, int inputval);
- READ16_MEMBER( iochip_0_r );
- WRITE16_MEMBER( iochip_0_w );
- READ16_MEMBER( iochip_1_r );
- WRITE16_MEMBER( iochip_1_w );
- WRITE16_MEMBER( iocontrol_w );
+ DECLARE_READ16_MEMBER( iochip_0_r );
+ DECLARE_WRITE16_MEMBER( iochip_0_w );
+ DECLARE_READ16_MEMBER( iochip_1_r );
+ DECLARE_WRITE16_MEMBER( iochip_1_w );
+ DECLARE_WRITE16_MEMBER( iocontrol_w );
// game-specific main CPU read/write handlers
- WRITE16_MEMBER( loffire_sync0_w );
- READ16_MEMBER( rascot_excs_r );
- WRITE16_MEMBER( rascot_excs_w );
- READ16_MEMBER( smgp_excs_r );
- WRITE16_MEMBER( smgp_excs_w );
+ DECLARE_WRITE16_MEMBER( loffire_sync0_w );
+ DECLARE_READ16_MEMBER( rascot_excs_r );
+ DECLARE_WRITE16_MEMBER( rascot_excs_w );
+ DECLARE_READ16_MEMBER( smgp_excs_r );
+ DECLARE_WRITE16_MEMBER( smgp_excs_w );
// sound Z80 CPU read/write handlers
- READ8_MEMBER( sound_data_r );
+ DECLARE_READ8_MEMBER( sound_data_r );
// game-specific driver init
DECLARE_DRIVER_INIT(generic);
diff --git a/src/mame/includes/segaybd.h b/src/mame/includes/segaybd.h
index b6d663e9b56..43b70d25de1 100644
--- a/src/mame/includes/segaybd.h
+++ b/src/mame/includes/segaybd.h
@@ -68,17 +68,17 @@ public:
}
// YM2151 chip callbacks
- WRITE_LINE_MEMBER( sound_cpu_irq );
+ DECLARE_WRITE_LINE_MEMBER( sound_cpu_irq );
// main CPU read/write handlers
- READ16_MEMBER( analog_r );
- WRITE16_MEMBER( analog_w );
- READ16_MEMBER( io_chip_r );
- WRITE16_MEMBER( io_chip_w );
- WRITE16_MEMBER( sound_data_w );
+ DECLARE_READ16_MEMBER( analog_r );
+ DECLARE_WRITE16_MEMBER( analog_w );
+ DECLARE_READ16_MEMBER( io_chip_r );
+ DECLARE_WRITE16_MEMBER( io_chip_w );
+ DECLARE_WRITE16_MEMBER( sound_data_w );
// sound Z80 CPU read/write handlers
- READ8_MEMBER( sound_data_r );
+ DECLARE_READ8_MEMBER( sound_data_r );
// game-specific output handlers
void gforce2_output_cb2(UINT16 data);
diff --git a/src/mess/audio/mos7360.h b/src/mess/audio/mos7360.h
index 810d59b0550..c60218a381c 100644
--- a/src/mess/audio/mos7360.h
+++ b/src/mess/audio/mos7360.h
@@ -127,8 +127,8 @@ public:
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
// horrible crap code
- WRITE_LINE_MEMBER( rom_switch_w );
- READ_LINE_MEMBER( rom_switch_r );
+ DECLARE_WRITE_LINE_MEMBER( rom_switch_w );
+ DECLARE_READ_LINE_MEMBER( rom_switch_r );
void frame_interrupt_gen();
void raster_interrupt_gen();
diff --git a/src/mess/drivers/a5105.c b/src/mess/drivers/a5105.c
index 6656a2457df..b742e18ed79 100644
--- a/src/mess/drivers/a5105.c
+++ b/src/mess/drivers/a5105.c
@@ -52,7 +52,7 @@ public:
DECLARE_WRITE8_MEMBER(key_mux_w);
DECLARE_WRITE8_MEMBER(a5105_ab_w);
DECLARE_WRITE8_MEMBER(a5105_memsel_w);
- WRITE8_MEMBER( a5105_upd765_w );
+ DECLARE_WRITE8_MEMBER( a5105_upd765_w );
DECLARE_WRITE8_MEMBER(pcg_addr_w);
DECLARE_WRITE8_MEMBER(pcg_val_w);
required_shared_ptr<UINT8> m_video_ram;
diff --git a/src/mess/drivers/geneve.c b/src/mess/drivers/geneve.c
index 7679c0f842d..7e6fda11021 100644
--- a/src/mess/drivers/geneve.c
+++ b/src/mess/drivers/geneve.c
@@ -242,7 +242,7 @@ public:
DECLARE_WRITE8_MEMBER(tms9901_interrupt);
- WRITE_LINE_MEMBER( keyboard_interrupt );
+ DECLARE_WRITE_LINE_MEMBER( keyboard_interrupt );
geneve_keyboard_device* m_keyboard;
geneve_mouse_device* m_mouse;
@@ -252,10 +252,10 @@ public:
tms9995_device* m_cpu;
joyport_device* m_joyport;
- WRITE_LINE_MEMBER( inta );
- WRITE_LINE_MEMBER( intb );
- WRITE_LINE_MEMBER( ext_ready );
- WRITE_LINE_MEMBER( mapper_ready );
+ DECLARE_WRITE_LINE_MEMBER( inta );
+ DECLARE_WRITE_LINE_MEMBER( intb );
+ DECLARE_WRITE_LINE_MEMBER( ext_ready );
+ DECLARE_WRITE_LINE_MEMBER( mapper_ready );
DECLARE_DRIVER_INIT(geneve);
virtual void machine_start();
diff --git a/src/mess/drivers/h19.c b/src/mess/drivers/h19.c
index d2b0dccbf65..3e8c8af8315 100644
--- a/src/mess/drivers/h19.c
+++ b/src/mess/drivers/h19.c
@@ -46,12 +46,12 @@ class h19_state : public driver_device
public:
h19_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_crtc(*this, "crtc"),
- m_ace(*this, "ins8250"),
- m_beep(*this, BEEPER_TAG)
- ,
- m_p_videoram(*this, "p_videoram"){ }
+ m_maincpu(*this, "maincpu"),
+ m_crtc(*this, "crtc"),
+ m_ace(*this, "ins8250"),
+ m_beep(*this, BEEPER_TAG),
+ m_p_videoram(*this, "p_videoram")
+ { }
required_device<cpu_device> m_maincpu;
required_device<mc6845_device> m_crtc;
@@ -60,7 +60,7 @@ public:
DECLARE_READ8_MEMBER(h19_80_r);
DECLARE_READ8_MEMBER(h19_a0_r);
DECLARE_WRITE8_MEMBER(h19_c0_w);
- WRITE8_MEMBER(h19_kbd_put);
+ DECLARE_WRITE8_MEMBER(h19_kbd_put);
required_shared_ptr<UINT8> m_p_videoram;
UINT8 *m_p_chargen;
UINT8 m_term_data;
diff --git a/src/mess/drivers/tm990189.c b/src/mess/drivers/tm990189.c
index d5eec703214..bc1251ce14c 100644
--- a/src/mess/drivers/tm990189.c
+++ b/src/mess/drivers/tm990189.c
@@ -85,7 +85,7 @@ public:
required_device<cassette_image_device> m_cass;
optional_device<tms9918_device> m_tms9918;
- READ8_MEMBER( interrupt_level );
+ DECLARE_READ8_MEMBER( interrupt_level );
DECLARE_READ8_MEMBER(video_vdp_r);
DECLARE_WRITE8_MEMBER(video_vdp_w);
diff --git a/src/mess/includes/atarist.h b/src/mess/includes/atarist.h
index a92939e3ead..0331529598a 100644
--- a/src/mess/includes/atarist.h
+++ b/src/mess/includes/atarist.h
@@ -305,15 +305,15 @@ public:
void video_start();
- READ8_MEMBER( shifter_base_low_r );
- WRITE8_MEMBER( shifter_base_low_w );
- READ8_MEMBER( shifter_counter_r );
- WRITE8_MEMBER( shifter_counter_w );
- WRITE16_MEMBER( shifter_palette_w );
- READ8_MEMBER( shifter_lineofs_r );
- WRITE8_MEMBER( shifter_lineofs_w );
- READ8_MEMBER( shifter_pixelofs_r );
- WRITE8_MEMBER( shifter_pixelofs_w );
+ DECLARE_READ8_MEMBER( shifter_base_low_r );
+ DECLARE_WRITE8_MEMBER( shifter_base_low_w );
+ DECLARE_READ8_MEMBER( shifter_counter_r );
+ DECLARE_WRITE8_MEMBER( shifter_counter_w );
+ DECLARE_WRITE16_MEMBER( shifter_palette_w );
+ DECLARE_READ8_MEMBER( shifter_lineofs_r );
+ DECLARE_WRITE8_MEMBER( shifter_lineofs_w );
+ DECLARE_READ8_MEMBER( shifter_pixelofs_r );
+ DECLARE_WRITE8_MEMBER( shifter_pixelofs_w );
DECLARE_READ8_MEMBER( sound_dma_control_r );
DECLARE_READ8_MEMBER( sound_dma_base_r );
diff --git a/src/mess/includes/dgn_beta.h b/src/mess/includes/dgn_beta.h
index ab344a15986..a9cfc7250f0 100644
--- a/src/mess/includes/dgn_beta.h
+++ b/src/mess/includes/dgn_beta.h
@@ -144,23 +144,23 @@ public:
int m_DrawInterlace;
virtual void machine_start();
virtual void palette_init();
- WRITE8_MEMBER(dgnbeta_ram_b0_w);
- WRITE8_MEMBER(dgnbeta_ram_b1_w);
- WRITE8_MEMBER(dgnbeta_ram_b2_w);
- WRITE8_MEMBER(dgnbeta_ram_b3_w);
- WRITE8_MEMBER(dgnbeta_ram_b4_w);
- WRITE8_MEMBER(dgnbeta_ram_b5_w);
- WRITE8_MEMBER(dgnbeta_ram_b6_w);
- WRITE8_MEMBER(dgnbeta_ram_b7_w);
- WRITE8_MEMBER(dgnbeta_ram_b8_w);
- WRITE8_MEMBER(dgnbeta_ram_b9_w);
- WRITE8_MEMBER(dgnbeta_ram_bA_w);
- WRITE8_MEMBER(dgnbeta_ram_bB_w);
- WRITE8_MEMBER(dgnbeta_ram_bC_w);
- WRITE8_MEMBER(dgnbeta_ram_bD_w);
- WRITE8_MEMBER(dgnbeta_ram_bE_w);
- WRITE8_MEMBER(dgnbeta_ram_bF_w);
- WRITE8_MEMBER(dgnbeta_ram_bG_w);
+ 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);
};
diff --git a/src/mess/includes/next.h b/src/mess/includes/next.h
index 9e4139386f4..a7406433371 100644
--- a/src/mess/includes/next.h
+++ b/src/mess/includes/next.h
@@ -48,34 +48,34 @@ public:
void setup(UINT32 scr1, int size_x, int size_y, int skip, bool color);
- READ8_MEMBER( io_r );
- WRITE8_MEMBER( io_w );
- READ32_MEMBER( rom_map_r );
- READ32_MEMBER( scr2_r );
- WRITE32_MEMBER( scr2_w );
- READ32_MEMBER( scr1_r );
- READ32_MEMBER( irq_status_r );
- READ32_MEMBER( irq_mask_r );
- WRITE32_MEMBER( irq_mask_w );
- READ32_MEMBER( modisk_r );
- READ32_MEMBER( network_r );
- READ32_MEMBER( event_counter_r );
- READ32_MEMBER( dsp_r );
- READ32_MEMBER( fdc_control_r );
- WRITE32_MEMBER( fdc_control_w );
- READ32_MEMBER( dma_ctrl_r );
- WRITE32_MEMBER( dma_ctrl_w );
- WRITE32_MEMBER( dma_040_ctrl_w );
- READ32_MEMBER( dma_regs_r );
- WRITE32_MEMBER( dma_regs_w );
- READ32_MEMBER( scsictrl_r );
- WRITE32_MEMBER( scsictrl_w );
- READ32_MEMBER( phy_r );
- WRITE32_MEMBER( phy_w );
- READ32_MEMBER( timer_data_r );
- WRITE32_MEMBER( timer_data_w );
- READ32_MEMBER( timer_ctrl_r );
- WRITE32_MEMBER( timer_ctrl_w );
+ DECLARE_READ8_MEMBER( io_r );
+ DECLARE_WRITE8_MEMBER( io_w );
+ DECLARE_READ32_MEMBER( rom_map_r );
+ DECLARE_READ32_MEMBER( scr2_r );
+ DECLARE_WRITE32_MEMBER( scr2_w );
+ DECLARE_READ32_MEMBER( scr1_r );
+ DECLARE_READ32_MEMBER( irq_status_r );
+ DECLARE_READ32_MEMBER( irq_mask_r );
+ DECLARE_WRITE32_MEMBER( irq_mask_w );
+ DECLARE_READ32_MEMBER( modisk_r );
+ DECLARE_READ32_MEMBER( network_r );
+ DECLARE_READ32_MEMBER( event_counter_r );
+ DECLARE_READ32_MEMBER( dsp_r );
+ DECLARE_READ32_MEMBER( fdc_control_r );
+ DECLARE_WRITE32_MEMBER( fdc_control_w );
+ DECLARE_READ32_MEMBER( dma_ctrl_r );
+ DECLARE_WRITE32_MEMBER( dma_ctrl_w );
+ DECLARE_WRITE32_MEMBER( dma_040_ctrl_w );
+ DECLARE_READ32_MEMBER( dma_regs_r );
+ DECLARE_WRITE32_MEMBER( dma_regs_w );
+ DECLARE_READ32_MEMBER( scsictrl_r );
+ DECLARE_WRITE32_MEMBER( scsictrl_w );
+ DECLARE_READ32_MEMBER( phy_r );
+ DECLARE_WRITE32_MEMBER( phy_w );
+ DECLARE_READ32_MEMBER( timer_data_r );
+ DECLARE_WRITE32_MEMBER( timer_data_w );
+ DECLARE_READ32_MEMBER( timer_ctrl_r );
+ DECLARE_WRITE32_MEMBER( timer_ctrl_w );
UINT32 scr1;
UINT32 scr2;
diff --git a/src/mess/includes/px8.h b/src/mess/includes/px8.h
index ccb1c328afa..64ab326f85f 100644
--- a/src/mess/includes/px8.h
+++ b/src/mess/includes/px8.h
@@ -46,14 +46,14 @@ public:
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- READ8_MEMBER( gah40m_r );
- WRITE8_MEMBER( gah40m_w );
- READ8_MEMBER( gah40s_r );
- WRITE8_MEMBER( gah40s_w );
- WRITE8_MEMBER( gah40s_ier_w );
- READ8_MEMBER( krtn_0_3_r );
- READ8_MEMBER( krtn_4_7_r );
- WRITE8_MEMBER( ksc_w );
+ DECLARE_READ8_MEMBER( gah40m_r );
+ DECLARE_WRITE8_MEMBER( gah40m_w );
+ DECLARE_READ8_MEMBER( gah40s_r );
+ DECLARE_WRITE8_MEMBER( gah40s_w );
+ DECLARE_WRITE8_MEMBER( gah40s_ier_w );
+ DECLARE_READ8_MEMBER( krtn_0_3_r );
+ DECLARE_READ8_MEMBER( krtn_4_7_r );
+ DECLARE_WRITE8_MEMBER( ksc_w );
void bankswitch();
UINT8 krtn_read();
diff --git a/src/mess/includes/studio2.h b/src/mess/includes/studio2.h
index 2eab34b441c..5c140ee7609 100644
--- a/src/mess/includes/studio2.h
+++ b/src/mess/includes/studio2.h
@@ -40,10 +40,10 @@ public:
DECLARE_READ8_MEMBER( dispon_r );
DECLARE_WRITE8_MEMBER( keylatch_w );
DECLARE_WRITE8_MEMBER( dispon_w );
- READ_LINE_MEMBER( clear_r );
- READ_LINE_MEMBER( ef3_r );
- READ_LINE_MEMBER( ef4_r );
- WRITE_LINE_MEMBER( q_w );
+ DECLARE_READ_LINE_MEMBER( clear_r );
+ DECLARE_READ_LINE_MEMBER( ef3_r );
+ DECLARE_READ_LINE_MEMBER( ef4_r );
+ DECLARE_WRITE_LINE_MEMBER( q_w );
DECLARE_INPUT_CHANGED_MEMBER( reset_w );
/* keyboard state */
diff --git a/src/mess/includes/super80.h b/src/mess/includes/super80.h
index bad31dcc438..ca42d0ab7a1 100644
--- a/src/mess/includes/super80.h
+++ b/src/mess/includes/super80.h
@@ -38,21 +38,21 @@ public:
required_device<device_t> m_speaker;
required_device<centronics_device> m_centronics;
optional_device<mc6845_device> m_6845;
- READ8_MEMBER( super80v_low_r );
- READ8_MEMBER( super80v_high_r );
- WRITE8_MEMBER( super80v_low_w );
- WRITE8_MEMBER( super80v_high_w );
- WRITE8_MEMBER( super80v_10_w );
- WRITE8_MEMBER( super80v_11_w );
- WRITE8_MEMBER( super80_f1_w );
- READ8_MEMBER( super80_dc_r );
- READ8_MEMBER( super80_f2_r );
- WRITE8_MEMBER( super80_dc_w );
- WRITE8_MEMBER( super80_f0_w );
- WRITE8_MEMBER( super80r_f0_w );
- READ8_MEMBER( super80_read_ff );
- WRITE8_MEMBER( pio_port_a_w );
- //READ8_MEMBER( pio_port_b_r );
+ DECLARE_READ8_MEMBER( super80v_low_r );
+ DECLARE_READ8_MEMBER( super80v_high_r );
+ DECLARE_WRITE8_MEMBER( super80v_low_w );
+ DECLARE_WRITE8_MEMBER( super80v_high_w );
+ DECLARE_WRITE8_MEMBER( super80v_10_w );
+ DECLARE_WRITE8_MEMBER( super80v_11_w );
+ DECLARE_WRITE8_MEMBER( super80_f1_w );
+ DECLARE_READ8_MEMBER( super80_dc_r );
+ DECLARE_READ8_MEMBER( super80_f2_r );
+ DECLARE_WRITE8_MEMBER( super80_dc_w );
+ DECLARE_WRITE8_MEMBER( super80_f0_w );
+ DECLARE_WRITE8_MEMBER( super80r_f0_w );
+ DECLARE_READ8_MEMBER( super80_read_ff );
+ DECLARE_WRITE8_MEMBER( pio_port_a_w );
+ //DECLARE_READ8_MEMBER( pio_port_b_r );
virtual void machine_reset();
UINT8 m_shared;
UINT8 m_keylatch;
diff --git a/src/mess/includes/tiki100.h b/src/mess/includes/tiki100.h
index 0a300fb14cc..929bfa00e7b 100644
--- a/src/mess/includes/tiki100.h
+++ b/src/mess/includes/tiki100.h
@@ -55,15 +55,15 @@ public:
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- READ8_MEMBER( gfxram_r );
- WRITE8_MEMBER( gfxram_w );
- READ8_MEMBER( keyboard_r );
- WRITE8_MEMBER( keyboard_w );
- WRITE8_MEMBER( video_mode_w );
- WRITE8_MEMBER( palette_w );
- WRITE8_MEMBER( system_w );
- WRITE_LINE_MEMBER( ctc_z1_w );
- WRITE8_MEMBER( video_scroll_w );
+ DECLARE_READ8_MEMBER( gfxram_r );
+ DECLARE_WRITE8_MEMBER( gfxram_w );
+ DECLARE_READ8_MEMBER( keyboard_r );
+ DECLARE_WRITE8_MEMBER( keyboard_w );
+ DECLARE_WRITE8_MEMBER( video_mode_w );
+ DECLARE_WRITE8_MEMBER( palette_w );
+ DECLARE_WRITE8_MEMBER( system_w );
+ DECLARE_WRITE_LINE_MEMBER( ctc_z1_w );
+ DECLARE_WRITE8_MEMBER( video_scroll_w );
void bankswitch();
diff --git a/src/mess/machine/coco_multi.h b/src/mess/machine/coco_multi.h
index 16c1a167bac..85d8030aef8 100644
--- a/src/mess/machine/coco_multi.h
+++ b/src/mess/machine/coco_multi.h
@@ -52,7 +52,7 @@ private:
UINT8 m_select;
// methods
- WRITE8_MEMBER(ff7f_write);
+ DECLARE_WRITE8_MEMBER(ff7f_write);
cococart_slot_device *active_scs_slot(void);
cococart_slot_device *active_cts_slot(void);
void set_select(UINT8 new_select);
diff --git a/src/mess/machine/ieee488.h b/src/mess/machine/ieee488.h
index 87a01af0141..3a2105bb4ff 100644
--- a/src/mess/machine/ieee488.h
+++ b/src/mess/machine/ieee488.h
@@ -79,7 +79,7 @@ public:
// reads for both host and peripherals
UINT8 dio_r();
- READ8_MEMBER( dio_r );
+ DECLARE_READ8_MEMBER( dio_r );
DECLARE_READ_LINE_MEMBER( eoi_r );
DECLARE_READ_LINE_MEMBER( dav_r );
DECLARE_READ_LINE_MEMBER( nrfd_r );
@@ -91,7 +91,7 @@ public:
// writes for host (driver_device)
void dio_w(UINT8 data);
- WRITE8_MEMBER( dio_w );
+ DECLARE_WRITE8_MEMBER( dio_w );
DECLARE_WRITE_LINE_MEMBER( eoi_w );
DECLARE_WRITE_LINE_MEMBER( dav_w );
DECLARE_WRITE_LINE_MEMBER( nrfd_w );
diff --git a/src/mess/video/ef9345.h b/src/mess/video/ef9345.h
index 4595b8eceef..bb14ff43b55 100644
--- a/src/mess/video/ef9345.h
+++ b/src/mess/video/ef9345.h
@@ -39,8 +39,8 @@ public:
ef9345_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device interface
- READ8_MEMBER( data_r );
- WRITE8_MEMBER( data_w );
+ DECLARE_READ8_MEMBER( data_r );
+ DECLARE_WRITE8_MEMBER( data_w );
void update_scanline(UINT16 scanline);
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);