From cca6ddeb889f075109bfbf9ab5b87f6c07320469 Mon Sep 17 00:00:00 2001 From: AJR Date: Thu, 16 Jun 2016 16:18:17 -0400 Subject: [PATCH] Watchdog cleanups (nw) --- src/devices/machine/watchdog.h | 11 ----------- src/mame/drivers/abc1600.cpp | 4 ---- src/mame/machine/abc1600mac.cpp | 1 + 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/devices/machine/watchdog.h b/src/devices/machine/watchdog.h index 67cc915b092..ee97e9026db 100644 --- a/src/devices/machine/watchdog.h +++ b/src/devices/machine/watchdog.h @@ -11,17 +11,6 @@ // DEVICE CONFIGURATION MACROS //************************************************************************** -#ifdef LEGACY_WATCHDOG -#undef MCFG_WATCHDOG_VBLANK_INIT -#undef MCFG_WATCHDOG_TIME_INIT -#define watchdog_reset_r MUST_USE_WATCHDOG_DEVICE_INSTEAD -#define watchdog_reset_w MUST_USE_WATCHDOG_DEVICE_INSTEAD -#define watchdog_reset16_r MUST_USE_WATCHDOG_DEVICE_INSTEAD -#define watchdog_reset16_w MUST_USE_WATCHDOG_DEVICE_INSTEAD -#define watchdog_reset32_r MUST_USE_WATCHDOG_DEVICE_INSTEAD -#define watchdog_reset32_w MUST_USE_WATCHDOG_DEVICE_INSTEAD -#endif - #define MCFG_WATCHDOG_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, WATCHDOG_TIMER, 0) #define MCFG_WATCHDOG_MODIFY(_tag) \ diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp index 5560b34f675..f7db95b7640 100644 --- a/src/mame/drivers/abc1600.cpp +++ b/src/mame/drivers/abc1600.cpp @@ -46,7 +46,6 @@ */ #include "includes/abc1600.h" -#include "machine/watchdog.h" #include "softlist.h" @@ -845,9 +844,6 @@ static MACHINE_CONFIG_START( abc1600, abc1600_state ) MCFG_CPU_PROGRAM_MAP(abc1600_mem) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(abc1600_state,abc1600_int_ack) - //MCFG_WATCHDOG_ADD("watchdog") - //MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1600)) // XTAL_64MHz/8/10/20000/8/8 - // video hardware MCFG_ABC1600_MOVER_ADD() diff --git a/src/mame/machine/abc1600mac.cpp b/src/mame/machine/abc1600mac.cpp index 470950f23c8..409bf5695b1 100644 --- a/src/mame/machine/abc1600mac.cpp +++ b/src/mame/machine/abc1600mac.cpp @@ -75,6 +75,7 @@ ADDRESS_MAP_END static MACHINE_CONFIG_FRAGMENT( abc1600_mac ) MCFG_WATCHDOG_ADD("watchdog") + MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1600)) // XTAL_64MHz/8/10/20000/8/8 MACHINE_CONFIG_END machine_config_constructor abc1600_mac_device::device_mconfig_additions() const