From 06ddec4ee30a45bef83df0d60cd23fbae5394e44 Mon Sep 17 00:00:00 2001 From: Brett Gordon Date: Sun, 8 Apr 2018 19:07:50 -0400 Subject: [PATCH] time: change references to rtc_secs to platform_rtc_secs rtc_secs() has no prototype anymore, and errant results from an implied call was speeding my clock up by 51 secs every RTC_INTERVAL. change everyone over to new api. --- Kernel/dev/ds1302.c | 2 +- Kernel/dev/ds1302.h | 2 +- Kernel/dev/z80pack/devrtc.c | 2 +- Kernel/platform-coco3/dwtime.c | 2 +- Kernel/platform-msx2/devrtc.c | 2 +- Kernel/platform-nc100/main.c | 2 +- Kernel/platform-trs80/main.c | 2 +- Kernel/platform-ubee/main.c | 2 +- Kernel/timer.c | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Kernel/dev/ds1302.c b/Kernel/dev/ds1302.c index b4009872..35c18135 100644 --- a/Kernel/dev/ds1302.c +++ b/Kernel/dev/ds1302.c @@ -77,7 +77,7 @@ void ds1302_read_clock(uint8_t *buffer, uint8_t length) } /* define CONFIG_RTC in platform's config.h to hook this into timer.c */ -uint8_t rtc_secs(void) +uint8_t platform_rtc_secs(void) { uint8_t buffer; ds1302_read_clock(&buffer, 1); /* read out only the seconds value */ diff --git a/Kernel/dev/ds1302.h b/Kernel/dev/ds1302.h index 94f3f835..ea769501 100644 --- a/Kernel/dev/ds1302.h +++ b/Kernel/dev/ds1302.h @@ -3,7 +3,7 @@ /* public interface */ void ds1302_init(void); -uint8_t rtc_secs(void); +uint8_t platform_rtc_secs(void); #ifdef _DS1302_PRIVATE /* consult the DS1302 datasheet for data format; diff --git a/Kernel/dev/z80pack/devrtc.c b/Kernel/dev/z80pack/devrtc.c index e85a6f1c..24f9069a 100644 --- a/Kernel/dev/z80pack/devrtc.c +++ b/Kernel/dev/z80pack/devrtc.c @@ -16,7 +16,7 @@ void zrtc_init(void) inittod(); } -uint8_t rtc_secs(void) +uint8_t platform_rtc_secs(void) { return clkd; } diff --git a/Kernel/platform-coco3/dwtime.c b/Kernel/platform-coco3/dwtime.c index b55240be..6159fe98 100644 --- a/Kernel/platform-coco3/dwtime.c +++ b/Kernel/platform-coco3/dwtime.c @@ -105,7 +105,7 @@ DISC int dwtime_init( void ) /* Called every every so often from updatetod from timer.c */ -uint16_t rtc_secs(void) +uint8_t platform_rtc_secs(void) { uint8_t t[6]; /* poll dw time and return it */ diff --git a/Kernel/platform-msx2/devrtc.c b/Kernel/platform-msx2/devrtc.c index f9777cfd..d2e3f7ca 100755 --- a/Kernel/platform-msx2/devrtc.c +++ b/Kernel/platform-msx2/devrtc.c @@ -15,7 +15,7 @@ void rp5c01_write_reg(uint8_t reg, uint8_t value) RTC_DATA = value; } -uint8_t rtc_secs(void) +uint8_t platform_rtc_secs(void) { return rp5c01_rtc_secs(); } diff --git a/Kernel/platform-nc100/main.c b/Kernel/platform-nc100/main.c index ac490836..7f8a607a 100644 --- a/Kernel/platform-nc100/main.c +++ b/Kernel/platform-nc100/main.c @@ -49,7 +49,7 @@ __sfr __at 0xD0 rtc_secl; __sfr __at 0xD1 rtc_sech; __sfr __at 0xDD rtc_page; -uint8_t rtc_secs(void) +uint8_t platform_rtc_secs(void) { uint8_t sl, rv; /* Make sure we are seeing the seconds not NVRAM */ diff --git a/Kernel/platform-trs80/main.c b/Kernel/platform-trs80/main.c index 84b414e4..013dd1d5 100644 --- a/Kernel/platform-trs80/main.c +++ b/Kernel/platform-trs80/main.c @@ -71,7 +71,7 @@ void platform_discard(void) __sfr __at 0xB0 rtc_secl; __sfr __at 0xB1 rtc_sech; -uint8_t rtc_secs(void) +uint8_t platform_rtc_secs(void) { uint8_t sl, rv; /* BCD encoded */ diff --git a/Kernel/platform-ubee/main.c b/Kernel/platform-ubee/main.c index 93fb5984..e9bff507 100644 --- a/Kernel/platform-ubee/main.c +++ b/Kernel/platform-ubee/main.c @@ -24,7 +24,7 @@ __sfr __at 0x02 pia0b; __sfr __at 0x04 cmos_reg; __sfr __at 0x07 cmos_read; -uint8_t rtc_secs(void) +uint8_t platform_rtc_secs(void) { cmos_reg = 0x00; return cmos_read; diff --git a/Kernel/timer.c b/Kernel/timer.c index 4308f3f6..7dbb2355 100644 --- a/Kernel/timer.c +++ b/Kernel/timer.c @@ -99,7 +99,7 @@ void updatetod(void) tod_deci = 0; #endif - rtcnew = rtc_secs(); /* platform function */ + rtcnew = platform_rtc_secs(); /* platform function */ if (rtcnew == rtcsec) return; @@ -115,7 +115,7 @@ addtod: void inittod(void) { - rtcsec = rtc_secs(); + rtcsec = platform_rtc_secs(); } #endif /* NO_RTC */ -- 2.34.1