diff --git a/.gitattributes b/.gitattributes index 6c3ad8f60e3..00a22c2c659 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2172,7 +2172,6 @@ src/emu/devfind.c svneol=native#text/plain src/emu/devfind.h svneol=native#text/plain src/emu/device.c svneol=native#text/plain src/emu/device.h svneol=native#text/plain -src/emu/devlegcy.h svneol=native#text/plain src/emu/didisasm.c svneol=native#text/plain src/emu/didisasm.h svneol=native#text/plain src/emu/diexec.c svneol=native#text/plain diff --git a/src/emu/devlegcy.h b/src/emu/devlegcy.h deleted file mode 100644 index 276fc27b0fe..00000000000 --- a/src/emu/devlegcy.h +++ /dev/null @@ -1,31 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Aaron Giles -/*************************************************************************** - - devlegcy.h - - Legacy device helpers. - -***************************************************************************/ - -#pragma once - -#ifndef __DEVLEGCY_H__ -#define __DEVLEGCY_H__ - -//************************************************************************** -// MACROS -//************************************************************************** - -#define DEVICE_START_NAME(name) device_start_##name -#define DEVICE_START(name) void DEVICE_START_NAME(name)(device_t *device) -#define DEVICE_START_CALL(name) DEVICE_START_NAME(name)(device) - -#define DEVICE_STOP_NAME(name) device_stop_##name -#define DEVICE_STOP(name) void DEVICE_STOP_NAME(name)(device_t *device) - -#define DEVICE_RESET_NAME(name) device_reset_##name -#define DEVICE_RESET(name) void DEVICE_RESET_NAME(name)(device_t *device) -#define DEVICE_RESET_CALL(name) DEVICE_RESET_NAME(name)(device) - -#endif /* __DEVLEGCY_H__ */ diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c index 440a5426255..2c64d31fcba 100644 --- a/src/emu/video/voodoo.c +++ b/src/emu/video/voodoo.c @@ -149,7 +149,6 @@ bits(7:4) and bit(24)), X, and Y: #include "video/rgbutil.h" #include "voodoo.h" #include "vooddefs.h" -#include "devlegcy.h" /************************************* @@ -5037,48 +5036,7 @@ static void common_start_voodoo(device_t *device, UINT8 type) init_save_state(device); } -static DEVICE_START( voodoo_1 ) -{ - common_start_voodoo(device, TYPE_VOODOO_1); -} -static DEVICE_START( voodoo_2 ) -{ - common_start_voodoo(device, TYPE_VOODOO_2); -} -static DEVICE_START( voodoo_banshee ) -{ - common_start_voodoo(device, TYPE_VOODOO_BANSHEE); -} - -static DEVICE_START( voodoo_3 ) -{ - common_start_voodoo(device, TYPE_VOODOO_3); -} - -/*------------------------------------------------- - device exit callback --------------------------------------------------*/ - -static DEVICE_STOP( voodoo ) -{ - voodoo_state *v = get_safe_token(device); - - /* release the work queue, ensuring all work is finished */ - if (v->poly != NULL) - poly_free(v->poly); -} - - -/*------------------------------------------------- - device reset callback --------------------------------------------------*/ - -static DEVICE_RESET( voodoo ) -{ - voodoo_state *v = get_safe_token(device); - soft_reset(v); -} /*************************************************************************** COMMAND HANDLERS @@ -5734,7 +5692,8 @@ void voodoo_device::device_config_complete() void voodoo_device::device_reset() { - DEVICE_RESET_NAME( voodoo )(this); + voodoo_state *v = get_safe_token(this); + soft_reset(v); } //------------------------------------------------- @@ -5743,7 +5702,11 @@ void voodoo_device::device_reset() void voodoo_device::device_stop() { - DEVICE_STOP_NAME( voodoo )(this); + voodoo_state *v = get_safe_token(this); + + /* release the work queue, ensuring all work is finished */ + if (v->poly != NULL) + poly_free(v->poly); } @@ -5760,7 +5723,7 @@ voodoo_1_device::voodoo_1_device(const machine_config &mconfig, const char *tag, void voodoo_1_device::device_start() { - DEVICE_START_NAME( voodoo_1 )(this); + common_start_voodoo(this, TYPE_VOODOO_1); } @@ -5777,7 +5740,7 @@ voodoo_2_device::voodoo_2_device(const machine_config &mconfig, const char *tag, void voodoo_2_device::device_start() { - DEVICE_START_NAME( voodoo_2 )(this); + common_start_voodoo(this, TYPE_VOODOO_2); } @@ -5794,7 +5757,7 @@ voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, cons void voodoo_banshee_device::device_start() { - DEVICE_START_NAME( voodoo_banshee )(this); + common_start_voodoo(this, TYPE_VOODOO_BANSHEE); } @@ -5811,7 +5774,7 @@ voodoo_3_device::voodoo_3_device(const machine_config &mconfig, const char *tag, void voodoo_3_device::device_start() { - DEVICE_START_NAME( voodoo_3 )(this); + common_start_voodoo(this, TYPE_VOODOO_3); }