From ea6b459eadfe96cf6951bb47cce74a3b56dd2f5d Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Wed, 5 Oct 2016 08:33:35 +0100
Subject: [PATCH] Tidy up msp related #includes

---
 src/main/fc/mw.c                       | 10 ++++++++--
 src/main/io/serial.c                   | 14 --------------
 src/main/io/serial.h                   |  4 ----
 src/main/io/serial_4way.c              |  3 ---
 src/main/io/serial_4way_avrootloader.c |  6 +++---
 src/main/io/serial_4way_stk500v2.c     |  9 ++++-----
 src/main/io/serial_msp.c               |  5 +++++
 7 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/src/main/fc/mw.c b/src/main/fc/mw.c
index f9a2e6fcac..3666a47d84 100644
--- a/src/main/fc/mw.c
+++ b/src/main/fc/mw.c
@@ -898,8 +898,14 @@ void taskUpdateAttitude(uint32_t currentTime)
 void taskHandleSerial(uint32_t currentTime)
 {
     UNUSED(currentTime);
-
-    handleSerial();
+#ifdef USE_CLI
+    // in cli mode, all serial stuff goes to here. enter cli mode by sending #
+    if (cliMode) {
+        cliProcess();
+        return;
+    }
+#endif
+    mspSerialProcess();
 }
 
 void taskUpdateBeeper(uint32_t currentTime)
diff --git a/src/main/io/serial.c b/src/main/io/serial.c
index 8b5fcfc855..99f7cfcf3f 100644
--- a/src/main/io/serial.c
+++ b/src/main/io/serial.c
@@ -42,7 +42,6 @@
 #endif
 
 #include "io/serial.h"
-#include "serial_cli.h"
 #include "serial_msp.h"
 
 
@@ -423,19 +422,6 @@ bool serialIsPortAvailable(serialPortIdentifier_e identifier)
     return false;
 }
 
-void handleSerial(void)
-{
-#ifdef USE_CLI
-    // in cli mode, all serial stuff goes to here. enter cli mode by sending #
-    if (cliMode) {
-        cliProcess();
-        return;
-    }
-#endif
-
-    mspSerialProcess();
-}
-
 void waitForSerialPortToFinishTransmitting(serialPort_t *serialPort)
 {
     while (!isSerialTransmitBufferEmpty(serialPort)) {
diff --git a/src/main/io/serial.h b/src/main/io/serial.h
index 13845446a1..0448d3e592 100644
--- a/src/main/io/serial.h
+++ b/src/main/io/serial.h
@@ -140,8 +140,4 @@ baudRate_e lookupBaudRateIndex(uint32_t baudRate);
 // msp/cli/bootloader
 //
 void evaluateOtherData(serialPort_t *serialPort, uint8_t receivedChar);
-void handleSerial(void);
-
-void evaluateOtherData(serialPort_t *serialPort, uint8_t receivedChar);
-void handleSerial(void);
 void serialPassthrough(serialPort_t *left, serialPort_t *right, serialConsumer *leftC, serialConsumer *rightC);
diff --git a/src/main/io/serial_4way.c b/src/main/io/serial_4way.c
index 0065cff899..0c41390747 100644
--- a/src/main/io/serial_4way.c
+++ b/src/main/io/serial_4way.c
@@ -19,8 +19,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
 
 #include "platform.h"
 
@@ -38,7 +36,6 @@
 #include "flight/mixer.h"
 
 #include "io/beeper.h"
-#include "io/serial_msp.h"
 #include "io/serial_4way.h"
 
 #ifdef USE_SERIAL_4WAY_BLHELI_BOOTLOADER
diff --git a/src/main/io/serial_4way_avrootloader.c b/src/main/io/serial_4way_avrootloader.c
index a70e3657c1..bfdf35cfbe 100644
--- a/src/main/io/serial_4way_avrootloader.c
+++ b/src/main/io/serial_4way_avrootloader.c
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include <stdlib.h>
+
 #include "platform.h"
 
 #ifdef  USE_SERIAL_4WAY_BLHELI_INTERFACE
@@ -31,13 +31,13 @@
 #include "drivers/serial.h"
 #include "drivers/timer.h"
 #include "drivers/pwm_mapping.h"
+
 #include "io/serial.h"
-#include "io/serial_msp.h"
 #include "io/serial_4way.h"
 #include "io/serial_4way_impl.h"
 #include "io/serial_4way_avrootloader.h"
-#if defined(USE_SERIAL_4WAY_BLHELI_BOOTLOADER) && !defined(USE_FAKE_ESC)
 
+#if defined(USE_SERIAL_4WAY_BLHELI_BOOTLOADER) && !defined(USE_FAKE_ESC)
 
 // Bootloader commands
 // RunCmd
diff --git a/src/main/io/serial_4way_stk500v2.c b/src/main/io/serial_4way_stk500v2.c
index 0b406531f0..e83f994273 100644
--- a/src/main/io/serial_4way_stk500v2.c
+++ b/src/main/io/serial_4way_stk500v2.c
@@ -17,10 +17,9 @@
  * have a look at https://github.com/sim-/tgy/blob/master/boot.inc
  * for info about the stk500v2 implementation
  */
+
 #include <stdbool.h>
 #include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
 
 #include "platform.h"
 
@@ -28,13 +27,13 @@
 
 #include "drivers/io.h"
 #include "drivers/serial.h"
-#include "config/config.h"
+#include "drivers/system.h"
+
 #include "io/serial.h"
-#include "io/serial_msp.h"
 #include "io/serial_4way.h"
 #include "io/serial_4way_impl.h"
 #include "io/serial_4way_stk500v2.h"
-#include "drivers/system.h"
+
 #ifdef USE_SERIAL_4WAY_SK_BOOTLOADER
 
 #define BIT_LO_US (32) //32uS
diff --git a/src/main/io/serial_msp.c b/src/main/io/serial_msp.c
index 0f95aa5b18..914f89ff8c 100644
--- a/src/main/io/serial_msp.c
+++ b/src/main/io/serial_msp.c
@@ -100,6 +100,11 @@ static void setCurrentPort(mspPort_t *port)
     mspSerialPort = currentPort->port;
 }
 
+/*
+ * Process MSP commands from serial ports configured as MSP ports.
+ *
+ * Called periodically by the scheduler.
+ */
 void mspSerialProcess(void)
 {
     uint8_t portIndex;