diff --git a/src/emu/driver.h b/src/emu/driver.h index 41948873fd7..55d79263a29 100644 --- a/src/emu/driver.h +++ b/src/emu/driver.h @@ -83,18 +83,15 @@ // OTHER MACROS //************************************************************************** -// macros to wrap legacy callbacks #define MACHINE_START_NAME(name) machine_start_##name -#define MACHINE_START(name) void MACHINE_START_NAME(name)(running_machine &machine) -#define MACHINE_START_CALL(name) MACHINE_START_NAME(name)(machine) +#define MACHINE_START(name) void MACHINE_START_NAME(name)(running_machine &machine) // legacy #define MACHINE_START_CALL_MEMBER(name) MACHINE_START_NAME(name)() #define MACHINE_START_CALL_LEGACY(name) MACHINE_START_NAME(name)(machine()) #define DECLARE_MACHINE_START(name) void MACHINE_START_NAME(name)() #define MACHINE_START_MEMBER(cls,name) void cls::MACHINE_START_NAME(name)() #define MACHINE_RESET_NAME(name) machine_reset_##name -#define MACHINE_RESET(name) void MACHINE_RESET_NAME(name)(running_machine &machine) -#define MACHINE_RESET_CALL(name) MACHINE_RESET_NAME(name)(machine) +#define MACHINE_RESET(name) void MACHINE_RESET_NAME(name)(running_machine &machine) // legacy #define MACHINE_RESET_CALL_MEMBER(name) MACHINE_RESET_NAME(name)() #define MACHINE_RESET_CALL_LEGACY(name) MACHINE_RESET_NAME(name)(machine()) #define DECLARE_MACHINE_RESET(name) void MACHINE_RESET_NAME(name)() @@ -109,23 +106,20 @@ #define SOUND_RESET_CALL(name) SOUND_RESET_NAME(name)(machine) #define PALETTE_INIT_NAME(name) palette_init_##name -#define PALETTE_INIT(name) void PALETTE_INIT_NAME(name)(running_machine &machine) -#define PALETTE_INIT_CALL(name) PALETTE_INIT_NAME(name)(machine) +#define PALETTE_INIT(name) void PALETTE_INIT_NAME(name)(running_machine &machine) // legacy #define PALETTE_INIT_CALL_MEMBER(name) PALETTE_INIT_NAME(name)() #define DECLARE_PALETTE_INIT(name) void PALETTE_INIT_NAME(name)() #define PALETTE_INIT_MEMBER(cls,name) void cls::PALETTE_INIT_NAME(name)() #define VIDEO_START_NAME(name) video_start_##name -#define VIDEO_START(name) void VIDEO_START_NAME(name)(running_machine &machine) -#define VIDEO_START_CALL(name) VIDEO_START_NAME(name)(machine) +#define VIDEO_START(name) void VIDEO_START_NAME(name)(running_machine &machine) // legacy #define VIDEO_START_CALL_MEMBER(name) VIDEO_START_NAME(name)() #define VIDEO_START_CALL_LEGACY(name) VIDEO_START_NAME(name)(machine()) #define DECLARE_VIDEO_START(name) void VIDEO_START_NAME(name)() #define VIDEO_START_MEMBER(cls,name) void cls::VIDEO_START_NAME(name)() #define VIDEO_RESET_NAME(name) video_reset_##name -#define VIDEO_RESET(name) void VIDEO_RESET_NAME(name)(running_machine &machine) -#define VIDEO_RESET_CALL(name) VIDEO_RESET_NAME(name)(machine) +#define VIDEO_RESET(name) void VIDEO_RESET_NAME(name)(running_machine &machine) // legacy #define VIDEO_RESET_CALL_MEMBER(name) VIDEO_RESET_NAME(name)() #define DECLARE_VIDEO_RESET(name) void VIDEO_RESET_NAME(name)() #define VIDEO_RESET_MEMBER(cls,name) void cls::VIDEO_RESET_NAME(name)() diff --git a/src/emu/drivlgcy.h b/src/emu/drivlgcy.h index 17742a6fed8..86612245708 100644 --- a/src/emu/drivlgcy.h +++ b/src/emu/drivlgcy.h @@ -67,5 +67,15 @@ #define MCFG_VIDEO_RESET(_func) \ driver_device::static_set_callback(*owner, driver_device::CB_VIDEO_RESET, VIDEO_RESET_NAME(_func)); + +#define MACHINE_START_CALL(name) MACHINE_START_NAME(name)(machine) + +#define MACHINE_RESET_CALL(name) MACHINE_RESET_NAME(name)(machine) + +#define PALETTE_INIT_CALL(name) PALETTE_INIT_NAME(name)(machine) + +#define VIDEO_START_CALL(name) VIDEO_START_NAME(name)(machine) + +#define VIDEO_RESET_CALL(name) VIDEO_RESET_NAME(name)(machine) #endif /* __DRIVLGCY_H__ */ diff --git a/src/emu/video/v9938.c b/src/emu/video/v9938.c index d484826d7f2..056e0fe8a18 100644 --- a/src/emu/video/v9938.c +++ b/src/emu/video/v9938.c @@ -16,6 +16,7 @@ todo: #include "emu.h" #include "v9938.h" +#include "drivlgcy.h" #define VERBOSE 0 #define LOG(x) do { if (VERBOSE) logerror x; } while (0) diff --git a/src/mame/video/avgdvg.c b/src/mame/video/avgdvg.c index d7c907d289e..9410e87d86f 100644 --- a/src/mame/video/avgdvg.c +++ b/src/mame/video/avgdvg.c @@ -14,6 +14,7 @@ #include "emu.h" #include "avgdvg.h" #include "video/vector.h" +#include "drivlgcy.h" /*************************************