sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changing NuttX fixed size type names to C99 standard names -- things will be broken for awhile

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2335 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-12-14 15:46:55 +00:00
parent 005ed42a22
commit 65afaa684a
15 changed files with 297 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/arm/include/types.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* arch/arm/include/types.h * arch/arm/include/types.h
* *
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -54,22 +54,32 @@
#ifndef __ASSEMBLY__ #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 sbyte; typedef char _int8_t;
typedef unsigned char ubyte; typedef unsigned char _uint8_t;
typedef unsigned char uint8;
typedef unsigned char boolean; typedef short _int16_t;
typedef short sint16; typedef unsigned short _uint16_t;
typedef unsigned short uint16;
typedef int sint32; typedef int _int32_t;
typedef unsigned int uint32; typedef unsigned int _uint32_t;
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 */ /* A pointer is 4 bytes */
typedef unsigned int uintptr; typedef int _intptr_t;
typedef unsigned int _uintptr_t;
/* This is the size of the interrupt state save returned by irqsave(). For /* This is the size of the interrupt state save returned by irqsave(). For
* ARM, a 32 register value is returned, for the thumb2, Cortex-M3, the 16-bit * ARM, a 32 register value is returned, for the thumb2, Cortex-M3, the 16-bit

37
arch/hc/include/hc12/types.h
View File

@ -54,14 +54,19 @@
#ifndef __ASSEMBLY__ #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 sbyte; typedef char _int8_t;
typedef unsigned char ubyte; typedef unsigned char _uint8_t;
typedef unsigned char uint8; typedef short _int16_t;
typedef unsigned char boolean; typedef unsigned short _uint16_t;
typedef short sint16;
typedef unsigned short uint16;
/* Normally, mc68hc1x code is compiled with the -mshort option /* Normally, mc68hc1x code is compiled with the -mshort option
* which results in a 16-bit integer. If -mnoshort is defined * which results in a 16-bit integer. If -mnoshort is defined
@ -69,23 +74,25 @@ typedef unsigned short uint16;
*/ */
# if __INT__ == 16 # if __INT__ == 16
typedef long sint32; typedef long _int32_t;
typedef unsigned long uint32; typedef unsigned long _uint32_t;
#else #else
typedef int sint32; typedef int _int32_t;
typedef unsigned int uint32; typedef unsigned int _uint32_t;
#endif #endif
typedef long long sint64; typedef long long _int64_t;
typedef unsigned long long uint64; typedef unsigned long long _uint64_t;
#define __INT64_DEFINED
/* A pointer is two bytes */ /* A pointer is two bytes */
typedef unsigned short uintptr; typedef short _intptr_t;
typedef unsigned short _uintptr_t;
/* This is the size of the interrupt state save returned by irqsave()*/ /* This is the size of the interrupt state save returned by irqsave()*/
typedef unsigned int irqstate_t; typedef unsigned int irqstate_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */

38
arch/hc/include/hcs12/types.h
View File

@ -54,14 +54,20 @@
#ifndef __ASSEMBLY__ #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 sbyte; typedef char _int8_t;
typedef unsigned char ubyte; typedef unsigned char _uint8_t;
typedef unsigned char uint8;
typedef unsigned char boolean; typedef short _int16_t;
typedef short sint16; typedef unsigned short _uint16_t;
typedef unsigned short uint16;
/* Normally, mc68hc1x code is compiled with the -mshort option /* Normally, mc68hc1x code is compiled with the -mshort option
* which results in a 16-bit integer. If -mnoshort is defined * which results in a 16-bit integer. If -mnoshort is defined
@ -69,23 +75,25 @@ typedef unsigned short uint16;
*/ */
# if __INT__ == 16 # if __INT__ == 16
typedef long sint32; typedef long _int32_t;
typedef unsigned long uint32; typedef unsigned long _uint32_t;
#else #else
typedef int sint32; typedef int _int32_t;
typedef unsigned int uint32; typedef unsigned int _uint32_t;
#endif #endif
typedef long long sint64; typedef long long _int64_t;
typedef unsigned long long uint64; typedef unsigned long long _uint64_t;
#define __INT64_DEFINED
/* A pointer is two bytes */ /* A pointer is two bytes */
typedef unsigned short uintptr; typedef short _intptr_t;
typedef unsigned short _uintptr_t;
/* This is the size of the interrupt state save returned by irqsave()*/ /* This is the size of the interrupt state save returned by irqsave()*/
typedef unsigned int irqstate_t; typedef unsigned int irqstate_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */

50
arch/pjrc-8051/include/types.h
View File

