fix[gd32][rtc]: Fix the initialization logic of the RTC clock and the issue of default triggering of the alarm interrupt.

Author: kurisaW

bsp/gd32/arm/libraries/gd32_drivers/drv_rtc.c

@@ -13,6 +13,7 @@
 #include <board.h>
 #include <rtdevice.h>
 #include <rthw.h>
+#include <sys/time.h>
 
 #define DBG_TAG             "drv.rtc"
 #define DBG_LVL             DBG_INFO
@@ -29,9 +30,11 @@
 #elif defined(BSP_USING_ALARM0)
     #define BSP_ALARM_FLAG         RTC_FLAG_ALARM0
     #define BSP_RTC_ALARM          RTC_ALARM0
+    #define BSP_RTC_INT_ALARM      RTC_INT_ALARM0
 #elif defined(BSP_USING_ALARM1)
     #define BSP_ALARM_FLAG         RTC_FLAG_ALARM1
     #define BSP_RTC_ALARM          RTC_ALARM1
+    #define BSP_RTC_INT_ALARM      RTC_INT_ALARM1
 #endif
 #endif
 
@@ -87,64 +90,32 @@ void RTC_Alarm_IRQHandler(void)
     {
         /* Clear alarm flag */
         rtc_flag_clear(RTC_FLAG_ALARM0);
-
-        /* Clear EXTI line 17 flag */
         exti_flag_clear(EXTI_17);
 
         /* Notify RTC framework about alarm event */
         if (g_rtc_device != RT_NULL)
         {
             rt_alarm_update(g_rtc_device, 1);
         }
-
         LOG_D("RTC Alarm0 triggered");
     }
 
-    /* Check if alarm1 interrupt occurred */
     if (rtc_flag_get(RTC_FLAG_ALARM1) != RESET)
     {
         /* Clear alarm flag */
         rtc_flag_clear(RTC_FLAG_ALARM1);
-
-        /* Clear EXTI line 17 flag */
         exti_flag_clear(EXTI_17);
 
         /* Notify RTC framework about alarm event */
         if (g_rtc_device != RT_NULL)
         {
             rt_alarm_update(g_rtc_device, 1);
         }
-
         LOG_D("RTC Alarm1 triggered");
     }
 
-
     rt_interrupt_leave();
 }
-
-/**
- * @brief Initialize RTC alarm interrupt
- */
-static void rtc_alarm_interrupt_init(void)
-{
-    /* Clear any pending alarm flag first */
-    rtc_flag_clear(RTC_FLAG_ALARM0);
-    rtc_flag_clear(RTC_FLAG_ALARM1);
-
-    /* Clear EXTI line 17 flag */
-    exti_flag_clear(EXTI_17);
-
-    /* Configure EXTI line 17 for RTC alarm interrupt */
-    exti_init(EXTI_17, EXTI_INTERRUPT, EXTI_TRIG_RISING);
-
-    /* Enable RTC alarm interrupt */
-    rtc_interrupt_enable(RTC_INT_ALARM0);
-
-    /* Enable RTC Alarm global interrupt in NVIC */
-    nvic_irq_enable(RTC_Alarm_IRQn, 0, 0);
-
-    LOG_D("RTC alarm interrupt initialized with EXTI configuration");
-}
 #endif /* RT_USING_ALARM */
 
 static rt_err_t gd_rtc_init(void)
@@ -181,48 +152,18 @@ static rt_err_t gd_rtc_init(void)
 #endif
     }
 
-#if defined (RTC_CLOCK_SOURCE_LXTAL)
     /* Use LSE (32.768kHz) as RTC clock source */
+#define PRESCALER_S     0xFF
+#define PRESCALER_A     0x7F
+
+    rcu_osci_on(RCU_LXTAL);
     if (rcu_osci_stab_wait(RCU_LXTAL) != SUCCESS)
     {
-        rcu_osci_on(RCU_LXTAL);
-        if (rcu_osci_stab_wait(RCU_LXTAL) != SUCCESS)
-        {
-            LOG_E("LSE oscillator failed to stabilize");
-            return -RT_ERROR;
-        }
+        LOG_E("LSE oscillator failed to stabilize");
+        return -RT_ERROR;
     }
     rcu_rtc_clock_config(RCU_RTCSRC_LXTAL);
     LOG_D("RTC clock source: LSE (32.768kHz)");
