From 347590deaddcf355b8cdfffd0500749e08188b1f Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 2 Feb 2014 11:36:01 +0000 Subject: [PATCH] removed few legacy calls (nw) --- src/emu/machine/generic.c | 5 ----- src/emu/machine/generic.h | 9 --------- src/mame/audio/dcs.c | 2 +- src/mame/video/ygv608.c | 4 ++-- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c index 28049b5df32..b6262507fc6 100644 --- a/src/emu/machine/generic.c +++ b/src/emu/machine/generic.c @@ -553,8 +553,3 @@ CUSTOM_INPUT_MEMBER( driver_device::custom_port_read ) return ioport(tag)->read(); } -// legacy -void generic_pulse_irq_line(device_t *device, int irqline, int cycles) { device->machine().driver_data()->generic_pulse_irq_line(device->execute(), irqline, cycles); } - -// legacy -INTERRUPT_GEN( irq2_line_hold ) { device->machine().driver_data()->irq2_line_hold(*device); } diff --git a/src/emu/machine/generic.h b/src/emu/machine/generic.h index 8514e76e0a1..fba940508ab 100644 --- a/src/emu/machine/generic.h +++ b/src/emu/machine/generic.h @@ -102,13 +102,4 @@ int memcard_present(running_machine &machine); /* set the status of an LED */ void set_led_status(running_machine &machine, int num, int value); - - -/* ----- interrupt enable and vector helpers ----- */ - -ATTR_DEPRECATED void generic_pulse_irq_line(device_t *device, int irqline, int cycles); - - -ATTR_DEPRECATED INTERRUPT_GEN( irq2_line_hold ); - #endif /* __MACHINE_GENERIC_H__ */ diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c index 213bb24c264..1d4e2f21fc9 100644 --- a/src/mame/audio/dcs.c +++ b/src/mame/audio/dcs.c @@ -1998,7 +1998,7 @@ static TIMER_DEVICE_CALLBACK( dcs_irq ) reg = dcs.ireg_base; /* generate the (internal, thats why the pulse) irq */ - generic_pulse_irq_line(dcs.cpu, ADSP2105_IRQ1, 1); + dcs.cpu->machine().driver_data()->generic_pulse_irq_line(*dcs.cpu, ADSP2105_IRQ1, 1); } /* store it */ diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c index 1e3ada36536..dd57723f6fc 100644 --- a/src/mame/video/ygv608.c +++ b/src/mame/video/ygv608.c @@ -79,7 +79,7 @@ INTERRUPT_GEN_MEMBER(ygv608_device::timed_interrupt ) { m_ports.s.p6 |= p6_fv; if (m_regs.s.r14 & r14_iev) - irq2_line_hold(&device); + device.execute().set_input_line(2, HOLD_LINE); } /* once every 60Hz, set the position detection flag (somewhere) */ @@ -87,7 +87,7 @@ INTERRUPT_GEN_MEMBER(ygv608_device::timed_interrupt ) { m_ports.s.p6 |= p6_fp; if (m_regs.s.r14 & r14_iep) - irq2_line_hold(&device); + device.execute().set_input_line(2, HOLD_LINE); } }