Merge pull request #959 from ajrhacker/master

Watchdog cleanups (nw)
This commit is contained in:
Ivan Vangelista 2016-06-17 07:39:08 +02:00 committed by GitHub
commit ccd561e93c
3 changed files with 1 additions and 15 deletions

View File

@ -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) \

View File

@ -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()

View File

@ -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