summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/devcpu.h
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2012-04-10 20:13:30 +0000
committer Aaron Giles <aaron@aarongiles.com>2012-04-10 20:13:30 +0000
commit53aca4fb0c68196bf794a34159114b8bafcd1bd1 (patch)
tree1596e7a64ea6d3dc3ed5a3715b9b4fdb253c9a69 /src/emu/devcpu.h
parent0f648fa34aec6f0ee1c7e7f64902d0ae09357243 (diff)
Renamed device_irq_callback to device_irq_acknowledge_callback to
make its purpose clearer. Added delegate support for interrupt callbacks, and made driver_device variants of the generic interrupt helper callbacks. Did not convert existing callers yet due to logistical issues.
Diffstat (limited to 'src/emu/devcpu.h')
-rw-r--r--src/emu/devcpu.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/emu/devcpu.h b/src/emu/devcpu.h
index 67abb12e5aa..f17ea627590 100644
--- a/src/emu/devcpu.h
+++ b/src/emu/devcpu.h
@@ -199,7 +199,7 @@ const device_type name = &legacy_device_creator<basename##_device>
#define CPU_SET_INFO_CALL(name) CPU_SET_INFO_NAME(name)(device, state, info)
#define CPU_INIT_NAME(name) cpu_init_##name
-#define CPU_INIT(name) void CPU_INIT_NAME(name)(legacy_cpu_device *device, device_irq_callback irqcallback)
+#define CPU_INIT(name) void CPU_INIT_NAME(name)(legacy_cpu_device *device, device_irq_acknowledge_callback irqcallback)
#define CPU_INIT_CALL(name) CPU_INIT_NAME(name)(device, irqcallback)
#define CPU_RESET_NAME(name) cpu_reset_##name
@@ -262,8 +262,6 @@ const device_type name = &legacy_device_creator<basename##_device>
#define cpu_set_reg(cpu, _reg, val) device_state(cpu)->set_state(_reg, val)
-#define INTERRUPT_GEN(func) void func(device_t *device)
-
// helpers for using machine/cputag instead of cpu objects
#define cputag_set_input_line(mach, tag, line, state) device_execute((mach).device(tag))->set_input_line(line, state)
#define cputag_set_input_line_and_vector(mach, tag, line, state, vec) device_execute((mach).device(tag))->set_input_line_and_vector(line, state, vec)
@@ -283,7 +281,7 @@ class legacy_cpu_device;
// CPU interface functions
typedef void (*cpu_get_info_func)(legacy_cpu_device *device, UINT32 state, cpuinfo *info);
typedef void (*cpu_set_info_func)(legacy_cpu_device *device, UINT32 state, cpuinfo *info);
-typedef void (*cpu_init_func)(legacy_cpu_device *device, device_irq_callback irqcallback);
+typedef void (*cpu_init_func)(legacy_cpu_device *device, device_irq_acknowledge_callback irqcallback);
typedef void (*cpu_reset_func)(legacy_cpu_device *device);
typedef void (*cpu_exit_func)(legacy_cpu_device *device);
typedef void (*cpu_execute_func)(legacy_cpu_device *device);