X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fcortex-m3%2Fdrv%2Fkdebug_stm32.c;h=f50f3d89c3d707ad9d2612307be32b585757eb2c;hb=6cdf30122278c0c69a828c290e31f7b2c03c450f;hp=722e3e2021dfe0b894d30ea4de9eaefad65a9086;hpb=9894dd2c3a530cf89e5f8011b88a5c18be836e1b;p=bertos.git

diff --git a/bertos/cpu/cortex-m3/drv/kdebug_stm32.c b/bertos/cpu/cortex-m3/drv/kdebug_stm32.c
index 722e3e20..f50f3d89 100644
--- a/bertos/cpu/cortex-m3/drv/kdebug_stm32.c
+++ b/bertos/cpu/cortex-m3/drv/kdebug_stm32.c
@@ -111,8 +111,6 @@ struct stm32_usart
 #define USART_LASTBIT_DISABLE     ((uint16_t)0x0000)
 #define USART_LASTBIT_ENABLE      ((uint16_t)0x0100)
 
-#if CONFIG_KDEBUG_PORT == KDEBUG_PORT_DBGU
-
 #if CONFIG_KDEBUG_PORT == 0
 	#define UART_BASE ((struct stm32_usart *)USART1_BASE)
 #elif CONFIG_KDEBUG_PORT == 1
@@ -136,10 +134,6 @@ struct stm32_usart
 
 typedef uint32_t kdbg_irqsave_t;
 
-#else
-#error CONFIG_KDEBUG_PORT should be KDEBUG_PORT_DBGU
-#endif
-
 #define GPIO_USART1_TX_PIN	(1 << 9)
 #define GPIO_USART1_RX_PIN	(1 << 10)
 
@@ -151,10 +145,11 @@ typedef uint32_t kdbg_irqsave_t;
 
 INLINE uint16_t evaluate_brr(void)
 {
-	uint32_t reg, div, frac;
+	uint32_t freq, reg, div, frac;
 
-	/* XXX: PCLK1 has been configured as CPU_FREQ / 2 */
-	div = (0x19 * CPU_FREQ / 2) / (0x04 * CONFIG_KDEBUG_BAUDRATE);
+	/* NOTE: PCLK1 has been configured as CPU_FREQ / 2 */
+	freq = (CONFIG_KDEBUG_PORT == 0) ? CPU_FREQ : CPU_FREQ / 2;
+	div = (0x19 * freq) / (0x04 * CONFIG_KDEBUG_BAUDRATE);
 	reg = (div / 0x64) << 0x04;
 	frac = div - (0x64 * (reg >> 0x04));
 	reg |= ((frac * 0x10 + 0x32) / 0x64) & 0x0f;
@@ -172,17 +167,17 @@ INLINE void kdbg_hw_init(void)
 	RCC->APB2ENR |= RCC_APB2_GPIOA;
 	RCC->APB2ENR |= RCC_APB2_USART1;
 	stm32_gpioPinConfig((struct stm32_gpio *)GPIOA_BASE, GPIO_USART1_TX_PIN,
-				GPIO_SPEED_50MHZ, GPIO_MODE_AF_PP);
+				GPIO_MODE_AF_PP, GPIO_SPEED_50MHZ);
 #elif CONFIG_KDEBUG_PORT == 1
 	RCC->APB2ENR |= RCC_APB2_GPIOA;
 	RCC->APB1ENR |= RCC_APB1_USART2;
 	stm32_gpioPinConfig((struct stm32_gpio *)GPIOA_BASE, GPIO_USART2_TX_PIN,
-				GPIO_SPEED_50MHZ, GPIO_MODE_AF_PP);
+				GPIO_MODE_AF_PP, GPIO_SPEED_50MHZ);
 #elif  CONFIG_KDEBUG_PORT == 2
 	RCC->APB2ENR |= RCC_APB2_GPIOB;
 	RCC->APB2ENR |= RCC_APB1_USART3;
 	stm32_gpioPinConfig((struct stm32_gpio *)GPIOB_BASE, GPIO_USART3_TX_PIN,
-				GPIO_SPEED_50MHZ, GPIO_MODE_AF_PP);
+				GPIO_MODE_AF_PP, GPIO_SPEED_50MHZ);
 #else
 	#error "UART port not supported in this board"
 #endif