From 94d02faf37db2c14b4b816b1559aa7bca6892ab9 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Mon, 21 Feb 2022 15:40:40 +1100
Subject: [PATCH] AP_Periph: fixed build for include changes

---
 Tools/AP_Periph/AP_Periph.cpp   | 1 +
 Tools/AP_Periph/AP_Periph.h     | 6 +-----
 Tools/AP_Periph/GCS_MAVLink.cpp | 1 +
 Tools/AP_Periph/Parameters.cpp  | 2 ++
 Tools/AP_Periph/adsb.cpp        | 1 +
 Tools/AP_Periph/can.cpp         | 2 ++
 Tools/AP_Periph/msp.cpp         | 1 +
 7 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Tools/AP_Periph/AP_Periph.cpp b/Tools/AP_Periph/AP_Periph.cpp
index 20656b13d3..8364ec59fb 100644
--- a/Tools/AP_Periph/AP_Periph.cpp
+++ b/Tools/AP_Periph/AP_Periph.cpp
@@ -21,6 +21,7 @@
 
  */
 #include <AP_HAL/AP_HAL.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 #include "AP_Periph.h"
 #include <stdio.h>
 
diff --git a/Tools/AP_Periph/AP_Periph.h b/Tools/AP_Periph/AP_Periph.h
index 212ab2332f..77262b1634 100644
--- a/Tools/AP_Periph/AP_Periph.h
+++ b/Tools/AP_Periph/AP_Periph.h
@@ -17,11 +17,7 @@
 #include "hwing_esc.h"
 #include <AP_CANManager/AP_CANManager.h>
 #include <AP_Scripting/AP_Scripting.h>
-#if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
-#include <AP_HAL_ChibiOS/CANIface.h>
-#elif CONFIG_HAL_BOARD == HAL_BOARD_SITL
-#include <AP_HAL_SITL/CANSocketIface.h>
-#endif
+#include <AP_HAL/CANIface.h>
 
 #if HAL_GCS_ENABLED
 #include "GCS_MAVLink.h"
diff --git a/Tools/AP_Periph/GCS_MAVLink.cpp b/Tools/AP_Periph/GCS_MAVLink.cpp
index 70bd4e5f0a..b8a0ee55b2 100644
--- a/Tools/AP_Periph/GCS_MAVLink.cpp
+++ b/Tools/AP_Periph/GCS_MAVLink.cpp
@@ -14,6 +14,7 @@
  */
 
 #include "GCS_MAVLink.h"
+#include <AP_HAL/AP_HAL_Boards.h>
 #include "AP_Periph.h"
 
 #if HAL_GCS_ENABLED
diff --git a/Tools/AP_Periph/Parameters.cpp b/Tools/AP_Periph/Parameters.cpp
index e81329f63a..0994320940 100644
--- a/Tools/AP_Periph/Parameters.cpp
+++ b/Tools/AP_Periph/Parameters.cpp
@@ -1,3 +1,5 @@
+
+#include <AP_HAL/AP_HAL_Boards.h>
 #include "AP_Periph.h"
 
 extern const AP_HAL::HAL &hal;
diff --git a/Tools/AP_Periph/adsb.cpp b/Tools/AP_Periph/adsb.cpp
index c78475fcc2..0e44461eb7 100644
--- a/Tools/AP_Periph/adsb.cpp
+++ b/Tools/AP_Periph/adsb.cpp
@@ -17,6 +17,7 @@
   module over the UART
  */
 
+#include <AP_HAL/AP_HAL_Boards.h>
 #include "AP_Periph.h"
 
 #ifdef HAL_PERIPH_ENABLE_ADSB
diff --git a/Tools/AP_Periph/can.cpp b/Tools/AP_Periph/can.cpp
index ad50fc9e79..bdd7c5a87d 100644
--- a/Tools/AP_Periph/can.cpp
+++ b/Tools/AP_Periph/can.cpp
@@ -18,6 +18,7 @@
 
 #include <AP_HAL/AP_HAL.h>
 #include <AP_Math/AP_Math.h>
+#include <AP_HAL/AP_HAL_Boards.h>
 #include "AP_Periph.h"
 #include <canard.h>
 #include <AP_GPS/RTCM3_Parser.h>
@@ -29,6 +30,7 @@
 #include <dronecan_msgs.h>
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
+#include <hal.h>
 #include "../AP_Bootloader/app_comms.h"
 #include <AP_HAL_ChibiOS/CANIface.h>
 #include <AP_HAL_ChibiOS/hwdef/common/stm32_util.h>
diff --git a/Tools/AP_Periph/msp.cpp b/Tools/AP_Periph/msp.cpp
index 9ebd56f663..e7d130f76f 100644
--- a/Tools/AP_Periph/msp.cpp
+++ b/Tools/AP_Periph/msp.cpp
@@ -3,6 +3,7 @@
   Thanks to input from Konstantin Sharlaimov
  */
 
+#include <AP_HAL/AP_HAL_Boards.h>
 #include "AP_Periph.h"
 
 #ifdef HAL_PERIPH_ENABLE_MSP