diff --git a/src/emu/driver.c b/src/emu/driver.c index 42f3bd50396..81af29444b1 100644 --- a/src/emu/driver.c +++ b/src/emu/driver.c @@ -46,7 +46,6 @@ driver_device::driver_device(const machine_config &mconfig, device_type type, co m_flip_screen_x(0), m_flip_screen_y(0) { - memset(m_legacy_callbacks, 0, sizeof(m_legacy_callbacks)); memset(m_latched_value, 0, sizeof(m_latched_value)); memset(m_latch_read, 0, sizeof(m_latch_read)); } @@ -91,11 +90,6 @@ void driver_device::static_set_game(device_t &device, const game_driver &game) // the device configuration //------------------------------------------------- -void driver_device::static_set_callback(device_t &device, callback_type type, legacy_callback_func callback) -{ - downcast(device).m_legacy_callbacks[type] = callback; -} - void driver_device::static_set_callback(device_t &device, callback_type type, driver_callback_delegate callback) { downcast(device).m_callbacks[type] = callback; @@ -211,11 +205,6 @@ ioport_constructor driver_device::device_input_ports() const void driver_device::device_start() { - // bind our legacy callbacks - for (int index = 0; index < ARRAY_LENGTH(m_legacy_callbacks); index++) - if (m_legacy_callbacks[index] != NULL) - m_callbacks[index] = driver_callback_delegate(m_legacy_callbacks[index], "legacy_callback", &machine()); - // reschedule ourselves to be last device_iterator iter(*this); for (device_t *test = iter.first(); test != NULL; test = iter.next()) diff --git a/src/emu/driver.h b/src/emu/driver.h index 80bd217bd25..51054ece6a9 100644 --- a/src/emu/driver.h +++ b/src/emu/driver.h @@ -98,9 +98,6 @@ class gfxdecode_device; class palette_device; typedef delegate driver_callback_delegate; -// legacy callback functions -/*ATTR_DEPRECATED*/ typedef void (*legacy_callback_func)(running_machine &machine); - // ======================> driver_device @@ -130,7 +127,6 @@ public: // inline configuration helpers static void static_set_game(device_t &device, const game_driver &game); - ATTR_DEPRECATED static void static_set_callback(device_t &device, callback_type type, legacy_callback_func callback); static void static_set_callback(device_t &device, callback_type type, driver_callback_delegate callback); // generic helpers @@ -291,7 +287,6 @@ private: // internal state const game_driver * m_system; // pointer to the game driver driver_callback_delegate m_callbacks[CB_COUNT]; // start/reset callbacks - legacy_callback_func m_legacy_callbacks[CB_COUNT]; // legacy start/reset callbacks // generic audio UINT16 m_latch_clear_value;