From 00e51f29768d4592d5ba0d5cb54a325e73b474ea Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Mon, 4 Nov 2019 17:35:45 +0000 Subject: [PATCH] Fixed bug #1054. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13158 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- os/hal/ports/STM32/STM32F37x/stm32_registry.h | 36 ++++++++++++++++--- readme.txt | 2 ++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/os/hal/ports/STM32/STM32F37x/stm32_registry.h b/os/hal/ports/STM32/STM32F37x/stm32_registry.h index b5fe4f32a..3a318fdf3 100644 --- a/os/hal/ports/STM32/STM32F37x/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F37x/stm32_registry.h @@ -143,8 +143,22 @@ #define STM32_HAS_RTC TRUE #define STM32_RTC_HAS_SUBSECONDS TRUE #define STM32_RTC_HAS_PERIODIC_WAKEUPS TRUE -#define STM32_RTC_NUM_ALARMS 2 -#define STM32_RTC_HAS_INTERRUPTS FALSE +#define STM32_RTC_NUM_ALARMS 1 +#define STM32_RTC_STORAGE_SIZE 64 +#define STM32_RTC_TAMP_STAMP_HANDLER Vector48 +#define STM32_RTC_WKUP_HANDLER Vector4C +#define STM32_RTC_ALARM_HANDLER VectorE4 +#define STM32_RTC_TAMP_STAMP_NUMBER 2 +#define STM32_RTC_WKUP_NUMBER 3 +#define STM32_RTC_ALARM_NUMBER 41 +#define STM32_RTC_ALARM_EXTI 17 +#define STM32_RTC_TAMP_STAMP_EXTI 19 +#define STM32_RTC_WKUP_EXTI 20 +#define STM32_RTC_IRQ_ENABLE() do { \ + nvicEnableVector(STM32_RTC_TAMP_STAMP_NUMBER, STM32_IRQ_EXTI19_PRIORITY); \ + nvicEnableVector(STM32_RTC_WKUP_NUMBER, STM32_IRQ_EXTI20_PRIORITY); \ + nvicEnableVector(STM32_RTC_ALARM_NUMBER, STM32_IRQ_EXTI17_PRIORITY); \ +} while (false) /* SDIO attributes.*/ #define STM32_HAS_SDIO FALSE @@ -396,8 +410,22 @@ #define STM32_HAS_RTC TRUE #define STM32_RTC_HAS_SUBSECONDS TRUE #define STM32_RTC_HAS_PERIODIC_WAKEUPS TRUE -#define STM32_RTC_NUM_ALARMS 2 -#define STM32_RTC_HAS_INTERRUPTS FALSE +#define STM32_RTC_NUM_ALARMS 1 +#define STM32_RTC_STORAGE_SIZE 64 +#define STM32_RTC_TAMP_STAMP_HANDLER Vector48 +#define STM32_RTC_WKUP_HANDLER Vector4C +#define STM32_RTC_ALARM_HANDLER VectorE4 +#define STM32_RTC_TAMP_STAMP_NUMBER 2 +#define STM32_RTC_WKUP_NUMBER 3 +#define STM32_RTC_ALARM_NUMBER 41 +#define STM32_RTC_ALARM_EXTI 17 +#define STM32_RTC_TAMP_STAMP_EXTI 19 +#define STM32_RTC_WKUP_EXTI 20 +#define STM32_RTC_IRQ_ENABLE() do { \ + nvicEnableVector(STM32_RTC_TAMP_STAMP_NUMBER, STM32_IRQ_EXTI19_PRIORITY); \ + nvicEnableVector(STM32_RTC_WKUP_NUMBER, STM32_IRQ_EXTI20_PRIORITY); \ + nvicEnableVector(STM32_RTC_ALARM_NUMBER, STM32_IRQ_EXTI17_PRIORITY); \ +} while (false) /* SDIO attributes.*/ #define STM32_HAS_SDIO FALSE diff --git a/readme.txt b/readme.txt index cdb309d08..6b5a15f77 100644 --- a/readme.txt +++ b/readme.txt @@ -133,6 +133,8 @@ - HAL: Added a new interface for range-finder devices (used by EX). - HAL: Added mcuconf.h updater tool for STM32F407 (backported to 19.1.1). - NIL: Integrated NIL 4.0. +- FIX: Fixed missing RTCv1 definitions in STM32F37x registry (bug #1054) + (backported to 19.1.4). - FIX: Fixed assertion triggered in STM32 OTGv1 driver (bug #1053) (backported to 19.1.4)(backported to 18.2.3). - FIX: Fixed STM32 CANv1 compile fails if CAN3 is used alone (bug #1052)