[paparazzi-commits] [5378] fixed uart3 initialization, this time for real :)

[antoine drouin]

Revision: 5378
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5378
Author:   poine
Date:     2010-08-15 16:53:09 +0000 (Sun, 15 Aug 2010)
Log Message:
-----------
fixed uart3 initialization, this time for real :)

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/stm32/uart_hw.c
    paparazzi3/trunk/sw/airborne/stm32/uart_hw.h

Modified: paparazzi3/trunk/sw/airborne/stm32/uart_hw.c
===================================================================
--- paparazzi3/trunk/sw/airborne/stm32/uart_hw.c        2010-08-15 16:37:59 UTC 
(rev 5377)
+++ paparazzi3/trunk/sw/airborne/stm32/uart_hw.c        2010-08-15 16:53:09 UTC 
(rev 5378)
@@ -291,7 +291,6 @@
 
   /* init RCC */
   Uart3_PeriphClockCmd();
-  RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO, ENABLE);
 
   /* Enable USART3 interrupts */
   NVIC_InitTypeDef nvic;
@@ -333,7 +332,7 @@
   uart3_tx_insert_idx = 0;
   uart3_tx_running = FALSE;
 
-  // initialize the receive data queue
+  // initialize the receive data queuenn
   uart3_rx_extract_idx = 0;
   uart3_rx_insert_idx = 0;
 

Modified: paparazzi3/trunk/sw/airborne/stm32/uart_hw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/stm32/uart_hw.h        2010-08-15 16:37:59 UTC 
(rev 5377)
+++ paparazzi3/trunk/sw/airborne/stm32/uart_hw.h        2010-08-15 16:53:09 UTC 
(rev 5378)
@@ -50,7 +50,10 @@
 #define Uart3_RxPin GPIO_Pin_11
 #define Uart3_TxPort GPIOC
 #define Uart3_RxPort GPIOC
-#define Uart3_PeriphClockCmd() RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO, 
ENABLE)
+#define Uart3_PeriphClockCmd() {                               \
+    RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART3, ENABLE);     \
+    RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO, ENABLE);       \
+  }
 
 #ifdef USE_UART1