andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

EXTIv1 changes. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12888 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2019-07-09 08:03:08 +00:00
parent 673b86136e
commit deca37741b
7 changed files with 67 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/STM32/RT-STM32G071RB-NUCLEO64/Makefile
View File

@ -5,7 +5,7 @@
# Compiler options here. # Compiler options here.
ifeq ($(USE_OPT),) ifeq ($(USE_OPT),)
USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16 USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16
endif endif
# C specific options here (added to USE_OPT). # C specific options here (added to USE_OPT).

2
demos/STM32/RT-STM32G071RB-NUCLEO64/cfg/halconf.h
View File

@ -191,7 +191,7 @@
* @brief Enables the WDG subsystem. * @brief Enables the WDG subsystem.
*/ */
#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__) #if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
#define HAL_USE_WDG FALSE #define HAL_USE_WDG TRUE
#endif #endif
/** /**

4
demos/STM32/RT-STM32G071RB-NUCLEO64/cfg/mcuconf.h
View File

@ -44,7 +44,7 @@
#define STM32_HSIDIV_VALUE 1 #define STM32_HSIDIV_VALUE 1
#define STM32_HSI16_ENABLED TRUE #define STM32_HSI16_ENABLED TRUE
#define STM32_HSE_ENABLED FALSE #define STM32_HSE_ENABLED FALSE
#define STM32_LSI_ENABLED FALSE #define STM32_LSI_ENABLED TRUE
#define STM32_LSE_ENABLED FALSE #define STM32_LSE_ENABLED FALSE
#define STM32_SW STM32_SW_PLLRCLK #define STM32_SW STM32_SW_PLLRCLK
#define STM32_PLLSRC STM32_PLLSRC_HSI16 #define STM32_PLLSRC STM32_PLLSRC_HSI16
@ -208,6 +208,6 @@
/* /*
* WDG driver system settings. * WDG driver system settings.
*/ */
#define STM32_WDG_USE_IWDG FALSE #define STM32_WDG_USE_IWDG TRUE
#endif /* MCUCONF_H */ #endif /* MCUCONF_H */

22
os/hal/ports/STM32/LLD/EXTIv1/stm32_exti.c
View File

