Renamed some MSP related files

Makefile

@@ -436,17 +436,17 @@ COMMON_SRC = \
             flight/pid.c \
             flight/pid_legacy.c \
             flight/pid_betaflight.c \
-            io/beeper.c \
+            fc/fc_msp.c \
             fc/rc_controls.c \
             fc/rc_curves.c \
+            io/beeper.c \
             io/serial.c \
             io/serial_4way.c \
             io/serial_4way_avrootloader.c \
             io/serial_4way_stk500v2.c \
             io/serial_cli.c \
-            io/serial_msp.c \
             io/statusindicator.c \
-            msp/msp_server_fc.c \
+            msp/msp_serial.c \
             rx/ibus.c \
             rx/jetiexbus.c \
             rx/msp.c \

src/main/blackbox/blackbox_io.c

@@ -22,7 +22,8 @@
 
 #include "io/asyncfatfs/asyncfatfs.h"
 #include "io/flashfs.h"
-#include "io/serial_msp.h"
+
+#include "msp/msp_serial.h"
 
 #include "config/config.h"
 #include "config/config_profile.h"

src/main/fc/fc_msp.c

@@ -49,6 +49,7 @@
 #include "drivers/max7456.h"
 #include "drivers/vtx_soft_spi_rtc6705.h"
 
+#include "fc/fc_msp.h"
 #include "fc/mw.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
@@ -65,11 +66,11 @@
 #include "io/asyncfatfs/asyncfatfs.h"
 #include "io/osd.h"
 #include "io/serial_4way.h"
-#include "io/serial_msp.h"
 #include "io/vtx.h"
 
 #include "msp/msp_protocol.h"
 #include "msp/msp.h"
+#include "msp/msp_serial.h"
 
 #include "rx/rx.h"
 #include "rx/msp.h"
@@ -104,7 +105,6 @@
 #include "hardware_revision.h"
 #endif
 
-#include "io/serial_msp.h"
 
 #include "io/serial_4way.h"
 
@@ -1318,7 +1318,7 @@ static bool processOutCommand(uint8_t cmdMSP, mspPostProcessFnPtr *mspPostProces
         // reply with the count of ESC found
         serialize8(esc4wayInit());
         if (mspPostProcessFn) {
-            *mspPostProcessFn = mspRebootFn;
+            *mspPostProcessFn = msp4WayIfFn;
         }
         break;
 #endif

src/main/fc/fc_tasks.c

@@ -44,10 +44,11 @@
 #include "io/ledstrip.h"
 #include "io/osd.h"
 #include "io/serial.h"
-#include "io/serial_msp.h"
 #include "io/serial_cli.h"
 #include "io/transponder_ir.h"
 
+#include "msp/msp_serial.h"
+
 #include "rx/rx.h"
 
 #include "telemetry/telemetry.h"

src/main/fc/mw.c

@@ -33,7 +33,6 @@
 #include "drivers/accgyro.h"
 #include "drivers/compass.h"
 #include "drivers/light_led.h"
-
 #include "drivers/system.h"
 #include "drivers/serial.h"
 #include "drivers/timer.h"
@@ -45,16 +44,16 @@
 #include "sensors/gyro.h"
 #include "sensors/battery.h"
 
-#include "io/beeper.h"
-#include "io/motors.h"
-#include "io/servos.h"
-
 #include "fc/rc_controls.h"
 #include "fc/rc_curves.h"
 
+#include "msp/msp_serial.h"
+
+#include "io/beeper.h"
+#include "io/motors.h"
+#include "io/servos.h"
 #include "io/serial.h"
 #include "io/serial_cli.h"
-#include "io/serial_msp.h"
 #include "io/statusindicator.h"
 #include "io/transponder_ir.h"
 #include "io/asyncfatfs/asyncfatfs.h"

src/main/io/serial.c

@@ -42,8 +42,8 @@
 #endif
 
 #include "io/serial.h"
-#include "serial_msp.h"
 
+#include "msp/msp_serial.h"
 
 #ifdef TELEMETRY
 #include "telemetry/telemetry.h"

src/main/main.c

@@ -63,11 +63,12 @@
 #include "bus_bst.h"
 #endif
 
+#include "fc/fc_msp.h"
 #include "fc/fc_tasks.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 
-#include "msp/msp_server_fc.h"
+#include "msp/msp_serial.h"
 
 #include "rx/rx.h"
 #include "rx/spektrum.h"
@@ -83,7 +84,6 @@
 #include "io/display.h"
 #include "io/asyncfatfs/asyncfatfs.h"
 #include "io/serial_cli.h"
-#include "io/serial_msp.h"
 #include "io/transponder_ir.h"
 #include "io/osd.h"
 #include "io/vtx.h"

src/main/msp/msp_serial.c

@@ -29,9 +29,9 @@
 #include "fc/runtime_config.h"
 
 #include "io/serial.h"
-#include "io/serial_msp.h"
 
 #include "msp/msp.h"
+#include "msp/msp_serial.h"
 
 
 static mspProcessCommandFnPtr mspProcessCommandFn;