diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-03-09 09:13:53 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-03-09 09:13:53 +0000 |
| commit | 53e7842505bd75038d531693928985f51e7ac980 (patch) | |
| tree | 1967254e691403452bf915caa3b631cef81f63e1 | |
| parent | ccdc24bfd1edd2bd0d8a11bec8c6c782c69dcdfd (diff) | |
| download | ChibiOS-53e7842505bd75038d531693928985f51e7ac980.tar.gz ChibiOS-53e7842505bd75038d531693928985f51e7ac980.tar.bz2 ChibiOS-53e7842505bd75038d531693928985f51e7ac980.zip | |
Fixed some crypto-related errors.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11658 110e8d01-0319-4d1e-a829-52ad28d1bb01
| -rw-r--r-- | os/hal/hal.mk | 1 | ||||
| -rw-r--r-- | os/hal/templates/hal_crypto_lld.c | 2 | ||||
| -rw-r--r-- | os/hal/templates/hal_dac_lld.c | 3 | ||||
| -rw-r--r-- | os/hal/templates/halconf.h | 4 | ||||
| -rw-r--r-- | os/hal/templates/platform.mk | 3 |
5 files changed, 6 insertions, 7 deletions
diff --git a/os/hal/hal.mk b/os/hal/hal.mk index 59e19c13b..f177a3f8b 100644 --- a/os/hal/hal.mk +++ b/os/hal/hal.mk @@ -87,6 +87,7 @@ HALSRC = $(CHIBIOS)/os/hal/src/hal.c \ $(CHIBIOS)/os/hal/src/hal_mmcsd.c \
$(CHIBIOS)/os/hal/src/hal_adc.c \
$(CHIBIOS)/os/hal/src/hal_can.c \
+ $(CHIBIOS)/os/hal/src/hal_crypto.c \
$(CHIBIOS)/os/hal/src/hal_dac.c \
$(CHIBIOS)/os/hal/src/hal_ext.c \
$(CHIBIOS)/os/hal/src/hal_gpt.c \
diff --git a/os/hal/templates/hal_crypto_lld.c b/os/hal/templates/hal_crypto_lld.c index f80aece65..abaaf1d78 100644 --- a/os/hal/templates/hal_crypto_lld.c +++ b/os/hal/templates/hal_crypto_lld.c @@ -35,7 +35,7 @@ /*===========================================================================*/
/** @brief CRY1 driver identifier.*/
-#if STM32_CRY_USE_CRYP1 || defined(__DOXYGEN__)
+#if PLATFORM_CRY_USE_CRY1 || defined(__DOXYGEN__)
CRYDriver CRYD1;
#endif
diff --git a/os/hal/templates/hal_dac_lld.c b/os/hal/templates/hal_dac_lld.c index 55a983e13..bb5265605 100644 --- a/os/hal/templates/hal_dac_lld.c +++ b/os/hal/templates/hal_dac_lld.c @@ -100,9 +100,6 @@ void dac_lld_stop(DACDriver *dacp) { /* If in ready state then disables the DAC clock.*/
if (dacp->state == DAC_READY) {
- /* Disabling DAC.*/
- dacp->params->dac->CR &= dacp->params->regmask;
-
#if PLATFORM_DAC_USE_DAC1 == TRUE
if (&DACD1 == dacp) {
diff --git a/os/hal/templates/halconf.h b/os/hal/templates/halconf.h index 3080c14e8..84f39392c 100644 --- a/os/hal/templates/halconf.h +++ b/os/hal/templates/halconf.h @@ -58,14 +58,14 @@ * @brief Enables the cryptographic subsystem.
*/
#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
-#define HAL_USE_CRY FALSE
+#define HAL_USE_CRY TRUE
#endif
/**
* @brief Enables the DAC subsystem.
*/
#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
-#define HAL_USE_DAC FALSE
+#define HAL_USE_DAC TRUE
#endif
/**
diff --git a/os/hal/templates/platform.mk b/os/hal/templates/platform.mk index e10b8dd61..13ea8a7c6 100644 --- a/os/hal/templates/platform.mk +++ b/os/hal/templates/platform.mk @@ -17,7 +17,7 @@ ifneq ($(findstring HAL_USE_CAN TRUE,$(HALCONF)),) PLATFORMSRC += ${CHIBIOS}/os/hal/templates/hal_can_lld.c
endif
ifneq ($(findstring HAL_USE_CRY TRUE,$(HALCONF)),)
-PLATFORMSRC += ${CHIBIOS}/os/hal/templates/hal_cry_lld.c
+PLATFORMSRC += ${CHIBIOS}/os/hal/templates/hal_crypto_lld.c
endif
ifneq ($(findstring HAL_USE_DAC TRUE,$(HALCONF)),)
PLATFORMSRC += ${CHIBIOS}/os/hal/templates/hal_dac_lld.c
@@ -74,6 +74,7 @@ else PLATFORMSRC = ${CHIBIOS}/os/hal/templates/hal_lld.c \
${CHIBIOS}/os/hal/templates/hal_adc_lld.c \
${CHIBIOS}/os/hal/templates/hal_can_lld.c \
+ ${CHIBIOS}/os/hal/templates/hal_crypto_lld.c \
${CHIBIOS}/os/hal/templates/hal_dac_lld.c \
${CHIBIOS}/os/hal/templates/hal_ext_lld.c \
${CHIBIOS}/os/hal/templates/hal_gpt_lld.c \
|