From 124b750c10b771f8e62f62a9a2f264fb585ae87d Mon Sep 17 00:00:00 2001 From: Gustavo Jose de Sousa Date: Tue, 11 Aug 2015 16:28:43 +1000 Subject: [PATCH] AP_HAL_Linux: standardize inclusion of libaries headers This commit changes the way libraries headers are included in source files: - If the header is in the same directory the source belongs to, so the notation '#include ""' is used with the path relative to the directory containing the source. - If the header is outside the directory containing the source, then we use the notation '#include <>' with the path relative to libraries folder. Some of the advantages of such approach: - Only one search path for libraries headers. - OSs like Windows may have a better lookup time. --- libraries/AP_HAL_Linux/AP_HAL_Linux.h | 2 +- libraries/AP_HAL_Linux/AnalogIn.cpp | 2 +- libraries/AP_HAL_Linux/AnalogIn.h | 2 +- libraries/AP_HAL_Linux/AnalogIn_Navio.cpp | 2 +- libraries/AP_HAL_Linux/AnalogIn_Navio.h | 4 ++-- libraries/AP_HAL_Linux/ConsoleDevice.cpp | 2 +- libraries/AP_HAL_Linux/GPIO.cpp | 2 +- libraries/AP_HAL_Linux/GPIO.h | 2 +- libraries/AP_HAL_Linux/GPIO_BBB.cpp | 2 +- libraries/AP_HAL_Linux/GPIO_BBB.h | 2 +- libraries/AP_HAL_Linux/GPIO_RPI.cpp | 2 +- libraries/AP_HAL_Linux/GPIO_RPI.h | 2 +- libraries/AP_HAL_Linux/HAL_Linux_Class.cpp | 8 ++++---- libraries/AP_HAL_Linux/HAL_Linux_Class.h | 2 +- libraries/AP_HAL_Linux/I2CDriver.cpp | 2 +- libraries/AP_HAL_Linux/I2CDriver.h | 2 +- libraries/AP_HAL_Linux/RCInput.cpp | 2 +- libraries/AP_HAL_Linux/RCInput.h | 2 +- libraries/AP_HAL_Linux/RCInput_AioPRU.cpp | 2 +- libraries/AP_HAL_Linux/RCInput_AioPRU.h | 2 +- libraries/AP_HAL_Linux/RCInput_Navio.cpp | 2 +- libraries/AP_HAL_Linux/RCInput_Navio.h | 2 +- libraries/AP_HAL_Linux/RCInput_PRU.cpp | 2 +- libraries/AP_HAL_Linux/RCInput_PRU.h | 2 +- libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp | 2 +- libraries/AP_HAL_Linux/RCInput_ZYNQ.h | 2 +- libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp | 2 +- libraries/AP_HAL_Linux/RCOutput_AioPRU.h | 2 +- libraries/AP_HAL_Linux/RCOutput_Bebop.cpp | 2 +- libraries/AP_HAL_Linux/RCOutput_Bebop.h | 2 +- libraries/AP_HAL_Linux/RCOutput_Navio.cpp | 2 +- libraries/AP_HAL_Linux/RCOutput_Navio.h | 2 +- libraries/AP_HAL_Linux/RCOutput_PRU.cpp | 2 +- libraries/AP_HAL_Linux/RCOutput_PRU.h | 2 +- libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp | 2 +- libraries/AP_HAL_Linux/RCOutput_ZYNQ.h | 2 +- libraries/AP_HAL_Linux/SPIDriver.cpp | 4 ++-- libraries/AP_HAL_Linux/SPIDriver.h | 2 +- libraries/AP_HAL_Linux/SPIUARTDriver.cpp | 2 +- libraries/AP_HAL_Linux/SPIUARTDriver.h | 2 +- libraries/AP_HAL_Linux/Scheduler.cpp | 2 +- libraries/AP_HAL_Linux/Scheduler.h | 2 +- libraries/AP_HAL_Linux/Semaphores.cpp | 2 +- libraries/AP_HAL_Linux/Semaphores.h | 4 ++-- libraries/AP_HAL_Linux/Storage.cpp | 2 +- libraries/AP_HAL_Linux/Storage.h | 2 +- libraries/AP_HAL_Linux/Storage_FRAM.cpp | 2 +- libraries/AP_HAL_Linux/Storage_FRAM.h | 2 +- libraries/AP_HAL_Linux/TCPServerDevice.cpp | 2 +- libraries/AP_HAL_Linux/ToneAlarmDriver.cpp | 2 +- libraries/AP_HAL_Linux/ToneAlarmDriver.h | 2 +- libraries/AP_HAL_Linux/UARTDevice.cpp | 2 +- libraries/AP_HAL_Linux/UARTDriver.cpp | 2 +- libraries/AP_HAL_Linux/UARTDriver.h | 2 +- libraries/AP_HAL_Linux/UDPDevice.cpp | 2 +- libraries/AP_HAL_Linux/Util.cpp | 2 +- libraries/AP_HAL_Linux/Util.h | 2 +- libraries/AP_HAL_Linux/dsm.cpp | 2 +- .../AP_HAL_Linux/examples/BusTest/BusTest.cpp | 16 ++++++++-------- 59 files changed, 72 insertions(+), 72 deletions(-) diff --git a/libraries/AP_HAL_Linux/AP_HAL_Linux.h b/libraries/AP_HAL_Linux/AP_HAL_Linux.h index 16f4f44fec..784c3e1f6e 100644 --- a/libraries/AP_HAL_Linux/AP_HAL_Linux.h +++ b/libraries/AP_HAL_Linux/AP_HAL_Linux.h @@ -3,7 +3,7 @@ #define __AP_HAL_LINUX_H__ /* Your layer exports should depend on AP_HAL.h ONLY. */ -#include +#include /** * Umbrella header for AP_HAL_Linux module. diff --git a/libraries/AP_HAL_Linux/AnalogIn.cpp b/libraries/AP_HAL_Linux/AnalogIn.cpp index f919b62c14..243bfa5a22 100644 --- a/libraries/AP_HAL_Linux/AnalogIn.cpp +++ b/libraries/AP_HAL_Linux/AnalogIn.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX #include "AnalogIn.h" diff --git a/libraries/AP_HAL_Linux/AnalogIn.h b/libraries/AP_HAL_Linux/AnalogIn.h index be0edced3c..74d65549c2 100644 --- a/libraries/AP_HAL_Linux/AnalogIn.h +++ b/libraries/AP_HAL_Linux/AnalogIn.h @@ -2,7 +2,7 @@ #ifndef __AP_HAL_LINUX_ANALOGIN_H__ #define __AP_HAL_LINUX_ANALOGIN_H__ -#include +#include "AP_HAL_Linux.h" class Linux::LinuxAnalogSource : public AP_HAL::AnalogSource { public: diff --git a/libraries/AP_HAL_Linux/AnalogIn_Navio.cpp b/libraries/AP_HAL_Linux/AnalogIn_Navio.cpp index bc3a5f8e7c..72bf454286 100644 --- a/libraries/AP_HAL_Linux/AnalogIn_Navio.cpp +++ b/libraries/AP_HAL_Linux/AnalogIn_Navio.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/AnalogIn_Navio.h b/libraries/AP_HAL_Linux/AnalogIn_Navio.h index 51d595af72..6a04ad52d3 100644 --- a/libraries/AP_HAL_Linux/AnalogIn_Navio.h +++ b/libraries/AP_HAL_Linux/AnalogIn_Navio.h @@ -1,8 +1,8 @@ #ifndef __NavioAnalogIn_H__ #define __NavioAnalogIn_H__ -#include -#include +#include "AP_HAL_Linux.h" +#include #define NAVIO_ADC_MAX_CHANNELS 6 diff --git a/libraries/AP_HAL_Linux/ConsoleDevice.cpp b/libraries/AP_HAL_Linux/ConsoleDevice.cpp index 7fd50a4de5..5b763ca3e4 100644 --- a/libraries/AP_HAL_Linux/ConsoleDevice.cpp +++ b/libraries/AP_HAL_Linux/ConsoleDevice.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX #include "ConsoleDevice.h" diff --git a/libraries/AP_HAL_Linux/GPIO.cpp b/libraries/AP_HAL_Linux/GPIO.cpp index dbfaf04dab..664d22df5d 100644 --- a/libraries/AP_HAL_Linux/GPIO.cpp +++ b/libraries/AP_HAL_Linux/GPIO.cpp @@ -1,4 +1,4 @@ -#include +#include #include "GPIO.h" #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/GPIO.h b/libraries/AP_HAL_Linux/GPIO.h index 17e706dc00..60dab83767 100644 --- a/libraries/AP_HAL_Linux/GPIO.h +++ b/libraries/AP_HAL_Linux/GPIO.h @@ -1,7 +1,7 @@ #ifndef __AP_HAL_LINUX_GPIO_H__ #define __AP_HAL_LINUX_GPIO_H__ -#include +#include "AP_HAL_Linux.h" #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLE || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI diff --git a/libraries/AP_HAL_Linux/GPIO_BBB.cpp b/libraries/AP_HAL_Linux/GPIO_BBB.cpp index 632a0ad00d..ac21b7e20b 100644 --- a/libraries/AP_HAL_Linux/GPIO_BBB.cpp +++ b/libraries/AP_HAL_Linux/GPIO_BBB.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF || \ CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLE || \ diff --git a/libraries/AP_HAL_Linux/GPIO_BBB.h b/libraries/AP_HAL_Linux/GPIO_BBB.h index 1a8f7a54b1..fe33e63e9e 100644 --- a/libraries/AP_HAL_Linux/GPIO_BBB.h +++ b/libraries/AP_HAL_Linux/GPIO_BBB.h @@ -2,7 +2,7 @@ #ifndef __AP_HAL_LINUX_GPIO_BBB_H__ #define __AP_HAL_LINUX_GPIO_BBB_H__ -#include +#include "AP_HAL_Linux.h" #define SYSFS_GPIO_DIR "/sys/class/gpio" diff --git a/libraries/AP_HAL_Linux/GPIO_RPI.cpp b/libraries/AP_HAL_Linux/GPIO_RPI.cpp index 811f45abcb..96a5afd6c9 100644 --- a/libraries/AP_HAL_Linux/GPIO_RPI.cpp +++ b/libraries/AP_HAL_Linux/GPIO_RPI.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO diff --git a/libraries/AP_HAL_Linux/GPIO_RPI.h b/libraries/AP_HAL_Linux/GPIO_RPI.h index 48813ecf7e..66f5914586 100644 --- a/libraries/AP_HAL_Linux/GPIO_RPI.h +++ b/libraries/AP_HAL_Linux/GPIO_RPI.h @@ -3,7 +3,7 @@ #define __AP_HAL_LINUX_GPIO_RPI_H__ #include -#include +#include "AP_HAL_Linux.h" #define LOW 0 #define HIGH 1 diff --git a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp index abaaf2ef86..1e4511e4f3 100644 --- a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp +++ b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp @@ -1,16 +1,16 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX #include "HAL_Linux_Class.h" #include "AP_HAL_Linux_Private.h" -#include +#include #include #include #include -#include -#include +#include +#include using namespace Linux; diff --git a/libraries/AP_HAL_Linux/HAL_Linux_Class.h b/libraries/AP_HAL_Linux/HAL_Linux_Class.h index 12a4474124..d783acfdeb 100644 --- a/libraries/AP_HAL_Linux/HAL_Linux_Class.h +++ b/libraries/AP_HAL_Linux/HAL_Linux_Class.h @@ -2,7 +2,7 @@ #ifndef __AP_HAL_LINUX_CLASS_H__ #define __AP_HAL_LINUX_CLASS_H__ -#include +#include #include "AP_HAL_Linux_Namespace.h" diff --git a/libraries/AP_HAL_Linux/I2CDriver.cpp b/libraries/AP_HAL_Linux/I2CDriver.cpp index 79f33505e3..3a5b52ce55 100644 --- a/libraries/AP_HAL_Linux/I2CDriver.cpp +++ b/libraries/AP_HAL_Linux/I2CDriver.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX #include "I2CDriver.h" diff --git a/libraries/AP_HAL_Linux/I2CDriver.h b/libraries/AP_HAL_Linux/I2CDriver.h index 7c2984b326..675ec9e151 100644 --- a/libraries/AP_HAL_Linux/I2CDriver.h +++ b/libraries/AP_HAL_Linux/I2CDriver.h @@ -2,7 +2,7 @@ #ifndef __AP_HAL_LINUX_I2CDRIVER_H__ #define __AP_HAL_LINUX_I2CDRIVER_H__ -#include +#include "AP_HAL_Linux.h" class Linux::LinuxI2CDriver : public AP_HAL::I2CDriver { public: diff --git a/libraries/AP_HAL_Linux/RCInput.cpp b/libraries/AP_HAL_Linux/RCInput.cpp index c97ba5c2d1..722c461efd 100644 --- a/libraries/AP_HAL_Linux/RCInput.cpp +++ b/libraries/AP_HAL_Linux/RCInput.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX #include diff --git a/libraries/AP_HAL_Linux/RCInput.h b/libraries/AP_HAL_Linux/RCInput.h index 6945ac1c24..a938de2eee 100644 --- a/libraries/AP_HAL_Linux/RCInput.h +++ b/libraries/AP_HAL_Linux/RCInput.h @@ -2,7 +2,7 @@ #ifndef __AP_HAL_LINUX_RCINPUT_H__ #define __AP_HAL_LINUX_RCINPUT_H__ -#include +#include "AP_HAL_Linux.h" #define LINUX_RC_INPUT_NUM_CHANNELS 16 diff --git a/libraries/AP_HAL_Linux/RCInput_AioPRU.cpp b/libraries/AP_HAL_Linux/RCInput_AioPRU.cpp index 30a36a3675..efc6285c1e 100644 --- a/libraries/AP_HAL_Linux/RCInput_AioPRU.cpp +++ b/libraries/AP_HAL_Linux/RCInput_AioPRU.cpp @@ -10,7 +10,7 @@ // along with this program. If not, see . -#include +#include #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI diff --git a/libraries/AP_HAL_Linux/RCInput_AioPRU.h b/libraries/AP_HAL_Linux/RCInput_AioPRU.h index 35d1d7a1af..009ca80321 100644 --- a/libraries/AP_HAL_Linux/RCInput_AioPRU.h +++ b/libraries/AP_HAL_Linux/RCInput_AioPRU.h @@ -18,7 +18,7 @@ doing the edge detection of the PPM sum input */ -#include +#include "AP_HAL_Linux.h" #define RCIN_PRUSS_RAM_BASE 0x4a303000 // we use 300 ring buffer entries to guarantee that a full 25 byte diff --git a/libraries/AP_HAL_Linux/RCInput_Navio.cpp b/libraries/AP_HAL_Linux/RCInput_Navio.cpp index 552d027407..e78333b991 100644 --- a/libraries/AP_HAL_Linux/RCInput_Navio.cpp +++ b/libraries/AP_HAL_Linux/RCInput_Navio.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO #include "GPIO.h" diff --git a/libraries/AP_HAL_Linux/RCInput_Navio.h b/libraries/AP_HAL_Linux/RCInput_Navio.h index 61c9620a6c..32b8a5dea5 100644 --- a/libraries/AP_HAL_Linux/RCInput_Navio.h +++ b/libraries/AP_HAL_Linux/RCInput_Navio.h @@ -1,7 +1,7 @@ #ifndef __AP_HAL_LINUX_RCINPUT_NAVIO_H__ #define __AP_HAL_LINUX_RCINPUT_NAVIO_H__ -#include +#include "AP_HAL_Linux.h" #include "RCInput.h" #include #include diff --git a/libraries/AP_HAL_Linux/RCInput_PRU.cpp b/libraries/AP_HAL_Linux/RCInput_PRU.cpp index e4aed1ac7e..20ae63c3de 100644 --- a/libraries/AP_HAL_Linux/RCInput_PRU.cpp +++ b/libraries/AP_HAL_Linux/RCInput_PRU.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF || \ CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLE || \ diff --git a/libraries/AP_HAL_Linux/RCInput_PRU.h b/libraries/AP_HAL_Linux/RCInput_PRU.h index 738f581f86..ecf6453147 100644 --- a/libraries/AP_HAL_Linux/RCInput_PRU.h +++ b/libraries/AP_HAL_Linux/RCInput_PRU.h @@ -7,7 +7,7 @@ doing the edge detection of the PPM sum input */ -#include +#include "AP_HAL_Linux.h" #define RCIN_PRUSS_SHAREDRAM_BASE 0x4a312000 // we use 300 ring buffer entries to guarantee that a full 25 byte diff --git a/libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp b/libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp index eb3938c579..ec33f38992 100644 --- a/libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp +++ b/libraries/AP_HAL_Linux/RCInput_ZYNQ.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX #include diff --git a/libraries/AP_HAL_Linux/RCInput_ZYNQ.h b/libraries/AP_HAL_Linux/RCInput_ZYNQ.h index 198dc0b3ac..f5d0e80b0f 100644 --- a/libraries/AP_HAL_Linux/RCInput_ZYNQ.h +++ b/libraries/AP_HAL_Linux/RCInput_ZYNQ.h @@ -7,7 +7,7 @@ logic doing the edge detection of the PPM sum input */ -#include +#include "AP_HAL_Linux.h" // FIXME A puppie dies when you hard code an address #define RCIN_ZYNQ_PULSE_INPUT_BASE 0x43c10000 diff --git a/libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp b/libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp index aee66be32f..664af613d5 100644 --- a/libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp +++ b/libraries/AP_HAL_Linux/RCOutput_AioPRU.cpp @@ -10,7 +10,7 @@ // along with this program. If not, see . -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/RCOutput_AioPRU.h b/libraries/AP_HAL_Linux/RCOutput_AioPRU.h index c8d8980e08..7978d07cdc 100644 --- a/libraries/AP_HAL_Linux/RCOutput_AioPRU.h +++ b/libraries/AP_HAL_Linux/RCOutput_AioPRU.h @@ -13,7 +13,7 @@ #ifndef __AP_HAL_LINUX_RCOUTPUT_AIOPRU_H__ #define __AP_HAL_LINUX_RCOUTPUT_AIOPRU_H__ -#include +#include "AP_HAL_Linux.h" #define RCOUT_PRUSS_RAM_BASE 0x4a302000 #define RCOUT_PRUSS_CTRL_BASE 0x4a324000 #define RCOUT_PRUSS_IRAM_BASE 0x4a338000 diff --git a/libraries/AP_HAL_Linux/RCOutput_Bebop.cpp b/libraries/AP_HAL_Linux/RCOutput_Bebop.cpp index 9609670105..493992c483 100644 --- a/libraries/AP_HAL_Linux/RCOutput_Bebop.cpp +++ b/libraries/AP_HAL_Linux/RCOutput_Bebop.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP #include diff --git a/libraries/AP_HAL_Linux/RCOutput_Bebop.h b/libraries/AP_HAL_Linux/RCOutput_Bebop.h index 6c33f7e758..43e0ac6889 100644 --- a/libraries/AP_HAL_Linux/RCOutput_Bebop.h +++ b/libraries/AP_HAL_Linux/RCOutput_Bebop.h @@ -1,7 +1,7 @@ #ifndef __AP_HAL_LINUX_RCOUTPUT_BEBOP_H__ #define __AP_HAL_LINUX_RCOUTPUT_BEBOP_H__ -#include +#include "AP_HAL_Linux.h" enum bebop_bldc_motor { BEBOP_BLDC_RIGHT_FRONT = 0, diff --git a/libraries/AP_HAL_Linux/RCOutput_Navio.cpp b/libraries/AP_HAL_Linux/RCOutput_Navio.cpp index 541a5a9d80..1db5143d52 100644 --- a/libraries/AP_HAL_Linux/RCOutput_Navio.cpp +++ b/libraries/AP_HAL_Linux/RCOutput_Navio.cpp @@ -1,5 +1,5 @@ -#include +#include #include "GPIO.h" #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO diff --git a/libraries/AP_HAL_Linux/RCOutput_Navio.h b/libraries/AP_HAL_Linux/RCOutput_Navio.h index 38dc14842c..42a6cd1a10 100644 --- a/libraries/AP_HAL_Linux/RCOutput_Navio.h +++ b/libraries/AP_HAL_Linux/RCOutput_Navio.h @@ -2,7 +2,7 @@ #ifndef __AP_HAL_LINUX_RCOUTPUT_NAVIO_H__ #define __AP_HAL_LINUX_RCOUTPUT_NAVIO_H__ -#include +#include "AP_HAL_Linux.h" class Linux::LinuxRCOutput_Navio : public AP_HAL::RCOutput { public: diff --git a/libraries/AP_HAL_Linux/RCOutput_PRU.cpp b/libraries/AP_HAL_Linux/RCOutput_PRU.cpp index eafbb7c3e8..f0800d233e 100644 --- a/libraries/AP_HAL_Linux/RCOutput_PRU.cpp +++ b/libraries/AP_HAL_Linux/RCOutput_PRU.cpp @@ -1,5 +1,5 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/RCOutput_PRU.h b/libraries/AP_HAL_Linux/RCOutput_PRU.h index 5d3fb73b89..06ca5e87fe 100644 --- a/libraries/AP_HAL_Linux/RCOutput_PRU.h +++ b/libraries/AP_HAL_Linux/RCOutput_PRU.h @@ -2,7 +2,7 @@ #ifndef __AP_HAL_LINUX_RCOUTPUT_PRU_H__ #define __AP_HAL_LINUX_RCOUTPUT_PRU_H__ -#include +#include "AP_HAL_Linux.h" #define RCOUT_PRUSS_SHAREDRAM_BASE 0x4a310000 #define MAX_PWMS 12 #define PWM_CMD_MAGIC 0xf00fbaaf diff --git a/libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp b/libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp index b66e452658..bb71f0a60d 100644 --- a/libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp +++ b/libraries/AP_HAL_Linux/RCOutput_ZYNQ.cpp @@ -1,5 +1,5 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/RCOutput_ZYNQ.h b/libraries/AP_HAL_Linux/RCOutput_ZYNQ.h index f614df0c79..986c0ab917 100644 --- a/libraries/AP_HAL_Linux/RCOutput_ZYNQ.h +++ b/libraries/AP_HAL_Linux/RCOutput_ZYNQ.h @@ -2,7 +2,7 @@ #ifndef __AP_HAL_LINUX_RCOUTPUT_ZYNQ_H__ #define __AP_HAL_LINUX_RCOUTPUT_ZYNQ_H__ -#include +#include "AP_HAL_Linux.h" #define RCOUT_ZYNQ_PWM_BASE 0x43c00000 //FIXME hardcoding is the devil's work #define MAX_ZYNQ_PWMS 8 /* number of pwm channels */ #define PWM_CMD_CONFIG 0 /* full configuration in one go */ diff --git a/libraries/AP_HAL_Linux/SPIDriver.cpp b/libraries/AP_HAL_Linux/SPIDriver.cpp index f9465bff06..c33ddaf4ca 100644 --- a/libraries/AP_HAL_Linux/SPIDriver.cpp +++ b/libraries/AP_HAL_Linux/SPIDriver.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX #include "SPIDriver.h" diff --git a/libraries/AP_HAL_Linux/SPIDriver.h b/libraries/AP_HAL_Linux/SPIDriver.h index b24676703e..445f029038 100644 --- a/libraries/AP_HAL_Linux/SPIDriver.h +++ b/libraries/AP_HAL_Linux/SPIDriver.h @@ -2,7 +2,7 @@ #ifndef __AP_HAL_EMPTY_SPIDRIVER_H__ #define __AP_HAL_EMPTY_SPIDRIVER_H__ -#include +#include "AP_HAL_Linux.h" #include "Semaphores.h" // Most platforms won't need to declare the spidev bus offset diff --git a/libraries/AP_HAL_Linux/SPIUARTDriver.cpp b/libraries/AP_HAL_Linux/SPIUARTDriver.cpp index a2a52a1579..37492830d5 100644 --- a/libraries/AP_HAL_Linux/SPIUARTDriver.cpp +++ b/libraries/AP_HAL_Linux/SPIUARTDriver.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/SPIUARTDriver.h b/libraries/AP_HAL_Linux/SPIUARTDriver.h index 325cc417a8..9e55491a2b 100644 --- a/libraries/AP_HAL_Linux/SPIUARTDriver.h +++ b/libraries/AP_HAL_Linux/SPIUARTDriver.h @@ -1,7 +1,7 @@ #ifndef __AP_HAL_LINUX_SPIUARTDRIVER_H__ #define __AP_HAL_LINUX_SPIUARTDRIVER_H__ -#include +#include "AP_HAL_Linux.h" #include "UARTDriver.h" diff --git a/libraries/AP_HAL_Linux/Scheduler.cpp b/libraries/AP_HAL_Linux/Scheduler.cpp index 1ef0c414b7..b247a57194 100644 --- a/libraries/AP_HAL_Linux/Scheduler.cpp +++ b/libraries/AP_HAL_Linux/Scheduler.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/Scheduler.h b/libraries/AP_HAL_Linux/Scheduler.h index 7d08ec371d..56c9a59ab0 100644 --- a/libraries/AP_HAL_Linux/Scheduler.h +++ b/libraries/AP_HAL_Linux/Scheduler.h @@ -2,7 +2,7 @@ #ifndef __AP_HAL_LINUX_SCHEDULER_H__ #define __AP_HAL_LINUX_SCHEDULER_H__ -#include +#include "AP_HAL_Linux.h" #include "Semaphores.h" #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/Semaphores.cpp b/libraries/AP_HAL_Linux/Semaphores.cpp index 09717bd4a4..265a587353 100644 --- a/libraries/AP_HAL_Linux/Semaphores.cpp +++ b/libraries/AP_HAL_Linux/Semaphores.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/Semaphores.h b/libraries/AP_HAL_Linux/Semaphores.h index 7828cbf0e1..88c61d4084 100644 --- a/libraries/AP_HAL_Linux/Semaphores.h +++ b/libraries/AP_HAL_Linux/Semaphores.h @@ -2,10 +2,10 @@ #ifndef __AP_HAL_LINUX_SEMAPHORE_H__ #define __AP_HAL_LINUX_SEMAPHORE_H__ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX -#include +#include "AP_HAL_Linux.h" #include class Linux::LinuxSemaphore : public AP_HAL::Semaphore { diff --git a/libraries/AP_HAL_Linux/Storage.cpp b/libraries/AP_HAL_Linux/Storage.cpp index b1029e349c..f44ecfccc6 100644 --- a/libraries/AP_HAL_Linux/Storage.cpp +++ b/libraries/AP_HAL_Linux/Storage.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/Storage.h b/libraries/AP_HAL_Linux/Storage.h index 34e875751d..d4cb455598 100644 --- a/libraries/AP_HAL_Linux/Storage.h +++ b/libraries/AP_HAL_Linux/Storage.h @@ -7,7 +7,7 @@ #define LINUX_STORAGE_USE_FRAM 0 #endif -#include +#include #include "AP_HAL_Linux_Namespace.h" #define LINUX_STORAGE_SIZE HAL_STORAGE_SIZE diff --git a/libraries/AP_HAL_Linux/Storage_FRAM.cpp b/libraries/AP_HAL_Linux/Storage_FRAM.cpp index 266df81966..97f4deaadc 100644 --- a/libraries/AP_HAL_Linux/Storage_FRAM.cpp +++ b/libraries/AP_HAL_Linux/Storage_FRAM.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX #include diff --git a/libraries/AP_HAL_Linux/Storage_FRAM.h b/libraries/AP_HAL_Linux/Storage_FRAM.h index 225417b5fd..3a7a70ab38 100644 --- a/libraries/AP_HAL_Linux/Storage_FRAM.h +++ b/libraries/AP_HAL_Linux/Storage_FRAM.h @@ -1,7 +1,7 @@ #ifndef __AP_HAL_LINUX_STORAGE_FRAM_H__ #define __AP_HAL_LINUX_STORAGE_FRAM_H__ -#include +#include #include "AP_HAL_Linux_Namespace.h" #define OPCODE_WREN 0b0110 /* Write Enable Latch */ diff --git a/libraries/AP_HAL_Linux/TCPServerDevice.cpp b/libraries/AP_HAL_Linux/TCPServerDevice.cpp index f7ead18037..c1d1c307c6 100644 --- a/libraries/AP_HAL_Linux/TCPServerDevice.cpp +++ b/libraries/AP_HAL_Linux/TCPServerDevice.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/ToneAlarmDriver.cpp b/libraries/AP_HAL_Linux/ToneAlarmDriver.cpp index 25cc0591ea..6e30b942ba 100644 --- a/libraries/AP_HAL_Linux/ToneAlarmDriver.cpp +++ b/libraries/AP_HAL_Linux/ToneAlarmDriver.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/ToneAlarmDriver.h b/libraries/AP_HAL_Linux/ToneAlarmDriver.h index 8f9da9078f..a779426227 100644 --- a/libraries/AP_HAL_Linux/ToneAlarmDriver.h +++ b/libraries/AP_HAL_Linux/ToneAlarmDriver.h @@ -1,7 +1,7 @@ #ifndef __TONE_ALARM_DRIVER_H__ #define __TONE_ALARM_DRIVER_H__ -#include +#include #include "AP_HAL_Linux_Namespace.h" #define OCTAVE_OFFSET 0 diff --git a/libraries/AP_HAL_Linux/UARTDevice.cpp b/libraries/AP_HAL_Linux/UARTDevice.cpp index 7187f4dbf1..d3a6ba59a7 100644 --- a/libraries/AP_HAL_Linux/UARTDevice.cpp +++ b/libraries/AP_HAL_Linux/UARTDevice.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/UARTDriver.cpp b/libraries/AP_HAL_Linux/UARTDriver.cpp index b8fd30dc49..7868806948 100644 --- a/libraries/AP_HAL_Linux/UARTDriver.cpp +++ b/libraries/AP_HAL_Linux/UARTDriver.cpp @@ -1,6 +1,6 @@ // -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: -*- nil -*- -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/UARTDriver.h b/libraries/AP_HAL_Linux/UARTDriver.h index cb8d9fe410..a6411a9e8c 100644 --- a/libraries/AP_HAL_Linux/UARTDriver.h +++ b/libraries/AP_HAL_Linux/UARTDriver.h @@ -2,7 +2,7 @@ #ifndef __AP_HAL_LINUX_UARTDRIVER_H__ #define __AP_HAL_LINUX_UARTDRIVER_H__ -#include +#include "AP_HAL_Linux.h" #include "SerialDevice.h" diff --git a/libraries/AP_HAL_Linux/UDPDevice.cpp b/libraries/AP_HAL_Linux/UDPDevice.cpp index 4e36dd50c9..f43c07f147 100644 --- a/libraries/AP_HAL_Linux/UDPDevice.cpp +++ b/libraries/AP_HAL_Linux/UDPDevice.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX diff --git a/libraries/AP_HAL_Linux/Util.cpp b/libraries/AP_HAL_Linux/Util.cpp index 66d0291350..669e28692d 100644 --- a/libraries/AP_HAL_Linux/Util.cpp +++ b/libraries/AP_HAL_Linux/Util.cpp @@ -1,4 +1,4 @@ -#include +#include #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX #include #include diff --git a/libraries/AP_HAL_Linux/Util.h b/libraries/AP_HAL_Linux/Util.h index be99968482..505cd6099d 100644 --- a/libraries/AP_HAL_Linux/Util.h +++ b/libraries/AP_HAL_Linux/Util.h @@ -2,7 +2,7 @@ #ifndef __AP_HAL_LINUX_UTIL_H__ #define __AP_HAL_LINUX_UTIL_H__ -#include +#include #include "AP_HAL_Linux_Namespace.h" #include "ToneAlarmDriver.h" diff --git a/libraries/AP_HAL_Linux/dsm.cpp b/libraries/AP_HAL_Linux/dsm.cpp index 5d9f1f7180..4ba811e20c 100644 --- a/libraries/AP_HAL_Linux/dsm.cpp +++ b/libraries/AP_HAL_Linux/dsm.cpp @@ -39,7 +39,7 @@ #include #include -#include +#include #include "dsm.h" diff --git a/libraries/AP_HAL_Linux/examples/BusTest/BusTest.cpp b/libraries/AP_HAL_Linux/examples/BusTest/BusTest.cpp index e0d237a3b9..c8ec818b72 100644 --- a/libraries/AP_HAL_Linux/examples/BusTest/BusTest.cpp +++ b/libraries/AP_HAL_Linux/examples/BusTest/BusTest.cpp @@ -4,14 +4,14 @@ // scan I2C and SPI buses for expected devices // -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include const AP_HAL::HAL& hal = AP_HAL_BOARD_DRIVER;