diff options
author | Diego Ismirlian <dismirlian@gmail.com> | 2019-09-29 10:25:16 -0300 |
---|---|---|
committer | Diego Ismirlian <dismirlian@gmail.com> | 2019-09-29 10:25:16 -0300 |
commit | 8db69eb38c86b7078e4d1ab055704e11a47bb573 (patch) | |
tree | a15f18fd2218ff2de07b4b82351ef4ed6c3e0ad3 /os/hal/ports/STM32/LLD | |
parent | 7b2c61a676e024163057ec5ccc508a29ab3b9ed4 (diff) | |
parent | 8f7c2d187bbb02915f44b926c7aa02185402aef7 (diff) | |
download | ChibiOS-Contrib-8db69eb38c86b7078e4d1ab055704e11a47bb573.tar.gz ChibiOS-Contrib-8db69eb38c86b7078e4d1ab055704e11a47bb573.tar.bz2 ChibiOS-Contrib-8db69eb38c86b7078e4d1ab055704e11a47bb573.zip |
Merge branch 'master' of https://github.com/ChibiOS/ChibiOS-Contrib
Diffstat (limited to 'os/hal/ports/STM32/LLD')
-rw-r--r-- | os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.c | 22 | ||||
-rw-r--r-- | os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.h | 6 |
2 files changed, 20 insertions, 8 deletions
diff --git a/os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.c b/os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.c index 62d9f14..b1dde2f 100644 --- a/os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.c +++ b/os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.c @@ -34,6 +34,14 @@ /* Driver local definitions. */ /*===========================================================================*/ +#ifndef COMP_CSR_EN +#define COMP_CSR_EN COMP_CSR_COMPxEN +#endif + +#ifndef COMP_CSR_POLARITY +#define COMP_CSR_POLARITY COMP_CSR_COMPxPOL +#endif + /*===========================================================================*/ /* Driver exported variables. */ /*===========================================================================*/ @@ -122,7 +130,7 @@ void comp_lld_init(void) { #if STM32_COMP_USE_COMP1 /* Driver initialization.*/ compObjectInit(&COMPD1); - COMPD1.reg = COMP; + COMPD1.reg = COMP1; COMPD1.reg->CSR = 0; #if STM32_COMP_USE_INTERRUPTS nvicEnableVector(COMP1_2_3_IRQn, STM32_COMP_1_2_3_IRQ_PRIORITY); @@ -191,6 +199,8 @@ void comp_lld_init(void) { } +#if STM32_COMP_USE_INTERRUPTS + /** * @brief COMP1, COMP2, COMP3 interrupt handler. * @@ -369,6 +379,8 @@ void comp_ext_lld_channel_disable(COMPDriver *compp, uint32_t channel) { #endif } +#endif + /** * @brief Configures and activates the COMP peripheral. * @@ -379,11 +391,11 @@ void comp_ext_lld_channel_disable(COMPDriver *compp, uint32_t channel) { void comp_lld_start(COMPDriver *compp) { // Apply CSR Execpt the enable bit. - compp->reg->CSR = compp->config->csr & ~COMP_CSR_COMPxEN; + compp->reg->CSR = compp->config->csr & ~COMP_CSR_EN; // Inverted output if (compp->config->output_mode == COMP_OUTPUT_INVERTED) - compp->reg->CSR |= COMP_CSR_COMPxPOL; + compp->reg->CSR |= COMP_CSR_POLARITY; #if STM32_COMP_USE_INTERRUPTS #if STM32_COMP_USE_COMP1 @@ -500,7 +512,7 @@ void comp_lld_stop(COMPDriver *compp) { */ void comp_lld_enable(COMPDriver *compp) { - compp->reg->CSR |= COMP_CSR_COMPxEN; /* Enable */ + compp->reg->CSR |= COMP_CSR_EN; /* Enable */ } /** @@ -512,7 +524,7 @@ void comp_lld_enable(COMPDriver *compp) { */ void comp_lld_disable(COMPDriver *compp) { - compp->reg->CSR &= ~COMP_CSR_COMPxEN; /* Disable */ + compp->reg->CSR &= ~COMP_CSR_EN; /* Disable */ } #endif /* HAL_USE_COMP */ diff --git a/os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.h b/os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.h index bb40327..e3cae4e 100644 --- a/os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.h +++ b/os/hal/ports/STM32/LLD/COMPv1/hal_comp_lld.h @@ -201,9 +201,9 @@ #define STM32_HAS_COMP6 TRUE #define STM32_HAS_COMP7 TRUE -#elif defined(STM32F373xx) || defined(STM32F378xx) || defined(STM32L0XX) || defined(STM32L1XX) \ - || defined(STM32F051x8) || defined(STM32F048xx) || defined(STM32F058xx) || defined(STM32F078xx) \ - || defined(STM32F072xb) || defined(STM32F071xb) +#elif defined(STM32F373xx) || defined(STM32F378xx) || defined(STM32L0XX) || defined(STM32L1XX) \ + || defined(STM32F051x8) || defined(STM32F048xx) || defined(STM32F058xx) || defined(STM32F078xx) \ + || defined(STM32F072xb) || defined(STM32F071xb) || defined(STM32L4XX) #define STM32_HAS_COMP1 TRUE #define STM32_HAS_COMP2 TRUE #define STM32_HAS_COMP3 FALSE |