From dad37f36ba00afacbf65cff89370b23ede76efac Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sat, 18 Jun 2016 17:13:41 +0200
Subject: [PATCH] Cosmetics

---
 radio/src/targets/horus/serial2_driver.cpp   | 12 ++++++------
 radio/src/targets/taranis/serial2_driver.cpp |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/radio/src/targets/horus/serial2_driver.cpp b/radio/src/targets/horus/serial2_driver.cpp
index fae6e56e0..aaa16715b 100644
--- a/radio/src/targets/horus/serial2_driver.cpp
+++ b/radio/src/targets/horus/serial2_driver.cpp
@@ -73,7 +73,7 @@ void uart3Setup(unsigned int baudrate, bool dma)
     DMA_Cmd(SERIAL_DMA_Stream_RX, ENABLE);
   }
   else {
-#if !defined(USB_SERIAL) && defined(CLI)
+#if !defined(USB_SERIAL) && (defined(CLI) || defined(DEBUG))
     USART_Cmd(SERIAL_USART, ENABLE);
     USART_ITConfig(SERIAL_USART, USART_IT_RXNE, ENABLE);
     USART_ITConfig(SERIAL_USART, USART_IT_TXE, DISABLE);
@@ -115,7 +115,6 @@ void serial2Putc(char c)
 
 void serial2SbusInit()
 {
-  // TODO is it possible on Horus?
   uart3Setup(SBUS_BAUDRATE, true);
   SERIAL_USART->CR1 |= USART_CR1_M | USART_CR1_PCE ;
 }
@@ -128,10 +127,13 @@ void serial2Stop()
 
 uint8_t serial2TracesEnabled()
 {
-  return 1; // TODO (serial2Mode == 0);
+#if defined(DEBUG)
+  return (serial2Mode == UART_MODE_DEBUG);
+#else
+  return false;
+#endif
 }
 
-#if !defined(SIMU)
 extern "C" void SERIAL_USART_IRQHandler(void)
 {
   DEBUG_INTERRUPT(INT_SER2);
@@ -162,6 +164,4 @@ extern "C" void SERIAL_USART_IRQHandler(void)
     status = SERIAL_USART->SR;
   }
 #endif
-
 }
-#endif
diff --git a/radio/src/targets/taranis/serial2_driver.cpp b/radio/src/targets/taranis/serial2_driver.cpp
index 4a9110f12..aaa16715b 100644
--- a/radio/src/targets/taranis/serial2_driver.cpp
+++ b/radio/src/targets/taranis/serial2_driver.cpp
@@ -45,7 +45,6 @@ void uart3Setup(unsigned int baudrate, bool dma)
   USART_InitStructure.USART_Parity = USART_Parity_No;
   USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
   USART_InitStructure.USART_Mode = USART_Mode_Tx | USART_Mode_Rx;
-
   USART_Init(SERIAL_USART, &USART_InitStructure);
 
   if (dma) {