From 1d4b13af0839261018663c134dd77e377890cdf5 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Wed, 24 Nov 2021 14:33:03 +1100
Subject: [PATCH] AP_Periph: correct compilation when both periph-adsb and GCS
 enabled

Get lots of these otherwise:

/home/pbarker/gcc/gcc-arm-none-eabi-10.3-2021.07/bin/../lib/gcc/arm-none-eabi/10.3.1/../../../../arm-none-eabi/bin/ld: lib/libAP_Periph_libs.a(GCS_MAVLink.cpp.0.o): in function `mavlink_parse_char':
GCS_MAVLink.cpp:(.text.mavlink_parse_char+0x0): multiple definition of `mavlink_parse_char'; Tools/AP_Periph/adsb.cpp.41.o:adsb.cpp:(.text.mavlink_parse_char+0x0): first defined here
/home/pbarker/gcc/gcc-arm-none-eabi-10.3-2021.07/bin/../lib/gcc/arm-none-eabi/10.3.1/../../../../arm-none-eabi/bin/ld: lib/libAP_Periph_libs.a(GCS_MAVLink.cpp.0.o): in function `put_bitfield_n_by_index':
GCS_MAVLink.cpp:(.text.put_bitfield_n_by_index+0x0): multiple definition of `put_bitfield_n_by_index'; Tools/AP_Periph/adsb.cpp.41.o:adsb.cpp:(.text.put_bitfield_n_by_index+0x0): first defined here
---
 Tools/AP_Periph/adsb.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Tools/AP_Periph/adsb.cpp b/Tools/AP_Periph/adsb.cpp
index 81787d9b1f..b9e72c24db 100644
--- a/Tools/AP_Periph/adsb.cpp
+++ b/Tools/AP_Periph/adsb.cpp
@@ -25,6 +25,8 @@
 
 extern const AP_HAL::HAL &hal;
 
+# if !HAL_GCS_ENABLED
+
 #include "include/mavlink/v2.0/protocol.h"
 #include "include/mavlink/v2.0/mavlink_types.h"
 #include "include/mavlink/v2.0/ardupilotmega/mavlink.h"
@@ -33,6 +35,7 @@ extern const AP_HAL::HAL &hal;
 #include "include/mavlink/v2.0/mavlink_helpers.h"
 #pragma GCC diagnostic pop
 
+#endif
 
 /*
   init ADSB support