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

@@ -29,9 +29,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
 
@@ -100,7 +102,6 @@ void RTC_Alarm_IRQHandler(void)
         LOG_D("RTC Alarm0 triggered");
     }
 
-    /* Check if alarm1 interrupt occurred */
     if (rtc_flag_get(RTC_FLAG_ALARM1) != RESET)
     {
         /* Clear alarm flag */
@@ -118,33 +119,8 @@ void RTC_Alarm_IRQHandler(void)
         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)
@@ -183,40 +159,31 @@ static rt_err_t gd_rtc_init(void)
 
 #if defined (RTC_CLOCK_SOURCE_LXTAL)
     /* Use LSE (32.768kHz) as RTC clock source */
+    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 */
+    rcu_osci_on(RCU_IRC32K);
     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;
-        }
+        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 */
+    rcu_osci_on(RCU_IRC40K);
     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;
-        }
+        LOG_E("LSI oscillator failed to stabilize");
+        return -RT_ERROR;
     }
     rcu_rtc_clock_config(RCU_RTCSRC_IRC40K);
     LOG_D("RTC clock source: LSI (40kHz)");
@@ -243,11 +210,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;
 }
@@ -412,7 +374,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 +387,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 +422,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",