From 4026305a367fcf3079efd324d06b15853ac9cd48 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Tue, 22 Nov 2011 22:46:44 +0000 Subject: [PATCH] tbh I don't think that the RTC clock(s) are supposed to be changed, so let's simplify the macros, nw --- src/emu/machine/rtc9701.c | 3 +-- src/emu/machine/rtc9701.h | 4 ++-- src/emu/machine/v3021.c | 3 +-- src/emu/machine/v3021.h | 4 ++-- src/mame/drivers/fortecar.c | 2 +- src/mame/drivers/pgm.c | 4 ++-- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/emu/machine/rtc9701.c b/src/emu/machine/rtc9701.c index 492d1ae9139..2ac36ee0072 100644 --- a/src/emu/machine/rtc9701.c +++ b/src/emu/machine/rtc9701.c @@ -94,8 +94,7 @@ bool rtc9701_device::device_validity_check(emu_options &options, const game_driv void rtc9701_device::device_start() { /* let's call the timer callback every second */ - if(clock() >= XTAL_32_768kHz) - machine().scheduler().timer_pulse(attotime::from_hz(clock() / XTAL_32_768kHz), FUNC(rtc_inc_callback), 0, (void *)this); + machine().scheduler().timer_pulse(attotime::from_hz(clock() / XTAL_32_768kHz), FUNC(rtc_inc_callback), 0, (void *)this); system_time systime; machine().base_datetime(systime); diff --git a/src/emu/machine/rtc9701.h b/src/emu/machine/rtc9701.h index 9595786a63a..4d633167e66 100644 --- a/src/emu/machine/rtc9701.h +++ b/src/emu/machine/rtc9701.h @@ -17,8 +17,8 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_RTC9701_ADD(_tag, _clock ) \ - MCFG_DEVICE_ADD(_tag, rtc9701, _clock) \ +#define MCFG_RTC9701_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, rtc9701, XTAL_32_768kHz) \ //************************************************************************** diff --git a/src/emu/machine/v3021.c b/src/emu/machine/v3021.c index 9ab6c2b05e7..364aad53646 100644 --- a/src/emu/machine/v3021.c +++ b/src/emu/machine/v3021.c @@ -91,8 +91,7 @@ bool v3021_device::device_validity_check(emu_options &options, const game_driver void v3021_device::device_start() { /* let's call the timer callback every second */ - if(clock() >= XTAL_32_768kHz) - machine().scheduler().timer_pulse(attotime::from_hz(clock() / XTAL_32_768kHz), FUNC(rtc_inc_callback), 0, (void *)this); + machine().scheduler().timer_pulse(attotime::from_hz(clock() / XTAL_32_768kHz), FUNC(rtc_inc_callback), 0, (void *)this); system_time systime; machine().base_datetime(systime); diff --git a/src/emu/machine/v3021.h b/src/emu/machine/v3021.h index dcb401cc9e0..3ba3f06581b 100644 --- a/src/emu/machine/v3021.h +++ b/src/emu/machine/v3021.h @@ -19,8 +19,8 @@ // INTERFACE CONFIGURATION MACROS //************************************************************************** -#define MCFG_V3021_ADD(_tag, _clock ) \ - MCFG_DEVICE_ADD(_tag, v3021, _clock) \ +#define MCFG_V3021_ADD(_tag) \ + MCFG_DEVICE_ADD(_tag, v3021, XTAL_32_768kHz) \ //************************************************************************** diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c index bd39c437838..7f967417df7 100644 --- a/src/mame/drivers/fortecar.c +++ b/src/mame/drivers/fortecar.c @@ -480,7 +480,7 @@ static MACHINE_CONFIG_START( fortecar, fortecar_state ) MCFG_EEPROM_DEFAULT_VALUE(0) MCFG_PPI8255_ADD("fcppi0", ppi0intf) - MCFG_V3021_ADD("rtc", XTAL_32_768kHz) + MCFG_V3021_ADD("rtc") MCFG_GFXDECODE(fortecar) MCFG_PALETTE_LENGTH(0x200) diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index 9b9a356b708..3fe3752bd40 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -1322,7 +1322,7 @@ MACHINE_CONFIG_FRAGMENT( pgmbase ) MCFG_MACHINE_RESET( pgm ) MCFG_NVRAM_ADD_0FILL("sram") - MCFG_V3021_ADD("rtc", XTAL_32_768kHz) + MCFG_V3021_ADD("rtc") /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1495,7 +1495,7 @@ static MACHINE_CONFIG_START( cavepgm, cavepgm_state ) MCFG_MACHINE_RESET( pgm ) MCFG_NVRAM_ADD_0FILL("sram") - MCFG_V3021_ADD("rtc", XTAL_32_768kHz) + MCFG_V3021_ADD("rtc") /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER)