Compilation fixes

paparazzi · Mar 20, 2017 · 7fd1d52 · 7fd1d52
1 parent 7402d0a
commit 7fd1d52
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 14 deletions.
diff --git a/sw/airborne/arch/sim/sim_ap.c b/sw/airborne/arch/sim/sim_ap.c
@@ -137,7 +137,7 @@ value set_datalink_message(value s)
   }
 
   dl_msg_available = true;
-  DlCheckAndParse(&(DOWNLINK_DEVICE).device, &ivy_tp.trans_tx, dl_buffer);
+  DlCheckAndParse(&(DOWNLINK_DEVICE).device, &ivy_tp.trans_tx, dl_buffer, &dl_msg_available);
 
   return Val_unit;
 }

diff --git a/sw/airborne/modules/datalink/bluegiga_dl.c b/sw/airborne/modules/datalink/bluegiga_dl.c
@@ -38,6 +38,6 @@ void bluegiga_dl_init(void)
 void bluegiga_dl_event(void)
 {
   pprz_check_and_parse(&DOWNLINK_DEVICE.device, &pprz_bg_tp, dl_buffer, &dl_msg_available);
-  DlCheckAndParse(&DOWNLINK_DEVICE.device, &pprz_bg_tp.trans_tx, dl_buffer);
+  DlCheckAndParse(&DOWNLINK_DEVICE.device, &pprz_bg_tp.trans_tx, dl_buffer, &dl_msg_available);
 }
 
diff --git a/sw/airborne/modules/datalink/extra_pprz_dl.c b/sw/airborne/modules/datalink/extra_pprz_dl.c
@@ -60,18 +60,17 @@
 bool extra_dl_msg_available;
 uint8_t extra_dl_buffer[MSG_SIZE]  __attribute__((aligned));
 
-/* PPRZ transport structure */
 struct pprz_transport extra_pprz_tp;
 
 void extra_pprz_dl_init(void)
 {
   pprz_transport_init(&extra_pprz_tp);
 }
 
-extern void extra_pprz_dl_event(void)
+void extra_pprz_dl_event(void)
 {
   pprz_check_and_parse(&EXTRA_DOWNLINK_DEVICE.device, &extra_pprz_tp, extra_dl_buffer, &extra_dl_msg_available);
-  DlCheckAndParse(&EXTRA_DOWNLINK_DEVICE.device, &extra_pprz_tp.trans_tx, extra_dl_buffer);
+  DlCheckAndParse(&EXTRA_DOWNLINK_DEVICE.device, &extra_pprz_tp.trans_tx, extra_dl_buffer, &extra_dl_msg_available);
 }
 
 void extra_pprz_dl_periodic(void)

diff --git a/sw/airborne/modules/datalink/extra_pprz_dl.h b/sw/airborne/modules/datalink/extra_pprz_dl.h
@@ -36,6 +36,9 @@
 // so we don't have to remember the index of bytes
 #define PAYLOAD_CMD_IDX 0
 
+/* PPRZ transport structure */
+extern struct pprz_transport extra_pprz_tp;
+
 /** Datalink Event */
 void extra_pprz_dl_event(void);
 

diff --git a/sw/airborne/modules/datalink/pprz_dl.c b/sw/airborne/modules/datalink/pprz_dl.c
@@ -36,6 +36,6 @@ void pprz_dl_init(void)
 void pprz_dl_event(void)
 {
   pprz_check_and_parse(&DOWNLINK_DEVICE.device, &pprz_tp, dl_buffer, &dl_msg_available);
-  DlCheckAndParse(&DOWNLINK_DEVICE.device, &pprz_tp.trans_tx, dl_buffer);
+  DlCheckAndParse(&DOWNLINK_DEVICE.device, &pprz_tp.trans_tx, dl_buffer, &dl_msg_available);
 }
 
diff --git a/sw/airborne/modules/datalink/xbee_dl.c b/sw/airborne/modules/datalink/xbee_dl.c
@@ -53,6 +53,6 @@ void xbee_dl_init(void)
 void xbee_dl_event(void)
 {
   xbee_check_and_parse(&(XBEE_UART).device, &xbee_tp, dl_buffer, &dl_msg_available);
-  DlCheckAndParse(&(XBEE_UART).device, &xbee_tp.trans_tx, dl_buffer);
+  DlCheckAndParse(&(XBEE_UART).device, &xbee_tp.trans_tx, dl_buffer, &dl_msg_available);
 }
 
diff --git a/sw/airborne/modules/nav/nav_geofence.h b/sw/airborne/modules/nav/nav_geofence.h
@@ -30,8 +30,7 @@
  * home_mode_max_alt is (optionally) defined in the flight plan
  * GEOFENCE_DATALINK_LOST_TIME is defined in the airframe config file
  */
-
-#include <stdbool.h>
+#include "subsystems/datalink/datalink.h"
 
 #ifdef GEOFENCE_DATALINK_LOST_TIME
 /*

diff --git a/sw/airborne/subsystems/datalink/datalink.h b/sw/airborne/subsystems/datalink/datalink.h
@@ -79,7 +79,7 @@ EXTERN bool datalink_enabled;
 }
 
 /** Check for new message and parse */
-static inline void DlCheckAndParse(struct link_device *dev, struct transport_tx *trans, uint8_t *buf)
+static inline void DlCheckAndParse(struct link_device *dev, struct transport_tx *trans, uint8_t *buf, bool *msg_available)
 {
   // make it possible to disable datalink in NPS sim
 #if USE_NPS
@@ -88,11 +88,11 @@ static inline void DlCheckAndParse(struct link_device *dev, struct transport_tx
   }
 #endif
 
-  if (dl_msg_available) {
+  if (*msg_available) {
     datalink_time = 0;
     datalink_nb_msgs++;
     dl_parse_msg(dev, trans, buf);
-    dl_msg_available = false;
+    *msg_available = false;
   }
 }
 

diff --git a/sw/airborne/subsystems/datalink/superbitrf.c b/sw/airborne/subsystems/datalink/superbitrf.c
@@ -288,7 +288,7 @@ void superbitrf_dl_init(void)
  */
 void superbitrf_dl_event(void)
 {
-  DlCheckAndParse(&DOWNLINK_DEVICE.device, &pprz_srf_tp.trans_tx, dl_buffer);
+  DlCheckAndParse(&DOWNLINK_DEVICE.device, &pprz_srf_tp.trans_tx, dl_buffer, &dl_msg_available);
 }
 
 void superbitrf_set_mfg_id(uint32_t id)

diff --git a/sw/airborne/subsystems/datalink/w5100.h b/sw/airborne/subsystems/datalink/w5100.h
@@ -104,7 +104,7 @@ static inline void w5100_check_and_parse(struct link_device *dev, struct pprz_tr
 static inline w5100_event(void)
 {
   w5100_check_and_parse(&(W5100).device, &pprz_w5100_tp);
-  DlCheckAndParse(&(W5100).device, &pprz_w5100_tp.trans_tx, dl_buffer);
+  DlCheckAndParse(&(W5100).device, &pprz_w5100_tp.trans_tx, dl_buffer, &dl_msg_available);
 }
 
 #endif /* W5100_H */