@ -1,4 +1,4 @@
/************************************************************ /************************************************************************
* arch/pjrc-8051/include/types.h * arch/pjrc-8051/include/types.h
* *
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
@ -31,7 +31,7 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************/ ************************************************************************/
/* This file should never be included directed but, rather, /* This file should never be included directed but, rather,
* only indirectly through sys/types.h * only indirectly through sys/types.h
@ -40,51 +40,59 @@
#ifndef __ARCH_PJRC8051_INCLUDE_TYPES_H #ifndef __ARCH_PJRC8051_INCLUDE_TYPES_H
#define __ARCH_PJRC8051_INCLUDE_TYPES_H #define __ARCH_PJRC8051_INCLUDE_TYPES_H
/************************************************************ /************************************************************************
* Included Files * Included Files
************************************************************/ ************************************************************************/
/************************************************************ /************************************************************************
* Definitions * Definitions
************************************************************/ ************************************************************************/
/************************************************************ /************************************************************************
* Type Declarations * Type Declarations
************************************************************/ ************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* These are the sizes of the standard SDCC 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
*
* *
* For SDCC, sizeof(int) is 16 and sizeof(long) is 32. * For SDCC, sizeof(int) is 16 and sizeof(long) is 32.
* long long and double are not supported. * long long and double are not supported.
*/ */
typedef char sbyte; typedef char _int8_t;
typedef unsigned char ubyte; typedef unsigned char _uint8_t;
typedef unsigned char uint8;
typedef unsigned char boolean; typedef int _int16_t;
typedef int sint16; typedef unsigned int _uint16_t;
typedef unsigned int uint16;
typedef long sint32; typedef long _int32_t;
typedef unsigned long uint32; typedef unsigned long _uint32_t;
/* For SDCC, a Generic pointer is 3 bytes in length with the /* For SDCC, a Generic pointer is 3 bytes in length with the
* first byte holding data space information. * first byte holding data space information.
*/ */
typedef unsigned long uintptr; typedef long _intptr_t;
typedef unsigned long _uintptr_t;
/* This is the size of the interrupt state save returned by /* This is the size of the interrupt state save returned by
* irqsave() * irqsave()
*/ */
typedef unsigned char irqstate_t; typedef unsigned char irqstate_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
/************************************************************ /************************************************************************
* Global Function Prototypes * Global Function Prototypes
************************************************************/ ************************************************************************/
#endif /* __ARCH_PJRC8051_INCLUDE_TYPES_H */ #endif /* __ARCH_PJRC8051_INCLUDE_TYPES_H */

45
arch/sh/include/m16c/types.h
View File

@ -37,8 +37,8 @@
* through sys/types.h * through sys/types.h
*/ */
#ifndef __ARCH_SH_INCLUDE_SH1_TYPES_H #ifndef __ARCH_SH_INCLUDE_M16C_TYPES_H
#define __ARCH_SH_INCLUDE_SH1_TYPES_H #define __ARCH_SH_INCLUDE_M16C_TYPES_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -54,29 +54,40 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* These are the sizes of the standard GNU types. int is 16-bits and /* These are the sizes of the standard integer types. NOTE that these type
* long is 32-bits */ * 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
*
* int is 16-bits and long is 32-bits
*/
typedef char sbyte; typedef char _int8_t;
typedef unsigned char ubyte; typedef unsigned char _uint8_t;
typedef unsigned char uint8;
typedef unsigned char boolean; typedef int _int16_t;
typedef int sint16; typedef unsigned int _uint16_t;
typedef unsigned int uint16;
typedef long sint32; typedef long _int32_t;
typedef unsigned long uint32; typedef unsigned long _uint32_t;
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 2 bytes */ /* A pointer is 2 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 /* This is the size of the interrupt state save returned by
* irqsave() * irqsave()
*/ */
typedef uint16 irqstate_t; typedef _uint16_t irqstate_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
@ -84,4 +95,4 @@ typedef uint16 irqstate_t;
* Global Function Prototypes * Global Function Prototypes
****************************************************************************/ ****************************************************************************/
#endif /* __ARCH_SH_INCLUDE_SH1_TYPES_H */ #endif /* __ARCH_SH_INCLUDE_M16C_TYPES_H */

36
arch/sh/include/sh1/types.h
View File

