diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-14 15:46:55 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-14 15:46:55 +0000 |
commit | 24bdea23f746984480bd59dd13dd4d631a210320 (patch) | |
tree | 66cd9e753d9cf77ec35b1b06be757025188cefab /nuttx/arch/sim | |
parent | a23845ccf98018e8fc455677579fca2a947e1074 (diff) | |
download | px4-nuttx-24bdea23f746984480bd59dd13dd4d631a210320.tar.gz px4-nuttx-24bdea23f746984480bd59dd13dd4d631a210320.tar.bz2 px4-nuttx-24bdea23f746984480bd59dd13dd4d631a210320.zip |
Changing NuttX fixed size type names to C99 standard names -- things will be broken for awhile
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2335 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/sim')
-rw-r--r-- | nuttx/arch/sim/include/types.h | 64 |
1 files changed, 37 insertions, 27 deletions
diff --git a/nuttx/arch/sim/include/types.h b/nuttx/arch/sim/include/types.h index 9648b12ae..9c265bc6d 100644 --- a/nuttx/arch/sim/include/types.h +++ b/nuttx/arch/sim/include/types.h @@ -1,5 +1,5 @@ -/************************************************************ - * types.h +/************************************************************************ + * arch/sim/include/types.h * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> @@ -31,56 +31,66 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************/ + ************************************************************************/ /* This file should never be included directed but, rather, * only indirectly through sys/types.h */ -#ifndef __ARCH_TYPES_H -#define __ARCH_TYPES_H +#ifndef __ARCH_SIM_INCLUDE_TYPES_H +#define __ARCH_SIM_INCLUDE_TYPES_H -/************************************************************ +/************************************************************************ * Included Files - ************************************************************/ + ************************************************************************/ -/************************************************************ +/************************************************************************ * Definitions - ************************************************************/ + ************************************************************************/ -/************************************************************ +/************************************************************************ * Type Declarations - ************************************************************/ + ************************************************************************/ #ifndef __ASSEMBLY__ -/* These are the sizes of the standard GNU types */ +/* These are the sizes of the standard integer types. NOTE that these type + * names have a leading underscore character. This file will be included + * (indirectly) by include/stdint.h and typedef'ed to the final name without + * the underscore character. This roundabout way of doings things allows + * the stdint.h to be removed from the include/ directory in the event that + * the user prefers to use the definitions provided by their toolchain header + * files + */ + +typedef char _int8_t; +typedef unsigned char _uint8_t; + +typedef short _int16_t; +typedef unsigned short _uint16_t; + +typedef int _int32_t; +typedef unsigned int _uint32_t; -typedef char sbyte; -typedef unsigned char ubyte; -typedef unsigned char uint8; -typedef unsigned char boolean; -typedef short sint16; -typedef unsigned short uint16; -typedef int sint32; -typedef unsigned int uint32; -typedef long long sint64; -typedef unsigned long long uint64; +typedef long long _int64_t; +typedef unsigned long long _uint64_t; +#define __INT64_DEFINED /* A pointer is 4 bytes */ -typedef unsigned int uintptr; +typedef unsigned int _intptr_t; +typedef unsigned int _uintptr_t; /* This is the size of the interrupt state save returned by * irqsave() */ -typedef unsigned int irqstate_t; +typedef unsigned int irqstate_t; #endif /* __ASSEMBLY__ */ -/************************************************************ +/************************************************************************ * Global Function Prototypes - ************************************************************/ + ************************************************************************/ -#endif /* __ARCH_TYPES_H */ +#endif /* __ARCH_SIM_INCLUDE_TYPES_H */ |