Merge pull request #4559 from martinbudden/bfa_header_tidy

Tidied header files

src/main/interface/settings.c

@@ -17,11 +17,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <math.h>
-#include <ctype.h>
 
 #include "platform.h"
 

src/main/rx/crsf.c

@@ -38,8 +38,6 @@
 
 #include "io/serial.h"
 
-#include "msp/msp.h"
-
 #include "rx/rx.h"
 #include "rx/crsf.h"
 

src/main/telemetry/crsf.h

@@ -17,9 +17,11 @@
 
 #pragma once
 
+#include <stdbool.h>
+#include <stdint.h>
+
 #include "common/time.h"
 #include "rx/crsf.h"
-#include "telemetry/msp_shared.h"
 
 void initCrsfTelemetry(void);
 bool checkCrsfTelemetryState(void);

src/main/telemetry/msp_shared.c

@@ -1,7 +1,5 @@
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdlib.h>
-#include <math.h>
 #include <string.h>
 
 #include "platform.h"
@@ -14,10 +12,7 @@
 
 #include "interface/fc_msp.h"
 
-#include "msp/msp.h"
-
 #include "rx/crsf.h"
-#include "rx/msp.h"
 
 #include "telemetry/msp_shared.h"
 #include "telemetry/smartport.h"

src/main/telemetry/msp_shared.h

@@ -1,17 +1,18 @@
 #pragma once
 
-#include "msp/msp.h"
+#include "common/streambuf.h"
 #include "rx/crsf.h"
 #include "telemetry/smartport.h"
 
 typedef void (*mspResponseFnPtr)(uint8_t *payload);
 
+struct mspPacket_s;
 typedef struct mspPackage_s {
     sbuf_t requestFrame;
     uint8_t *requestBuffer;
     uint8_t *responseBuffer;
-    mspPacket_t *requestPacket;
-    mspPacket_t *responsePacket;
+    struct mspPacket_s *requestPacket;
+    struct mspPacket_s *responsePacket;
 } mspPackage_t;
 
 typedef union mspRxBuffer_u {

src/main/telemetry/smartport.h

@@ -7,7 +7,8 @@
 
 #pragma once
 
-#include "drivers/serial.h"
+#include <stdbool.h>
+#include <stdint.h>
 
 #define SMARTPORT_MSP_TX_BUF_SIZE 256
 #define SMARTPORT_MSP_RX_BUF_SIZE 64
@@ -27,5 +28,6 @@ bool initSmartPortTelemetryExternal(smartPortWriteFrameFn *smartPortWriteFrameEx
 void handleSmartPortTelemetry(void);
 void processSmartPortTelemetry(smartPortPayload_t *payload, volatile bool *hasRequest, const uint32_t *requestTimeout);
 
-void smartPortWriteFrameSerial(const smartPortPayload_t *payload, serialPort_t *port, uint16_t checksum);
-void smartPortSendByte(uint8_t c, uint16_t *checksum, serialPort_t *port);
+struct serialPort_s;
+void smartPortWriteFrameSerial(const smartPortPayload_t *payload, struct serialPort_s *port, uint16_t checksum);
+void smartPortSendByte(uint8_t c, uint16_t *checksum, struct serialPort_s *port);