From 91dba465241dbff972f4ba99619d8d7af9c5649b Mon Sep 17 00:00:00 2001 From: px4dev Date: Sun, 6 Jan 2013 19:20:22 -0800 Subject: Fix fallout from removing the spurious CMSIS --- apps/mathlib/CMSIS/Include/core_cm3.h | 4 ++-- apps/mathlib/CMSIS/Include/core_cm4.h | 6 +++--- apps/mathlib/math/arm/Matrix.hpp | 2 +- apps/mathlib/math/arm/Vector.hpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'apps/mathlib') diff --git a/apps/mathlib/CMSIS/Include/core_cm3.h b/apps/mathlib/CMSIS/Include/core_cm3.h index db1716ad9..733d6be53 100644 --- a/apps/mathlib/CMSIS/Include/core_cm3.h +++ b/apps/mathlib/CMSIS/Include/core_cm3.h @@ -118,8 +118,8 @@ #endif #include /* standard types definitions */ -#include /* Core Instruction Access */ -#include /* Core Function Access */ +#include "core_cmInstr.h" /* Core Instruction Access */ +#include "core_cmFunc.h" /* Core Function Access */ #endif /* __CORE_CM3_H_GENERIC */ diff --git a/apps/mathlib/CMSIS/Include/core_cm4.h b/apps/mathlib/CMSIS/Include/core_cm4.h index 024302e4a..5f3b7d619 100644 --- a/apps/mathlib/CMSIS/Include/core_cm4.h +++ b/apps/mathlib/CMSIS/Include/core_cm4.h @@ -151,9 +151,9 @@ #endif #include /* standard types definitions */ -#include /* Core Instruction Access */ -#include /* Core Function Access */ -#include /* Compiler specific SIMD Intrinsics */ +#include "core_cmInstr.h" /* Core Instruction Access */ +#include "core_cmFunc.h" /* Core Function Access */ +#include "core_cm4_simd.h" /* Compiler specific SIMD Intrinsics */ #endif /* __CORE_CM4_H_GENERIC */ diff --git a/apps/mathlib/math/arm/Matrix.hpp b/apps/mathlib/math/arm/Matrix.hpp index 63d755649..715fd3a5e 100644 --- a/apps/mathlib/math/arm/Matrix.hpp +++ b/apps/mathlib/math/arm/Matrix.hpp @@ -51,7 +51,7 @@ #include "../Matrix.hpp" // arm specific -#include "arm_math.h" +#include "../../CMSIS/Include/arm_math.h" namespace math { diff --git a/apps/mathlib/math/arm/Vector.hpp b/apps/mathlib/math/arm/Vector.hpp index e1f1838e7..58d51107d 100644 --- a/apps/mathlib/math/arm/Vector.hpp +++ b/apps/mathlib/math/arm/Vector.hpp @@ -50,7 +50,7 @@ #include "../test/test.hpp" // arm specific -#include "arm_math.h" +#include "../../CMSIS/Include/arm_math.h" namespace math { -- cgit v1.2.3