@ -54,28 +54,38 @@
#ifndef __ASSEMBLY__ #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 sbyte; typedef char _int8_t;
typedef unsigned char ubyte; typedef unsigned char _uint8_t;
typedef unsigned char uint8;
typedef unsigned char boolean; typedef short _int16_t;
typedef short sint16; typedef unsigned short _uint16_t;
typedef unsigned short uint16;
typedef int sint32; typedef int _int32_t;
typedef unsigned int uint32; typedef unsigned int _uint32_t;
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 */ /* A pointer is 4 bytes */
typedef unsigned int uintptr; typedef int _intptr_t;
typedef unsigned int _uintptr_t;
/* This is the size of the interrupt state save returned by /* This is the size of the interrupt state save returned by
* irqsave() * irqsave()
*/ */
typedef unsigned long irqstate_t; typedef unsigned long irqstate_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */

64
arch/sim/include/types.h
View File

@ -1,5 +1,5 @@
/************************************************************ /************************************************************************
* types.h * arch/sim/include/types.h
* *
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * 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 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************/ ************************************************************************/
/* This file should never be included directed but, rather, /* This file should never be included directed but, rather,
* only indirectly through sys/types.h * only indirectly through sys/types.h
*/ */
#ifndef __ARCH_TYPES_H #ifndef __ARCH_SIM_INCLUDE_TYPES_H
#define __ARCH_TYPES_H #define __ARCH_SIM_INCLUDE_TYPES_H
/************************************************************ /************************************************************************
* Included Files * Included Files
************************************************************/ ************************************************************************/
/************************************************************ /************************************************************************
* Definitions * Definitions
************************************************************/ ************************************************************************/
/************************************************************ /************************************************************************
* Type Declarations * Type Declarations
************************************************************/ ************************************************************************/
#ifndef __ASSEMBLY__ #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 sbyte; typedef char _int8_t;
typedef unsigned char ubyte; typedef unsigned char _uint8_t;
typedef unsigned char uint8;
typedef unsigned char boolean; typedef short _int16_t;
typedef short sint16; typedef unsigned short _uint16_t;
typedef unsigned short uint16;
typedef int sint32; typedef int _int32_t;
typedef unsigned int uint32; typedef unsigned int _uint32_t;
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 */ /* 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 /* This is the size of the interrupt state save returned by
* irqsave() * irqsave()
*/ */
typedef unsigned int irqstate_t; typedef unsigned int irqstate_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
/************************************************************ /************************************************************************
* Global Function Prototypes * Global Function Prototypes
************************************************************/ ************************************************************************/
#endif /* __ARCH_TYPES_H */ #endif /* __ARCH_SIM_INCLUDE_TYPES_H */

36
arch/z16/include/types.h
View File

@ -37,8 +37,8 @@
* only indirectly through sys/types.h * only indirectly through sys/types.h
*/ */
#ifndef __ARCH_Z16_INCLUDE_TYPE_H #ifndef __ARCH_Z16_INCLUDE_TYPES_H
#define __ARCH_Z16_INCLUDE_TYPE_H #define __ARCH_Z16_INCLUDE_TYPES_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -54,26 +54,34 @@
#ifndef __ASSEMBLY__ #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 sbyte; typedef char _int8_t;
typedef unsigned char ubyte; typedef unsigned char _uint8_t;
typedef unsigned char uint8;
typedef unsigned char boolean; typedef short _int16_t;
typedef short sint16; typedef unsigned short _uint16_t;
typedef unsigned short uint16;
typedef int sint32; typedef int _int32_t;
typedef unsigned int uint32; typedef unsigned int _uint32_t;
/* A pointer is 4 bytes */ /* A pointer is 4 bytes */
typedef unsigned int uintptr; typedef int _intptr_t;
typedef unsigned int _uintptr_t;
/* This is the size of the interrupt state save returned by /* This is the size of the interrupt state save returned by
* irqsave() * irqsave()
*/ */
typedef unsigned short irqstate_t; typedef unsigned short irqstate_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
@ -81,4 +89,4 @@ typedef unsigned short irqstate_t;
* Global Function Prototypes * Global Function Prototypes
****************************************************************************/ ****************************************************************************/
#endif /* __ARCH_Z16_INCLUDE_TYPE_H */ #endif /* __ARCH_Z16_INCLUDE_TYPES_H */

10
arch/z80/include/ez80/irq.h
View File

