From 020bb4d92cd259208b006f704d9975004a9635a8 Mon Sep 17 00:00:00 2001 From: waltje Date: Sun, 19 Nov 2017 21:58:24 -0500 Subject: [PATCH] Fixed type (not typo) oopsies. --- src/nvr.c | 55 ++++++++++++++++++++++++++++--------------------------- src/nvr.h | 14 ++++++-------- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/nvr.c b/src/nvr.c index 5b0111f04..692e0e66b 100644 --- a/src/nvr.c +++ b/src/nvr.c @@ -186,10 +186,9 @@ * (DS12887A) which implemented a "century" register to be * compatible with Y2K. * - * Version: @(#)nvr.c 1.0.12 2017/11/01 + * Version: @(#)nvr.c 1.0.13 2017/11/19 * - * Authors: Sarah Walker, - * Miran Grca, + * Authors: Miran Grca, * Mahod, * Fred N. van Kempen, * @@ -212,25 +211,25 @@ #include "nvr.h" -int64_t enable_sync; /* configuration variable: enable time sync */ -int64_t nvr_dosave; /* NVR is dirty, needs saved */ +int enable_sync; /* configuration variable: enable time sync */ +int nvr_dosave; /* NVR is dirty, needs saved */ static nvr_t *saved_nvr = NULL; static int8_t days_in_month[12] = { 31,28,31,30,31,30,31,31,30,31,30,31 }; static struct { - int64_t sec; - int64_t min; - int64_t hour; - int64_t mday; - int64_t mon; - int64_t year; + int16_t year; + int8_t sec; + int8_t min; + int8_t hour; + int8_t mday; + int8_t mon; } intclk; /* the internal clock */ /* Determine whether or not the year is leap. */ -static int -is_leap(int64_t year) +static int8_t +is_leap(int8_t year) { if (year % 400 == 0) return(1); if (year % 100 == 0) return(0); @@ -241,8 +240,8 @@ is_leap(int64_t year) /* Determine the days in the current month. */ -static int -get_days(int64_t month, int64_t year) +static int8_t +get_days(int8_t month, int8_t year) { if (month != 2) return(days_in_month[month - 1]); @@ -329,7 +328,7 @@ rtc_getnvr(uint8_t *nvr, struct tm *tm) static void rtc_setnvr(uint8_t *nvr) { - int64_t temp; + int8_t temp; if (nvr[RTC_REGB] & REGB_DM) { intclk.sec = nvr[RTC_SECONDS]; @@ -409,8 +408,8 @@ onesec_timer(void *priv) /* Check if the current time matches a set alarm time. */ -static int -check_alarm(nvr_t *nvr, int64_t addr) +static int8_t +check_alarm(nvr_t *nvr, int8_t addr) { #define ALARM_DONTCARE 0xc0 return((nvr->regs[addr+1] == nvr->regs[addr]) || @@ -424,7 +423,8 @@ update_timer(void *priv) { nvr_t *nvr = (nvr_t *)priv; struct tm tm; - int64_t dom, mon, yr, cent, sum, wd; + int8_t dom, mon, sum, wd; + int16_t cent, yr; if (! (nvr->regs[RTC_REGB] & REGB_SET)) { /* Get the current time from the internal clock. */ @@ -507,7 +507,8 @@ ticker_timer(void *priv) static void nvr_write(nvr_t *nvr, uint16_t reg, uint8_t val) { - int64_t c, old; + uint8_t old; + int64_t c; old = nvr->regs[reg]; switch(reg) { @@ -647,19 +648,19 @@ nvr_recalc(void) /* * Load an NVR from file. * - * This function does two things, really. It clear and initializes + * This function does two things, really. It clears and initializes * the RTC and NVRAM areas, sets up defaults for the RTC part, and * then attempts to load data from a saved file. * - * Either way, after that loading, it will continue to configure - * the local RTC to operate, so it can update either the local RTC, - * and/or the supplied by a client. + * Either way, after that, it will continue to configure the local + * RTC to operate, so it can update either the local RTC, and/or + * the one supplied by a client. */ -int64_t +int nvr_load(void) { - FILE *f; int64_t c; + FILE *f; /* Make sure we have been initialized. */ if (saved_nvr == NULL) return(0); @@ -709,7 +710,7 @@ nvr_load(void) /* Save the current NVR to a file. */ -int64_t +int nvr_save(void) { FILE *f; diff --git a/src/nvr.h b/src/nvr.h index ad163fec0..86999d637 100644 --- a/src/nvr.h +++ b/src/nvr.h @@ -8,14 +8,12 @@ * * Definitions for a defacto-standard RTC/NVRAM device. * - * Version: @(#)nvr.h 1.0.3 2017/10/02 + * Version: @(#)nvr.h 1.0.4 2017/11/19 * - * Authors: Sarah Walker, - * Miran Grca, + * Authors: Miran Grca, * Mahod, * Fred N. van Kempen, * - * Copyright 2008-2017 Sarah Walker. * Copyright 2016-2017 Miran Grca. * Copyright 2016-2017 Mahod. * Copyright 2017 Fred N. van Kempen. @@ -102,13 +100,13 @@ typedef struct _nvr_ { } nvr_t; -extern int64_t enable_sync; -extern int64_t nvr_dosave; +extern int enable_sync; +extern int nvr_dosave; extern void nvr_init(nvr_t *); -extern int64_t nvr_load(void); -extern int64_t nvr_save(void); +extern int nvr_load(void); +extern int nvr_save(void); extern void nvr_recalc(void); extern wchar_t *nvr_path(wchar_t *str);