summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/stm32/stm32_lowputc.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-02-09 15:03:49 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-02-09 15:03:49 +0000
commit9f1b0571589985f9aaed28f12a0af9c55c56a0c1 (patch)
treed96a6dcb40417d6a69639444f9c111846076e89d /nuttx/arch/arm/src/stm32/stm32_lowputc.c
parent04701a1a031e14674a6f98f235b84f60e27b139a (diff)
downloadpx4-nuttx-9f1b0571589985f9aaed28f12a0af9c55c56a0c1.tar.gz
px4-nuttx-9f1b0571589985f9aaed28f12a0af9c55c56a0c1.tar.bz2
px4-nuttx-9f1b0571589985f9aaed28f12a0af9c55c56a0c1.zip
Removed stm32_internal.h; Changes for clean compile of STM32F3Discovery configuration with SPI and USB
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5630 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/stm32/stm32_lowputc.c')
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_lowputc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_lowputc.c b/nuttx/arch/arm/src/stm32/stm32_lowputc.c
index 1ba29a573..4cd29845a 100644
--- a/nuttx/arch/arm/src/stm32/stm32_lowputc.c
+++ b/nuttx/arch/arm/src/stm32/stm32_lowputc.c
@@ -48,10 +48,10 @@
#include "chip.h"
+#include "stm32.h"
#include "stm32_rcc.h"
#include "stm32_gpio.h"
#include "stm32_uart.h"
-#include "stm32_internal.h"
/**************************************************************************
* Private Definitions
@@ -255,14 +255,14 @@
# define STM32_USARTDIV16 \
((STM32_APBCLOCK + (STM32_CONSOLE_BAUD >> 1)) / STM32_CONSOLE_BAUD)
- /* Use oversamply by 8 only if the divisor is small */
+ /* Use oversamply by 8 only if the divisor is small. But what is small? */
# if STM32_USARTDIV8 > 100
# define STM32_BRR_VALUE STM32_USARTDIV16
# else
# define USE_OVER8 1
# define STM32_BRR_VALUE \
- ((STM32_USARTDIV8 && 0xfff0) | ((STM32_USARTDIV8 & 0x000f) >> 1)
+ ((STM32_USARTDIV8 & 0xfff0) | ((STM32_USARTDIV8 & 0x000f) >> 1))
# endif
#else