summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/i86/i86.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/i86/i86.h')
-rw-r--r--src/devices/cpu/i86/i86.h26
1 files changed, 1 insertions, 25 deletions
diff --git a/src/devices/cpu/i86/i86.h b/src/devices/cpu/i86/i86.h
index 09b2696e38b..3d0a372b7d5 100644
--- a/src/devices/cpu/i86/i86.h
+++ b/src/devices/cpu/i86/i86.h
@@ -16,27 +16,6 @@ DECLARE_DEVICE_TYPE(I8088, i8088_cpu_device)
#define INPUT_LINE_TEST 20
-#define MCFG_I8086_LOCK_HANDLER(_write) \
- downcast<i8086_common_cpu_device &>(*device).set_lock_handler(DEVCB_##_write);
-
-#define MCFG_I8086_IF_HANDLER(_write) \
- downcast<i8086_cpu_device &>(*device).set_if_handler(DEVCB_##_write);
-
-#define MCFG_I8086_STACK_MAP(map) \
- MCFG_DEVICE_ADDRESS_MAP(i8086_cpu_device::AS_STACK, map)
-
-#define MCFG_I8086_CODE_MAP(map) \
- MCFG_DEVICE_ADDRESS_MAP(i8086_cpu_device::AS_CODE, map)
-
-#define MCFG_I8086_EXTRA_MAP(map) \
- MCFG_DEVICE_ADDRESS_MAP(i8086_cpu_device::AS_EXTRA, map)
-
-#define MCFG_I8086_ESC_OPCODE_HANDLER(_write) \
- downcast<i8086_cpu_device &>(*device).set_esc_opcode_handler(DEVCB_##_write);
-
-#define MCFG_I8086_ESC_DATA_HANDLER(_write) \
- downcast<i8086_cpu_device &>(*device).set_esc_data_handler(DEVCB_##_write);
-
enum
{
I8086_PC = STATE_GENPC,
@@ -49,7 +28,7 @@ enum
class i8086_common_cpu_device : public cpu_device, public i386_disassembler::config
{
public:
- template <class Object> devcb_base &set_lock_handler(Object &&cb) { return m_lock_handler.set_callback(std::forward<Object>(cb)); }
+ auto lock_handler() { return m_lock_handler.bind(); }
protected:
enum
@@ -366,9 +345,6 @@ public:
// device_memory_interface overrides
virtual space_config_vector memory_space_config() const override;
- template <class Object> devcb_base &set_if_handler(Object &&cb) { return m_out_if_func.set_callback(std::forward<Object>(cb)); }
- template <class Object> devcb_base &set_esc_opcode_handler(Object &&cb) { return m_esc_opcode_handler.set_callback(std::forward<Object>(cb)); }
- template <class Object> devcb_base &set_esc_data_handler(Object &&cb) { return m_esc_data_handler.set_callback(std::forward<Object>(cb)); }
auto if_handler() { return m_out_if_func.bind(); }
auto esc_opcode_handler() { return m_esc_opcode_handler.bind(); }
auto esc_data_handler() { return m_esc_data_handler.bind(); }