diff options
| author | px4dev <px4@purgatory.org> | 2013-01-08 08:26:04 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-08 08:26:04 -0800 |
| commit | 01ea8eb54f1838122ce4c938beb7b4452e89c2fe (patch) | |
| tree | 5d23b9278d3f60ce0f12abef708e0f9db0706bd7 /apps/mathlib | |
| parent | ee5cd2c95a9510fd849cc515988564412c6accd0 (diff) | |
| download | px4-firmware-01ea8eb54f1838122ce4c938beb7b4452e89c2fe.tar.gz px4-firmware-01ea8eb54f1838122ce4c938beb7b4452e89c2fe.tar.bz2 px4-firmware-01ea8eb54f1838122ce4c938beb7b4452e89c2fe.zip | |
Test for CortexM4 and FPU rather than the ARM mathlib-internal define.
Diffstat (limited to 'apps/mathlib')
| -rw-r--r-- | apps/mathlib/math/Matrix.hpp | 4 | ||||
| -rw-r--r-- | apps/mathlib/math/Vector.hpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/mathlib/math/Matrix.hpp b/apps/mathlib/math/Matrix.hpp index 4d7731653..f19db15ec 100644 --- a/apps/mathlib/math/Matrix.hpp +++ b/apps/mathlib/math/Matrix.hpp @@ -39,7 +39,9 @@ #pragma once -#ifdef ARM_MATH_CM4 +#include <nuttx/config.h> + +#if defined(CONFIG_ARCH_CORTEXM4) && defined(CONFIG_ARCH_FPU) #include "arm/Matrix.hpp" #else #include "generic/Matrix.hpp" diff --git a/apps/mathlib/math/Vector.hpp b/apps/mathlib/math/Vector.hpp index 773bd5032..73de793d5 100644 --- a/apps/mathlib/math/Vector.hpp +++ b/apps/mathlib/math/Vector.hpp @@ -39,7 +39,9 @@ #pragma once -#ifdef ARM_MATH_CM4 +#include <nuttx/config.h> + +#if defined(CONFIG_ARCH_CORTEXM4) && defined(CONFIG_ARCH_FPU) #include "arm/Vector.hpp" #else #include "generic/Vector.hpp" |