From 7703e5f1d1a023aabbc65cf907ad6c11d460c9a0 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Mon, 23 May 2016 09:50:58 -0300 Subject: [PATCH] AP_Common: remove support for flymaple --- libraries/AP_Common/AP_Common.h | 1 - libraries/AP_Common/c++.cpp | 20 -------------------- 2 files changed, 21 deletions(-) diff --git a/libraries/AP_Common/AP_Common.h b/libraries/AP_Common/AP_Common.h index 6b8ae626f8..dc167bc903 100644 --- a/libraries/AP_Common/AP_Common.h +++ b/libraries/AP_Common/AP_Common.h @@ -131,7 +131,6 @@ enum HomeState { #define AP_PRODUCT_ID_PX4 0x04 // PX4 on NuttX #define AP_PRODUCT_ID_PX4_V2 0x05 // PX4 FMU2 on NuttX #define AP_PRODUCT_ID_PX4_V4 0x06 // PX4 FMU4 on NuttX -#define AP_PRODUCT_ID_FLYMAPLE 0x100 // Flymaple with ITG3205, ADXL345, HMC5883, BMP085 #define AP_PRODUCT_ID_L3G4200D 0x101 // Linux with L3G4200D and ADXL345 #define AP_PRODUCT_ID_PIXHAWK_FIRE_CAPE 0x102 // Linux with the PixHawk Fire Cape #define AP_PRODUCT_ID_MPU9250 0x103 // MPU9250 diff --git a/libraries/AP_Common/c++.cpp b/libraries/AP_Common/c++.cpp index df13a9b67a..00ac1efd21 100644 --- a/libraries/AP_Common/c++.cpp +++ b/libraries/AP_Common/c++.cpp @@ -38,23 +38,3 @@ void operator delete[](void * ptr) { if (ptr) free(ptr); } - - -#if CONFIG_HAL_BOARD == HAL_BOARD_FLYMAPLE - -__extension__ typedef int __guard __attribute__((mode (__DI__))); - -int __cxa_guard_acquire(__guard *g) -{ - return !*(char *)(g); -}; - -void __cxa_guard_release (__guard *g){ - *(char *)g = 1; -}; - -void __cxa_guard_abort (__guard *) { -}; - -#endif // CONFIG_HAL_BOARD -