Make name of RTC ALARM interrupt common on STM32 F1,2,4

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4954 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 10 insertions, 10 deletions

diff --git a/nuttx/arch/arm/include/stm32/stm32f10xxx_irq.h b/nuttx/arch/arm/include/stm32/stm32f10xxx_irq.h
index 2b891b06e..04344a101 100644
--- a/nuttx/arch/arm/include/stm32/stm32f10xxx_irq.h
+++ b/nuttx/arch/arm/include/stm32/stm32f10xxx_irq.h
@@ -102,7 +102,7 @@
 #  define STM32_IRQ_USART2      (54) /* 38: USART2 global interrupt */
 #  define STM32_IRQ_USART3      (55) /* 39: USART3 global interrupt */
 #  define STM32_IRQ_EXTI1510    (56) /* 40: EXTI Line[15:10] interrupts */
-#  define STM32_IRQ_RTCALR      (57) /* 41: RTC alarm through EXTI line interrupt */
+#  define STM32_IRQ_RTCALRM     (57) /* 41: RTC alarm through EXTI line interrupt */
 #  define STM32_IRQ_OTGFSWKUP   (58) /* 42: USB On-The-Go FS Wakeup through EXTI line interrupt */
                                      /* 43-49: Reserved */
 #  define STM32_IRQ_TIM5        (66) /* 50: TIM5 global interrupt */
@@ -166,7 +166,7 @@
 #  define STM32_IRQ_USART2      (54) /* 38: USART2 global interrupt */
 #  define STM32_IRQ_USART3      (55) /* 39: USART3 global interrupt */
 #  define STM32_IRQ_EXTI1510    (56) /* 40: EXTI Line[15:10] interrupts */
-#  define STM32_IRQ_RTCALR      (57) /* 41: RTC alarm through EXTI line interrupt */
+#  define STM32_IRQ_RTCALRM     (57) /* 41: RTC alarm through EXTI line interrupt */
 #  define STM32_IRQ_USBWKUP     (58) /* 42: USB wakeup from suspend through EXTI line interrupt*/
 #  define STM32_IRQ_TIM8BRK     (59) /* 43: TIM8 Break interrupt */
 #  define STM32_IRQ_TIM8UP      (60) /* 44: TIM8 Update interrupt */
diff --git a/nuttx/arch/arm/src/stm32/chip/stm32f10xxx_vectors.h b/nuttx/arch/arm/src/stm32/chip/stm32f10xxx_vectors.h
index 8ce98c988..53ce4996e 100644
--- a/nuttx/arch/arm/src/stm32/chip/stm32f10xxx_vectors.h
+++ b/nuttx/arch/arm/src/stm32/chip/stm32f10xxx_vectors.h
@@ -97,7 +97,7 @@ VECTOR(stm32_usart1, STM32_IRQ_USART1)           /* Vector 16+37: USART1 global
 VECTOR(stm32_usart2, STM32_IRQ_USART2)           /* Vector 16+38: USART2 global interrupt */
 VECTOR(stm32_usart3, STM32_IRQ_USART3)           /* Vector 16+39: USART3 global interrupt */
 VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510)       /* Vector 16+40: EXTI Line[15:10] interrupts */
-VECTOR(stm32_rtcalr, STM32_IRQ_RTCALR)           /* Vector 16+41: RTC alarm through EXTI line interrupt */
+VECTOR(stm32_rtcalr, STM32_IRQ_RTCALRM)          /* Vector 16+41: RTC alarm through EXTI line interrupt */
 VECTOR(stm32_otgfswkup, STM32_IRQ_OTGFSWKUP)     /* Vector 16+42: USB On-The-Go FS Wakeup through EXTI line interrupt */
 VECTOR(stm32_tim5, STM32_IRQ_TIM5)               /* Vector 16+50: TIM5 global interrupt */
 VECTOR(stm32_spi3, STM32_IRQ_SPI3 )              /* Vector 16+51: SPI3 global interrupt */
@@ -174,7 +174,7 @@ VECTOR(stm32_usart1, STM32_IRQ_USART1)           /* Vector 16+37: USART1 global
 VECTOR(stm32_usart2, STM32_IRQ_USART2)           /* Vector 16+38: USART2 global interrupt */
 VECTOR(stm32_usart3, STM32_IRQ_USART3)           /* Vector 16+39: USART3 global interrupt */
 VECTOR(stm32_exti1510, STM32_IRQ_EXTI1510)       /* Vector 16+40: EXTI Line[15:10] interrupts */
-VECTOR(stm32_rtcalr, STM32_IRQ_RTCALR)           /* Vector 16+41: RTC alarm through EXTI line interrupt */
+VECTOR(stm32_rtcalr, STM32_IRQ_RTCALRM)          /* Vector 16+41: RTC alarm through EXTI line interrupt */
 VECTOR(stm32_usbwkup, STM32_IRQ_USBWKUP)         /* Vector 16+42: USB wakeup from suspend through EXTI line interrupt*/
 VECTOR(stm32_tim8brk, STM32_IRQ_TIM8BRK)         /* Vector 16+43: TIM8 Break interrupt */
 VECTOR(stm32_tim8up, STM32_IRQ_TIM8UP)           /* Vector 16+44: TIM8 Update interrupt */
diff --git a/nuttx/arch/arm/src/stm32/stm32_exti_alarm.c b/nuttx/arch/arm/src/stm32/stm32_exti_alarm.c
index 819e85c85..07db26fd4 100644
--- a/nuttx/arch/arm/src/stm32/stm32_exti_alarm.c
+++ b/nuttx/arch/arm/src/stm32/stm32_exti_alarm.c
@@ -77,7 +77,7 @@ static xcpt_t stm32_exti_callback;
  * Name: stm32_exti_alarm_isr
  *
  * Description:
- *   EXTI ALRAM interrupt service routine/dispatcher
+ *   EXTI ALARM interrupt service routine/dispatcher
  *
  ****************************************************************************/
 
@@ -135,12 +135,12 @@ xcpt_t stm32_exti_alarm(bool risingedge, bool fallingedge, bool event,
 
   if (func)
     {
-      irq_attach(STM32_IRQ_RTCALR, stm32_exti_alarm_isr);
-      up_enable_irq(STM32_IRQ_RTCALR);
+      irq_attach(STM32_IRQ_RTCALRM, stm32_exti_alarm_isr);
+      up_enable_irq(STM32_IRQ_RTCALRM);
     }
   else
     {
-      up_disable_irq(STM32_IRQ_RTCALR);
+      up_disable_irq(STM32_IRQ_RTCALRM);
     }
 
   /* Configure rising/falling edges */
@@ -164,4 +164,4 @@ xcpt_t stm32_exti_alarm(bool risingedge, bool fallingedge, bool event,
   /* Return the old IRQ handler */
 
   return oldhandler;
-}
\ No newline at end of file
+}
diff --git a/nuttx/arch/arm/src/stm32/stm32f10xxx_rtc.c b/nuttx/arch/arm/src/stm32/stm32f10xxx_rtc.c
index 203f45450..df8ad9dd5 100644
--- a/nuttx/arch/arm/src/stm32/stm32f10xxx_rtc.c
+++ b/nuttx/arch/arm/src/stm32/stm32f10xxx_rtc.c
@@ -397,7 +397,7 @@ int up_rtcinitialize(void)
 
   /* Alarm Int via EXTI Line */
 
-  /* STM32_IRQ_RTCALR  41: RTC alarm through EXTI line interrupt */
+  /* STM32_IRQ_RTCALRM  41: RTC alarm through EXTI line interrupt */
 
   return OK;
 }