@ -38,8 +38,8 @@
* only indirectly through nuttx/irq.h (via arch/irq.h) * only indirectly through nuttx/irq.h (via arch/irq.h)
*/ */
#ifndef __ARCH_EZ80_IRQ_H #ifndef __ARCH_Z80_INCLUDE_EZ80_IRQ_H
#define __ARCH_EZ80_IRQ_H #define __ARCH_Z80_INCLUDE_EZ80_IRQ_H
#ifndef _EZ80F91 #ifndef _EZ80F91
# error "Only the EZ80F91 is currently supported" # error "Only the EZ80F91 is currently supported"
@ -197,9 +197,9 @@
/* This is the type of the register save array */ /* This is the type of the register save array */
#ifdef CONFIG_EZ80_Z80MODE #ifdef CONFIG_EZ80_Z80MODE
typedef uint16 chipreg_t; typedef uint16_t chipreg_t;
#else #else
typedef uint24 chipreg_t; typedef uint24_t chipreg_t;
#endif #endif
/* This struct defines the way the registers are stored. */ /* This struct defines the way the registers are stored. */
@ -254,5 +254,5 @@ EXTERN void irqrestore(irqstate_t flags);
#endif #endif
#endif #endif
#endif /* __ARCH_EZ80_IRQ_H */ #endif /* __ARCH_Z80_INCLUDE_EZ80_IRQ_H */

46
arch/z80/include/ez80/types.h
View File

@ -38,8 +38,8 @@
* through sys/types.h * through sys/types.h
*/ */
#ifndef __ARCH_CHIP_TYPES_H #ifndef __ARCH_Z80_INCLUDE_EZ80_TYPES_H
#define __ARCH_CHIP_TYPES_H #define __ARCH_Z80_INCLUDE_EZ80_TYPES_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -55,7 +55,15 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* These are the sizes of the types supported by the ZiLOG Z8Encore! compiler: /* 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
*
* These are the sizes of the types supported by the ZiLOG compiler:
* *
* int - 24-bits * int - 24-bits
* short - 16-bits * short - 16-bits
@ -64,16 +72,18 @@
* float - 32-bits * float - 32-bits
*/ */
typedef char sbyte; typedef char _int8_t;
typedef unsigned char ubyte; typedef unsigned char _uint8_t;
typedef unsigned char uint8;
typedef unsigned char boolean; typedef short _int16_t;
typedef short sint16; typedef unsigned short _uint16_t;
typedef unsigned short uint16;
typedef int sint24; typedef int _int24_t;
typedef unsigned int uint24; typedef unsigned int _uint24_t;
typedef long sint32; #define __INT24_DEFINED
typedef unsigned long uint32;
typedef long _int32_t;
typedef unsigned long _uint32_t;
/* A pointer is 2 or 3 bytes, depending upon if the ez80 is in z80 /* A pointer is 2 or 3 bytes, depending upon if the ez80 is in z80
* compatibility mode or not * compatibility mode or not
@ -83,16 +93,18 @@ typedef unsigned long uint32;
*/ */
#ifdef CONFIG_EZ80_Z80MODE #ifdef CONFIG_EZ80_Z80MODE
typedef unsigned short uintptr; typedef short _intptr_t;
typedef unsigned short _uintptr_t;
#else #else
typedef unsigned int uintptr; typedef int _intptr_t;
typedef unsigned int _uintptr_t;
#endif #endif
/* This is the size of the interrupt state save returned by irqsave(). /* This is the size of the interrupt state save returned by irqsave().
* It holds the AF regiser pair + a zero pad byte * It holds the AF regiser pair + a zero pad byte
*/ */
typedef uint24 irqstate_t; typedef _uint24_t irqstate_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
@ -100,4 +112,4 @@ typedef uint24 irqstate_t;
* Global Function Prototypes * Global Function Prototypes
****************************************************************************/ ****************************************************************************/
#endif /* __ARCH_CHIP_TYPES_H */ #endif /* __ARCH_Z80_INCLUDE_EZ80_TYPES_H */

10
arch/z80/include/irq.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* arch/irq.h * arch/z80/include/irq.h
* *
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -37,8 +37,8 @@
* only indirectly through nuttx/irq.h * only indirectly through nuttx/irq.h
*/ */
#ifndef __ARCH_IRQ_H #ifndef __ARCH_Z80_INCLUDE_IRQ_H
#define __ARCH_IRQ_H #define __ARCH_Z80_INCLUDE_IRQ_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -77,5 +77,5 @@ extern "C" {
#endif #endif
#endif #endif
#endif /* __ARCH_IRQ_H */ #endif /* __ARCH_Z80_INCLUDE_IRQ_H */

2
arch/z80/include/z8/irq.h
View File

@ -306,7 +306,7 @@
/* This is the type of the register save array */ /* This is the type of the register save array */
typedef uint16 chipreg_t; typedef uint16_t chipreg_t;
/* This struct defines the way the registers are stored. */ /* This struct defines the way the registers are stored. */

37
arch/z80/include/z8/types.h
View File

