From 86ebf17a2360de740219cf9a5441cb72629c5a1d Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Sun, 7 Feb 2021 21:49:25 +0800 Subject: [PATCH] =?UTF-8?q?localtim=E6=94=B9=E4=B8=BAgmtime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/apollo2/board/rtc.c | 2 +- bsp/at32/Libraries/rt_drivers/drv_rtc.c | 2 +- bsp/essemi/es32f0271/drivers/drv_rtc.c | 2 +- bsp/essemi/es32f0334/drivers/drv_rtc.c | 2 +- bsp/essemi/es32f0654/drivers/drv_rtc.c | 2 +- bsp/essemi/es32f369x/drivers/drv_rtc.c | 2 +- bsp/hc32f4a0/drivers/drv_rtc.c | 2 +- bsp/imxrt/libraries/drivers/drv_rtc.c | 2 +- bsp/lpc55sxx/Libraries/drivers/drv_rtc.c | 2 +- bsp/ls1cdev/drivers/drv_rtc.c | 2 +- bsp/ls2kdev/drivers/drv_rtc.c | 2 +- bsp/nuvoton/libraries/m480/rtt_port/drv_rtc.c | 2 +- .../libraries/nuc980/rtt_port/drv_rtc.c | 2 +- bsp/raspberry-pi/raspi3-32/driver/drv_rtc.c | 2 +- bsp/raspberry-pi/raspi3-64/driver/drv_rtc.c | 2 +- bsp/stm32f20x/Drivers/drv_rtc.c | 2 +- bsp/swm320-lq100/drivers/drv_rtc.c | 2 +- bsp/w60x/drivers/drv_rtc.c | 4 ++-- components/dfs/filesystems/elmfat/dfs_elm.c | 2 +- libcpu/arm/s3c24x0/rtc.c | 18 +++++++++--------- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/bsp/apollo2/board/rtc.c b/bsp/apollo2/board/rtc.c index 3d2e1c8e7a..dbae7cf3c1 100644 --- a/bsp/apollo2/board/rtc.c +++ b/bsp/apollo2/board/rtc.c @@ -85,7 +85,7 @@ static rt_err_t rt_rtc_control(rt_device_t dev, int cmd, void *args) case RT_DEVICE_CTRL_RTC_SET_TIME: time = (time_t *)args; - time_new = localtime(time); + time_new = gmtime(time); hal_time.ui32Hour = time_new->tm_hour; hal_time.ui32Minute = time_new->tm_min; diff --git a/bsp/at32/Libraries/rt_drivers/drv_rtc.c b/bsp/at32/Libraries/rt_drivers/drv_rtc.c index 3ee2a61ec6..bd4d89a9ed 100644 --- a/bsp/at32/Libraries/rt_drivers/drv_rtc.c +++ b/bsp/at32/Libraries/rt_drivers/drv_rtc.c @@ -57,7 +57,7 @@ static rt_err_t set_rtc_time_stamp(time_t time_stamp) struct tm *p_tm; - p_tm = localtime(&time_stamp); + p_tm = gmtime(&time_stamp); if (p_tm->tm_year < 100) { return -RT_ERROR; diff --git a/bsp/essemi/es32f0271/drivers/drv_rtc.c b/bsp/essemi/es32f0271/drivers/drv_rtc.c index fa1582cb0f..3e2cdd17a3 100644 --- a/bsp/essemi/es32f0271/drivers/drv_rtc.c +++ b/bsp/essemi/es32f0271/drivers/drv_rtc.c @@ -104,7 +104,7 @@ static rt_err_t es32f0_rtc_control(rt_device_t dev, int cmd, void *args) { rt_enter_critical(); /* converts calendar time time into local time. */ - pNow = localtime((const time_t *)args); + pNow = gmtime((const time_t *)args); /* copy the statically located variable */ memcpy(&time_temp, pNow, sizeof(struct tm)); /* unlock scheduler. */ diff --git a/bsp/essemi/es32f0334/drivers/drv_rtc.c b/bsp/essemi/es32f0334/drivers/drv_rtc.c index 9cde99c8c6..9471368454 100644 --- a/bsp/essemi/es32f0334/drivers/drv_rtc.c +++ b/bsp/essemi/es32f0334/drivers/drv_rtc.c @@ -67,7 +67,7 @@ static rt_err_t es32f0_rtc_control(rt_device_t dev, int cmd, void *args) rt_enter_critical(); /* converts calendar time time into local time. */ - pNow = localtime((const time_t *)args); + pNow = gmtime((const time_t *)args); /* copy the statically located variable */ memcpy(&time_temp, pNow, sizeof(struct tm)); /* unlock scheduler. */ diff --git a/bsp/essemi/es32f0654/drivers/drv_rtc.c b/bsp/essemi/es32f0654/drivers/drv_rtc.c index 54f0d3294e..cab5b8b61b 100644 --- a/bsp/essemi/es32f0654/drivers/drv_rtc.c +++ b/bsp/essemi/es32f0654/drivers/drv_rtc.c @@ -67,7 +67,7 @@ static rt_err_t es32f0_rtc_control(rt_device_t dev, int cmd, void *args) rt_enter_critical(); /* converts calendar time time into local time. */ - pNow = localtime((const time_t *)args); + pNow = gmtime((const time_t *)args); /* copy the statically located variable */ memcpy(&time_temp, pNow, sizeof(struct tm)); /* unlock scheduler. */ diff --git a/bsp/essemi/es32f369x/drivers/drv_rtc.c b/bsp/essemi/es32f369x/drivers/drv_rtc.c index 54f0d3294e..cab5b8b61b 100644 --- a/bsp/essemi/es32f369x/drivers/drv_rtc.c +++ b/bsp/essemi/es32f369x/drivers/drv_rtc.c @@ -67,7 +67,7 @@ static rt_err_t es32f0_rtc_control(rt_device_t dev, int cmd, void *args) rt_enter_critical(); /* converts calendar time time into local time. */ - pNow = localtime((const time_t *)args); + pNow = gmtime((const time_t *)args); /* copy the statically located variable */ memcpy(&time_temp, pNow, sizeof(struct tm)); /* unlock scheduler. */ diff --git a/bsp/hc32f4a0/drivers/drv_rtc.c b/bsp/hc32f4a0/drivers/drv_rtc.c index 65d09fd559..27e3a665df 100644 --- a/bsp/hc32f4a0/drivers/drv_rtc.c +++ b/bsp/hc32f4a0/drivers/drv_rtc.c @@ -45,7 +45,7 @@ static rt_err_t hc32_rtc_set_time_stamp(time_t time_stamp) stc_rtc_date_t stcRtcDate = {0}; struct tm *p_tm; - p_tm = localtime(&time_stamp); + p_tm = gmtime(&time_stamp); if (p_tm->tm_year < 100) { return -RT_ERROR; diff --git a/bsp/imxrt/libraries/drivers/drv_rtc.c b/bsp/imxrt/libraries/drivers/drv_rtc.c index 22a39ac37d..96ae1006fa 100644 --- a/bsp/imxrt/libraries/drivers/drv_rtc.c +++ b/bsp/imxrt/libraries/drivers/drv_rtc.c @@ -49,7 +49,7 @@ static int set_timestamp(time_t timestamp) struct tm *p_tm; snvs_hp_rtc_datetime_t rtcDate = {0}; - p_tm = localtime(×tamp); + p_tm = gmtime(×tamp); rtcDate.second = p_tm->tm_sec ; rtcDate.minute = p_tm->tm_min ; diff --git a/bsp/lpc55sxx/Libraries/drivers/drv_rtc.c b/bsp/lpc55sxx/Libraries/drivers/drv_rtc.c index 00361a153a..c277d82079 100644 --- a/bsp/lpc55sxx/Libraries/drivers/drv_rtc.c +++ b/bsp/lpc55sxx/Libraries/drivers/drv_rtc.c @@ -46,7 +46,7 @@ static int set_timestamp(time_t timestamp) struct tm *p_tm; rtc_datetime_t rtcDate; - p_tm = localtime(×tamp); + p_tm = gmtime(×tamp); rtcDate.second = p_tm->tm_sec ; rtcDate.minute = p_tm->tm_min ; diff --git a/bsp/ls1cdev/drivers/drv_rtc.c b/bsp/ls1cdev/drivers/drv_rtc.c index 40153dc971..ef1398fe47 100644 --- a/bsp/ls1cdev/drivers/drv_rtc.c +++ b/bsp/ls1cdev/drivers/drv_rtc.c @@ -53,7 +53,7 @@ static int set_timestamp(time_t timestamp) struct tm *p_tm; RTC_TimeTypeDef rtcDate; - p_tm = localtime(×tamp); + p_tm = gmtime(×tamp); rtcDate.Seconds= p_tm->tm_sec ; rtcDate.Minutes= p_tm->tm_min ; diff --git a/bsp/ls2kdev/drivers/drv_rtc.c b/bsp/ls2kdev/drivers/drv_rtc.c index 06ae120f82..3cea0288be 100644 --- a/bsp/ls2kdev/drivers/drv_rtc.c +++ b/bsp/ls2kdev/drivers/drv_rtc.c @@ -128,7 +128,7 @@ static rt_err_t rt_rtc_ioctl(rt_device_t dev, int cmd, void *args) hw_rtc = dev->user_data; t = (time_t *)args; - time = *localtime(t); + time = *gmtime(t); rtctm.sys_toyread0 = hw_rtc->sys_toyread0; rtctm.sys_toyread1 = hw_rtc->sys_toyread1; diff --git a/bsp/nuvoton/libraries/m480/rtt_port/drv_rtc.c b/bsp/nuvoton/libraries/m480/rtt_port/drv_rtc.c index 37459b6ad1..a80ac79627 100644 --- a/bsp/nuvoton/libraries/m480/rtt_port/drv_rtc.c +++ b/bsp/nuvoton/libraries/m480/rtt_port/drv_rtc.c @@ -232,7 +232,7 @@ static rt_err_t nu_rtc_control(rt_device_t dev, int cmd, void *args) case RT_DEVICE_CTRL_RTC_SET_TIME: time = (time_t *) args; - tm_in = localtime(time); + tm_in = gmtime(time); if (nu_rtc_is_date_valid(time) != RT_EOK) return RT_ERROR; diff --git a/bsp/nuvoton/libraries/nuc980/rtt_port/drv_rtc.c b/bsp/nuvoton/libraries/nuc980/rtt_port/drv_rtc.c index 49ad03e1b8..49418316d1 100644 --- a/bsp/nuvoton/libraries/nuc980/rtt_port/drv_rtc.c +++ b/bsp/nuvoton/libraries/nuc980/rtt_port/drv_rtc.c @@ -233,7 +233,7 @@ static rt_err_t nu_rtc_control(rt_device_t dev, int cmd, void *args) case RT_DEVICE_CTRL_RTC_SET_TIME: time = (time_t *) args; - tm_in = localtime(time); + tm_in = gmtime(time); if (nu_rtc_is_date_valid(time) != RT_EOK) return -(RT_ERROR); diff --git a/bsp/raspberry-pi/raspi3-32/driver/drv_rtc.c b/bsp/raspberry-pi/raspi3-32/driver/drv_rtc.c index f69788b318..147504bd16 100644 --- a/bsp/raspberry-pi/raspi3-32/driver/drv_rtc.c +++ b/bsp/raspberry-pi/raspi3-32/driver/drv_rtc.c @@ -194,7 +194,7 @@ static time_t raspi_get_timestamp(void) static int raspi_set_timestamp(time_t timestamp) { struct tm *tblock; - tblock = localtime(×tamp); + tblock = gmtime(×tamp); buf[0] = 0; buf[1] = tblock->tm_sec; buf[2] = tblock->tm_min; diff --git a/bsp/raspberry-pi/raspi3-64/driver/drv_rtc.c b/bsp/raspberry-pi/raspi3-64/driver/drv_rtc.c index 7383464513..18fd6474a2 100644 --- a/bsp/raspberry-pi/raspi3-64/driver/drv_rtc.c +++ b/bsp/raspberry-pi/raspi3-64/driver/drv_rtc.c @@ -41,7 +41,7 @@ static time_t raspi_get_timestamp(void) static int raspi_set_timestamp(time_t timestamp) { struct tm *tblock; - tblock = localtime(×tamp); + tblock = gmtime(×tamp); buf[0] = 0; buf[1] = tblock->tm_sec; buf[2] = tblock->tm_min; diff --git a/bsp/stm32f20x/Drivers/drv_rtc.c b/bsp/stm32f20x/Drivers/drv_rtc.c index 3c70a417d2..6078a15249 100644 --- a/bsp/stm32f20x/Drivers/drv_rtc.c +++ b/bsp/stm32f20x/Drivers/drv_rtc.c @@ -115,7 +115,7 @@ static rt_err_t rt_rtc_control(rt_device_t dev, int cmd, void *args) /* Change the current time */ //RTC_SetCounter(*time); - to = localtime(time); + to = gmtime(time); RTC_TimeStructure.RTC_Seconds = to->tm_sec; RTC_TimeStructure.RTC_Minutes = to->tm_min; RTC_TimeStructure.RTC_Hours = to->tm_hour; diff --git a/bsp/swm320-lq100/drivers/drv_rtc.c b/bsp/swm320-lq100/drivers/drv_rtc.c index 1ec7d02417..5219a5b013 100644 --- a/bsp/swm320-lq100/drivers/drv_rtc.c +++ b/bsp/swm320-lq100/drivers/drv_rtc.c @@ -97,7 +97,7 @@ static rt_err_t swm320_rtc_control(rt_device_t dev, int cmd, void *args) case RT_DEVICE_CTRL_RTC_SET_TIME: rt_enter_critical(); /* converts calendar time time into local time. */ - pNow = localtime((const time_t *)args); + pNow = gmtime((const time_t *)args); /* copy the statically located variable */ memcpy(&time_temp, pNow, sizeof(struct tm)); /* unlock scheduler. */ diff --git a/bsp/w60x/drivers/drv_rtc.c b/bsp/w60x/drivers/drv_rtc.c index 5fb87af355..fa0aee498c 100644 --- a/bsp/w60x/drivers/drv_rtc.c +++ b/bsp/w60x/drivers/drv_rtc.c @@ -52,7 +52,7 @@ static int wm_set_timestamp(time_t timestamp) struct tm *tblock; - tblock = localtime(×tamp); + tblock = gmtime(×tamp); ctrl2 = tls_reg_read32(HR_PMU_RTC_CTRL2); /* disable */ ctrl2 &= ~(1 << 16); @@ -84,7 +84,7 @@ static int wm_alarm_set_timestamp(struct rt_rtc_wkalarm *wkalarm) time_t timestamp = 0; timestamp = wm_get_timestamp(); - tblock = localtime(×tamp); + tblock = gmtime(×tamp); tls_irq_enable(PMU_RTC_INT); diff --git a/components/dfs/filesystems/elmfat/dfs_elm.c b/components/dfs/filesystems/elmfat/dfs_elm.c index 5f69b069bf..d8c38e96ae 100644 --- a/components/dfs/filesystems/elmfat/dfs_elm.c +++ b/components/dfs/filesystems/elmfat/dfs_elm.c @@ -956,7 +956,7 @@ DWORD get_fattime(void) /* lock scheduler. */ rt_enter_critical(); /* converts calendar time time into local time. */ - p_tm = localtime(&now); + p_tm = gmtime(&now); /* copy the statically located variable */ memcpy(&tm_now, p_tm, sizeof(struct tm)); /* unlock scheduler. */ diff --git a/libcpu/arm/s3c24x0/rtc.c b/libcpu/arm/s3c24x0/rtc.c index 3b4c479001..73de840b37 100644 --- a/libcpu/arm/s3c24x0/rtc.c +++ b/libcpu/arm/s3c24x0/rtc.c @@ -125,27 +125,27 @@ static rt_size_t rtc_read(rt_device_t dev, rt_off_t pos, void* buffer, rt_size_t static rt_err_t rtc_control(rt_device_t dev, int cmd, void *args) { - struct tm tm, *tm_ptr; + struct tm tm, *tm_ptr; time_t *time; - RT_ASSERT(dev != RT_NULL); + RT_ASSERT(dev != RT_NULL); - time = (time_t *)args; - switch (cmd) - { + time = (time_t *)args; + switch (cmd) + { case RT_DEVICE_CTRL_RTC_GET_TIME: /* read device */ rt_hw_rtc_get(&tm); - *((rt_time_t *)args) = mktime(&tm); + *((rt_time_t *)args) = timegm(&tm); break; case RT_DEVICE_CTRL_RTC_SET_TIME: - tm_ptr = localtime(time); /* write device */ + tm_ptr = gmtime(time); rt_hw_rtc_set(tm_ptr); break; - } + } - return RT_EOK; + return RT_EOK; } void rt_hw_rtc_init(void)