@ -72,7 +72,12 @@ void extiEnableGroup1(uint32_t mask, extimode_t mode) {
EXTI->EMR1 &= ~mask; EXTI->EMR1 &= ~mask;
EXTI->RTSR1 &= ~mask; EXTI->RTSR1 &= ~mask;
EXTI->FTSR1 &= ~mask; EXTI->FTSR1 &= ~mask;
#if STM32_EXTI_TYPE == EXTI_TYPE_CLASSIC
EXTI->PR1 = mask; EXTI->PR1 = mask;
#else
EXTI->RPR1 = mask;
EXTI->FPR1 = mask;
#endif
} }
else { else {
/* Programming edge registers.*/ /* Programming edge registers.*/
@ -101,7 +106,7 @@ void extiEnableGroup1(uint32_t mask, extimode_t mode) {
} }
} }
#if (STM32_EXTI_NUM_LINES > 32) || defined(__DOXYGEN__) #if (STM32_EXTI_HAS_GROUP2 == TRUE) || defined(__DOXYGEN__)
/** /**
* @brief STM32 EXTI group 2 lines initialization. * @brief STM32 EXTI group 2 lines initialization.
* *
@ -121,7 +126,12 @@ void extiEnableGroup2(uint32_t mask, extimode_t mode) {
EXTI->EMR2 &= ~mask; EXTI->EMR2 &= ~mask;
EXTI->RTSR2 &= ~mask; EXTI->RTSR2 &= ~mask;
EXTI->FTSR2 &= ~mask; EXTI->FTSR2 &= ~mask;
#if STM32_EXTI_TYPE == EXTI_TYPE_CLASSIC
EXTI->PR2 = mask; EXTI->PR2 = mask;
#else
EXTI->RPR2 = mask;
EXTI->FPR2 = mask;
#endif
} }
else { else {
/* Programming edge registers.*/ /* Programming edge registers.*/
@ -149,7 +159,7 @@ void extiEnableGroup2(uint32_t mask, extimode_t mode) {
} }
} }
} }
#endif /* STM32_EXTI_NUM_LINES > 32 */ #endif /* STM32_EXTI_HAS_GROUP2 == TRUE */
/** /**
* @brief STM32 EXTI line initialization. * @brief STM32 EXTI line initialization.
@ -165,11 +175,11 @@ void extiEnableLine(extiline_t line, extimode_t mode) {
osalDbgCheck(line < STM32_EXTI_NUM_LINES); osalDbgCheck(line < STM32_EXTI_NUM_LINES);
osalDbgCheck((mode & ~EXTI_MODE_MASK) == 0U); osalDbgCheck((mode & ~EXTI_MODE_MASK) == 0U);
#if STM32_EXTI_NUM_LINES > 32 #if STM32_EXTI_HAS_GROUP2 == TRUE
if (line < 32) { if (line < 32) {
#endif #endif
extiEnableGroup1(mask, mode); extiEnableGroup1(mask, mode);
#if STM32_EXTI_NUM_LINES > 32 #if STM32_EXTI_HAS_GROUP2 == TRUE
} }
else { else {
extiEnableGroup2(mask, mode); extiEnableGroup2(mask, mode);
@ -189,11 +199,11 @@ void extiClearLine(extiline_t line) {
osalDbgCheck(line < STM32_EXTI_NUM_LINES); osalDbgCheck(line < STM32_EXTI_NUM_LINES);
#if STM32_EXTI_NUM_LINES > 32 #if STM32_EXTI_HAS_GROUP2 == TRUE
if (line < 32) { if (line < 32) {
#endif #endif
extiClearGroup1(mask); extiClearGroup1(mask);
#if STM32_EXTI_NUM_LINES > 32 #if STM32_EXTI_HAS_GROUP2 == TRUE
} }
else { else {
extiClearGroup2(mask); extiClearGroup2(mask);

51
os/hal/ports/STM32/LLD/EXTIv1/stm32_exti.h
View File

@ -66,6 +66,25 @@
/* Driver pre-compile time settings. */ /* Driver pre-compile time settings. */
/*===========================================================================*/ /*===========================================================================*/
/*===========================================================================*/
/* Derived constants and error checks. */
/*===========================================================================*/
#if !defined(STM32_EXTI_NUM_LINES)
#error "STM32_EXTI_NUM_LINES not defined in registry"
#endif
/* Checking for presence of bank 2 registers. If the definition is not
present in registry then it is iferred by the number of channels (which
is not an always-good method, see G0.*/
#if !defined(STM32_EXTI_HAS_GROUP2)
#if STM32_EXTI_NUM_LINES <= 32
#define STM32_EXTI_HAS_GROUP2 FALSE
#else
#define STM32_EXTI_HAS_GROUP2 TRUE
#endif
#endif /* !defined(STM32_EXTI_TYPE) */
/* If not defined then it is a classic EXTI (without EXTICR and separate PR /* If not defined then it is a classic EXTI (without EXTICR and separate PR
registers for raising and falling edges.*/ registers for raising and falling edges.*/
#if !defined(STM32_EXTI_TYPE) #if !defined(STM32_EXTI_TYPE)
@ -77,14 +96,6 @@
#error "invalid STM32_EXTI_TYPE" #error "invalid STM32_EXTI_TYPE"
#endif #endif
/*===========================================================================*/
/* Derived constants and error checks. */
/*===========================================================================*/
#if !defined(STM32_EXTI_NUM_LINES)
#error "STM32_EXTI_NUM_LINES not defined in registry"
#endif
#if (STM32_EXTI_NUM_LINES < 0) || (STM32_EXTI_NUM_LINES > 63) #if (STM32_EXTI_NUM_LINES < 0) || (STM32_EXTI_NUM_LINES > 63)
#error "invalid STM32_EXTI_NUM_LINES value" #error "invalid STM32_EXTI_NUM_LINES value"
#endif #endif
@ -138,12 +149,20 @@ typedef uint32_t extimode_t;
* *
* @api * @api
*/ */
#if (STM32_EXTI_TYPE == EXTI_TYPE_CLASSIC) || defined(__DOXYGEN__)
#define extiClearGroup1(mask) do { \ #define extiClearGroup1(mask) do { \
osalDbgAssert(((mask) & STM32_EXTI_IMR1_MASK) == 0U, "fixed lines"); \ osalDbgAssert(((mask) & STM32_EXTI_IMR1_MASK) == 0U, "fixed lines"); \
EXTI->PR1 = (uint32_t)(mask); \ EXTI->PR1 = (uint32_t)(mask); \
} while (false) } while (false)
#else
#define extiClearGroup1(mask) do { \
osalDbgAssert(((mask) & STM32_EXTI_IMR1_MASK) == 0U, "fixed lines"); \
EXTI->RPR1 = (uint32_t)(mask); \
EXTI->FPR1 = (uint32_t)(mask); \
} while (false)
#endif
#if (STM32_EXTI_NUM_LINES > 32) || defined(__DOXYGEN__) #if (STM32_EXTI_HAS_GROUP2 == TRUE) || defined(__DOXYGEN__)
/** /**
* @brief STM32 EXTI group 2 IRQ status clearing. * @brief STM32 EXTI group 2 IRQ status clearing.
* *
@ -151,11 +170,19 @@ typedef uint32_t extimode_t;
* *
* @api * @api
*/ */
#if (STM32_EXTI_TYPE == EXTI_TYPE_CLASSIC) || defined(__DOXYGEN__)
#define extiClearGroup2(mask) do { \ #define extiClearGroup2(mask) do { \
osalDbgAssert(((mask) & STM32_EXTI_IMR2_MASK) == 0U, "fixed lines"); \ osalDbgAssert(((mask) & STM32_EXTI_IMR2_MASK) == 0U, "fixed lines"); \
EXTI->PR2 = (uint32_t)(mask); \ EXTI->PR2 = (uint32_t)(mask); \
} while (false) } while (false)
#endif /* STM32_EXTI_NUM_LINES > 32 */ #else
#define extiClearGroup2(mask) do { \
osalDbgAssert(((mask) & STM32_EXTI_IMR2_MASK) == 0U, "fixed lines"); \
EXTI->RPR2 = (uint32_t)(mask); \
EXTI->FPR2 = (uint32_t)(mask); \
} while (false)
#endif
#endif /* STM32_EXTI_HAS_GROUP2 == TRUE */
/*===========================================================================*/ /*===========================================================================*/
/* External declarations. */ /* External declarations. */
@ -165,9 +192,9 @@ typedef uint32_t extimode_t;
extern "C" { extern "C" {
#endif #endif
void extiEnableGroup1(uint32_t mask, extimode_t mode); void extiEnableGroup1(uint32_t mask, extimode_t mode);
#if (STM32_EXTI_NUM_LINES > 32) || defined(__DOXYGEN__) #if (STM32_EXTI_HAS_GROUP2 == TRUE) || defined(__DOXYGEN__)
void extiEnableGroup2(uint32_t mask, extimode_t mode); void extiEnableGroup2(uint32_t mask, extimode_t mode);
#endif /* STM32_EXTI_NUM_LINES > 32 */ #endif /* STM32_EXTI_HAS_GROUP2 == TRUE */
void extiEnableLine(extiline_t line, extimode_t mode); void extiEnableLine(extiline_t line, extimode_t mode);
void extiClearLine(extiline_t line); void extiClearLine(extiline_t line);
#ifdef __cplusplus #ifdef __cplusplus

6
os/hal/ports/STM32/STM32G0xx/hal_lld.h
View File

@ -1210,6 +1210,12 @@
#error "invalid STM32_PPRE value specified" #error "invalid STM32_PPRE value specified"
#endif #endif
/*
* Compatibility definitions.
*/
#define STM32_PCLK1 STM32_PCLK
#define STM32_PCLK2 STM32_PCLK
/* /*
* APB frequency check. * APB frequency check.
*/ */

2
os/hal/ports/STM32/STM32G0xx/stm32_registry.h
View File

@ -110,6 +110,7 @@
/* EXTI attributes.*/ /* EXTI attributes.*/
#define STM32_EXTI_TYPE EXTI_TYPE_NEWG0 #define STM32_EXTI_TYPE EXTI_TYPE_NEWG0
#define STM32_EXTI_HAS_GROUP2 FALSE
#define STM32_EXTI_NUM_LINES 16 #define STM32_EXTI_NUM_LINES 16
#define STM32_EXTI_IMR1_MASK 0xFFF80000U #define STM32_EXTI_IMR1_MASK 0xFFF80000U
@ -305,6 +306,7 @@
/* EXTI attributes.*/ /* EXTI attributes.*/
#define STM32_EXTI_TYPE EXTI_TYPE_NEWG0 #define STM32_EXTI_TYPE EXTI_TYPE_NEWG0
#define STM32_EXTI_HAS_GROUP2 FALSE
#define STM32_EXTI_NUM_LINES 33 #define STM32_EXTI_NUM_LINES 33
#define STM32_EXTI_IMR1_MASK 0xFFF80000U #define STM32_EXTI_IMR1_MASK 0xFFF80000U
#define STM32_EXTI_IMR2_MASK 0xFFFFFFFFU #define STM32_EXTI_IMR2_MASK 0xFFFFFFFFU