From 695d92ddbfef532f6d57af9002d80bf9d15957ab Mon Sep 17 00:00:00 2001 From: Francisco Ferreira Date: Fri, 11 May 2018 13:26:51 +0100 Subject: [PATCH] AP_HAL: remove Qualcomm board support --- libraries/AP_HAL/AP_HAL_Boards.h | 10 ---------- libraries/AP_HAL/board/linux.h | 12 ------------ libraries/AP_HAL/board/qurt.h | 17 ----------------- libraries/AP_HAL/utility/getopt_cpp.cpp | 4 ---- 4 files changed, 43 deletions(-) delete mode 100644 libraries/AP_HAL/board/qurt.h diff --git a/libraries/AP_HAL/AP_HAL_Boards.h b/libraries/AP_HAL/AP_HAL_Boards.h index 245ca42f1d..62646a2142 100644 --- a/libraries/AP_HAL/AP_HAL_Boards.h +++ b/libraries/AP_HAL/AP_HAL_Boards.h @@ -11,7 +11,6 @@ #define HAL_BOARD_PX4 5 #define HAL_BOARD_LINUX 7 #define HAL_BOARD_VRBRAIN 8 -#define HAL_BOARD_QURT 9 #define HAL_BOARD_CHIBIOS 10 #define HAL_BOARD_F4LIGHT 11 #define HAL_BOARD_EMPTY 99 @@ -30,7 +29,6 @@ #define HAL_BOARD_SUBTYPE_LINUX_MINLURE 1008 #define HAL_BOARD_SUBTYPE_LINUX_ERLEBRAIN2 1009 #define HAL_BOARD_SUBTYPE_LINUX_BH 1010 -#define HAL_BOARD_SUBTYPE_LINUX_QFLIGHT 1011 #define HAL_BOARD_SUBTYPE_LINUX_PXFMINI 1012 #define HAL_BOARD_SUBTYPE_LINUX_NAVIO2 1013 #define HAL_BOARD_SUBTYPE_LINUX_DISCO 1014 @@ -89,8 +87,6 @@ #define HAL_INS_LSM9DS0 11 #define HAL_INS_MPU9250_I2C 13 #define HAL_INS_BH 14 -#define HAL_INS_QFLIGHT 15 -#define HAL_INS_QURT 16 #define HAL_INS_BBBMINI 17 #define HAL_INS_AERO 18 #define HAL_INS_MPU6500 19 @@ -109,8 +105,6 @@ #define HAL_BARO_HIL 6 #define HAL_BARO_VRBRAIN 7 #define HAL_BARO_MS5637_I2C 8 -#define HAL_BARO_QFLIGHT 9 -#define HAL_BARO_QURT 10 #define HAL_BARO_BMP280_I2C 11 #define HAL_BARO_BMP280_SPI 12 #define HAL_BARO_LPS25H 13 @@ -132,8 +126,6 @@ #define HAL_COMPASS_HMC5843_MPU6000 7 #define HAL_COMPASS_AK8963_MPU9250_I2C 9 #define HAL_COMPASS_BH 10 -#define HAL_COMPASS_QFLIGHT 11 -#define HAL_COMPASS_QURT 12 #define HAL_COMPASS_BBBMINI 13 #define HAL_COMPASS_NAVIO2 14 #define HAL_COMPASS_NAVIO 15 @@ -177,8 +169,6 @@ #include #elif CONFIG_HAL_BOARD == HAL_BOARD_EMPTY #include -#elif CONFIG_HAL_BOARD == HAL_BOARD_QURT - #include #elif CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN #include #elif CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS diff --git a/libraries/AP_HAL/board/linux.h b/libraries/AP_HAL/board/linux.h index d4ea680333..5a6ac49a41 100644 --- a/libraries/AP_HAL/board/linux.h +++ b/libraries/AP_HAL/board/linux.h @@ -310,14 +310,6 @@ #define HAL_RCOUT_RGBLED_RED 13 #define HAL_RCOUT_RGBLED_GREEN 14 #define HAL_RCOUT_RGBLED_BLUE 15 -#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_QFLIGHT -#define HAL_BOARD_LOG_DIRECTORY "/var/APM/logs" -#define HAL_BOARD_TERRAIN_DIRECTORY "/var/APM/terrain" -#define HAL_BOARD_STORAGE_DIRECTORY "/var/APM" -#define HAL_INS_DEFAULT HAL_INS_QFLIGHT -#define HAL_BARO_DEFAULT HAL_BARO_QFLIGHT -#define HAL_COMPASS_DEFAULT HAL_COMPASS_QFLIGHT -#define HAL_LINUX_UARTS_ON_TIMER_THREAD 1 #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXFMINI #define HAL_BOARD_LOG_DIRECTORY "/var/APM/logs" #define HAL_BOARD_TERRAIN_DIRECTORY "/var/APM/terrain" @@ -414,10 +406,6 @@ #define HAL_COMPASS_DEFAULT -1 #endif -#ifndef HAL_LINUX_UARTS_ON_TIMER_THREAD -#define HAL_LINUX_UARTS_ON_TIMER_THREAD 0 -#endif - #ifndef HAL_OPTFLOW_PX4FLOW_I2C_ADDRESS #define HAL_OPTFLOW_PX4FLOW_I2C_ADDRESS 0x42 #endif diff --git a/libraries/AP_HAL/board/qurt.h b/libraries/AP_HAL/board/qurt.h deleted file mode 100644 index a83221f41a..0000000000 --- a/libraries/AP_HAL/board/qurt.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#define AP_HAL_BOARD_DRIVER AP_HAL_QURT -#define HAL_BOARD_NAME "QURT" -#define HAL_CPU_CLASS HAL_CPU_CLASS_1000 -#define HAL_STORAGE_SIZE 16384 -#define HAL_STORAGE_SIZE_AVAILABLE HAL_STORAGE_SIZE -#define HAL_INS_DEFAULT HAL_INS_QURT -#define HAL_BARO_DEFAULT HAL_BARO_QURT -#define HAL_COMPASS_DEFAULT HAL_COMPASS_QURT -#define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_NONE -#define HAL_BOARD_LOG_DIRECTORY "/dev/fs/logs" -#define HAL_OS_POSIX_IO 1 -#define HAL_SERIAL0_BAUD_DEFAULT 115200 - -#define HAL_HAVE_BOARD_VOLTAGE 1 -#define HAL_HAVE_SAFETY_SWITCH 1 diff --git a/libraries/AP_HAL/utility/getopt_cpp.cpp b/libraries/AP_HAL/utility/getopt_cpp.cpp index 114bfcacef..fd324418f0 100644 --- a/libraries/AP_HAL/utility/getopt_cpp.cpp +++ b/libraries/AP_HAL/utility/getopt_cpp.cpp @@ -42,11 +42,7 @@ #include #include -#if CONFIG_HAL_BOARD == HAL_BOARD_QURT -#define GETOPT_ERROR(...) HAP_printf(__FILE__, __LINE__, __VA_ARGS__) -#else #define GETOPT_ERROR(...) fprintf(stderr, __VA_ARGS__) -#endif /*