diff options
Diffstat (limited to 'nuttx/arch')
-rw-r--r-- | nuttx/arch/sh/include/sh1/README.txt | 4 | ||||
-rw-r--r-- | nuttx/arch/sh/include/sh1/types.h | 82 | ||||
-rw-r--r-- | nuttx/arch/sh/include/types.h | 33 |
3 files changed, 89 insertions, 30 deletions
diff --git a/nuttx/arch/sh/include/sh1/README.txt b/nuttx/arch/sh/include/sh1/README.txt index dabd6e83a..c95fca459 100644 --- a/nuttx/arch/sh/include/sh1/README.txt +++ b/nuttx/arch/sh/include/sh1/README.txt @@ -1,3 +1 @@ -This directory contains header files common to all SH architectures. -Sub-directories within this directory contain header files unique to -specific SH architectures. +This directory contains header files specific to the SH-1 architecture. diff --git a/nuttx/arch/sh/include/sh1/types.h b/nuttx/arch/sh/include/sh1/types.h new file mode 100644 index 000000000..1166fb40c --- /dev/null +++ b/nuttx/arch/sh/include/sh1/types.h @@ -0,0 +1,82 @@ +/**************************************************************************** + * arch/sh/include/sh1/types.h + * + * Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * 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_SH_INCLUDE_SH1_TYPES_H +#define __ARCH_SH_INCLUDE_SH1_TYPES_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +/**************************************************************************** + * Definitions + ****************************************************************************/ + +/**************************************************************************** + * Type Declarations + ****************************************************************************/ + +#ifndef __ASSEMBLY__ + +/* These are the sizes of the standard GNU types */ + +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; + +/* This is the size of the interrupt state save returned by + * irqsave() + */ + +typedef unsigned long irqstate_t; + +#endif /* __ASSEMBLY__ */ + +/**************************************************************************** + * Global Function Prototypes + ****************************************************************************/ + +#endif /* __ARCH_SH_INCLUDE_SH1_TYPES_H */ diff --git a/nuttx/arch/sh/include/types.h b/nuttx/arch/sh/include/types.h index 139cee2c4..593d88306 100644 --- a/nuttx/arch/sh/include/types.h +++ b/nuttx/arch/sh/include/types.h @@ -1,7 +1,7 @@ /**************************************************************************** * arch/sh/include/types.h * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be + * 3. Neither the name Gregory Nutt nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * @@ -33,8 +33,8 @@ * ****************************************************************************/ -/* This file should never be included directed but, rather, - * only indirectly through sys/types.h +/* This file should never be included directed but, rather, only indirectly + * through sys/types.h */ #ifndef __ARCH_SH_INCLUDE_TYPES_H @@ -44,6 +44,8 @@ * Included Files ****************************************************************************/ +#include <arch/chip/types.h> + /**************************************************************************** * Definitions ****************************************************************************/ @@ -52,29 +54,6 @@ * Type Declarations ****************************************************************************/ -#ifndef __ASSEMBLY__ - -/* These are the sizes of the standard GNU types */ - -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; - -/* This is the size of the interrupt state save returned by - * irqsave() - */ - -typedef unsigned long irqstate_t; - -#endif /* __ASSEMBLY__ */ - /**************************************************************************** * Global Function Prototypes ****************************************************************************/ |