aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-08-19 10:54:01 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-08-19 10:54:01 +0000
commitf2f3d60519f35608b22b33059eb6bf40b1cca411 (patch)
tree1fffea595f62ebd74fed756d00564f0f1f262262
parent649c937cdb4aa6076ce29e8f116b60c2b4f68601 (diff)
downloadChibiOS-f2f3d60519f35608b22b33059eb6bf40b1cca411.tar.gz
ChibiOS-f2f3d60519f35608b22b33059eb6bf40b1cca411.tar.bz2
ChibiOS-f2f3d60519f35608b22b33059eb6bf40b1cca411.zip
Fixed bug #631.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8227 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/ports/STM32/LLD/DACv1/dac_lld.c4
-rw-r--r--readme.txt2
2 files changed, 4 insertions, 2 deletions
diff --git a/os/hal/ports/STM32/LLD/DACv1/dac_lld.c b/os/hal/ports/STM32/LLD/DACv1/dac_lld.c
index 197bf855f..6015c176c 100644
--- a/os/hal/ports/STM32/LLD/DACv1/dac_lld.c
+++ b/os/hal/ports/STM32/LLD/DACv1/dac_lld.c
@@ -348,7 +348,7 @@ void dac_lld_put_channel(DACDriver *dacp,
}
break;
default:
- chDbgAssert(false, "unexpected DAC mode");
+ osalDbgAssert(false, "unexpected DAC mode");
break;
}
}
@@ -436,7 +436,7 @@ void dac_lld_start_conversion(DACDriver *dacp) {
break;
#endif
default:
- chDbgAssert(false, "unexpected DAC mode");
+ osalDbgAssert(false, "unexpected DAC mode");
return;
}
diff --git a/readme.txt b/readme.txt
index d4669d8ca..ffa0c2613 100644
--- a/readme.txt
+++ b/readme.txt
@@ -95,6 +95,8 @@
- HAL: Introduced support for TIM21 and TIM22 in STM32 ST driver.
- HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support
for STM32F030xC, STM32F070x6, STM32F070xB devices.
+- HAL: Fixed HAL to RT dependency in STM32 DAC driver (bug #631)(backported
+ to 3.0.2).
- HAL: Fixed problem with STM32 I2S driver restart (bug #630)(backported
to 3.0.2).
- HAL: Fixed STM32F3xx ADC driver uses US2RTC directly (bug #629)(backported