aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-06-13 10:00:50 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-06-13 10:00:50 +0000
commitbddc8f7ff77320e1dfcb457c7568ef9a90545fe1 (patch)
tree80f14fc1b82e0dac8599e116db2bea0b91d932fe
parentabec054420be9af92aeb3b5740cc20050236e01d (diff)
downloadChibiOS-bddc8f7ff77320e1dfcb457c7568ef9a90545fe1.tar.gz
ChibiOS-bddc8f7ff77320e1dfcb457c7568ef9a90545fe1.tar.bz2
ChibiOS-bddc8f7ff77320e1dfcb457c7568ef9a90545fe1.zip
Fixed bug #605.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8025 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/ports/STM32/STM32F0xx/hal_lld.h8
-rw-r--r--readme.txt3
2 files changed, 7 insertions, 4 deletions
diff --git a/os/hal/ports/STM32/STM32F0xx/hal_lld.h b/os/hal/ports/STM32/STM32F0xx/hal_lld.h
index e854e7db0..98151b653 100644
--- a/os/hal/ports/STM32/STM32F0xx/hal_lld.h
+++ b/os/hal/ports/STM32/STM32F0xx/hal_lld.h
@@ -805,9 +805,9 @@
/**
* @brief I2C1 frequency.
*/
-#if (STM32_I2CSW == STM32_I2C1SW_HSI) || defined(__DOXYGEN__)
+#if (STM32_I2C1SW == STM32_I2C1SW_HSI) || defined(__DOXYGEN__)
#define STM32_I2C1CLK STM32_HSICLK
-#elif STM32_I2CSW == STM32_I2C1SW_SYSCLK
+#elif STM32_I2C1SW == STM32_I2C1SW_SYSCLK
#define STM32_I2C1CLK STM32_SYSCLK
#else
#error "invalid source selected for I2C1 clock"
@@ -820,9 +820,9 @@
#define STM32_USART1CLK STM32_PCLK
#elif STM32_USART1SW == STM32_USART1SW_SYSCLK
#define STM32_USART1CLK STM32_SYSCLK
-#elif STM32_USART1SW == STM32_USART1SW_LSECLK
+#elif STM32_USART1SW == STM32_USART1SW_LSE
#define STM32_USART1CLK STM32_LSECLK
-#elif STM32_USART1SW == STM32_USART1SW_HSICLK
+#elif STM32_USART1SW == STM32_USART1SW_HSI
#define STM32_USART1CLK STM32_HSICLK
#else
#error "invalid source selected for USART1 clock"
diff --git a/readme.txt b/readme.txt
index 110324a90..4181ad3e7 100644
--- a/readme.txt
+++ b/readme.txt
@@ -74,9 +74,12 @@
*****************************************************************************
*** 3.0.0p6 ***
+- DEM: Added -Wundef to all the demos and test programs in order to find
+ common error cases.
- NIL: Added INTC priorities check to the e200z port.
- RT: Added INTC priorities check to the e200z port.
- HAL: Added support for extra DMA channels in STM32F072 devices.
+- HAL: Fixed wrong macro names in STM32F0xx HAL driver (bug #605).
- HAL: Fixed wrong check on ADC3 in STM32F3xx ADC driver (bug #604).
- HAL: Fixed wrong macro names in STM32F3xx HAL driver (bug #603).
- HAL: Fixed errors in STM32 OTGv1 driver (bug #601).