-#elif defined(RTC_CLOCK_SOURCE_IRC32K)
-    /* Use LSI (40kHz) as RTC clock source */
-    if (rcu_osci_stab_wait(RCU_IRC32K) != SUCCESS)
-    {
-        rcu_osci_on(RCU_IRC32K);
-        if (rcu_osci_stab_wait(RCU_IRC32K) != SUCCESS)
-        {
-            LOG_E("LSI oscillator failed to stabilize");
-            return -RT_ERROR;
-        }
-    }
-    rcu_rtc_clock_config(RCU_RTCSRC_IRC32K);
-    LOG_D("RTC clock source: LSI (32kHz)");
-#elif defined(RTC_CLOCK_SOURCE_IRC40K)
-    /* Use LSI (40kHz) as RTC clock source */
-    if (rcu_osci_stab_wait(RCU_IRC40K) != SUCCESS)
-    {
-        rcu_osci_on(RCU_IRC40K);
-        if (rcu_osci_stab_wait(RCU_IRC40K) != SUCCESS)
-        {
-            LOG_E("LSI oscillator failed to stabilize");
-            return -RT_ERROR;
-        }
-    }
-    rcu_rtc_clock_config(RCU_RTCSRC_IRC40K);
-    LOG_D("RTC clock source: LSI (40kHz)");
-#else
-    #error "Please defined RTC clock source (RTC_CLOCK_SOURCE_LXTAL | RTC_CLOCK_SOURCE_IRC32K | RCU_RTCSRC_IRC40K)"
-#endif
 
     /* Wait for RTC registers synchronization */
     if (rtc_register_sync_wait() != SUCCESS)
@@ -243,11 +184,6 @@ static rt_err_t gd_rtc_init(void)
         LOG_D("RTC set to default time: 2024-01-01 00:00:00");
     }
 
-#ifdef RT_USING_ALARM
-    /* Initialize alarm interrupt */
-    rtc_alarm_interrupt_init();
-#endif
-
     LOG_D("RTC initialization successful");
     return RT_EOK;
 }
@@ -279,10 +215,11 @@ static time_t get_rtc_timestamp(void)
     tm_new.tm_wday = (rtc_wday == 7) ? 0 : rtc_wday; /* Sunday conversion */
 
     /* Calculate day of year */
-    tm_new.tm_yday = 0; /* Will be calculated by mktime */
+    tm_new.tm_yday = 0; /* Will be calculated by timegm */
     tm_new.tm_isdst = 0; /* No daylight saving */
 
-    return mktime(&tm_new);
+    /* Use timegm instead of mktime to avoid timezone issues */
+    return timegm(&tm_new);
 }
 
 static rt_err_t gd_get_secs(time_t *sec)
@@ -300,43 +237,35 @@ static rt_err_t gd_get_secs(time_t *sec)
 
 static rt_err_t set_rtc_timestamp(time_t time_stamp)
 {
-    struct tm *p_tm;
+    struct tm now;
     rtc_parameter_struct rtc_init_struct;
     ErrStatus status;
 
-    p_tm = gmtime(&time_stamp);
-    if (p_tm == RT_NULL)
-    {
-        LOG_E("Invalid timestamp");
-        return -RT_ERROR;
-    }
+    /* Use gmtime_r for thread safety */
+    gmtime_r(&time_stamp, &now);
 
-    /* GD32 RTC uses year starting from 2000; tm_year is years since 1900 */
-    if (p_tm->tm_year < 100)
+    if (now.tm_year < 100)
     {
         LOG_E("Year must be >= 2000");
         return -RT_ERROR;
     }
 
-    /* Initialize RTC parameter structure */
-    rtc_init(&rtc_init_struct);
-
     /* Convert to BCD format */
-    rtc_init_struct.rtc_year = bin_to_bcd(p_tm->tm_year - 100); /* RTC year: 0-99 (2000-2099) */
-    rtc_init_struct.rtc_month = bin_to_bcd(p_tm->tm_mon + 1);   /* RTC month: 1-12 */
-    rtc_init_struct.rtc_date = bin_to_bcd(p_tm->tm_mday);
+    rtc_init_struct.rtc_year = bin_to_bcd(now.tm_year - 100); /* RTC year: 0-99 (2000-2099) */
+    rtc_init_struct.rtc_month = bin_to_bcd(now.tm_mon + 1);   /* RTC month: 1-12 */
+    rtc_init_struct.rtc_date = bin_to_bcd(now.tm_mday);
 
     /* Convert weekday: tm_wday 0-6 (Sun-Sat) to RTC 1-7 (Mon-Sun) */
-    rtc_init_struct.rtc_day_of_week = bin_to_bcd(p_tm->tm_wday == 0 ? 7 : p_tm->tm_wday);
+    rtc_init_struct.rtc_day_of_week = bin_to_bcd(now.tm_wday == 0 ? 7 : now.tm_wday);
 
-    rtc_init_struct.rtc_hour = bin_to_bcd(p_tm->tm_hour);
-    rtc_init_struct.rtc_minute = bin_to_bcd(p_tm->tm_min);
-    rtc_init_struct.rtc_second = bin_to_bcd(p_tm->tm_sec);
+    rtc_init_struct.rtc_hour = bin_to_bcd(now.tm_hour);
+    rtc_init_struct.rtc_minute = bin_to_bcd(now.tm_min);
+    rtc_init_struct.rtc_second = bin_to_bcd(now.tm_sec);
     rtc_init_struct.rtc_display_format = RTC_24HOUR;
 
-    /* Use default prescaler values for 32.768kHz or 40kHz clock */
-    rtc_init_struct.factor_asyn = 0x7F;
-    rtc_init_struct.factor_syn = 0xFF;
+    /* Use default prescaler values */
+    rtc_init_struct.factor_asyn = PRESCALER_A;
+    rtc_init_struct.factor_syn = PRESCALER_S;
     rtc_init_struct.am_pm = RTC_AM;
 
     status = rtc_init(&rtc_init_struct);
@@ -353,7 +282,7 @@ static rt_err_t set_rtc_timestamp(time_t time_stamp)
         return -RT_ERROR;
     }
 
