diff options
| author | px4dev <px4@purgatory.org> | 2013-01-25 19:29:29 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-25 19:29:29 -0800 |
| commit | 24f6c6b121ea87b26a2c5cac933089be496a28b6 (patch) | |
| tree | c3b8fdab88b12c72197348873caa03d22eb46b60 /nuttx/arch/arm/include/types.h | |
| parent | 0bc836ae1d90b1805940ec8ae271639f0074a792 (diff) | |
| parent | beb45222985f1eb9fbe21b22b95c30ab8ca5bbac (diff) | |
| download | px4-firmware-24f6c6b121ea87b26a2c5cac933089be496a28b6.tar.gz px4-firmware-24f6c6b121ea87b26a2c5cac933089be496a28b6.tar.bz2 px4-firmware-24f6c6b121ea87b26a2c5cac933089be496a28b6.zip | |
Merge branch 'master' into px4io-i2c
Diffstat (limited to 'nuttx/arch/arm/include/types.h')
| -rw-r--r-- | nuttx/arch/arm/include/types.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nuttx/arch/arm/include/types.h b/nuttx/arch/arm/include/types.h index c06b28950..1d2ea4cfe 100644 --- a/nuttx/arch/arm/include/types.h +++ b/nuttx/arch/arm/include/types.h @@ -44,6 +44,8 @@ * Included Files ****************************************************************************/ +#include <nuttx/config.h> + /**************************************************************************** * Definitions ****************************************************************************/ @@ -87,7 +89,11 @@ typedef unsigned int _uintptr_t; */ #ifdef __thumb2__ +#ifdef CONFIG_ARMV7M_USEBASEPRI +typedef unsigned char irqstate_t; +#else typedef unsigned short irqstate_t; +#endif #else /* __thumb2__ */ typedef unsigned int irqstate_t; #endif /* __thumb2__ */ |