diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2014-05-14 06:46:50 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2014-05-14 06:46:50 +0000 |
commit | 546fbff34966f4f5f62930dd73c064df90d4e51e (patch) | |
tree | a2e859303874d5ee6cda105c465983e5223d5675 /src/mame | |
parent | c5a60146edfc6d9bf8ff7f398b0c3fa17b94b1e3 (diff) |
devcv2 -> devcb (nw)
Diffstat (limited to 'src/mame')
34 files changed, 325 insertions, 325 deletions
diff --git a/src/mame/audio/atarijsa.h b/src/mame/audio/atarijsa.h index 85a66cbab1c..e1866d1c75c 100644 --- a/src/mame/audio/atarijsa.h +++ b/src/mame/audio/atarijsa.h @@ -38,22 +38,22 @@ extern const device_type ATARI_JSA_IIIS; #define MCFG_ATARI_JSA_I_ADD(_tag, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_JSA_I, 0) \ - devcb = &atari_jsa_i_device::static_set_main_int_cb(*device, DEVCB2_##_intcb); + devcb = &atari_jsa_i_device::static_set_main_int_cb(*device, DEVCB_##_intcb); #define MCFG_ATARI_JSA_II_ADD(_tag, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_JSA_II, 0) \ - devcb = &atari_jsa_ii_device::static_set_main_int_cb(*device, DEVCB2_##_intcb); + devcb = &atari_jsa_ii_device::static_set_main_int_cb(*device, DEVCB_##_intcb); #define MCFG_ATARI_JSA_III_ADD(_tag, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_JSA_III, 0) \ - devcb = &atari_jsa_iii_device::static_set_main_int_cb(*device, DEVCB2_##_intcb); + devcb = &atari_jsa_iii_device::static_set_main_int_cb(*device, DEVCB_##_intcb); #define MCFG_ATARI_JSA_IIIS_ADD(_tag, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_JSA_IIIS, 0) \ - devcb = &atari_jsa_iiis_device::static_set_main_int_cb(*device, DEVCB2_##_intcb); + devcb = &atari_jsa_iiis_device::static_set_main_int_cb(*device, DEVCB_##_intcb); #define MCFG_ATARI_JSA_TEST_PORT(_port, _bitnum) \ - devcb = &atari_jsa_base_device::static_set_test_read_cb(*device, DEVCB2_IOPORT(_port)); \ + devcb = &atari_jsa_base_device::static_set_test_read_cb(*device, DEVCB_IOPORT(_port)); \ MCFG_DEVCB_RSHIFT(_bitnum); @@ -84,8 +84,8 @@ protected: public: // static configuration - template<class _Object> static devcb2_base &static_set_test_read_cb(device_t &device, _Object object) { return downcast<atari_jsa_base_device &>(device).m_test_read_cb.set_callback(object); } - template<class _Object> static devcb2_base &static_set_main_int_cb(device_t &device, _Object object) { return downcast<atari_jsa_base_device &>(device).m_main_int_cb.set_callback(object); } + template<class _Object> static devcb_base &static_set_test_read_cb(device_t &device, _Object object) { return downcast<atari_jsa_base_device &>(device).m_test_read_cb.set_callback(object); } + template<class _Object> static devcb_base &static_set_main_int_cb(device_t &device, _Object object) { return downcast<atari_jsa_base_device &>(device).m_main_int_cb.set_callback(object); } // getters m6502_device &soundcpu() const { return *m_jsacpu; } @@ -121,8 +121,8 @@ protected: required_memory_bank m_cpu_bank; // configuration state - devcb2_read_line m_test_read_cb; - devcb2_write_line m_main_int_cb; + devcb_read_line m_test_read_cb; + devcb_write_line m_main_int_cb; // internal state double m_ym2151_volume; diff --git a/src/mame/audio/cage.h b/src/mame/audio/cage.h index aa075967f0e..f1db2dd3e26 100644 --- a/src/mame/audio/cage.h +++ b/src/mame/audio/cage.h @@ -15,7 +15,7 @@ #define CAGE_IRQ_REASON_BUFFER_EMPTY (2) #define MCFG_ATARI_CAGE_IRQ_CALLBACK(_write) \ - devcb = &atari_cage_device::set_irqhandler_callback(*device, DEVCB2_##_write); + devcb = &atari_cage_device::set_irqhandler_callback(*device, DEVCB_##_write); #define MCFG_ATARI_CAGE_SPEEDUP(_speedup) \ atari_cage_device::static_set_speedup(*device, _speedup); @@ -28,7 +28,7 @@ public: atari_cage_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); static void static_set_speedup(device_t &device, offs_t speedup) { downcast<atari_cage_device &>(device).m_speedup = speedup; } - template<class _Object> static devcb2_base &set_irqhandler_callback(device_t &device, _Object object) { return downcast<atari_cage_device &>(device).m_irqhandler.set_callback(object); } + template<class _Object> static devcb_base &set_irqhandler_callback(device_t &device, _Object object) { return downcast<atari_cage_device &>(device).m_irqhandler.set_callback(object); } // optional information overrides virtual machine_config_constructor device_mconfig_additions() const; @@ -67,7 +67,7 @@ private: UINT8 m_cpu_to_cage_ready; UINT8 m_cage_to_cpu_ready; - devcb2_write8 m_irqhandler; + devcb_write8 m_irqhandler; attotime m_serial_period_per_word; diff --git a/src/mame/audio/namco52.h b/src/mame/audio/namco52.h index 949c62de1e2..b38061618e7 100644 --- a/src/mame/audio/namco52.h +++ b/src/mame/audio/namco52.h @@ -19,10 +19,10 @@ namco_52xx_device::set_extclock(*device, _clock); #define MCFG_NAMCO_52XX_ROMREAD_CB(_devcb) \ - devcb = &namco_52xx_device::set_romread_callback(*device, DEVCB2_##_devcb); + devcb = &namco_52xx_device::set_romread_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_52XX_SI_CB(_devcb) \ - devcb = &namco_52xx_device::set_si_callback(*device, DEVCB2_##_devcb); + devcb = &namco_52xx_device::set_si_callback(*device, DEVCB_##_devcb); class namco_52xx_device : public device_t @@ -33,8 +33,8 @@ public: static void set_discrete(device_t &device, const char *tag) { downcast<namco_52xx_device &>(device).m_discrete.set_tag(tag); } static void set_basenote(device_t &device, int node) { downcast<namco_52xx_device &>(device).m_basenode = node; } static void set_extclock(device_t &device, attoseconds_t clk) { downcast<namco_52xx_device &>(device).m_extclock = clk; } - template<class _Object> static devcb2_base &set_romread_callback(device_t &device, _Object object) { return downcast<namco_52xx_device &>(device).m_romread.set_callback(object); } - template<class _Object> static devcb2_base &set_si_callback(device_t &device, _Object object) { return downcast<namco_52xx_device &>(device).m_si.set_callback(object); } + template<class _Object> static devcb_base &set_romread_callback(device_t &device, _Object object) { return downcast<namco_52xx_device &>(device).m_romread.set_callback(object); } + template<class _Object> static devcb_base &set_si_callback(device_t &device, _Object object) { return downcast<namco_52xx_device &>(device).m_si.set_callback(object); } DECLARE_WRITE8_MEMBER(write); @@ -63,8 +63,8 @@ private: int m_basenode; attoseconds_t m_extclock; - devcb2_read8 m_romread; - devcb2_read8 m_si; + devcb_read8 m_romread; + devcb_read8 m_si; UINT8 m_latched_cmd; UINT32 m_address; diff --git a/src/mame/audio/segam1audio.h b/src/mame/audio/segam1audio.h index 023d6e07e6f..1146324c62e 100644 --- a/src/mame/audio/segam1audio.h +++ b/src/mame/audio/segam1audio.h @@ -54,7 +54,7 @@ private: int m_to_68k[8]; int m_fifo_rptr; int m_fifo_wptr; - devcb2_write_line m_main_irq_cb; + devcb_write_line m_main_irq_cb; }; diff --git a/src/mame/audio/wpcsnd.h b/src/mame/audio/wpcsnd.h index d1150ea6d59..6b502b908da 100644 --- a/src/mame/audio/wpcsnd.h +++ b/src/mame/audio/wpcsnd.h @@ -18,7 +18,7 @@ wpcsnd_device::static_set_gfxregion(*device, _region); #define MCFG_WPC_SOUND_REPLY_CALLBACK(_reply) \ - downcast<wpcsnd_device *>(device)->set_reply_callback(DEVCB2_##_reply); + downcast<wpcsnd_device *>(device)->set_reply_callback(DEVCB_##_reply); class wpcsnd_device : public device_t { @@ -65,7 +65,7 @@ private: bool m_reply_available; // callback - devcb2_write_line m_reply_cb; + devcb_write_line m_reply_cb; }; diff --git a/src/mame/drivers/de_2.c b/src/mame/drivers/de_2.c index 9886a757b98..98ba6d52292 100644 --- a/src/mame/drivers/de_2.c +++ b/src/mame/drivers/de_2.c @@ -86,7 +86,7 @@ public: DECLARE_READ8_MEMBER(sound_latch_r); DECLARE_WRITE8_MEMBER(sample_bank_w); - // devcb2 callbacks + // devcb callbacks DECLARE_READ8_MEMBER(display_r); DECLARE_WRITE8_MEMBER(display_w); DECLARE_WRITE8_MEMBER(type2alpha3_display_w); diff --git a/src/mame/drivers/de_3.c b/src/mame/drivers/de_3.c index 439f93f723d..2766505a35e 100644 --- a/src/mame/drivers/de_3.c +++ b/src/mame/drivers/de_3.c @@ -73,7 +73,7 @@ public: required_device<decobsmt_device> m_decobsmt; bool m_nmi_enable; - // devcb2 callbacks + // devcb callbacks DECLARE_READ8_MEMBER(display_r); DECLARE_WRITE8_MEMBER(display_w); DECLARE_WRITE8_MEMBER(lamps_w); diff --git a/src/mame/drivers/de_3b.c b/src/mame/drivers/de_3b.c index 888de9877e8..b042f3e87bf 100644 --- a/src/mame/drivers/de_3b.c +++ b/src/mame/drivers/de_3b.c @@ -34,7 +34,7 @@ public: DECLARE_READ8_MEMBER(pia2c_pb_r); DECLARE_WRITE8_MEMBER(pia2c_pb_w); - // devcb2 callbacks + // devcb callbacks DECLARE_READ8_MEMBER(display_r); DECLARE_WRITE8_MEMBER(display_w); DECLARE_WRITE8_MEMBER(lamps_w); diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 8260ef82b9a..994dea8335d 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -1703,7 +1703,7 @@ ADDRESS_MAP_END MCFG_DEVICE_ADD(_tag, PUZZLET_IO, 0) #define MCFG_PUZZLET_IO_DATA_CALLBACK(_devcb) \ - devcb = &puzzlet_io_device::set_data_cb(*device, DEVCB2_##_devcb); + devcb = &puzzlet_io_device::set_data_cb(*device, DEVCB_##_devcb); class puzzlet_io_device : public device_t { public: @@ -1712,14 +1712,14 @@ public: DECLARE_WRITE_LINE_MEMBER( ce_w ); DECLARE_WRITE_LINE_MEMBER( clk_w ); - template<class _Object> static devcb2_base &set_data_cb(device_t &device, _Object object) { return downcast<puzzlet_io_device &>(device).data_cb.set_callback(object); } + template<class _Object> static devcb_base &set_data_cb(device_t &device, _Object object) { return downcast<puzzlet_io_device &>(device).data_cb.set_callback(object); } protected: virtual void device_start(); virtual void device_reset(); private: - devcb2_write_line data_cb; + devcb_write_line data_cb; required_ioport port; int ce, clk; int cur_bit; diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index 34be79073f5..a8058235300 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -1578,7 +1578,7 @@ static MACHINE_CONFIG_START( coh700, namcos12_state ) MCFG_DEVICE_MODIFY("sub:sci1") MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":namco_settings", namco_settings_device, data_w)) - MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb2_line_dispatch_device<2>, in_w)) + MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb_line_dispatch_device<2>, in_w)) MCFG_AT28C16_ADD("at28c16", NULL) diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index a04183a6040..e20163ff6a4 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -3361,7 +3361,7 @@ static MACHINE_CONFIG_START( gorgon, namcos23_state ) MCFG_DEVICE_MODIFY("subcpu:sci1") MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":namco_settings", namco_settings_device, data_w)) - MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb2_line_dispatch_device<2>, in_w)) + MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb_line_dispatch_device<2>, in_w)) MCFG_NVRAM_ADD_0FILL("nvram") @@ -3429,7 +3429,7 @@ static MACHINE_CONFIG_START( s23, namcos23_state ) MCFG_DEVICE_MODIFY("subcpu:sci1") MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":namco_settings", namco_settings_device, data_w)) - MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb2_line_dispatch_device<2>, in_w)) + MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb_line_dispatch_device<2>, in_w)) MCFG_NVRAM_ADD_0FILL("nvram") @@ -3508,7 +3508,7 @@ static MACHINE_CONFIG_START( ss23, namcos23_state ) MCFG_DEVICE_MODIFY("subcpu:sci1") MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":namco_settings", namco_settings_device, data_w)) - MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb2_line_dispatch_device<2>, in_w)) + MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":clk_dispatch", devcb_line_dispatch_device<2>, in_w)) MCFG_NVRAM_ADD_0FILL("nvram") diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 67b23b1236b..207071e163d 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -515,7 +515,7 @@ ADDRESS_MAP_END MCFG_DEVICE_ADD( _tag, FUNCUBE_TOUCHSCREEN, _clock ) #define MCFG_FUNCUBE_TOUCHSCREEN_TX_CALLBACK(_devcb) \ - devcb = &funcube_touchscreen_device::set_tx_cb(*device, DEVCB2_##_devcb); + devcb = &funcube_touchscreen_device::set_tx_cb(*device, DEVCB_##_devcb); class funcube_touchscreen_device : public device_t, public device_serial_interface @@ -524,7 +524,7 @@ public: funcube_touchscreen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const; - template<class _Object> static devcb2_base &set_tx_cb(device_t &device, _Object object) { return downcast<funcube_touchscreen_device &>(device).m_tx_cb.set_callback(object); } + template<class _Object> static devcb_base &set_tx_cb(device_t &device, _Object object) { return downcast<funcube_touchscreen_device &>(device).m_tx_cb.set_callback(object); } protected: virtual void device_start(); @@ -535,7 +535,7 @@ protected: virtual void tra_callback(); private: - devcb2_write_line m_tx_cb; + devcb_write_line m_tx_cb; required_ioport m_x; required_ioport m_y; required_ioport m_btn; diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index e7a8b1191c6..5031e24c15a 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -37,14 +37,14 @@ #define MCFG_ATARI_SOUND_COMM_ADD(_tag, _soundcpu, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_SOUND_COMM, 0) \ atari_sound_comm_device::static_set_sound_cpu(*device, _soundcpu); \ - devcb = &atari_sound_comm_device::static_set_main_int_cb(*device, DEVCB2_##_intcb); + devcb = &atari_sound_comm_device::static_set_main_int_cb(*device, DEVCB_##_intcb); #define MCFG_ATARI_VAD_ADD(_tag, _screen, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_VAD, 0) \ MCFG_VIDEO_SET_SCREEN(_screen) \ - devcb = &atari_vad_device::static_set_scanline_int_cb(*device, DEVCB2_##_intcb); + devcb = &atari_vad_device::static_set_scanline_int_cb(*device, DEVCB_##_intcb); #define MCFG_ATARI_VAD_PLAYFIELD(_class, _gfxtag, _getinfo) \ { astring fulltag(device->tag(), ":playfield"); device_t *device; \ @@ -114,7 +114,7 @@ public: // static configuration helpers static void static_set_sound_cpu(device_t &device, const char *cputag); - template<class _Object> static devcb2_base &static_set_main_int_cb(device_t &device, _Object object) { return downcast<atari_sound_comm_device &>(device).m_main_int_cb.set_callback(object); } + template<class _Object> static devcb_base &static_set_main_int_cb(device_t &device, _Object object) { return downcast<atari_sound_comm_device &>(device).m_main_int_cb.set_callback(object); } // getters DECLARE_READ_LINE_MEMBER(main_to_sound_ready) { return m_main_to_sound_ready ? ASSERT_LINE : CLEAR_LINE; } @@ -159,7 +159,7 @@ private: // configuration state const char * m_sound_cpu_tag; - devcb2_write_line m_main_int_cb; + devcb_write_line m_main_int_cb; // internal state m6502_device * m_sound_cpu; @@ -186,7 +186,7 @@ public: atari_vad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &static_set_scanline_int_cb(device_t &device, _Object object) { return downcast<atari_vad_device &>(device).m_scanline_int_cb.set_callback(object); } + template<class _Object> static devcb_base &static_set_scanline_int_cb(device_t &device, _Object object) { return downcast<atari_vad_device &>(device).m_scanline_int_cb.set_callback(object); } // getters tilemap_device *alpha() const { return m_alpha_tilemap; } @@ -228,7 +228,7 @@ private: void eof_update(emu_timer &timer); // configuration state - devcb2_write_line m_scanline_int_cb; + devcb_write_line m_scanline_int_cb; // internal state optional_device<tilemap_device> m_alpha_tilemap; diff --git a/src/mame/machine/decopincpu.h b/src/mame/machine/decopincpu.h index 6c215f88dd6..6cf3508fc2d 100644 --- a/src/mame/machine/decopincpu.h +++ b/src/mame/machine/decopincpu.h @@ -29,24 +29,24 @@ decocpu_type1_device::static_set_cpuregion(*device, _region); #define MCFG_DECOCPU_DISPLAY(_disp_r, _disp_w) \ - downcast<decocpu_type1_device *>(device)->set_display_read_callback(DEVCB2_##_disp_r); \ - downcast<decocpu_type1_device *>(device)->set_display_write_callback(DEVCB2_##_disp_w); + downcast<decocpu_type1_device *>(device)->set_display_read_callback(DEVCB_##_disp_r); \ + downcast<decocpu_type1_device *>(device)->set_display_write_callback(DEVCB_##_disp_w); #define MCFG_DECOCPU_DMDSTATUS(_dmdstat_r) \ - downcast<decocpu_type1_device *>(device)->set_dmdstatus_read_callback(DEVCB2_##_dmdstat_r); + downcast<decocpu_type1_device *>(device)->set_dmdstatus_read_callback(DEVCB_##_dmdstat_r); #define MCFG_DECOCPU_SOUNDLATCH(_soundlatch_w) \ - downcast<decocpu_type1_device *>(device)->set_soundlatch_write_callback(DEVCB2_##_soundlatch_w); + downcast<decocpu_type1_device *>(device)->set_soundlatch_write_callback(DEVCB_##_soundlatch_w); #define MCFG_DECOCPU_SWITCH(_switch_r, _switch_w) \ - downcast<decocpu_type1_device *>(device)->set_switch_read_callback(DEVCB2_##_switch_r); \ - downcast<decocpu_type1_device *>(device)->set_switch_write_callback(DEVCB2_##_switch_w); + downcast<decocpu_type1_device *>(device)->set_switch_read_callback(DEVCB_##_switch_r); \ + downcast<decocpu_type1_device *>(device)->set_switch_write_callback(DEVCB_##_switch_w); #define MCFG_DECOCPU_LAMP(_lamp_w) \ - downcast<decocpu_type1_device *>(device)->set_lamp_write_callback(DEVCB2_##_lamp_w); + downcast<decocpu_type1_device *>(device)->set_lamp_write_callback(DEVCB_##_lamp_w); #define MCFG_DECOCPU_SOLENOIDS(_sol_w) \ - downcast<decocpu_type1_device *>(device)->set_solenoid_write_callback(DEVCB2_##_sol_w); + downcast<decocpu_type1_device *>(device)->set_solenoid_write_callback(DEVCB_##_sol_w); // 6808 CPU's input clock is 4MHz @@ -119,14 +119,14 @@ private: bool m_ca2; // callbacks - devcb2_read8 m_read_display; - devcb2_write8 m_write_display; - devcb2_read8 m_read_dmdstatus; - devcb2_write8 m_write_soundlatch; - devcb2_read8 m_read_switch; - devcb2_write8 m_write_switch; - devcb2_write8 m_write_lamp; - devcb2_write8 m_write_solenoid; + devcb_read8 m_read_display; + devcb_write8 m_write_display; + devcb_read8 m_read_dmdstatus; + devcb_write8 m_write_soundlatch; + devcb_read8 m_read_switch; + devcb_write8 m_write_switch; + devcb_write8 m_write_lamp; + devcb_write8 m_write_solenoid; }; class decocpu_type2_device : public decocpu_type1_device diff --git a/src/mame/machine/gaelco3d.h b/src/mame/machine/gaelco3d.h index 14269cf6942..0c9b5a4f894 100644 --- a/src/mame/machine/gaelco3d.h +++ b/src/mame/machine/gaelco3d.h @@ -13,7 +13,7 @@ ***************************************************************************/ #define MCFG_GAELCO_SERIAL_IRQ_HANDLER(_devcb) \ - devcb = &gaelco_serial_device::set_irq_handler(*device, DEVCB2_##_devcb); + devcb = &gaelco_serial_device::set_irq_handler(*device, DEVCB_##_devcb); /* external status bits */ #define GAELCOSER_STATUS_READY 0x01 @@ -65,7 +65,7 @@ public: gaelco_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~gaelco_serial_device() {} - template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<gaelco_serial_device &>(device).m_irq_handler.set_callback(object); } + template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<gaelco_serial_device &>(device).m_irq_handler.set_callback(object); } DECLARE_READ8_MEMBER( status_r); DECLARE_WRITE8_MEMBER( data_w); @@ -94,7 +94,7 @@ protected: private: // internal state - devcb2_write_line m_irq_handler; + devcb_write_line m_irq_handler; UINT8 m_status; int m_last_in_msg_cnt; diff --git a/src/mame/machine/k573cass.h b/src/mame/machine/k573cass.h index 9d86ab41f19..3dc431111f3 100644 --- a/src/mame/machine/k573cass.h +++ b/src/mame/machine/k573cass.h @@ -95,28 +95,28 @@ extern const device_type KONAMI573_CASSETTE_Y; #define MCFG_KONAMI573_CASSETTE_Y_D0_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d0_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d0_handler(*device, DEVCB_##_devcb); #define MCFG_KONAMI573_CASSETTE_Y_D1_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d1_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d1_handler(*device, DEVCB_##_devcb); #define MCFG_KONAMI573_CASSETTE_Y_D2_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d2_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d2_handler(*device, DEVCB_##_devcb); #define MCFG_KONAMI573_CASSETTE_Y_D3_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d3_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d3_handler(*device, DEVCB_##_devcb); #define MCFG_KONAMI573_CASSETTE_Y_D4_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d4_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d4_handler(*device, DEVCB_##_devcb); #define MCFG_KONAMI573_CASSETTE_Y_D5_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d5_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d5_handler(*device, DEVCB_##_devcb); #define MCFG_KONAMI573_CASSETTE_Y_D6_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d6_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d6_handler(*device, DEVCB_##_devcb); #define MCFG_KONAMI573_CASSETTE_Y_D7_HANDLER(_devcb) \ - devcb = &konami573_cassette_y_device::set_d7_handler(*device, DEVCB2_##_devcb); + devcb = &konami573_cassette_y_device::set_d7_handler(*device, DEVCB_##_devcb); class konami573_cassette_y_device: public device_t, public konami573_cassette_interface, @@ -127,14 +127,14 @@ public: konami573_cassette_y_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); // static configuration helpers - template<class _Object> static devcb2_base &set_d0_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d0_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d1_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d1_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d2_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d2_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d3_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d3_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d4_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d4_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d5_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d5_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d6_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d6_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_d7_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d7_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d0_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d0_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d1_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d1_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d2_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d2_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d3_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d3_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d4_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d4_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d5_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d5_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d6_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d6_handler.set_callback(object); } + template<class _Object> static devcb_base &set_d7_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d7_handler.set_callback(object); } virtual DECLARE_READ_LINE_MEMBER(read_line_secflash_sda); virtual DECLARE_WRITE_LINE_MEMBER(write_line_d0); @@ -152,14 +152,14 @@ protected: private: required_device<x76f100_device> m_x76f100; - devcb2_write_line m_d0_handler; - devcb2_write_line m_d1_handler; - devcb2_write_line m_d2_handler; - devcb2_write_line m_d3_handler; - devcb2_write_line m_d4_handler; - devcb2_write_line m_d5_handler; - devcb2_write_line m_d6_handler; - devcb2_write_line m_d7_handler; + devcb_write_line m_d0_handler; + devcb_write_line m_d1_handler; + devcb_write_line m_d2_handler; + devcb_write_line m_d3_handler; + devcb_write_line m_d4_handler; + devcb_write_line m_d5_handler; + devcb_write_line m_d6_handler; + devcb_write_line m_d7_handler; }; diff --git a/src/mame/machine/k573dio.h b/src/mame/machine/k573dio.h index 88bbfc05b51..c215ee7c429 100644 --- a/src/mame/machine/k573dio.h +++ b/src/mame/machine/k573dio.h @@ -10,7 +10,7 @@ MCFG_DEVICE_ADD(_tag, KONAMI_573_DIGITAL_IO_BOARD, _clock) #define MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( _output_cb ) \ - downcast<k573dio_device *>(device)->set_output_cb(DEVCB2_##_output_cb); + downcast<k573dio_device *>(device)->set_output_cb(DEVCB_##_output_cb); class k573dio_device : public device_t { @@ -69,7 +69,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); private: - devcb2_write8 output_cb; + devcb_write8 output_cb; UINT16 *ram; UINT32 ram_adr; diff --git a/src/mame/machine/midikbd.h b/src/mame/machine/midikbd.h index 74d6af03378..9198e5e983e 100644 --- a/src/mame/machine/midikbd.h +++ b/src/mame/machine/midikbd.h @@ -5,7 +5,7 @@ #define MCFG_MIDI_KBD_ADD(_tag, _devcb, _clock) \ MCFG_DEVICE_ADD(_tag, MIDI_KBD, _clock) \ - devcb = &midi_keyboard_device::static_set_tx_callback(*device, DEVCB2_##_devcb); + devcb = &midi_keyboard_device::static_set_tx_callback(*device, DEVCB_##_devcb); class midi_keyboard_device : public device_t, public device_serial_interface @@ -14,7 +14,7 @@ public: midi_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ioport_constructor device_input_ports() const; - template<class _Object> static devcb2_base &static_set_tx_callback(device_t &device, _Object object) { return downcast<midi_keyboard_device &>(device).m_out_tx_func.set_callback(object); } + template<class _Object> static devcb_base &static_set_tx_callback(device_t &device, _Object object) { return downcast<midi_keyboard_device &>(device).m_out_tx_func.set_callback(object); } protected: void device_start(); @@ -25,7 +25,7 @@ protected: private: void push_tx(UINT8 data) { ++m_head %= 16; m_buffer[m_head] = data; } - devcb2_write_line m_out_tx_func; + devcb_write_line m_out_tx_func; emu_timer *m_keyboard_timer; required_ioport m_keyboard; UINT32 m_keyboard_state; diff --git a/src/mame/machine/midwayic.h b/src/mame/machine/midwayic.h index 0b7a363b754..e300e7f473f 100644 --- a/src/mame/machine/midwayic.h +++ b/src/mame/machine/midwayic.h @@ -124,7 +124,7 @@ public: static void static_set_shuffle(device_t &device, UINT8 shuffle) { downcast<midway_ioasic_device &>(device).m_shuffle_type = shuffle; } static void static_set_shuffle_default(device_t &device, UINT8 shuffle) { downcast<midway_ioasic_device &>(device).m_shuffle_default = shuffle; } static void static_set_auto_ack(device_t &device, UINT8 auto_ack) { downcast<midway_ioasic_device &>(device).m_auto_ack = auto_ack; } - template<class _Object> static devcb2_base &set_irqhandler_callback(device_t &device, _Object object) { return downcast<midway_ioasic_device &>(device).m_irq_callback.set_callback(object); } + template<class _Object> static devcb_base &set_irqhandler_callback(device_t &device, _Object object) { return downcast<midway_ioasic_device &>(device).m_irq_callback.set_callback(object); } void set_shuffle_state(int state); void fifo_w(UINT16 data); @@ -163,7 +163,7 @@ private: UINT8 m_shuffle_default; UINT8 m_shuffle_active; const UINT8 * m_shuffle_map; - devcb2_write8 m_irq_callback; + devcb_write8 m_irq_callback; UINT8 m_irq_state; UINT16 m_sound_irq_state; UINT8 m_auto_ack; @@ -194,7 +194,7 @@ extern const device_type MIDWAY_IOASIC; midway_ioasic_device::static_set_shuffle_default(*device, _shuffle); #define MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(_write) \ - devcb = &midway_ioasic_device::set_irqhandler_callback(*device, DEVCB2_##_write); + devcb = &midway_ioasic_device::set_irqhandler_callback(*device, DEVCB_##_write); #define MCFG_MIDWAY_IOASIC_AUTO_ACK(_ack) \ midway_ioasic_device::static_set_auto_ack(*device, _ack); diff --git a/src/mame/machine/namco06.h b/src/mame/machine/namco06.h index 4a539566483..bf1af3aea16 100644 --- a/src/mame/machine/namco06.h +++ b/src/mame/machine/namco06.h @@ -21,42 +21,42 @@ struct namco_06xx_config namco_06xx_device::set_maincpu(*device, "^" _tag); #define MCFG_NAMCO_06XX_READ_0_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_READ_1_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_READ_2_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_READ_3_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_READ_REQUEST_0_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_request_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_request_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_READ_REQUEST_1_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_request_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_request_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_READ_REQUEST_2_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_request_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_request_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_READ_REQUEST_3_CB(_devcb) \ - devcb = &namco_06xx_device::set_read_request_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_read_request_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_WRITE_0_CB(_devcb) \ - devcb = &namco_06xx_device::set_write_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_write_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_WRITE_1_CB(_devcb) \ - devcb = &namco_06xx_device::set_write_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_write_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_WRITE_2_CB(_devcb) \ - devcb = &namco_06xx_device::set_write_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_write_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_06XX_WRITE_3_CB(_devcb) \ - devcb = &namco_06xx_device::set_write_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco_06xx_device::set_write_3_callback(*device, DEVCB_##_devcb); /* device get info callback */ @@ -67,21 +67,21 @@ public: static void set_maincpu(device_t &device, const char *tag) { downcast<namco_06xx_device &>(device).m_nmicpu.set_tag(tag); } - template<class _Object> static devcb2_base &set_read_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_0.set_callback(object); } - template<class _Object> static devcb2_base &set_read_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_1.set_callback(object); } - template<class _Object> static devcb2_base &set_read_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_2.set_callback(object); } - template<class _Object> static devcb2_base &set_read_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_3.set_callback(object); } + template<class _Object> static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_0.set_callback(object); } + template<class _Object> static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_1.set_callback(object); } + template<class _Object> static devcb_base &set_read_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_2.set_callback(object); } + template<class _Object> static devcb_base &set_read_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_3.set_callback(object); } - template<class _Object> static devcb2_base &set_read_request_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_0.set_callback(object); } - template<class _Object> static devcb2_base &set_read_request_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_1.set_callback(object); } - template<class _Object> static devcb2_base &set_read_request_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_2.set_callback(object); } - template<class _Object> static devcb2_base &set_read_request_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_3.set_callback(object); } + template<class _Object> static devcb_base &set_read_request_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_0.set_callback(object); } + template<class _Object> static devcb_base &set_read_request_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_1.set_callback(object); } + template<class _Object> static devcb_base &set_read_request_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_2.set_callback(object); } + template<class _Object> static devcb_base &set_read_request_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_3.set_callback(object); } - template<class _Object> static devcb2_base &set_write_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_0.set_callback(object); } - template<class _Object> static devcb2_base &set_write_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_1.set_callback(object); } - template<class _Object> static devcb2_base &set_write_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_2.set_callback(object); } - template<class _Object> static devcb2_base &set_write_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_3.set_callback(object); } + template<class _Object> static devcb_base &set_write_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_0.set_callback(object); } + template<class _Object> static devcb_base &set_write_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_1.set_callback(object); } + template<class _Object> static devcb_base &set_write_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_2.set_callback(object); } + template<class _Object> static devcb_base &set_write_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_3.set_callback(object); } DECLARE_READ8_MEMBER( data_r ); DECLARE_WRITE8_MEMBER( data_w ); @@ -102,20 +102,20 @@ private: required_device<cpu_device> m_nmicpu; - devcb2_read8 m_read_0; - devcb2_read8 m_read_1; - devcb2_read8 m_read_2; - devcb2_read8 m_read_3; + devcb_read8 m_read_0; + devcb_read8 m_read_1; + devcb_read8 m_read_2; + devcb_read8 m_read_3; - devcb2_write_line m_readreq_0; - devcb2_write_line m_readreq_1; - devcb2_write_line m_readreq_2; - devcb2_write_line m_readreq_3; + devcb_write_line m_readreq_0; + devcb_write_line m_readreq_1; + devcb_write_line m_readreq_2; + devcb_write_line m_readreq_3; - devcb2_write8 m_write_0; - devcb2_write8 m_write_1; - devcb2_write8 m_write_2; - devcb2_write8 m_write_3; + devcb_write8 m_write_0; + devcb_write8 m_write_1; + devcb_write8 m_write_2; + devcb_write8 m_write_3; }; extern const device_type NAMCO_06XX; diff --git a/src/mame/machine/namco51.h b/src/mame/machine/namco51.h index 4b5cabe0468..f4fc6cd170e 100644 --- a/src/mame/machine/namco51.h +++ b/src/mame/machine/namco51.h @@ -10,35 +10,35 @@ MCFG_DEVICE_ADD(_tag, NAMCO_51XX, _clock) #define MCFG_NAMCO_51XX_INPUT_0_CB(_devcb) \ - devcb = &namco_51xx_device::set_input_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_51xx_device::set_input_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_51XX_INPUT_1_CB(_devcb) \ - devcb = &namco_51xx_device::set_input_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_51xx_device::set_input_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_51XX_INPUT_2_CB(_devcb) \ - devcb = &namco_51xx_device::set_input_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco_51xx_device::set_input_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_51XX_INPUT_3_CB(_devcb) \ - devcb = &namco_51xx_device::set_input_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco_51xx_device::set_input_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_51XX_OUTPUT_0_CB(_devcb) \ - devcb = &namco_51xx_device::set_output_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_51xx_device::set_output_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_51XX_OUTPUT_1_CB(_devcb) \ - devcb = &namco_51xx_device::set_output_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_51xx_device::set_output_1_callback(*device, DEVCB_##_devcb); class namco_51xx_device : public device_t { public: namco_51xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_0.set_callback(object); } - template<class _Object> static devcb2_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_1.set_callback(object); } - template<class _Object> static devcb2_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_2.set_callback(object); } - template<class _Object> static devcb2_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_3.set_callback(object); } + template<class _Object> static devcb_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_0.set_callback(object); } + template<class _Object> static devcb_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_1.set_callback(object); } + template<class _Object> static devcb_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_2.set_callback(object); } + template<class _Object> static devcb_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_3.set_callback(object); } - template<class _Object> static devcb2_base &set_output_0_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_out_0.set_callback(object); } - template<class _Object> static devcb2_base &set_output_1_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_out_1.set_callback(object); } + template<class _Object> static devcb_base &set_output_0_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_out_0.set_callback(object); } + template<class _Object> static devcb_base &set_output_1_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_out_1.set_callback(object); } DECLARE_WRITE8_MEMBER( write ); DECLARE_READ8_MEMBER( read ); @@ -52,12 +52,12 @@ protected: private: // internal state required_device<mb88_cpu_device> m_cpu; - devcb2_read8 m_in_0; - devcb2_read8 m_in_1; - devcb2_read8 m_in_2; - devcb2_read8 m_in_3; - devcb2_write8 m_out_0; - devcb2_write8 m_out_1; + devcb_read8 m_in_0; + devcb_read8 m_in_1; + devcb_read8 m_in_2; + devcb_read8 m_in_3; + devcb_write8 m_out_0; + devcb_write8 m_out_1; INT32 m_lastcoins; INT32 m_lastbuttons; diff --git a/src/mame/machine/namco53.h b/src/mame/machine/namco53.h index 03a1324ef9a..2bbf95a6ccd 100644 --- a/src/mame/machine/namco53.h +++ b/src/mame/machine/namco53.h @@ -9,22 +9,22 @@ MCFG_DEVICE_ADD(_tag, NAMCO_53XX, _clock) #define MCFG_NAMCO_53XX_K_CB(_devcb) \ - devcb = &namco_53xx_device::set_k_port_callback(*device, DEVCB2_##_devcb); + devcb = &namco_53xx_device::set_k_port_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_53XX_INPUT_0_CB(_devcb) \ - devcb = &namco_53xx_device::set_input_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_53xx_device::set_input_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_53XX_INPUT_1_CB(_devcb) \ - devcb = &namco_53xx_device::set_input_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_53xx_device::set_input_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_53XX_INPUT_2_CB(_devcb) \ - devcb = &namco_53xx_device::set_input_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco_53xx_device::set_input_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_53XX_INPUT_3_CB(_devcb) \ - devcb = &namco_53xx_device::set_input_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco_53xx_device::set_input_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_53XX_P_CB(_devcb) \ - devcb = &namco_53xx_device::set_p_port_callback(*device, DEVCB2_##_devcb); + devcb = &namco_53xx_device::set_p_port_callback(*device, DEVCB_##_devcb); class namco_53xx_device : public device_t @@ -32,13 +32,13 @@ class namco_53xx_device : public device_t public: namco_53xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_0.set_callback(object); } - template<class _Object> static devcb2_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_1.set_callback(object); } - template<class _Object> static devcb2_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_2.set_callback(object); } - template<class _Object> static devcb2_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_3.set_callback(object); } + template<class _Object> static devcb_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_0.set_callback(object); } + template<class _Object> static devcb_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_1.set_callback(object); } + template<class _Object> static devcb_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_2.set_callback(object); } + template<class _Object> static devcb_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_3.set_callback(object); } - template<class _Object> static devcb2_base &set_k_port_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_k.set_callback(object); } - template<class _Object> static devcb2_base &set_p_port_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_p.set_callback(object); } + template<class _Object> static devcb_base &set_k_port_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_k.set_callback(object); } + template<class _Object> static devcb_base &set_p_port_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_p.set_callback(object); } DECLARE_READ8_MEMBER( K_r ); DECLARE_READ8_MEMBER( Rx_r ); @@ -59,12 +59,12 @@ private: // internal state required_device<mb88_cpu_device> m_cpu; UINT8 m_portO; - devcb2_read8 m_k; - devcb2_read8 m_in_0; - devcb2_read8 m_in_1; - devcb2_read8 m_in_2; - devcb2_read8 m_in_3; - devcb2_write8 m_p; + devcb_read8 m_k; + devcb_read8 m_in_0; + devcb_read8 m_in_1; + devcb_read8 m_in_2; + devcb_read8 m_in_3; + devcb_write8 m_p; }; diff --git a/src/mame/machine/namco62.h b/src/mame/machine/namco62.h index e6ff411b2cc..212fa9fb085 100644 --- a/src/mame/machine/namco62.h +++ b/src/mame/machine/namco62.h @@ -7,22 +7,22 @@ MCFG_DEVICE_ADD(_tag, NAMCO_62XX, _clock) #define MCFG_NAMCO_62XX_INPUT_0_CB(_devcb) \ - devcb = &namco_62xx_device::set_input_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_62xx_device::set_input_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_62XX_INPUT_1_CB(_devcb) \ - devcb = &namco_62xx_device::set_input_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_62xx_device::set_input_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_62XX_INPUT_2_CB(_devcb) \ - devcb = &namco_62xx_device::set_input_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco_62xx_device::set_input_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_62XX_INPUT_3_CB(_devcb) \ - devcb = &namco_62xx_device::set_input_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco_62xx_device::set_input_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_62XX_OUTPUT_0_CB(_devcb) \ - devcb = &namco_62xx_device::set_output_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco_62xx_device::set_output_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO_62XX_OUTPUT_1_CB(_devcb) \ - devcb = &namco_62xx_device::set_output_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco_62xx_device::set_output_1_callback(*device, DEVCB_##_devcb); class namco_62xx_device : public device_t @@ -30,13 +30,13 @@ class namco_62xx_device : public device_t public: namco_62xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_0.set_callback(object); } - template<class _Object> static devcb2_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_1.set_callback(object); } - template<class _Object> static devcb2_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_2.set_callback(object); } - template<class _Object> static devcb2_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_3.set_callback(object); } + template<class _Object> static devcb_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_0.set_callback(object); } + template<class _Object> static devcb_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_1.set_callback(object); } + template<class _Object> static devcb_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_2.set_callback(object); } + template<class _Object> static devcb_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_3.set_callback(object); } - template<class _Object> static devcb2_base &set_output_0_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_out_0.set_callback(object); } - template<class _Object> static devcb2_base &set_output_1_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_out_1.set_callback(object); } + template<class _Object> static devcb_base &set_output_0_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_out_0.set_callback(object); } + template<class _Object> static devcb_base &set_output_1_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_out_1.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -50,12 +50,12 @@ protected: private: // internal state required_device<mb88_cpu_device> m_cpu; - devcb2_read8 m_in_0; - devcb2_read8 m_in_1; - devcb2_read8 m_in_2; - devcb2_read8 m_in_3; - devcb2_write8 m_out_0; - devcb2_write8 m_out_1; + devcb_read8 m_in_0; + devcb_read8 m_in_1; + devcb_read8 m_in_2; + devcb_read8 m_in_3; + devcb_write8 m_out_0; + devcb_write8 m_out_1; }; extern const device_type NAMCO_62XX; diff --git a/src/mame/machine/namcoio.h b/src/mame/machine/namcoio.h index 1e05b758ea4..7c2b4e14249 100644 --- a/src/mame/machine/namcoio.h +++ b/src/mame/machine/namcoio.h @@ -11,12 +11,12 @@ class namcoio_device : public device_t public: namcoio_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); - template<class _Object> static devcb2_base &set_in_0_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_1_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_2_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_in_3_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_0_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_out_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_out_1_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_out_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_0_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_1_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_2_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_in_3_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_0_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_out_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_out_1_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_out_1_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); @@ -41,12 +41,12 @@ protected: // internal state UINT8 m_ram[16]; - devcb2_read8 m_in_0_cb; - devcb2_read8 m_in_1_cb; - devcb2_read8 m_in_2_cb; - devcb2_read8 m_in_3_cb; - devcb2_write8 m_out_0_cb; - devcb2_write8 m_out_1_cb; + devcb_read8 m_in_0_cb; + devcb_read8 m_in_1_cb; + devcb_read8 m_in_2_cb; + devcb_read8 m_in_3_cb; + devcb_write8 m_out_0_cb; + devcb_write8 m_out_1_cb; int m_reset; INT32 m_lastcoins, m_lastbuttons; @@ -97,59 +97,59 @@ extern const device_type NAMCO59XX; ***************************************************************************/ #define MCFG_NAMCO56XX_IN_0_CB(_devcb) \ - devcb = &namco56xx_device::set_in_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco56xx_device::set_in_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO56XX_IN_1_CB(_devcb) \ - devcb = &namco56xx_device::set_in_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco56xx_device::set_in_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO56XX_IN_2_CB(_devcb) \ - devcb = &namco56xx_device::set_in_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco56xx_device::set_in_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO56XX_IN_3_CB(_devcb) \ - devcb = &namco56xx_device::set_in_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco56xx_device::set_in_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO56XX_OUT_0_CB(_devcb) \ - devcb = &namco56xx_device::set_out_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco56xx_device::set_out_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO56XX_OUT_1_CB(_devcb) \ - devcb = &namco56xx_device::set_out_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco56xx_device::set_out_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO58XX_IN_0_CB(_devcb) \ - devcb = &namco58xx_device::set_in_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco58xx_device::set_in_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO58XX_IN_1_CB(_devcb) \ - devcb = &namco58xx_device::set_in_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco58xx_device::set_in_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO58XX_IN_2_CB(_devcb) \ - devcb = &namco58xx_device::set_in_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco58xx_device::set_in_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO58XX_IN_3_CB(_devcb) \ - devcb = &namco58xx_device::set_in_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco58xx_device::set_in_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO58XX_OUT_0_CB(_devcb) \ - devcb = &namco58xx_device::set_out_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco58xx_device::set_out_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO58XX_OUT_1_CB(_devcb) \ - devcb = &namco58xx_device::set_out_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco58xx_device::set_out_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO59XX_IN_0_CB(_devcb) \ - devcb = &namco59xx_device::set_in_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco59xx_device::set_in_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO59XX_IN_1_CB(_devcb) \ - devcb = &namco59xx_device::set_in_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco59xx_device::set_in_1_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO59XX_IN_2_CB(_devcb) \ - devcb = &namco59xx_device::set_in_2_callback(*device, DEVCB2_##_devcb); + devcb = &namco59xx_device::set_in_2_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO59XX_IN_3_CB(_devcb) \ - devcb = &namco59xx_device::set_in_3_callback(*device, DEVCB2_##_devcb); + devcb = &namco59xx_device::set_in_3_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO59XX_OUT_0_CB(_devcb) \ - devcb = &namco59xx_device::set_out_0_callback(*device, DEVCB2_##_devcb); + devcb = &namco59xx_device::set_out_0_callback(*device, DEVCB_##_devcb); #define MCFG_NAMCO59XX_OUT_1_CB(_devcb) \ - devcb = &namco59xx_device::set_out_1_callback(*device, DEVCB2_##_devcb); + devcb = &namco59xx_device::set_out_1_callback(*device, DEVCB_##_devcb); #endif /* __NAMCOIO_H__ */ diff --git a/src/mame/machine/naomig1.h b/src/mame/machine/naomig1.h index 90fc0ed7440..6aac02c5d2f 100644 --- a/src/mame/machine/naomig1.h +++ b/src/mame/machine/naomig1.h @@ -5,7 +5,7 @@ #define MCFG_NAOMI_G1_ADD(_tag, type, _irq_cb) \ MCFG_DEVICE_ADD(_tag, type, 0) \ - downcast<naomi_g1_device *>(device)->set_irq_cb(DEVCB2_ ## _irq_cb); + downcast<naomi_g1_device *>(device)->set_irq_cb(DEVCB_ ## _irq_cb); class naomi_g1_device : public device_t { @@ -62,7 +62,7 @@ private: UINT32 gdstar, gdlen, gddir, gden, gdst; emu_timer *timer; - devcb2_write8 irq_cb; + devcb_write8 irq_cb; dma_cb _dma_cb; void dma(void *dma_ptr, UINT32 main_adr, UINT32 size, bool to_mainram); diff --git a/src/mame/machine/tait8741.h b/src/mame/machine/tait8741.h index 27953fb4966..5fc07eb2122 100644 --- a/src/mame/machine/tait8741.h +++ b/src/mame/machine/tait8741.h @@ -15,10 +15,10 @@ MCFG_DEVICE_ADD(_tag, TAITO8741_4PACK, 0) #define MCFG_TAITO8741_PORT_HANDLERS(_devcb0, _devcb1, _devcb2, _devcb3) \ - devcb = &taito8741_4pack_device::set_port_handler_0_callback(*device, DEVCB2_##_devcb0); \ - devcb = &taito8741_4pack_device::set_port_handler_1_callback(*device, DEVCB2_##_devcb1); \ - devcb = &taito8741_4pack_device::set_port_handler_2_callback(*device, DEVCB2_##_devcb2); \ - devcb = &taito8741_4pack_device::set_port_handler_3_callback(*device, DEVCB2_##_devcb3); + devcb = &taito8741_4pack_device::set_port_handler_0_callback(*device, DEVCB_##_devcb0); \ + devcb = &taito8741_4pack_device::set_port_handler_1_callback(*device, DEVCB_##_devcb1); \ + devcb = &taito8741_4pack_device::set_port_handler_2_callback(*device, DEVCB_##_devcb2); \ + devcb = &taito8741_4pack_device::set_port_handler_3_callback(*device, DEVCB_##_devcb3); #define MCFG_TAITO8741_MODES(_mode0, _mode1, _mode2, _mode3) \ taito8741_4pack_device::static_set_mode(*device, 0, _mode0); \ @@ -58,10 +58,10 @@ public: taito8741_4pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~taito8741_4pack_device() {} - template<class _Object> static devcb2_base &set_port_handler_0_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_0_r.set_callback(object); } - template<class _Object> static devcb2_base &set_port_handler_1_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_1_r.set_callback(object); } - template<class _Object> static devcb2_base &set_port_handler_2_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_2_r.set_callback(object); } - template<class _Object> static devcb2_base &set_port_handler_3_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_3_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_0_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_0_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_1_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_1_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_2_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_2_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_3_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_3_r.set_callback(object); } static void static_set_mode(device_t &device, int num, UINT8 mode) { downcast<taito8741_4pack_device &>(device).m_taito8741[num].mode = mode; } static void static_set_connect(device_t &device, int num, int conn) { downcast<taito8741_4pack_device &>(device).m_taito8741[num].connect = conn; } @@ -98,10 +98,10 @@ private: // internal state I8741 m_taito8741[4]; - devcb2_read8 m_port_handler_0_r; - devcb2_read8 m_port_handler_1_r; - devcb2_read8 m_port_handler_2_r; - devcb2_read8 m_port_handler_3_r; + devcb_read8 m_port_handler_0_r; + devcb_read8 m_port_handler_1_r; + devcb_read8 m_port_handler_2_r; + devcb_read8 m_port_handler_3_r; }; @@ -116,10 +116,10 @@ extern const device_type TAITO8741_4PACK; MCFG_DEVICE_ADD(_tag, JOSVOLLY8741_4PACK, 0) #define MCFG_JOSVOLLY8741_PORT_HANDLERS(_devcb0, _devcb1, _devcb2, _devcb3) \ - devcb = &josvolly8741_4pack_device::set_port_handler_0_callback(*device, DEVCB2_##_devcb0); \ - devcb = &josvolly8741_4pack_device::set_port_handler_1_callback(*device, DEVCB2_##_devcb1); \ - devcb = &josvolly8741_4pack_device::set_port_handler_2_callback(*device, DEVCB2_##_devcb2); \ - devcb = &josvolly8741_4pack_device::set_port_handler_3_callback(*device, DEVCB2_##_devcb3); + devcb = &josvolly8741_4pack_device::set_port_handler_0_callback(*device, DEVCB_##_devcb0); \ + devcb = &josvolly8741_4pack_device::set_port_handler_1_callback(*device, DEVCB_##_devcb1); \ + devcb = &josvolly8741_4pack_device::set_port_handler_2_callback(*device, DEVCB_##_devcb2); \ + devcb = &josvolly8741_4pack_device::set_port_handler_3_callback(*device, DEVCB_##_devcb3); #define MCFG_JOSVOLLY8741_CONNECT(_con0, _con1, _con2, _con3) \ josvolly8741_4pack_device::static_set_connect(*device, 0, _con0); \ @@ -144,10 +144,10 @@ public: josvolly8741_4pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~josvolly8741_4pack_device() {} - template<class _Object> static devcb2_base &set_port_handler_0_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_0_r.set_callback(object); } - template<class _Object> static devcb2_base &set_port_handler_1_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_1_r.set_callback(object); } - template<class _Object> static devcb2_base &set_port_handler_2_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_2_r.set_callback(object); } - template<class _Object> static devcb2_base &set_port_handler_3_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_3_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_0_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_0_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_1_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_1_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_2_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_2_r.set_callback(object); } + template<class _Object> static devcb_base &set_port_handler_3_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_3_r.set_callback(object); } static void static_set_connect(device_t &device, int num, int conn) { downcast<josvolly8741_4pack_device &>(device).m_i8741[num].connect = conn; } @@ -174,10 +174,10 @@ private: JV8741 m_i8741[4]; int m_nmi_enable; - devcb2_read8 m_port_handler_0_r; - devcb2_read8 m_port_handler_1_r; - devcb2_read8 m_port_handler_2_r; - devcb2_read8 m_port_handler_3_r; + devcb_read8 m_port_handler_0_r; + devcb_read8 m_port_handler_1_r; + devcb_read8 m_port_handler_2_r; + devcb_read8 m_port_handler_3_r; }; diff --git a/src/mame/machine/taitoio.h b/src/mame/machine/taitoio.h index 1a5204c8d69..9e60fc48bd8 100644 --- a/src/mame/machine/taitoio.h +++ b/src/mame/machine/taitoio.h @@ -16,11 +16,11 @@ public: tc0220ioc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0220ioc_device() {} - template<class _Object> static devcb2_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_7_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_7_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -39,11 +39,11 @@ private: UINT8 m_regs[8]; UINT8 m_port; - devcb2_read8 m_read_0_cb; - devcb2_read8 m_read_1_cb; - devcb2_read8 m_read_2_cb; - devcb2_read8 m_read_3_cb; - devcb2_read8 m_read_7_cb; + devcb_read8 m_read_0_cb; + devcb_read8 m_read_1_cb; + devcb_read8 m_read_2_cb; + devcb_read8 m_read_3_cb; + devcb_read8 m_read_7_cb; }; extern const device_type TC0220IOC; @@ -54,11 +54,11 @@ public: tc0510nio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0510nio_device() {} - template<class _Object> static devcb2_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_7_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_7_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -76,11 +76,11 @@ private: // internal state UINT8 m_regs[8]; - devcb2_read8 m_read_0_cb; - devcb2_read8 m_read_1_cb; - devcb2_read8 m_read_2_cb; - devcb2_read8 m_read_3_cb; - devcb2_read8 m_read_7_cb; + devcb_read8 m_read_0_cb; + devcb_read8 m_read_1_cb; + devcb_read8 m_read_2_cb; + devcb_read8 m_read_3_cb; + devcb_read8 m_read_7_cb; }; extern const device_type TC0510NIO; @@ -91,11 +91,11 @@ public: tc0640fio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~tc0640fio_device() {} - template<class _Object> static devcb2_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_0_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_1_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_2_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_3_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_7_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_0_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_1_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_2_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_3_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_7_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); @@ -114,11 +114,11 @@ protected: // internal state UINT8 m_regs[8]; - devcb2_read8 m_read_0_cb; - devcb2_read8 m_read_1_cb; - devcb2_read8 m_read_2_cb; - devcb2_read8 m_read_3_cb; - devcb2_read8 m_read_7_cb; + devcb_read8 m_read_0_cb; + devcb_read8 m_read_1_cb; + devcb_read8 m_read_2_cb; + devcb_read8 m_read_3_cb; + devcb_read8 m_read_7_cb; }; extern const device_type TC0640FIO; @@ -129,51 +129,51 @@ extern const device_type TC0640FIO; ***************************************************************************/ #define MCFG_TC0220IOC_READ_0_CB(_devcb) \ - devcb = &tc0220ioc_device::set_read_0_callback(*device, DEVCB2_##_devcb); + devcb = &tc0220ioc_device::set_read_0_callback(*device, DEVCB_##_devcb); #define MCFG_TC0220IOC_READ_1_CB(_devcb) \ - devcb = &tc0220ioc_device::set_read_1_callback(*device, DEVCB2_##_devcb); + devcb = &tc0220ioc_device::set_read_1_callback(*device, DEVCB_##_devcb); #define MCFG_TC0220IOC_READ_2_CB(_devcb) \ - devcb = &tc0220ioc_device::set_read_2_callback(*device, DEVCB2_##_devcb); + devcb = &tc0220ioc_device::set_read_2_callback(*device, DEVCB_##_devcb); #define MCFG_TC0220IOC_READ_3_CB(_devcb) \ - devcb = &tc0220ioc_device::set_read_3_callback(*device, DEVCB2_##_devcb); + devcb = &tc0220ioc_device::set_read_3_callback(*device, DEVCB_##_devcb); #define MCFG_TC0220IOC_READ_7_CB(_devcb) \ - devcb = &tc0220ioc_device::set_read_7_callback(*device, DEVCB2_##_devcb); + devcb = &tc0220ioc_device::set_read_7_callback(*device, DEVCB_##_devcb); #define MCFG_TC0510NIO_READ_0_CB(_devcb) \ - devcb = &tc0510nio_device::set_read_0_callback(*device, DEVCB2_##_devcb); + devcb = &tc0510nio_device::set_read_0_callback(*device, DEVCB_##_devcb); #define MCFG_TC0510NIO_READ_1_CB(_devcb) \ - devcb = &tc0510nio_device::set_read_1_callback(*device, DEVCB2_##_devcb); + devcb = &tc0510nio_device::set_read_1_callback(*device, DEVCB_##_devcb); #define MCFG_TC0510NIO_READ_2_CB(_devcb) \ - devcb = &tc0510nio_device::set_read_2_callback(*device, DEVCB2_##_devcb); + devcb = &tc0510nio_device::set_read_2_callback(*device, DEVCB_##_devcb); #define MCFG_TC0510NIO_READ_3_CB(_devcb) \ - devcb = &tc0510nio_device::set_read_3_callback(*device, DEVCB2_##_devcb); + devcb = &tc0510nio_device::set_read_3_callback(*device, DEVCB_##_devcb); #define MCFG_TC0510NIO_READ_7_CB(_devcb) \ - devcb = &tc0510nio_device::set_read_7_callback(*device, DEVCB2_##_devcb); + devcb = &tc0510nio_device::set_read_7_callback(*device, DEVCB_##_devcb); #define MCFG_TC0640FIO_READ_0_CB(_devcb) \ - devcb = &tc0640fio_device::set_read_0_callback(*device, DEVCB2_##_devcb); + devcb = &tc0640fio_device::set_read_0_callback(*device, DEVCB_##_devcb); #define MCFG_TC0640FIO_READ_1_CB(_devcb) \ - devcb = &tc0640fio_device::set_read_1_callback(*device, DEVCB2_##_devcb); + devcb = &tc0640fio_device::set_read_1_callback(*device, DEVCB_##_devcb); #define MCFG_TC0640FIO_READ_2_CB(_devcb) \ - devcb = &tc0640fio_device::set_read_2_callback(*device, DEVCB2_##_devcb); + devcb = &tc0640fio_device::set_read_2_callback(*device, DEVCB_##_devcb); #define MCFG_TC0640FIO_READ_3_CB(_devcb) \ - devcb = &tc0640fio_device::set_read_3_callback(*device, DEVCB2_##_devcb); + devcb = &tc0640fio_device::set_read_3_callback(*device, DEVCB_##_devcb); #define MCFG_TC0640FIO_READ_7_CB(_devcb) \ - devcb = &tc0640fio_device::set_read_7_callback(*device, DEVCB2_##_devcb); + devcb = &tc0640fio_device::set_read_7_callback(*device, DEVCB_##_devcb); #endif /* __TAITOIO_H__ */ diff --git a/src/mame/machine/wpc.h b/src/mame/machine/wpc.h index 0d7547412df..5594082ff74 100644 --- a/src/mame/machine/wpc.h +++ b/src/mame/machine/wpc.h @@ -75,27 +75,27 @@ MCFG_DEVICE_ADD(_tag, WPCASIC, 0); #define MCFG_WPC_IRQ_ACKNOWLEDGE(_irq) \ - downcast<wpc_device *>(device)->set_irq_callback(DEVCB2_##_irq); + downcast<wpc_device *>(device)->set_irq_callback(DEVCB_##_irq); #define MCFG_WPC_FIRQ_ACKNOWLEDGE(_firq) \ - downcast<wpc_device *>(device)->set_firq_callback(DEVCB2_##_firq); + downcast<wpc_device *>(device)->set_firq_callback(DEVCB_##_firq); #define MCFG_WPC_SOUND_DATA(_sounddata_r,_sounddata_w) \ - downcast<wpc_device *>(device)->set_sound_data_read(DEVCB2_##_sounddata_r); \ - downcast<wpc_device *>(device)->set_sound_data_write(DEVCB2_##_sounddata_w); + downcast<wpc_device *>(device)->set_sound_data_read(DEVCB_##_sounddata_r); \ + downcast<wpc_device *>(device)->set_sound_data_write(DEVCB_##_sounddata_w); #define MCFG_WPC_SOUND_CTRL(_soundctrl_r,_soundctrl_w) \ - downcast<wpc_device *>(device)->set_sound_ctrl_read(DEVCB2_##_soundctrl_r); \ - downcast<wpc_device *>(device)->set_sound_ctrl_write(DEVCB2_##_soundctrl_w); + downcast<wpc_device *>(device)->set_sound_ctrl_read(DEVCB_##_soundctrl_r); \ + downcast<wpc_device *>(device)->set_sound_ctrl_write(DEVCB_##_soundctrl_w); #define MCFG_WPC_SOUND_S11C(_sounds11_w) \ - downcast<wpc_device *>(device)->set_sound_s11_write(DEVCB2_##_sounds11_w); + downcast<wpc_device *>(device)->set_sound_s11_write(DEVCB_##_sounds11_w); #define MCFG_WPC_ROMBANK(_bank_w) \ - downcast<wpc_device *>(device)->set_bank_write(DEVCB2_##_bank_w); + downcast<wpc_device *>(device)->set_bank_write(DEVCB_##_bank_w); #define MCFG_WPC_DMDBANK(_dmdbank_w) \ - downcast<wpc_device *>(device)->set_dmdbank_write(DEVCB2_##_dmdbank_w); + downcast<wpc_device *>(device)->set_dmdbank_write(DEVCB_##_dmdbank_w); class wpc_device : public device_t { @@ -151,15 +151,15 @@ private: UINT8 m_dmd_irqline; emu_timer* m_zc_timer; - devcb2_write_line m_irq_cb; - devcb2_write_line m_firq_cb; - devcb2_read8 m_sounddata_r; - devcb2_write8 m_sounddata_w; - devcb2_read8 m_soundctrl_r; - devcb2_write8 m_soundctrl_w; - devcb2_write8 m_sounds11_w; - devcb2_write8 m_bank_w; - devcb2_write8 m_dmdbank_w; + devcb_write_line m_irq_cb; + devcb_write_line m_firq_cb; + devcb_read8 m_sounddata_r; + devcb_write8 m_sounddata_w; + devcb_read8 m_soundctrl_r; + devcb_write8 m_soundctrl_w; + devcb_write8 m_sounds11_w; + devcb_write8 m_bank_w; + devcb_write8 m_dmdbank_w; }; extern const device_type WPCASIC; diff --git a/src/mame/machine/zndip.h b/src/mame/machine/zndip.h index e6cc2f01708..1c7b364fb07 100644 --- a/src/mame/machine/zndip.h +++ b/src/mame/machine/zndip.h @@ -10,14 +10,14 @@ extern const device_type ZNDIP; #define MCFG_ZNDIP_DATA_HANDLER(_devcb) \ - devcb = &zndip_device::set_data_handler(*device, DEVCB2_##_devcb); + devcb = &zndip_device::set_data_handler(*device, DEVCB_##_devcb); class zndip_device : public psxsiodev_device { public: zndip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // static configuration helpers - template<class _Object> static devcb2_base &set_data_handler(device_t &device, _Object object) { return downcast<zndip_device &>(device).m_data_handler.set_callback(object); } + template<class _Object> static devcb_base &set_data_handler(device_t &device, _Object object) { return downcast<zndip_device &>(device).m_data_handler.set_callback(object); } void select(int select); @@ -28,7 +28,7 @@ protected: private: virtual void data_in( int data, int mask ); - devcb2_read8 m_data_handler; + devcb_read8 m_data_handler; int m_select; UINT8 m_bit; diff --git a/src/mame/video/bfm_dm01.h b/src/mame/video/bfm_dm01.h index dd6ace9f1fb..df68264a556 100644 --- a/src/mame/video/bfm_dm01.h +++ b/src/mame/video/bfm_dm01.h @@ -9,7 +9,7 @@ #define DM_BYTESPERROW 9 #define MCFG_BF_DM01_BUSY_CB(_devcb) \ - devcb = &bfmdm01_device::set_busy_callback(*device, DEVCB2_##_devcb); + devcb = &bfmdm01_device::set_busy_callback(*device, DEVCB_##_devcb); class bfmdm01_device : public device_t { @@ -17,7 +17,7 @@ public: bfmdm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ~bfmdm01_device() {} - template<class _Object> static devcb2_base &set_busy_callback(device_t &device, _Object object) { return downcast<bfmdm01_device &>(device).m_busy_cb.set_callback(object); } + template<class _Object> static devcb_base &set_busy_callback(device_t &device, _Object object) { return downcast<bfmdm01_device &>(device).m_busy_cb.set_callback(object); } DECLARE_READ8_MEMBER( control_r ); DECLARE_WRITE8_MEMBER( control_w ); @@ -47,7 +47,7 @@ private: UINT8 m_scanline[DM_BYTESPERROW]; UINT8 m_comdata; - devcb2_write_line m_busy_cb; + devcb_write_line m_busy_cb; int read_data(void); }; diff --git a/src/mame/video/powervr2.h b/src/mame/video/powervr2.h index bc8b0e2ae14..bb0c1f60d55 100644 --- a/src/mame/video/powervr2.h +++ b/src/mame/video/powervr2.h @@ -3,7 +3,7 @@ #define MCFG_POWERVR2_ADD(_tag, _irq_cb) \ MCFG_DEVICE_ADD(_tag, POWERVR2, 0) \ - downcast<powervr2_device *>(device)->set_irq_cb(DEVCB2_ ## _irq_cb); + downcast<powervr2_device *>(device)->set_irq_cb(DEVCB_ ## _irq_cb); class powervr2_device : public device_t, public device_video_interface @@ -282,7 +282,7 @@ protected: virtual void device_reset(); private: - devcb2_write8 irq_cb; + devcb_write8 irq_cb; // Core registers UINT32 softreset; diff --git a/src/mame/video/scn2674.h b/src/mame/video/scn2674.h index 2a846e2ce76..eb50750e979 100644 --- a/src/mame/video/scn2674.h +++ b/src/mame/video/scn2674.h @@ -5,7 +5,7 @@ #define MCFG_SCN2674_VIDEO_ADD(_tag, _clock, _irq) \ MCFG_DEVICE_ADD(_tag, SCN2674_VIDEO, _clock) \ - downcast<scn2674_device *>(device)->set_callbacks(DEVCB2_##_irq); + downcast<scn2674_device *>(device)->set_callbacks(DEVCB_##_irq); #define MCFG_SCN2674_GFXDECODE(_gfxtag) \ scn2674_device::static_set_gfxdecode_tag(*device, "^" _gfxtag); @@ -51,7 +51,7 @@ protected: virtual void device_start(); virtual void device_reset(); - devcb2_write_line m_interrupt_callback; + devcb_write_line m_interrupt_callback; UINT8 m_scn2674_IR_pointer; UINT8 m_scn2674_screen1_l; diff --git a/src/mame/video/seibu_crtc.h b/src/mame/video/seibu_crtc.h index eeac3b6d3d3..abfe7d3dae1 100644 --- a/src/mame/video/seibu_crtc.h +++ b/src/mame/video/seibu_crtc.h @@ -15,10 +15,10 @@ //************************************************************************** #define MCFG_SEIBU_CRTC_LAYER_EN_CB(_devcb) \ - devcb = &seibu_crtc_device::set_layer_en_callback(*device, DEVCB2_##_devcb); + devcb = &seibu_crtc_device::set_layer_en_callback(*device, DEVCB_##_devcb); #define MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(_devcb) \ - devcb = &seibu_crtc_device::set_layer_scroll_callback(*device, DEVCB2_##_devcb); + devcb = &seibu_crtc_device::set_layer_scroll_callback(*device, DEVCB_##_devcb); //************************************************************************** @@ -35,8 +35,8 @@ public: // construction/destruction seibu_crtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - template<class _Object> static devcb2_base &set_layer_en_callback(device_t &device, _Object object) { return downcast<seibu_crtc_device &>(device).m_layer_en_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_layer_scroll_callback(device_t &device, _Object object) { return downcast<seibu_crtc_device &>(device).m_layer_scroll_cb.set_callback(object); } + template<class _Object> static devcb_base &set_layer_en_callback(device_t &device, _Object object) { return downcast<seibu_crtc_device &>(device).m_layer_en_cb.set_callback(object); } + template<class _Object> static devcb_base &set_layer_scroll_callback(device_t &device, _Object object) { return downcast<seibu_crtc_device &>(device).m_layer_scroll_cb.set_callback(object); } // I/O operations DECLARE_WRITE16_MEMBER( write ); @@ -56,8 +56,8 @@ protected: virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; private: - devcb2_write16 m_layer_en_cb; - devcb2_write16 m_layer_scroll_cb; + devcb_write16 m_layer_en_cb; + devcb_write16 m_layer_scroll_cb; const address_space_config m_space_config; inline UINT16 read_word(offs_t address); inline void write_word(offs_t address, UINT16 data); diff --git a/src/mame/video/tia.h b/src/mame/video/tia.h index cc544299e62..cc321f5bd7a 100644 --- a/src/mame/video/tia.h +++ b/src/mame/video/tia.h @@ -29,13 +29,13 @@ struct player_gfx { //************************************************************************** #define MCFG_TIA_READ_INPUT_PORT_CB(_devcb) \ - devcb = &tia_video_device::set_read_input_port_callback(*device, DEVCB2_##_devcb); + devcb = &tia_video_device::set_read_input_port_callback(*device, DEVCB_##_devcb); #define MCFG_TIA_DATABUS_CONTENTS_CB(_devcb) \ - devcb = &tia_video_device::set_databus_contents_callback(*device, DEVCB2_##_devcb); + devcb = &tia_video_device::set_databus_contents_callback(*device, DEVCB_##_devcb); #define MCFG_TIA_VSYNC_CB(_devcb) \ - devcb = &tia_video_device::set_vsync_callback(*device, DEVCB2_##_devcb); + devcb = &tia_video_device::set_vsync_callback(*device, DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -50,9 +50,9 @@ class tia_video_device : public device_t, public: UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - template<class _Object> static devcb2_base &set_read_input_port_callback(device_t &device, _Object object) { return downcast<tia_video_device &>(device).m_read_input_port_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_databus_contents_callback(device_t &device, _Object object) { return downcast<tia_video_device &>(device).m_databus_contents_cb.set_callback(object); } - template<class _Object> static devcb2_base &set_vsync_callback(device_t &device, _Object object) { return downcast<tia_video_device &>(device).m_vsync_cb.set_callback(object); } + template<class _Object> static devcb_base &set_read_input_port_callback(device_t &device, _Object object) { return downcast<tia_video_device &>(device).m_read_input_port_cb.set_callback(object); } + template<class _Object> static devcb_base &set_databus_contents_callback(device_t &device, _Object object) { return downcast<tia_video_device &>(device).m_databus_contents_cb.set_callback(object); } + template<class _Object> static devcb_base &set_vsync_callback(device_t &device, _Object object) { return downcast<tia_video_device &>(device).m_vsync_cb.set_callback(object); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -108,9 +108,9 @@ protected: private: - devcb2_read16 m_read_input_port_cb; - devcb2_read8 m_databus_contents_cb; - devcb2_write16 m_vsync_cb; + devcb_read16 m_read_input_port_cb; + devcb_read8 m_databus_contents_cb; + devcb_write16 m_vsync_cb; struct player_gfx p0gfx; struct player_gfx p1gfx; |