Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-10 00:01:52 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

removed unused legacy VBLANK interrupt code

Browse Source
This commit is contained in:
Oliver Stöneberg 2013-08-20 12:50:47 +00:00
parent 5980642169
commit 5ab8b79d24
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/emu/devcpu.h
View File

@ -190,7 +190,6 @@ enum
#define MCFG_CPU_IO_MAP MCFG_DEVICE_IO_MAP
// legacy
#define MCFG_CPU_VBLANK_INT MCFG_DEVICE_VBLANK_INT
#define MCFG_CPU_PERIODIC_INT MCFG_DEVICE_PERIODIC_INT
#define MCFG_CPU_VBLANK_INT_DRIVER MCFG_DEVICE_VBLANK_INT_DRIVER

18
src/emu/diexec.c
View File

@ -73,7 +73,6 @@ const int TRIGGER_SUSPENDTIME = -4000;
device_execute_interface::device_execute_interface(const machine_config &mconfig, device_t &device)
: device_interface(device),
m_disabled(false),
m_vblank_interrupt_legacy(NULL),
m_vblank_interrupt_screen(NULL),
m_timed_interrupt_legacy(NULL),
m_timed_interrupt_period(attotime::zero),
@ -132,22 +131,12 @@ void device_execute_interface::static_set_disable(device_t &device)
// to set up VBLANK interrupts on the device
//-------------------------------------------------
void device_execute_interface::static_set_vblank_int(device_t &device, device_interrupt_func function, const char *tag, int rate)
{
device_execute_interface *exec;
if (!device.interface(exec))
throw emu_fatalerror("MCFG_DEVICE_VBLANK_INT called on device '%s' with no execute interface", device.tag());
exec->m_vblank_interrupt_legacy = function;
exec->m_vblank_interrupt_screen = tag;
}
void device_execute_interface::static_set_vblank_int(device_t &device, device_interrupt_delegate function, const char *tag, int rate)
{
device_execute_interface *exec;
if (!device.interface(exec))
throw emu_fatalerror("MCFG_DEVICE_VBLANK_INT called on device '%s' with no execute interface", device.tag());
exec->m_vblank_interrupt = function;
exec->m_vblank_interrupt_legacy = NULL;
exec->m_vblank_interrupt_screen = tag;
}
@ -162,7 +151,6 @@ void device_execute_interface::static_remove_vblank_int(device_t &device)
if (!device.interface(exec))
throw emu_fatalerror("MCFG_DEVICE_VBLANK_INT_REMOVE called on device '%s' with no execute interface", device.tag());
exec->m_vblank_interrupt = device_interrupt_delegate();
exec->m_vblank_interrupt_legacy = NULL;
exec->m_vblank_interrupt_screen = NULL;
}
@ -537,7 +525,7 @@ void device_execute_interface::execute_set_input(int linenum, int state)
void device_execute_interface::interface_validity_check(validity_checker &valid) const
{
// validate the interrupts
if (!m_vblank_interrupt.isnull() || m_vblank_interrupt_legacy != NULL)
if (!m_vblank_interrupt.isnull())
{
screen_device_iterator iter(device().mconfig().root_device());
if (iter.first() == NULL)
@ -774,9 +762,7 @@ void device_execute_interface::on_vblank(screen_device &screen, bool vblank_stat
// generate the interrupt callback
if (!suspended(SUSPEND_REASON_HALT | SUSPEND_REASON_RESET | SUSPEND_REASON_DISABLE | SUSPEND_REASON_CLOCK))
{
if (m_vblank_interrupt_legacy != NULL)
(*m_vblank_interrupt_legacy)(&device());
else if (!m_vblank_interrupt.isnull())
if (!m_vblank_interrupt.isnull())
m_vblank_interrupt(device());
}
}

5
src/emu/diexec.h
View File

@ -116,9 +116,6 @@ enum
#define MCFG_DEVICE_DISABLE() \
device_execute_interface::static_set_disable(*device);
// legacy
#define MCFG_DEVICE_VBLANK_INT(_tag, _func) \
device_execute_interface::static_set_vblank_int(*device, _func, _tag);
#define MCFG_DEVICE_VBLANK_INT_DRIVER(_tag, _class, _func) \
device_execute_interface::static_set_vblank_int(*device, device_interrupt_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)0), _tag);
#define MCFG_DEVICE_VBLANK_INT_DEVICE(_tag, _devtag, _class, _func) \
@ -180,7 +177,6 @@ public:
// static inline configuration helpers
static void static_set_disable(device_t &device);
static void static_set_vblank_int(device_t &device, device_interrupt_func function, const char *tag, int rate = 0); // legacy
static void static_set_vblank_int(device_t &device, device_interrupt_delegate function, const char *tag, int rate = 0);
static void static_remove_vblank_int(device_t &device);
static void static_set_periodic_int(device_t &device, device_interrupt_func function, attotime rate); // legacy
@ -292,7 +288,6 @@ protected:
// configuration
bool m_disabled; // disabled from executing?
device_interrupt_delegate m_vblank_interrupt; // for interrupts tied to VBLANK
device_interrupt_func m_vblank_interrupt_legacy; // for interrupts tied to VBLANK
const char * m_vblank_interrupt_screen; // the screen that causes the VBLANK interrupt
device_interrupt_delegate m_timed_interrupt; // for interrupts not tied to VBLANK
device_interrupt_func m_timed_interrupt_legacy; // for interrupts not tied to VBLANK