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/machine/namco06.h | |
parent | c5a60146edfc6d9bf8ff7f398b0c3fa17b94b1e3 (diff) |
devcv2 -> devcb (nw)
Diffstat (limited to 'src/mame/machine/namco06.h')
-rw-r--r-- | src/mame/machine/namco06.h | 72 |
1 files changed, 36 insertions, 36 deletions
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; |