@ -38,8 +38,8 @@
* through sys/types.h * through sys/types.h
*/ */
#ifndef __ARCH_CHIP_TYPES_H #ifndef __ARCH_Z80_INCLUDE_Z8_IRQ_H
#define __ARCH_CHIP_TYPES_H #define __ARCH_Z80_INCLUDE_Z8_IRQ_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -55,7 +55,15 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* These are the sizes of the types supported by the ZiLOG Z8Encore! compiler: /* 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
*
* These are the sizes of the types supported by the ZiLOG Z8Encore! compiler:
* *
* int - 16-bits * int - 16-bits
* short - 16-bits * short - 16-bits
@ -71,22 +79,23 @@
* rom pointer - 16-bits * rom pointer - 16-bits
*/ */
typedef char sbyte; typedef char _int8_t;
typedef unsigned char ubyte; typedef unsigned char _uint8_t;
typedef unsigned char uint8;
typedef unsigned char boolean; typedef int _int16_t;
typedef int sint16; typedef unsigned int _uint16_t;
typedef unsigned int uint16;
typedef long sint32; typedef long _int32_t;
typedef unsigned long uint32; typedef unsigned long _uint32_t;
/* A pointer is 2 bytes */ /* A pointer is 2 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() */ /* This is the size of the interrupt state save returned by irqsave() */
typedef ubyte irqstate_t; typedef _uint8_t irqstate_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
@ -94,4 +103,4 @@ typedef ubyte irqstate_t;
* Global Function Prototypes * Global Function Prototypes
****************************************************************************/ ****************************************************************************/
#endif /* __ARCH_CHIP_TYPES_H */ #endif /* __ARCH_Z80_INCLUDE_Z8_IRQ_H */

8
arch/z80/include/z80/irq.h
View File

@ -38,8 +38,8 @@
* only indirectly through nuttx/irq.h (via arch/irq.h) * only indirectly through nuttx/irq.h (via arch/irq.h)
*/ */
#ifndef __ARCH_Z80_IRQ_H #ifndef __ARCH_Z80_INCLUDE_Z80_IRQ_H
#define __ARCH_Z80_IRQ_H #define __ARCH_Z80_INCLUDE_Z80_IRQ_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -90,7 +90,7 @@
/* This is the type of the register save array */ /* This is the type of the register save array */
typedef uint16 chipreg_t; typedef uint16_t chipreg_t;
/* This struct defines the way the registers are stored. */ /* This struct defines the way the registers are stored. */
@ -144,5 +144,5 @@ EXTERN void irqrestore(irqstate_t flags) __naked;
#endif #endif
#endif #endif
#endif /* __ARCH_Z80_IRQ_H */ #endif /* __ARCH_Z80_INCLUDE_Z80_IRQ_H */

37
arch/z80/include/z80/types.h
View File

@ -38,8 +38,8 @@
* through sys/types.h * through sys/types.h
*/ */
#ifndef __ARCH_CHIP_TYPES_H #ifndef __ARC_Z80_INCLUDE_Z80_TYPES_H
#define __ARCH_CHIP_TYPES_H #define __ARC_Z80_INCLUDE_Z80_TYPES_H
/**************************************************************************** /****************************************************************************
* Included Files * Included Files
@ -55,7 +55,15 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* These are the sizes of the standard SDCC 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
*
* These are the sizes of the standard SDCC types
* *
* For SDCC, sizeof(int) is 16 and sizeof(long) is 32. long long and double * For SDCC, sizeof(int) is 16 and sizeof(long) is 32. long long and double
* are not supported. * are not supported.
@ -64,22 +72,23 @@
* space information. * space information.
*/ */
typedef char sbyte; typedef char _int8_t;
typedef unsigned char ubyte; typedef unsigned char _uint8_t;
typedef unsigned char uint8;
typedef unsigned char boolean; typedef int _int16_t;
typedef int sint16; typedef unsigned int _uint16_t;
typedef unsigned int uint16;
typedef long sint32; typedef long _int32_t;
typedef unsigned long uint32; typedef unsigned long _uint32_t;
/* A pointer is 2 bytes */ /* A pointer is 2 bytes */
typedef unsigned int uintptr; typedef int _intptr_t;
typedef unsigned int _uintptr_t;
/* This is the size of the interrupt state save returned by irqsave() */ /* This is the size of the interrupt state save returned by irqsave() */
typedef uint16 irqstate_t; typedef _uint16_t irqstate_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
@ -87,4 +96,4 @@ typedef uint16 irqstate_t;
* Global Function Prototypes * Global Function Prototypes
****************************************************************************/ ****************************************************************************/
#endif /* __ARCH_CHIP_TYPES_H */ #endif /* __ARC_Z80_INCLUDE_Z80_TYPES_H */