-    LOG_D("RTC time set successfully");
+    LOG_D("RTC time set successfully: %lu", time_stamp);
     return RT_EOK;
 }
 
@@ -367,11 +296,11 @@ static rt_err_t gd_set_secs(time_t *sec)
     rt_err_t result = set_rtc_timestamp(*sec);
     if (result == RT_EOK)
     {
-        LOG_D("RTC: set timestamp %lu", *sec);
+        LOG_D("RTC: set rtc_time %lu", *sec);
     }
     else
     {
-        LOG_E("RTC: set timestamp failed %lu", *sec);
+        LOG_E("RTC: set rtc_time failed %lu", *sec);
     }
 
     return result;
@@ -385,8 +314,9 @@ static rt_err_t gd_get_alarm(struct rt_rtc_wkalarm *alarm)
         return -RT_EINVAL;
     }
 
-    /* GD32H7xx supports two alarms, we use ALARM0 by default */
     rtc_alarm_struct rtc_alarm;
+
+    /* Get current alarm configuration */
     rtc_alarm_get(BSP_RTC_ALARM, &rtc_alarm);
 
     /* Convert RTC alarm to RT-Thread alarm format */
@@ -395,7 +325,7 @@ static rt_err_t gd_get_alarm(struct rt_rtc_wkalarm *alarm)
     alarm->tm_sec = bcd_to_bin(rtc_alarm.alarm_second);
 
     /* Check if alarm is enabled */
-    alarm->enable = (RTC_CTL & RTC_CTL_ALRM0EN) ? 1 : 0;
+    alarm->enable = (RTC_CTL & (BSP_RTC_ALARM == RTC_ALARM0 ? RTC_CTL_ALRM0EN : RTC_CTL_ALRM1EN)) ? 1 : 0;
 
     LOG_D("RTC: get alarm %02d:%02d:%02d, enable: %d",
           alarm->tm_hour, alarm->tm_min, alarm->tm_sec, alarm->enable);
@@ -412,7 +342,7 @@ static rt_err_t gd_set_alarm(struct rt_rtc_wkalarm *alarm)
 
     rtc_alarm_struct rtc_alarm;
 
-    rtc_alarm_disable(RTC_ALARM0);
+    rtc_alarm_disable(BSP_RTC_ALARM);
     /* Initialize alarm structure */
     rtc_alarm.alarm_mask = RTC_ALARM_ALL_MASK;
     rtc_alarm.weekday_or_date = RTC_ALARM_DATE_SELECTED;
@@ -425,28 +355,33 @@ static rt_err_t gd_set_alarm(struct rt_rtc_wkalarm *alarm)
     /* Configure alarm */
     rtc_alarm_config(BSP_RTC_ALARM, &rtc_alarm);
 
-    rtc_interrupt_enable(RTC_INT_ALARM0);
-    rtc_alarm_enable(BSP_RTC_ALARM);
-
     /* Enable or disable alarm */
     if (alarm->enable)
     {
         /* Clear any pending alarm flag first */
         rtc_flag_clear(BSP_ALARM_FLAG);
+
+        /* Clear EXTI line 17 flag */
         exti_flag_clear(EXTI_17);
 
-        /* Enable alarm interrupt */
-        rtc_interrupt_enable(RTC_INT_ALARM0);
+        /* Enable RTC alarm interrupt */
+        rtc_interrupt_enable(BSP_RTC_INT_ALARM);
 
         /* Enable alarm */
         rtc_alarm_enable(BSP_RTC_ALARM);
 
-        LOG_D("RTC Alarm0 enabled with interrupt");
+        /* Configure EXTI line 17 for RTC alarm interrupt */
+        exti_init(EXTI_17, EXTI_INTERRUPT, EXTI_TRIG_RISING);
+
+        /* Enable RTC Alarm global interrupt in NVIC */
+        nvic_irq_enable(RTC_Alarm_IRQn, 0, 0);
+
+        LOG_D("RTC Alarm enabled with interrupt");
     }
     else
     {
         /* Disable alarm interrupt first */
-        rtc_interrupt_disable(RTC_INT_ALARM0);
+        rtc_interrupt_disable(BSP_RTC_INT_ALARM);
 
         /* Disable alarm */
         rtc_alarm_disable(BSP_RTC_ALARM);
@@ -455,7 +390,7 @@ static rt_err_t gd_set_alarm(struct rt_rtc_wkalarm *alarm)
         rtc_flag_clear(BSP_ALARM_FLAG);
         exti_flag_clear(EXTI_17);
 
-        LOG_D("RTC Alarm0 disabled");
+        LOG_D("RTC Alarm disabled");
     }
 
     LOG_D("RTC: set alarm %02d:%02d:%02d, enable: %d",