summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/m6502
diff options
context:
space:
mode:
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
commit546fbff34966f4f5f62930dd73c064df90d4e51e (patch)
treea2e859303874d5ee6cda105c465983e5223d5675 /src/emu/cpu/m6502
parentc5a60146edfc6d9bf8ff7f398b0c3fa17b94b1e3 (diff)
devcv2 -> devcb (nw)
Diffstat (limited to 'src/emu/cpu/m6502')
-rw-r--r--src/emu/cpu/m6502/m3745x.h20
-rw-r--r--src/emu/cpu/m6502/m5074x.h38
-rw-r--r--src/emu/cpu/m6502/m6502.h6
-rw-r--r--src/emu/cpu/m6502/m6510.h6
-rw-r--r--src/emu/cpu/m6502/m6510t.h2
-rw-r--r--src/emu/cpu/m6502/m7501.h2
-rw-r--r--src/emu/cpu/m6502/m8502.h2
7 files changed, 38 insertions, 38 deletions
diff --git a/src/emu/cpu/m6502/m3745x.h b/src/emu/cpu/m6502/m3745x.h
index 45cfd2cda5a..e6a3b35a0d7 100644
--- a/src/emu/cpu/m6502/m3745x.h
+++ b/src/emu/cpu/m6502/m3745x.h
@@ -10,22 +10,22 @@
//**************************************************************************
#define MCFG_M3745X_ADC14_CALLBACKS(_ad0, _ad1, _ad2, _ad3) \
- downcast<m3745x_device *>(device)->set_ad14_callbacks(DEVCB2_##_ad0, DEVCB2_##_ad1, DEVCB2_##_ad2, DEVCB2_##_ad3);
+ downcast<m3745x_device *>(device)->set_ad14_callbacks(DEVCB_##_ad0, DEVCB_##_ad1, DEVCB_##_ad2, DEVCB_##_ad3);
#define MCFG_M3745X_ADC58_CALLBACKS(_ad0, _ad1, _ad2, _ad3) \
- downcast<m3745x_device *>(device)->set_ad58_callbacks(DEVCB2_##_ad0, DEVCB2_##_ad1, DEVCB2_##_ad2, DEVCB2_##_ad3);
+ downcast<m3745x_device *>(device)->set_ad58_callbacks(DEVCB_##_ad0, DEVCB_##_ad1, DEVCB_##_ad2, DEVCB_##_ad3);
#define MCFG_M3745X_PORT3_CALLBACKS(_read, _write) \
- downcast<m3745x_device *>(device)->set_p3_callbacks(DEVCB2_##_read, DEVCB2_##_write);
+ downcast<m3745x_device *>(device)->set_p3_callbacks(DEVCB_##_read, DEVCB_##_write);
#define MCFG_M3745X_PORT4_CALLBACKS(_read, _write) \
- downcast<m3745x_device *>(device)->set_p4_callbacks(DEVCB2_##_read, DEVCB2_##_write);
+ downcast<m3745x_device *>(device)->set_p4_callbacks(DEVCB_##_read, DEVCB_##_write);
#define MCFG_M3745X_PORT5_CALLBACKS(_read, _write) \
- downcast<m3745x_device *>(device)->set_p5_callbacks(DEVCB2_##_read, DEVCB2_##_write);
+ downcast<m3745x_device *>(device)->set_p5_callbacks(DEVCB_##_read, DEVCB_##_write);
#define MCFG_M3745X_PORT6_CALLBACKS(_read, _write) \
- downcast<m3745x_device *>(device)->set_p6_callbacks(DEVCB2_##_read, DEVCB2_##_write);
+ downcast<m3745x_device *>(device)->set_p6_callbacks(DEVCB_##_read, DEVCB_##_write);
//**************************************************************************
// TYPE DEFINITIONS
@@ -103,10 +103,10 @@ public:
read_ad_7.set_callback(rd4);
}
- devcb2_read8 read_p3, read_p4, read_p5, read_p6;
- devcb2_write8 write_p3, write_p4, write_p5, write_p6;
- devcb2_read8 read_ad_0, read_ad_1, read_ad_2, read_ad_3;
- devcb2_read8 read_ad_4, read_ad_5, read_ad_6, read_ad_7;
+ devcb_read8 read_p3, read_p4, read_p5, read_p6;
+ devcb_write8 write_p3, write_p4, write_p5, write_p6;
+ devcb_read8 read_ad_0, read_ad_1, read_ad_2, read_ad_3;
+ devcb_read8 read_ad_4, read_ad_5, read_ad_6, read_ad_7;
DECLARE_READ8_MEMBER(ports_r);
DECLARE_WRITE8_MEMBER(ports_w);
diff --git a/src/emu/cpu/m6502/m5074x.h b/src/emu/cpu/m6502/m5074x.h
index d8054aba221..5b40a8ae4c3 100644
--- a/src/emu/cpu/m6502/m5074x.h
+++ b/src/emu/cpu/m6502/m5074x.h
@@ -10,28 +10,28 @@
//**************************************************************************
#define MCFG_M5074X_PORT0_READ_CALLBACK(_read) \
- devcb = &m5074x_device::set_p0_rd_callback(*device, DEVCB2_##_read);
+ devcb = &m5074x_device::set_p0_rd_callback(*device, DEVCB_##_read);
#define MCFG_M5074X_PORT1_READ_CALLBACK(_read) \
- devcb = &m5074x_device::set_p1_rd_callback(*device, DEVCB2_##_read);
+ devcb = &m5074x_device::set_p1_rd_callback(*device, DEVCB_##_read);
#define MCFG_M5074X_PORT2_READ_CALLBACK(_read) \
- devcb = &m5074x_device::set_p2_rd_callback(*device, DEVCB2_##_read);
+ devcb = &m5074x_device::set_p2_rd_callback(*device, DEVCB_##_read);
#define MCFG_M5074X_PORT3_READ_CALLBACK(_read) \
- devcb = &m5074x_device::set_p3_rd_callback(*device, DEVCB2_##_read);
+ devcb = &m5074x_device::set_p3_rd_callback(*device, DEVCB_##_read);
#define MCFG_M5074X_PORT0_WRITE_CALLBACK(_write) \
- devcb = &m5074x_device::set_p0_wr_callback(*device, DEVCB2_##_write);
+ devcb = &m5074x_device::set_p0_wr_callback(*device, DEVCB_##_write);
#define MCFG_M5074X_PORT1_WRITE_CALLBACK(_write) \
- devcb = &m5074x_device::set_p1_wr_callback(*device, DEVCB2_##_write);
+ devcb = &m5074x_device::set_p1_wr_callback(*device, DEVCB_##_write);
#define MCFG_M5074X_PORT2_WRITE_CALLBACK(_write) \
- devcb = &m5074x_device::set_p2_wr_callback(*device, DEVCB2_##_write);
+ devcb = &m5074x_device::set_p2_wr_callback(*device, DEVCB_##_write);
#define MCFG_M5074X_PORT3_WRITE_CALLBACK(_write) \
- devcb = &m5074x_device::set_p3_wr_callback(*device, DEVCB2_##_write);
+ devcb = &m5074x_device::set_p3_wr_callback(*device, DEVCB_##_write);
//**************************************************************************
// TYPE DEFINITIONS
@@ -66,17 +66,17 @@ public:
const address_space_config m_program_config;
- template<class _Object> static devcb2_base &set_p0_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p0.set_callback(object); }
- template<class _Object> static devcb2_base &set_p1_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p1.set_callback(object); }
- template<class _Object> static devcb2_base &set_p2_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p2.set_callback(object); }
- template<class _Object> static devcb2_base &set_p3_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p3.set_callback(object); }
- template<class _Object> static devcb2_base &set_p0_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p0.set_callback(object); }
- template<class _Object> static devcb2_base &set_p1_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p1.set_callback(object); }
- template<class _Object> static devcb2_base &set_p2_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p2.set_callback(object); }
- template<class _Object> static devcb2_base &set_p3_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p3.set_callback(object); }
-
- devcb2_read8 read_p0, read_p1, read_p2, read_p3;
- devcb2_write8 write_p0, write_p1, write_p2, write_p3;
+ template<class _Object> static devcb_base &set_p0_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p0.set_callback(object); }
+ template<class _Object> static devcb_base &set_p1_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p1.set_callback(object); }
+ template<class _Object> static devcb_base &set_p2_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p2.set_callback(object); }
+ template<class _Object> static devcb_base &set_p3_rd_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).read_p3.set_callback(object); }
+ template<class _Object> static devcb_base &set_p0_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p0.set_callback(object); }
+ template<class _Object> static devcb_base &set_p1_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p1.set_callback(object); }
+ template<class _Object> static devcb_base &set_p2_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p2.set_callback(object); }
+ template<class _Object> static devcb_base &set_p3_wr_callback(device_t &device, _Object object) { return downcast<m5074x_device &>(device).write_p3.set_callback(object); }
+
+ devcb_read8 read_p0, read_p1, read_p2, read_p3;
+ devcb_write8 write_p0, write_p1, write_p2, write_p3;
DECLARE_READ8_MEMBER(ports_r);
DECLARE_WRITE8_MEMBER(ports_w);
diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h
index 6c8a9809def..b433c72f9e5 100644
--- a/src/emu/cpu/m6502/m6502.h
+++ b/src/emu/cpu/m6502/m6502.h
@@ -44,7 +44,7 @@
downcast<m6502_device *>(device)->disable_direct();
#define MCFG_M6502_SYNC_CALLBACK(_cb) \
- devcb = &m6502_device::set_sync_callback(*device, DEVCB2_##_cb);
+ devcb = &m6502_device::set_sync_callback(*device, DEVCB_##_cb);
class m6502_device : public cpu_device {
public:
@@ -65,9 +65,9 @@ public:
bool get_sync() const { return sync; }
void disable_direct() { direct_disabled = true; }
- template<class _Object> static devcb2_base &set_sync_callback(device_t &device, _Object object) { return downcast<m6502_device &>(device).sync_w.set_callback(object); }
+ template<class _Object> static devcb_base &set_sync_callback(device_t &device, _Object object) { return downcast<m6502_device &>(device).sync_w.set_callback(object); }
- devcb2_write_line sync_w;
+ devcb_write_line sync_w;
protected:
class memory_interface {
diff --git a/src/emu/cpu/m6502/m6510.h b/src/emu/cpu/m6502/m6510.h
index 224f530b4f9..9906f588074 100644
--- a/src/emu/cpu/m6502/m6510.h
+++ b/src/emu/cpu/m6502/m6510.h
@@ -43,7 +43,7 @@
#include "m6502.h"
#define MCFG_M6510_PORT_CALLBACKS(_read, _write) \
- downcast<m6510_device *>(device)->set_callbacks(DEVCB2_##_read, DEVCB2_##_write);
+ downcast<m6510_device *>(device)->set_callbacks(DEVCB_##_read, DEVCB_##_write);
#define MCFG_M6510_PORT_PULLS(_up, _down) \
downcast<m6510_device *>(device)->set_pulls(_up, _down);
@@ -89,8 +89,8 @@ protected:
virtual UINT8 read_decrypted(UINT16 adr);
};
- devcb2_read8 read_port;
- devcb2_write8 write_port;
+ devcb_read8 read_port;
+ devcb_write8 write_port;
UINT8 pullup, floating, dir, port, drive;
diff --git a/src/emu/cpu/m6502/m6510t.h b/src/emu/cpu/m6502/m6510t.h
index 82e1baecf29..0765f9e38c1 100644
--- a/src/emu/cpu/m6502/m6510t.h
+++ b/src/emu/cpu/m6502/m6510t.h
@@ -43,7 +43,7 @@
#include "m6510.h"
#define MCFG_M6510T_PORT_CALLBACKS(_read, _write) \
- downcast<m6510t_device *>(device)->set_callbacks(DEVCB2_##_read, DEVCB2_##_write);
+ downcast<m6510t_device *>(device)->set_callbacks(DEVCB_##_read, DEVCB_##_write);
#define MCFG_M6510T_PORT_PULLS(_up, _down) \
downcast<m6510t_device *>(device)->set_pulls(_up, _down);
diff --git a/src/emu/cpu/m6502/m7501.h b/src/emu/cpu/m6502/m7501.h
index c75dba10de5..f869dfc5234 100644
--- a/src/emu/cpu/m6502/m7501.h
+++ b/src/emu/cpu/m6502/m7501.h
@@ -43,7 +43,7 @@
#include "m6510.h"
#define MCFG_M7501_PORT_CALLBACKS(_read, _write) \
- downcast<m7501_device *>(device)->set_callbacks(DEVCB2_##_read, DEVCB2_##_write);
+ downcast<m7501_device *>(device)->set_callbacks(DEVCB_##_read, DEVCB_##_write);
#define MCFG_M7501_PORT_PULLS(_up, _down) \
downcast<m7501_device *>(device)->set_pulls(_up, _down);
diff --git a/src/emu/cpu/m6502/m8502.h b/src/emu/cpu/m6502/m8502.h
index cbd10093da8..c44206e8bdf 100644
--- a/src/emu/cpu/m6502/m8502.h
+++ b/src/emu/cpu/m6502/m8502.h
@@ -43,7 +43,7 @@
#include "m6510.h"
#define MCFG_M8502_PORT_CALLBACKS(_read, _write) \
- downcast<m8502_device *>(device)->set_callbacks(DEVCB2_##_read, DEVCB2_##_write);
+ downcast<m8502_device *>(device)->set_callbacks(DEVCB_##_read, DEVCB_##_write);
#define MCFG_M8502_PORT_PULLS(_up, _down) \
downcast<m8502_device *>(device)->set_pulls(_up, _down);