summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Oliver Stöneberg <firewave@users.noreply.github.com>2013-07-24 13:20:19 +0000
committer Oliver Stöneberg <firewave@users.noreply.github.com>2013-07-24 13:20:19 +0000
commit319f5dc0122b9ca4d6f9abaf6ea24ac706e882b0 (patch)
tree4edb5ef92982d073564f8fd11267e11d32683561 /src
parent68e33427df578ae2f6c2015647ea3abd5b422650 (diff)
removed some legacy interrupt trampolines (nw)
Diffstat (limited to 'src')
-rw-r--r--src/emu/machine/generic.c31
-rw-r--r--src/emu/machine/generic.h33
-rw-r--r--src/mame/audio/exidy440.c2
3 files changed, 3 insertions, 63 deletions
diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c
index 2739c3959fc..cfad0dcc7fe 100644
--- a/src/emu/machine/generic.c
+++ b/src/emu/machine/generic.c
@@ -557,37 +557,8 @@ CUSTOM_INPUT_MEMBER( driver_device::custom_port_read )
void generic_pulse_irq_line(device_t *device, int irqline, int cycles) { device->machine().driver_data()->generic_pulse_irq_line(device->execute(), irqline, cycles); }
void generic_pulse_irq_line_and_vector(device_t *device, int irqline, int vector, int cycles) { device->machine().driver_data()->generic_pulse_irq_line_and_vector(device->execute(), irqline, vector, cycles); }
-INTERRUPT_GEN( nmi_line_pulse ) { device->machine().driver_data()->nmi_line_pulse(*device); }
-INTERRUPT_GEN( nmi_line_assert ) { device->machine().driver_data()->nmi_line_assert(*device); }
-
-INTERRUPT_GEN( irq0_line_hold ) { device->machine().driver_data()->irq0_line_hold(*device); }
-INTERRUPT_GEN( irq0_line_pulse ) { device->machine().driver_data()->irq0_line_pulse(*device); }
-INTERRUPT_GEN( irq0_line_assert ) { device->machine().driver_data()->irq0_line_assert(*device); }
-
-INTERRUPT_GEN( irq1_line_hold ) { device->machine().driver_data()->irq1_line_hold(*device); }
-INTERRUPT_GEN( irq1_line_pulse ) { device->machine().driver_data()->irq1_line_pulse(*device); }
-INTERRUPT_GEN( irq1_line_assert ) { device->machine().driver_data()->irq1_line_assert(*device); }
-
+// legacy
INTERRUPT_GEN( irq2_line_hold ) { device->machine().driver_data()->irq2_line_hold(*device); }
INTERRUPT_GEN( irq2_line_pulse ) { device->machine().driver_data()->irq2_line_pulse(*device); }
INTERRUPT_GEN( irq2_line_assert ) { device->machine().driver_data()->irq2_line_assert(*device); }
-INTERRUPT_GEN( irq3_line_hold ) { device->machine().driver_data()->irq3_line_hold(*device); }
-INTERRUPT_GEN( irq3_line_pulse ) { device->machine().driver_data()->irq3_line_pulse(*device); }
-INTERRUPT_GEN( irq3_line_assert ) { device->machine().driver_data()->irq3_line_assert(*device); }
-
-INTERRUPT_GEN( irq4_line_hold ) { device->machine().driver_data()->irq4_line_hold(*device); }
-INTERRUPT_GEN( irq4_line_pulse ) { device->machine().driver_data()->irq4_line_pulse(*device); }
-INTERRUPT_GEN( irq4_line_assert ) { device->machine().driver_data()->irq4_line_assert(*device); }
-
-INTERRUPT_GEN( irq5_line_hold ) { device->machine().driver_data()->irq5_line_hold(*device); }
-INTERRUPT_GEN( irq5_line_pulse ) { device->machine().driver_data()->irq5_line_pulse(*device); }
-INTERRUPT_GEN( irq5_line_assert ) { device->machine().driver_data()->irq5_line_assert(*device); }
-
-INTERRUPT_GEN( irq6_line_hold ) { device->machine().driver_data()->irq6_line_hold(*device); }
-INTERRUPT_GEN( irq6_line_pulse ) { device->machine().driver_data()->irq6_line_pulse(*device); }
-INTERRUPT_GEN( irq6_line_assert ) { device->machine().driver_data()->irq6_line_assert(*device); }
-
-INTERRUPT_GEN( irq7_line_hold ) { device->machine().driver_data()->irq7_line_hold(*device); }
-INTERRUPT_GEN( irq7_line_pulse ) { device->machine().driver_data()->irq7_line_pulse(*device); }
-INTERRUPT_GEN( irq7_line_assert ) { device->machine().driver_data()->irq7_line_assert(*device); }
diff --git a/src/emu/machine/generic.h b/src/emu/machine/generic.h
index 6ff15ceb215..35195180bb1 100644
--- a/src/emu/machine/generic.h
+++ b/src/emu/machine/generic.h
@@ -109,40 +109,9 @@ void set_led_status(running_machine &machine, int num, int value);
void generic_pulse_irq_line(device_t *device, int irqline, int cycles);
void generic_pulse_irq_line_and_vector(device_t *device, int irqline, int vector, int cycles);
-
-INTERRUPT_GEN( nmi_line_pulse );
-INTERRUPT_GEN( nmi_line_assert );
-
-INTERRUPT_GEN( irq0_line_hold );
-INTERRUPT_GEN( irq0_line_pulse );
-INTERRUPT_GEN( irq0_line_assert );
-
-INTERRUPT_GEN( irq1_line_hold );
-INTERRUPT_GEN( irq1_line_pulse );
-INTERRUPT_GEN( irq1_line_assert );
-
+// legacy
INTERRUPT_GEN( irq2_line_hold );
INTERRUPT_GEN( irq2_line_pulse );
INTERRUPT_GEN( irq2_line_assert );
-INTERRUPT_GEN( irq3_line_hold );
-INTERRUPT_GEN( irq3_line_pulse );
-INTERRUPT_GEN( irq3_line_assert );
-
-INTERRUPT_GEN( irq4_line_hold );
-INTERRUPT_GEN( irq4_line_pulse );
-INTERRUPT_GEN( irq4_line_assert );
-
-INTERRUPT_GEN( irq5_line_hold );
-INTERRUPT_GEN( irq5_line_pulse );
-INTERRUPT_GEN( irq5_line_assert );
-
-INTERRUPT_GEN( irq6_line_hold );
-INTERRUPT_GEN( irq6_line_pulse );
-INTERRUPT_GEN( irq6_line_assert );
-
-INTERRUPT_GEN( irq7_line_hold );
-INTERRUPT_GEN( irq7_line_pulse );
-INTERRUPT_GEN( irq7_line_assert );
-
#endif /* __MACHINE_GENERIC_H__ */
diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c
index 26ef63bb841..88443decd61 100644
--- a/src/mame/audio/exidy440.c
+++ b/src/mame/audio/exidy440.c
@@ -875,7 +875,7 @@ MACHINE_CONFIG_FRAGMENT( exidy440_audio )
MCFG_CPU_ADD("audiocpu", M6809, EXIDY440_AUDIO_CLOCK)
MCFG_CPU_PROGRAM_MAP(exidy440_audio_map)
- MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_VBLANK_INT_DRIVER("screen", driver_device, irq0_line_assert)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")