change log for rtems (2010-07-16)

rtems-vc at rtems.org rtems-vc at rtems.org
Fri Jul 16 09:11:35 UTC 2010


 *sh*:
2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>

	* score/include/rtems/score/basedefs.h: New file.
	* score/Makefile.am, score/preinstall.am: Reflect change above.
	* score/include/rtems/score/percpu.h: Include <rtems/score/cpu.h>.
	* score/include/rtems/system.h: Moved definition of SCORE_EXTERN,
	SAPI_EXTERN, RTEMS_EXTERN, POSIX_EXTERN, RTEMS_INLINE_ROUTINE,
	RTEMS_COMPILER_MEMORY_BARRIER, RTEMS_COMPILER_NO_RETURN_ATTRIBUTE,
	RTEMS_COMPILER_DEPRECATED_ATTRIBUTE, TRUE, and FALSE to
	<rtems/score/basedefs.h>.
	Removed include of <rtems/score/cpu.h>, <stdint.h> and <stddef.h>.

M 1.2514  cpukit/ChangeLog
M   1.86  cpukit/score/Makefile.am
A    1.1  cpukit/score/include/rtems/score/basedefs.h
M    1.3  cpukit/score/include/rtems/score/percpu.h
M   1.66  cpukit/score/include/rtems/system.h
M   1.23  cpukit/score/preinstall.am

diff -u rtems/cpukit/ChangeLog:1.2513 rtems/cpukit/ChangeLog:1.2514
--- rtems/cpukit/ChangeLog:1.2513	Fri Jul 16 02:45:18 2010
+++ rtems/cpukit/ChangeLog	Fri Jul 16 03:31:33 2010
@@ -1,5 +1,17 @@
 2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
 
+	* score/include/rtems/score/basedefs.h: New file.
+	* score/Makefile.am, score/preinstall.am: Reflect change above.
+	* score/include/rtems/score/percpu.h: Include <rtems/score/cpu.h>.
+	* score/include/rtems/system.h: Moved definition of SCORE_EXTERN,
+	SAPI_EXTERN, RTEMS_EXTERN, POSIX_EXTERN, RTEMS_INLINE_ROUTINE,
+	RTEMS_COMPILER_MEMORY_BARRIER, RTEMS_COMPILER_NO_RETURN_ATTRIBUTE,
+	RTEMS_COMPILER_DEPRECATED_ATTRIBUTE, TRUE, and FALSE to
+	<rtems/score/basedefs.h>.
+	Removed include of <rtems/score/cpu.h>, <stdint.h> and <stddef.h>.
+
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
 	* libmd/md4.c: Removed definition of TRUE and FALSE.
 
 2010-07-15	Joel Sherrill <joel.sherrill at oarcorp.com>

diff -u rtems/cpukit/score/Makefile.am:1.85 rtems/cpukit/score/Makefile.am:1.86
--- rtems/cpukit/score/Makefile.am:1.85	Tue Jul  6 02:56:15 2010
+++ rtems/cpukit/score/Makefile.am	Fri Jul 16 03:31:34 2010
@@ -32,7 +32,8 @@
     include/rtems/score/timestamp.h include/rtems/score/timestamp64.h \
     include/rtems/score/tod.h include/rtems/score/tqdata.h \
     include/rtems/score/userext.h include/rtems/score/watchdog.h \
-    include/rtems/score/wkspace.h include/rtems/score/cpuopts.h
+    include/rtems/score/wkspace.h include/rtems/score/cpuopts.h \
+    include/rtems/score/basedefs.h
 
 if HAS_PTHREADS
 include_rtems_score_HEADERS += include/rtems/score/corespinlock.h \

diff -u /dev/null rtems/cpukit/score/include/rtems/score/basedefs.h:1.1
--- /dev/null	Fri Jul 16 04:11:29 2010
+++ rtems/cpukit/score/include/rtems/score/basedefs.h	Fri Jul 16 03:31:33 2010
@@ -0,0 +1,162 @@
+/**
+ * @file
+ *
+ * @ingroup Score
+ *
+ * @brief Basic definitions.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2007.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  Copyright (c) 2010 embedded brains GmbH.
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#ifndef _RTEMS_BASEDEFS_H
+#define _RTEMS_BASEDEFS_H
+
+#include <rtems/score/cpuopts.h>
+
+#ifndef ASM
+  #include <stddef.h>
+  #include <stdbool.h>
+  #include <stdint.h>
+#endif
+
+#ifndef TRUE
+  #define TRUE 1
+#endif
+
+#ifndef FALSE
+  #define FALSE 0
+#endif
+
+#if TRUE == FALSE
+  #error "TRUE equals FALSE"
+#endif
+
+/**
+ *  The following ensures that all data is declared in the space
+ *  of the initialization routine for either the Initialization Manager
+ *  or the initialization file for the appropriate API.  It is
+ *  referenced as "external" in every other file.
+ */
+#ifdef SCORE_INIT
+#undef  SCORE_EXTERN
+#define SCORE_EXTERN
+#else
+#undef  SCORE_EXTERN
+#define SCORE_EXTERN  extern
+#endif
+
+/**
+ *  The following ensures that all data is declared in the space
+ *  of the initialization routine for either the Initialization Manager
+ *  or the initialization file for the appropriate API.  It is
+ *  referenced as "external" in every other file.
+ */
+#ifdef SAPI_INIT
+#undef  SAPI_EXTERN
+#define SAPI_EXTERN
+#else
+#undef  SAPI_EXTERN
+#define SAPI_EXTERN  extern
+#endif
+
+/**
+ *  The following ensures that all data is declared in the space
+ *  of the initialization routine for either the Initialization Manager
+ *  or the initialization file for the appropriate API.  It is
+ *  referenced as "external" in every other file.
+ */
+#ifdef RTEMS_API_INIT
+#undef  RTEMS_EXTERN
+#define RTEMS_EXTERN
+#else
+#undef  RTEMS_EXTERN
+#define RTEMS_EXTERN  extern
+#endif
+
+/**
+ *  The following ensures that all data is declared in the space
+ *  of the initialization routine for either the Initialization Manager
+ *  or the initialization file for the appropriate API.  It is
+ *  referenced as "external" in every other file.
+ */
+#ifdef POSIX_API_INIT
+#undef  POSIX_EXTERN
+#define POSIX_EXTERN
+#else
+#undef  POSIX_EXTERN
+#define POSIX_EXTERN  extern
+#endif
+
+/**
+ *  The following (in conjunction with compiler arguments) are used
+ *  to choose between the use of static inline functions and macro
+ *  functions.   The static inline implementation allows better
+ *  type checking with no cost in code size or execution speed.
+ */
+#ifdef __GNUC__
+#  define RTEMS_INLINE_ROUTINE static __inline__
+#else
+#  define RTEMS_INLINE_ROUTINE static inline
+#endif
+
+/**
+ *  The following macro is a compiler specific way to ensure that memory
+ *  writes are not reordered around certian points.  This specifically can
+ *  impact interrupt disable and thread dispatching critical sections.
+ */
+#ifdef __GNUC__
+  #define RTEMS_COMPILER_MEMORY_BARRIER() asm volatile("" ::: "memory")
+#else
+  #define RTEMS_COMPILER_MEMORY_BARRIER()
+#endif
+
+/**
+ *  The following macro is a compiler specific way to indicate that
+ *  the method will NOT return to the caller.  This can assist the
+ *  compiler in code generation and avoid unreachable paths.  This
+ *  can impact the code generated following calls to
+ *  rtems_fatal_error_occurred and _Internal_error_Occurred.
+ */
+#ifdef __GNUC__
+  #define RTEMS_COMPILER_NO_RETURN_ATTRIBUTE \
+      __attribute__ ((noreturn))
+#else
+  #define RTEMS_COMPILER_NO_RETURN_ATTRIBUTE
+#endif
+
+/**
+ *  Instructs the compiler to issue a warning whenever a variable or function
+ *  with this attribute will be used.
+ */
+#ifdef __GNUC__
+  #define RTEMS_COMPILER_DEPRECATED_ATTRIBUTE \
+     __attribute__ ((deprecated))
+#else
+  #define RTEMS_COMPILER_DEPRECATED_ATTRIBUTE
+#endif
+
+#ifndef ASM
+  #ifdef RTEMS_DEPRECATED_TYPES
+    typedef bool boolean;
+    typedef float single_precision;
+    typedef double double_precision;
+  #endif
+
+  /**
+   * XXX: Eventually proc_ptr needs to disappear!!!
+   */
+  typedef void * proc_ptr;
+#endif
+
+#endif /* _RTEMS_BASEDEFS_H */

diff -u rtems/cpukit/score/include/rtems/score/percpu.h:1.2 rtems/cpukit/score/include/rtems/score/percpu.h:1.3
--- rtems/cpukit/score/include/rtems/score/percpu.h:1.2	Tue Jun 29 13:51:49 2010
+++ rtems/cpukit/score/include/rtems/score/percpu.h	Fri Jul 16 03:31:33 2010
@@ -19,6 +19,8 @@
 #ifndef _RTEMS_PERCPU_H
 #define _RTEMS_PERCPU_H
 
+#include <rtems/score/cpu.h>
+
 #ifdef ASM
   #include <rtems/asm.h>
 #endif

diff -u rtems/cpukit/score/include/rtems/system.h:1.65 rtems/cpukit/score/include/rtems/system.h:1.66
--- rtems/cpukit/score/include/rtems/system.h:1.65	Mon Jun 28 19:34:11 2010
+++ rtems/cpukit/score/include/rtems/system.h	Fri Jul 16 03:31:34 2010
@@ -20,158 +20,19 @@
 #ifndef _RTEMS_SYSTEM_H
 #define _RTEMS_SYSTEM_H
 
+#include <rtems/score/percpu.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/*
- *  The cpu options include file defines all cpu dependent
- *  parameters for this build of RTEMS.  It must be included
- *  first so the basic macro definitions are in place.
- */
-#include <rtems/score/cpuopts.h>
-
-/**
- *  The following ensures that all data is declared in the space
- *  of the initialization routine for either the Initialization Manager
- *  or the initialization file for the appropriate API.  It is
- *  referenced as "external" in every other file.
- */
-#ifdef SCORE_INIT
-#undef  SCORE_EXTERN
-#define SCORE_EXTERN
-#else
-#undef  SCORE_EXTERN
-#define SCORE_EXTERN  extern
-#endif
-
-/**
- *  The following ensures that all data is declared in the space
- *  of the initialization routine for either the Initialization Manager
- *  or the initialization file for the appropriate API.  It is
- *  referenced as "external" in every other file.
- */
-#ifdef SAPI_INIT
-#undef  SAPI_EXTERN
-#define SAPI_EXTERN
-#else
-#undef  SAPI_EXTERN
-#define SAPI_EXTERN  extern
-#endif
-
-/**
- *  The following ensures that all data is declared in the space
- *  of the initialization routine for either the Initialization Manager
- *  or the initialization file for the appropriate API.  It is
- *  referenced as "external" in every other file.
- */
-#ifdef RTEMS_API_INIT
-#undef  RTEMS_EXTERN
-#define RTEMS_EXTERN
-#else
-#undef  RTEMS_EXTERN
-#define RTEMS_EXTERN  extern
-#endif
-
-/**
- *  The following ensures that all data is declared in the space
- *  of the initialization routine for either the Initialization Manager
- *  or the initialization file for the appropriate API.  It is
- *  referenced as "external" in every other file.
- */
-#ifdef POSIX_API_INIT
-#undef  POSIX_EXTERN
-#define POSIX_EXTERN
-#else
-#undef  POSIX_EXTERN
-#define POSIX_EXTERN  extern
-#endif
-
-/**
- *  The following (in conjunction with compiler arguments) are used
- *  to choose between the use of static inline functions and macro
- *  functions.   The static inline implementation allows better
- *  type checking with no cost in code size or execution speed.
- */
-#ifdef __GNUC__
-#  define RTEMS_INLINE_ROUTINE static __inline__
-#else
-#  define RTEMS_INLINE_ROUTINE static inline
-#endif
-
-/**
- *  The following macro is a compiler specific way to ensure that memory
- *  writes are not reordered around certian points.  This specifically can
- *  impact interrupt disable and thread dispatching critical sections.
- */
-#ifdef __GNUC__
-  #define RTEMS_COMPILER_MEMORY_BARRIER() asm volatile("" ::: "memory")
-#else
-  #define RTEMS_COMPILER_MEMORY_BARRIER()
-#endif
-
-/**
- *  The following macro is a compiler specific way to indicate that
- *  the method will NOT return to the caller.  This can assist the
- *  compiler in code generation and avoid unreachable paths.  This
- *  can impact the code generated following calls to
- *  rtems_fatal_error_occurred and _Internal_error_Occurred.
- */
-#ifdef __GNUC__
-  #define RTEMS_COMPILER_NO_RETURN_ATTRIBUTE \
-      __attribute__ ((noreturn))
-#else
-  #define RTEMS_COMPILER_NO_RETURN_ATTRIBUTE
-#endif
-
-/**
- *  Instructs the compiler to issue a warning whenever a variable or function
- *  with this attribute will be used.
- */
-#ifdef __GNUC__
-  #define RTEMS_COMPILER_DEPRECATED_ATTRIBUTE \
-     __attribute__ ((deprecated))
-#else
-  #define RTEMS_COMPILER_DEPRECATED_ATTRIBUTE
-#endif
-
 #ifndef ASM
+
 #ifdef RTEMS_POSIX_API
 /** The following is used by the POSIX implementation to catch bad paths.  */
 int POSIX_NOT_IMPLEMENTED( void );
 #endif
 
-/*
- *  Include a base set of files.
- */
-
-/**
- * XXX: Eventually proc_ptr needs to disappear!!!
- */
-typedef void * proc_ptr;
-
-#include <stddef.h>
-#endif
-
-#if !defined( TRUE ) || (TRUE != 1)
-/**  Boolean constant TRUE */
-#undef TRUE
-#define TRUE     (1)
-#endif
-
-#if !defined( FALSE ) || (FALSE != 0)
-/**  Boolean constant FALSE */
-#undef FALSE
-#define FALSE     (0)
-#endif
-
-#ifndef ASM
-#include <stdint.h>
-#endif
-#include <rtems/score/cpu.h>        /* processor specific information */
-#include <rtems/score/percpu.h>
-
-#ifndef ASM
 /**
  *  This macro is used to obtain the offset of a field in a structure.
  */
@@ -192,7 +53,8 @@
 
 /** This macro defines the maximum length of a Classic API name. */
 #define RTEMS_MAXIMUM_NAME_LENGTH sizeof(rtems_name)
-#endif
+
+#endif /* ASM */
 
 #ifdef __cplusplus
 }

diff -u rtems/cpukit/score/preinstall.am:1.22 rtems/cpukit/score/preinstall.am:1.23
--- rtems/cpukit/score/preinstall.am:1.22	Mon Jun 28 19:34:11 2010
+++ rtems/cpukit/score/preinstall.am	Fri Jul 16 03:31:34 2010
@@ -167,6 +167,10 @@
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpuopts.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuopts.h
 
+$(PROJECT_INCLUDE)/rtems/score/basedefs.h: include/rtems/score/basedefs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/basedefs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/basedefs.h
+
 if HAS_PTHREADS
 $(PROJECT_INCLUDE)/rtems/score/corespinlock.h: include/rtems/score/corespinlock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/corespinlock.h


 *sh*:
2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>

	* rtems/new-exceptions/cpu.h: Removed file.
	* Makefile.am, preinstall.am: Reflect change above.
	* rtems/score/cpu.h: Include <rtems/score/types.h> first.  Added
	contents of <rtems/new-exceptions/cpu.h>.
	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.

M  1.155  cpukit/score/cpu/powerpc/ChangeLog
M   1.38  cpukit/score/cpu/powerpc/Makefile.am
M    1.9  cpukit/score/cpu/powerpc/preinstall.am
R   1.39  cpukit/score/cpu/powerpc/rtems/new-exceptions/cpu.h
M   1.42  cpukit/score/cpu/powerpc/rtems/score/cpu.h
M   1.16  cpukit/score/cpu/powerpc/rtems/score/types.h

diff -u rtems/cpukit/score/cpu/powerpc/ChangeLog:1.154 rtems/cpukit/score/cpu/powerpc/ChangeLog:1.155
--- rtems/cpukit/score/cpu/powerpc/ChangeLog:1.154	Wed Jun 30 02:43:00 2010
+++ rtems/cpukit/score/cpu/powerpc/ChangeLog	Fri Jul 16 03:45:02 2010
@@ -1,3 +1,11 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/new-exceptions/cpu.h: Removed file.
+	* Makefile.am, preinstall.am: Reflect change above.
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.  Added
+	contents of <rtems/new-exceptions/cpu.h>.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-30	Peter Dufault <dufault at hda.com>
 
 	PR 1588/cpukit

diff -u rtems/cpukit/score/cpu/powerpc/Makefile.am:1.37 rtems/cpukit/score/cpu/powerpc/Makefile.am:1.38
--- rtems/cpukit/score/cpu/powerpc/Makefile.am:1.37	Tue Feb 19 21:02:36 2008
+++ rtems/cpukit/score/cpu/powerpc/Makefile.am	Fri Jul 16 03:45:02 2010
@@ -11,9 +11,6 @@
 include_rtems_score_HEADERS = rtems/score/powerpc.h rtems/score/cpu.h \
     rtems/score/types.h
 
-include_rtems_new_exceptionsdir = $(includedir)/rtems/new-exceptions
-include_rtems_new_exceptions_HEADERS = rtems/new-exceptions/cpu.h
-
 include_rtems_powerpcdir = $(includedir)/rtems/powerpc
 include_rtems_powerpc_HEADERS = rtems/powerpc/registers.h
 

diff -u rtems/cpukit/score/cpu/powerpc/preinstall.am:1.8 rtems/cpukit/score/cpu/powerpc/preinstall.am:1.9
--- rtems/cpukit/score/cpu/powerpc/preinstall.am:1.8	Tue Feb 19 21:03:04 2008
+++ rtems/cpukit/score/cpu/powerpc/preinstall.am	Fri Jul 16 03:45:02 2010
@@ -39,15 +39,6 @@
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
 
-$(PROJECT_INCLUDE)/rtems/new-exceptions/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/new-exceptions
-	@: > $(PROJECT_INCLUDE)/rtems/new-exceptions/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/new-exceptions/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/new-exceptions/cpu.h: rtems/new-exceptions/cpu.h $(PROJECT_INCLUDE)/rtems/new-exceptions/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/new-exceptions/cpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/new-exceptions/cpu.h
-
 $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/powerpc
 	@: > $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)

diff -u rtems/cpukit/score/cpu/powerpc/rtems/score/cpu.h:1.41 rtems/cpukit/score/cpu/powerpc/rtems/score/cpu.h:1.42
--- rtems/cpukit/score/cpu/powerpc/rtems/score/cpu.h:1.41	Thu Dec  3 23:24:33 2009
+++ rtems/cpukit/score/cpu/powerpc/rtems/score/cpu.h	Fri Jul 16 03:45:02 2010
@@ -6,6 +6,25 @@
  *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
+ *  COPYRIGHT (c) 1995 i-cubed ltd.
+ *
+ *  To anyone who acknowledges that this file is provided "AS IS"
+ *  without any express or implied warranty:
+ *      permission to use, copy, modify, and distribute this file
+ *      for any purpose is hereby granted without fee, provided that
+ *      the above copyright notice and this notice appears in all
+ *      copies, and that the name of i-cubed limited not be used in
+ *      advertising or publicity pertaining to distribution of the
+ *      software without specific, written prior permission.
+ *      i-cubed limited makes no representations about the suitability
+ *      of this software for any purpose.
+ *
+ *  Copyright (c) 2001 Andy Dachs <a.dachs at sstl.co.uk>.
+ *
+ *  Copyright (c) 2001 Surrey Satellite Technology Limited (SSTL).
+ *
+ *  Copyright (c) 2010 embedded brains GmbH.
+ *
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
  *  http://www.rtems.com/license/LICENSE.
@@ -16,11 +35,16 @@
 #ifndef _RTEMS_SCORE_CPU_H
 #define _RTEMS_SCORE_CPU_H
 
-#include <rtems/score/powerpc.h>              /* pick up machine definitions */
+#include <rtems/score/types.h>
+#include <rtems/score/powerpc.h>
+#include <rtems/powerpc/registers.h>
 
 #ifndef ASM
   #include <string.h> /* for memset() */
-  #include <rtems/score/types.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
 #endif
 
 /* conditional compilation parameters */
@@ -319,7 +343,248 @@
 
 #endif /* ASM */
 
-#include <rtems/new-exceptions/cpu.h>
+/*
+ *  Does RTEMS manage a dedicated interrupt stack in software?
+ *
+ *  If TRUE, then a stack is allocated in _ISR_Handler_initialization.
+ *  If FALSE, nothing is done.
+ *
+ *  If the CPU supports a dedicated interrupt stack in hardware,
+ *  then it is generally the responsibility of the BSP to allocate it
+ *  and set it up.
+ *
+ *  If the CPU does not support a dedicated interrupt stack, then
+ *  the porter has two options: (1) execute interrupts on the
+ *  stack of the interrupted task, and (2) have RTEMS manage a dedicated
+ *  interrupt stack.
+ *
+ *  If this is TRUE, CPU_ALLOCATE_INTERRUPT_STACK should also be TRUE.
+ *
+ *  Only one of CPU_HAS_SOFTWARE_INTERRUPT_STACK and
+ *  CPU_HAS_HARDWARE_INTERRUPT_STACK should be set to TRUE.  It is
+ *  possible that both are FALSE for a particular CPU.  Although it
+ *  is unclear what that would imply about the interrupt processing
+ *  procedure on that CPU.
+ */
+
+#define CPU_HAS_SOFTWARE_INTERRUPT_STACK TRUE
+
+/*
+ *  Does this CPU have hardware support for a dedicated interrupt stack?
+ *
+ *  If TRUE, then it must be installed during initialization.
+ *  If FALSE, then no installation is performed.
+ *
+ *  If this is TRUE, CPU_ALLOCATE_INTERRUPT_STACK should also be TRUE.
+ *
+ *  Only one of CPU_HAS_SOFTWARE_INTERRUPT_STACK and
+ *  CPU_HAS_HARDWARE_INTERRUPT_STACK should be set to TRUE.  It is
+ *  possible that both are FALSE for a particular CPU.  Although it
+ *  is unclear what that would imply about the interrupt processing
+ *  procedure on that CPU.
+ */
+
+#define CPU_HAS_HARDWARE_INTERRUPT_STACK FALSE
+
+/*
+ *  Does RTEMS allocate a dedicated interrupt stack in the Interrupt Manager?
+ *
+ *  If TRUE, then the memory is allocated during initialization.
+ *  If FALSE, then the memory is allocated during initialization.
+ *
+ *  This should be TRUE is CPU_HAS_SOFTWARE_INTERRUPT_STACK is TRUE.
+ */
+
+#define CPU_ALLOCATE_INTERRUPT_STACK FALSE
+
+/*
+ *  Does the RTEMS invoke the user's ISR with the vector number and
+ *  a pointer to the saved interrupt frame (1) or just the vector
+ *  number (0)?
+ */
+
+#define CPU_ISR_PASSES_FRAME_POINTER 0
+
+/*
+ *  Should the saving of the floating point registers be deferred
+ *  until a context switch is made to another different floating point
+ *  task?
+ *
+ *  If TRUE, then the floating point context will not be stored until
+ *  necessary.  It will remain in the floating point registers and not
+ *  disturned until another floating point task is switched to.
+ *
+ *  If FALSE, then the floating point context is saved when a floating
+ *  point task is switched out and restored when the next floating point
+ *  task is restored.  The state of the floating point registers between
+ *  those two operations is not specified.
+ *
+ *  If the floating point context does NOT have to be saved as part of
+ *  interrupt dispatching, then it should be safe to set this to TRUE.
+ *
+ *  Setting this flag to TRUE results in using a different algorithm
+ *  for deciding when to save and restore the floating point context.
+ *  The deferred FP switch algorithm minimizes the number of times
+ *  the FP context is saved and restored.  The FP context is not saved
+ *  until a context switch is made to another, different FP task.
+ *  Thus in a system with only one FP task, the FP context will never
+ *  be saved or restored.
+ *
+ *  Note, however that compilers may use floating point registers/
+ *  instructions for optimization or they may save/restore FP registers
+ *  on the stack. You must not use deferred switching in these cases
+ *  and on the PowerPC attempting to do so will raise a "FP unavailable"
+ *  exception.
+ */
+/*
+ *  ACB Note:  This could make debugging tricky..
+ */
+
+/* conservative setting (FALSE); probably doesn't affect performance too much */
+#define CPU_USE_DEFERRED_FP_SWITCH       FALSE
+
+/*
+ *  Processor defined structures required for cpukit/score.
+ */
+
+#ifndef ASM
+
+/*
+ *  This variable is optional.  It is used on CPUs on which it is difficult
+ *  to generate an "uninitialized" FP context.  It is filled in by
+ *  _CPU_Initialize and copied into the task's FP context area during
+ *  _CPU_Context_Initialize.
+ */
+
+/* EXTERN Context_Control_fp  _CPU_Null_fp_context; */
+
+#endif /* ndef ASM */
+
+/*
+ *  This defines the number of levels and the mask used to pick those
+ *  bits out of a thread mode.
+ */
+
+#define CPU_MODES_INTERRUPT_LEVEL  0x00000001 /* interrupt level in mode */
+#define CPU_MODES_INTERRUPT_MASK   0x00000001 /* interrupt level in mode */
+
+/*
+ *  Nothing prevents the porter from declaring more CPU specific variables.
+ */
+
+#ifndef ASM
+
+SCORE_EXTERN struct {
+  uint32_t      *Disable_level;
+  void          *Stack;
+  volatile bool *Switch_necessary;
+  bool          *Signal;
+
+} _CPU_IRQ_info CPU_STRUCTURE_ALIGNMENT;
+
+#endif /* ndef ASM */
+
+/*
+ *  The size of the floating point context area.  On some CPUs this
+ *  will not be a "sizeof" because the format of the floating point
+ *  area is not defined -- only the size is.  This is usually on
+ *  CPUs with a "floating point save context" instruction.
+ */
+
+#define CPU_CONTEXT_FP_SIZE sizeof( Context_Control_fp )
+
+/*
+ * (Optional) # of bytes for libmisc/stackchk to check
+ * If not specifed, then it defaults to something reasonable
+ * for most architectures.
+ */
+
+#define CPU_STACK_CHECK_SIZE    (128)
+
+/*
+ *  Amount of extra stack (above minimum stack size) required by
+ *  MPCI receive server thread.  Remember that in a multiprocessor
+ *  system this thread must exist and be able to process all directives.
+ */
+
+#define CPU_MPCI_RECEIVE_SERVER_EXTRA_STACK 0
+
+/*
+ *  This defines the number of entries in the ISR_Vector_table managed
+ *  by RTEMS.
+ */
+
+#define CPU_INTERRUPT_NUMBER_OF_VECTORS     (0)
+#define CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER (UINT32_MAX)
+
+/*
+ *  This is defined if the port has a special way to report the ISR nesting
+ *  level.  Most ports maintain the variable _ISR_Nest_level. Note that
+ *  this is not an option - RTEMS/score _relies_ on _ISR_Nest_level
+ *  being maintained (e.g. watchdog queues).
+ */
+
+#define CPU_PROVIDES_ISR_IS_IN_PROGRESS FALSE
+
+/*
+ *  ISR handler macros
+ */
+
+#define _CPU_Initialize_vectors()
+
+/*
+ *  Disable all interrupts for an RTEMS critical section.  The previous
+ *  level is returned in _isr_cookie.
+ */
+
+#ifndef ASM
+
+static inline uint32_t   _CPU_ISR_Get_level( void )
+{
+  register unsigned int msr;
+  _CPU_MSR_GET(msr);
+  if (msr & MSR_EE) return 0;
+  else	return 1;
+}
+
+static inline void _CPU_ISR_Set_level( uint32_t   level )
+{
+  register unsigned int msr;
+  _CPU_MSR_GET(msr);
+  if (!(level & CPU_MODES_INTERRUPT_MASK)) {
+    msr |= ppc_interrupt_get_disable_mask();
+  }
+  else {
+    msr &= ~ppc_interrupt_get_disable_mask();
+  }
+  _CPU_MSR_SET(msr);
+}
+
+void BSP_panic(char *);
+
+/* Fatal Error manager macros */
+
+/*
+ *  This routine copies _error into a known place -- typically a stack
+ *  location or a register, optionally disables interrupts, and
+ *  halts/stops the CPU.
+ */
+
+void _BSP_Fatal_error(unsigned int);
+
+#endif /* ASM */
+
+#define _CPU_Fatal_halt( _error ) \
+  _BSP_Fatal_error(_error)
+
+/* end of Fatal Error manager macros */
+
+/*
+ * SPRG0 was previously used to make sure that the BSP fixed the PR288 bug.
+ * Now SPRG0 is devoted to the interrupt disable mask.
+ */
+
+#define PPC_BSP_HAS_FIXED_PR288	ppc_this_is_now_the_interrupt_disable_mask
 
 /*
  *  Should be large enough to run all RTEMS tests.  This ensures
@@ -707,4 +972,8 @@
 
 #endif /* ASM */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTEMS_SCORE_CPU_H */

diff -u rtems/cpukit/score/cpu/powerpc/rtems/score/types.h:1.15 rtems/cpukit/score/cpu/powerpc/rtems/score/types.h:1.16
--- rtems/cpukit/score/cpu/powerpc/rtems/score/types.h:1.15	Wed Dec 10 18:45:34 2008
+++ rtems/cpukit/score/cpu/powerpc/rtems/score/types.h	Fri Jul 16 03:45:02 2010
@@ -36,10 +36,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,12 +50,6 @@
 typedef uint32_t     Priority_Bit_map_control;
 typedef void ppc_isr;
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif


 *sh*:
2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>

	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.

M  1.124  cpukit/score/cpu/arm/ChangeLog
M   1.45  cpukit/score/cpu/arm/rtems/score/cpu.h
M   1.19  cpukit/score/cpu/arm/rtems/score/types.h
M   1.49  cpukit/score/cpu/avr/ChangeLog
M   1.27  cpukit/score/cpu/avr/rtems/score/cpu.h
M   1.11  cpukit/score/cpu/avr/rtems/score/types.h
M   1.38  cpukit/score/cpu/bfin/ChangeLog
M   1.21  cpukit/score/cpu/bfin/rtems/score/cpu.h
M    1.6  cpukit/score/cpu/bfin/rtems/score/types.h
M   1.96  cpukit/score/cpu/h8300/ChangeLog
M   1.41  cpukit/score/cpu/h8300/rtems/score/cpu.h
M   1.14  cpukit/score/cpu/h8300/rtems/score/types.h
M  1.101  cpukit/score/cpu/i386/ChangeLog
M   1.36  cpukit/score/cpu/i386/rtems/score/cpu.h
M   1.15  cpukit/score/cpu/i386/rtems/score/types.h
M   1.14  cpukit/score/cpu/lm32/ChangeLog
M   1.10  cpukit/score/cpu/lm32/rtems/score/cpu.h
M    1.3  cpukit/score/cpu/lm32/rtems/score/types.h
M   1.13  cpukit/score/cpu/m32c/ChangeLog
M    1.9  cpukit/score/cpu/m32c/rtems/score/cpu.h
M    1.3  cpukit/score/cpu/m32c/rtems/score/types.h
M    1.6  cpukit/score/cpu/m32r/ChangeLog
M    1.6  cpukit/score/cpu/m32r/rtems/score/cpu.h
M    1.3  cpukit/score/cpu/m32r/rtems/score/types.h
M  1.124  cpukit/score/cpu/m68k/ChangeLog
M   1.44  cpukit/score/cpu/m68k/rtems/score/cpu.h
M   1.15  cpukit/score/cpu/m68k/rtems/score/types.h
M  1.141  cpukit/score/cpu/mips/ChangeLog
M   1.59  cpukit/score/cpu/mips/rtems/score/cpu.h
M   1.16  cpukit/score/cpu/mips/rtems/score/types.h
M   1.23  cpukit/score/cpu/nios2/ChangeLog
M   1.15  cpukit/score/cpu/nios2/rtems/score/cpu.h
M    1.9  cpukit/score/cpu/nios2/rtems/score/types.h
M   1.83  cpukit/score/cpu/no_cpu/ChangeLog
M   1.33  cpukit/score/cpu/no_cpu/rtems/score/cpu.h
M   1.18  cpukit/score/cpu/no_cpu/rtems/score/types.h
M   1.96  cpukit/score/cpu/sh/ChangeLog
M   1.33  cpukit/score/cpu/sh/rtems/score/cpu.h
M   1.15  cpukit/score/cpu/sh/rtems/score/types.h
M   1.97  cpukit/score/cpu/sparc/ChangeLog
M   1.37  cpukit/score/cpu/sparc/rtems/score/cpu.h
M   1.17  cpukit/score/cpu/sparc/rtems/score/types.h
M    1.2  cpukit/score/cpu/sparc64/ChangeLog
M    1.2  cpukit/score/cpu/sparc64/rtems/score/cpu.h
M    1.2  cpukit/score/cpu/sparc64/rtems/score/types.h

diff -u rtems/cpukit/score/cpu/arm/ChangeLog:1.123 rtems/cpukit/score/cpu/arm/ChangeLog:1.124
--- rtems/cpukit/score/cpu/arm/ChangeLog:1.123	Tue Jul  6 02:52:36 2010
+++ rtems/cpukit/score/cpu/arm/ChangeLog	Fri Jul 16 03:35:32 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-07-06	Sebastian Huber <sebastian.huber at embedded-brains.de>
 
 	* rtems/score/cpu.h: Removed CPU_ENABLE_C_ISR_DISPATCH_IMPLEMENTATION

diff -u rtems/cpukit/score/cpu/arm/rtems/score/cpu.h:1.44 rtems/cpukit/score/cpu/arm/rtems/score/cpu.h:1.45
--- rtems/cpukit/score/cpu/arm/rtems/score/cpu.h:1.44	Tue Jul  6 02:52:36 2010
+++ rtems/cpukit/score/cpu/arm/rtems/score/cpu.h	Fri Jul 16 03:35:32 2010
@@ -33,22 +33,9 @@
 #ifndef _RTEMS_SCORE_CPU_H
 #define _RTEMS_SCORE_CPU_H
 
+#include <rtems/score/types.h>
 #include <rtems/score/arm.h>
 
-#ifndef ASM
-  #include <rtems/score/types.h>
-#endif
-
-#ifndef TRUE
-  #warning "TRUE not defined"
-  #define TRUE 1
-#endif
-
-#ifndef FALSE
-  #warning "FALSE not defined"
-  #define FALSE 0
-#endif
-
 /**
  * @defgroup ScoreCPUARM ARM Specific Support
  *

diff -u rtems/cpukit/score/cpu/arm/rtems/score/types.h:1.18 rtems/cpukit/score/cpu/arm/rtems/score/types.h:1.19
--- rtems/cpukit/score/cpu/arm/rtems/score/types.h:1.18	Thu Apr  8 05:13:46 2010
+++ rtems/cpukit/score/cpu/arm/rtems/score/types.h	Fri Jul 16 03:35:32 2010
@@ -24,10 +24,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {
@@ -45,12 +44,6 @@
 
 typedef uint16_t         Priority_Bit_map_control;
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool		boolean;            /* Boolean value   */
-typedef float           single_precision;   /* single precision float */
-typedef double          double_precision;   /* double precision float */
-#endif
-
 /** @} */
 
 #ifdef __cplusplus

diff -u rtems/cpukit/score/cpu/avr/ChangeLog:1.48 rtems/cpukit/score/cpu/avr/ChangeLog:1.49
--- rtems/cpukit/score/cpu/avr/ChangeLog:1.48	Mon Jun 28 19:31:04 2010
+++ rtems/cpukit/score/cpu/avr/ChangeLog	Fri Jul 16 03:36:36 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	PR 1573/cpukit

diff -u rtems/cpukit/score/cpu/avr/rtems/score/cpu.h:1.26 rtems/cpukit/score/cpu/avr/rtems/score/cpu.h:1.27
--- rtems/cpukit/score/cpu/avr/rtems/score/cpu.h:1.26	Mon Jun 28 19:31:05 2010
+++ rtems/cpukit/score/cpu/avr/rtems/score/cpu.h	Fri Jul 16 03:36:36 2010
@@ -23,11 +23,9 @@
 extern "C" {
 #endif
 
-#include <rtems/score/avr.h>            /* pick up machine definitions */
-#include <avr/common.h>
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/avr.h>
+#include <avr/common.h>
 
 /* conditional compilation parameters */
 

diff -u rtems/cpukit/score/cpu/avr/rtems/score/types.h:1.10 rtems/cpukit/score/cpu/avr/rtems/score/types.h:1.11
--- rtems/cpukit/score/cpu/avr/rtems/score/types.h:1.10	Wed Dec 10 18:45:34 2008
+++ rtems/cpukit/score/cpu/avr/rtems/score/types.h	Fri Jul 16 03:36:36 2010
@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@
 typedef void avr_isr;
 typedef void ( *avr_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff -u rtems/cpukit/score/cpu/bfin/ChangeLog:1.37 rtems/cpukit/score/cpu/bfin/ChangeLog:1.38
--- rtems/cpukit/score/cpu/bfin/ChangeLog:1.37	Mon Jun 28 19:31:07 2010
+++ rtems/cpukit/score/cpu/bfin/ChangeLog	Fri Jul 16 03:37:09 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	PR 1573/cpukit

diff -u rtems/cpukit/score/cpu/bfin/rtems/score/cpu.h:1.20 rtems/cpukit/score/cpu/bfin/rtems/score/cpu.h:1.21
--- rtems/cpukit/score/cpu/bfin/rtems/score/cpu.h:1.20	Mon Jun 28 19:31:07 2010
+++ rtems/cpukit/score/cpu/bfin/rtems/score/cpu.h	Fri Jul 16 03:37:10 2010
@@ -25,10 +25,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/bfin.h>            /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/bfin.h>
 
 /* conditional compilation parameters */
 

diff -u rtems/cpukit/score/cpu/bfin/rtems/score/types.h:1.5 rtems/cpukit/score/cpu/bfin/rtems/score/types.h:1.6
--- rtems/cpukit/score/cpu/bfin/rtems/score/types.h:1.5	Wed Dec 10 18:45:34 2008
+++ rtems/cpukit/score/cpu/bfin/rtems/score/types.h	Fri Jul 16 03:37:10 2010
@@ -15,10 +15,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,12 +36,6 @@
 /** This defines the prototype for an ISR entry point. */
 typedef blackfin_isr ( *blackfin_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff -u rtems/cpukit/score/cpu/h8300/ChangeLog:1.95 rtems/cpukit/score/cpu/h8300/ChangeLog:1.96
--- rtems/cpukit/score/cpu/h8300/ChangeLog:1.95	Mon Jun 28 19:31:09 2010
+++ rtems/cpukit/score/cpu/h8300/ChangeLog	Fri Jul 16 03:37:53 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	PR 1573/cpukit

diff -u rtems/cpukit/score/cpu/h8300/rtems/score/cpu.h:1.40 rtems/cpukit/score/cpu/h8300/rtems/score/cpu.h:1.41
--- rtems/cpukit/score/cpu/h8300/rtems/score/cpu.h:1.40	Mon Jun 28 19:31:09 2010
+++ rtems/cpukit/score/cpu/h8300/rtems/score/cpu.h	Fri Jul 16 03:37:53 2010
@@ -23,10 +23,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/h8300.h>               /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/h8300.h>
 
 #include <rtems/bspIo.h>	/* printk */
 

diff -u rtems/cpukit/score/cpu/h8300/rtems/score/types.h:1.13 rtems/cpukit/score/cpu/h8300/rtems/score/types.h:1.14
--- rtems/cpukit/score/cpu/h8300/rtems/score/types.h:1.13	Wed Dec 10 18:45:34 2008
+++ rtems/cpukit/score/cpu/h8300/rtems/score/types.h	Fri Jul 16 03:37:53 2010
@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@
 typedef void h8300_isr;
 typedef void ( *h8300_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff -u rtems/cpukit/score/cpu/i386/ChangeLog:1.100 rtems/cpukit/score/cpu/i386/ChangeLog:1.101
--- rtems/cpukit/score/cpu/i386/ChangeLog:1.100	Tue Jun 15 11:25:16 2010
+++ rtems/cpukit/score/cpu/i386/ChangeLog	Fri Jul 16 03:38:35 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-15	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	* cpu_asm.S: Formatting.

diff -u rtems/cpukit/score/cpu/i386/rtems/score/cpu.h:1.35 rtems/cpukit/score/cpu/i386/rtems/score/cpu.h:1.36
--- rtems/cpukit/score/cpu/i386/rtems/score/cpu.h:1.35	Thu Dec  3 22:26:32 2009
+++ rtems/cpukit/score/cpu/i386/rtems/score/cpu.h	Fri Jul 16 03:38:35 2010
@@ -27,10 +27,10 @@
 extern "C" {
 #endif
 
-#include <rtems/score/i386.h>              /* pick up machine definitions */
+#include <rtems/score/types.h>
+#include <rtems/score/i386.h>
 
 #ifndef ASM
-#include <rtems/score/types.h>
 #include <rtems/score/interrupts.h>	/* formerly in libcpu/cpu.h> */
 #include <rtems/score/registers.h>	/* formerly part of libcpu */
 #endif

diff -u rtems/cpukit/score/cpu/i386/rtems/score/types.h:1.14 rtems/cpukit/score/cpu/i386/rtems/score/types.h:1.15
--- rtems/cpukit/score/cpu/i386/rtems/score/types.h:1.14	Wed Dec 10 18:45:34 2008
+++ rtems/cpukit/score/cpu/i386/rtems/score/types.h	Fri Jul 16 03:38:35 2010
@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@
 typedef void i386_isr;
 typedef i386_isr ( *i386_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool 		boolean;              /* Boolean value   */
-typedef float		single_precision;     /* single precision float */
-typedef double		double_precision;     /* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff -u rtems/cpukit/score/cpu/lm32/ChangeLog:1.13 rtems/cpukit/score/cpu/lm32/ChangeLog:1.14
--- rtems/cpukit/score/cpu/lm32/ChangeLog:1.13	Mon Jun 28 19:31:12 2010
+++ rtems/cpukit/score/cpu/lm32/ChangeLog	Fri Jul 16 03:39:05 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	PR 1573/cpukit

diff -u rtems/cpukit/score/cpu/lm32/rtems/score/cpu.h:1.9 rtems/cpukit/score/cpu/lm32/rtems/score/cpu.h:1.10
--- rtems/cpukit/score/cpu/lm32/rtems/score/cpu.h:1.9	Mon Jun 28 19:31:12 2010
+++ rtems/cpukit/score/cpu/lm32/rtems/score/cpu.h	Fri Jul 16 03:39:05 2010
@@ -37,10 +37,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/lm32.h>            /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/lm32.h>
 
 /* conditional compilation parameters */
 

diff -u rtems/cpukit/score/cpu/lm32/rtems/score/types.h:1.2 rtems/cpukit/score/cpu/lm32/rtems/score/types.h:1.3
--- rtems/cpukit/score/cpu/lm32/rtems/score/types.h:1.2	Wed Dec 10 18:45:34 2008
+++ rtems/cpukit/score/cpu/lm32/rtems/score/types.h	Fri Jul 16 03:39:05 2010
@@ -22,10 +22,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,12 +43,6 @@
 /** This defines the prototype for an ISR entry point. */
 typedef lm32_isr ( *lm32_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff -u rtems/cpukit/score/cpu/m32c/ChangeLog:1.12 rtems/cpukit/score/cpu/m32c/ChangeLog:1.13
--- rtems/cpukit/score/cpu/m32c/ChangeLog:1.12	Mon Jun 28 19:31:14 2010
+++ rtems/cpukit/score/cpu/m32c/ChangeLog	Fri Jul 16 03:39:36 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	PR 1573/cpukit

diff -u rtems/cpukit/score/cpu/m32c/rtems/score/cpu.h:1.8 rtems/cpukit/score/cpu/m32c/rtems/score/cpu.h:1.9
--- rtems/cpukit/score/cpu/m32c/rtems/score/cpu.h:1.8	Mon Jun 28 19:31:14 2010
+++ rtems/cpukit/score/cpu/m32c/rtems/score/cpu.h	Fri Jul 16 03:39:36 2010
@@ -37,10 +37,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/m32c.h>            /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/m32c.h>
 
 /* conditional compilation parameters */
 

diff -u rtems/cpukit/score/cpu/m32c/rtems/score/types.h:1.2 rtems/cpukit/score/cpu/m32c/rtems/score/types.h:1.3
--- rtems/cpukit/score/cpu/m32c/rtems/score/types.h:1.2	Wed Dec 10 18:45:34 2008
+++ rtems/cpukit/score/cpu/m32c/rtems/score/types.h	Fri Jul 16 03:39:36 2010
@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {

diff -u rtems/cpukit/score/cpu/m32r/ChangeLog:1.5 rtems/cpukit/score/cpu/m32r/ChangeLog:1.6
--- rtems/cpukit/score/cpu/m32r/ChangeLog:1.5	Mon Jun 28 19:31:16 2010
+++ rtems/cpukit/score/cpu/m32r/ChangeLog	Fri Jul 16 03:40:07 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	PR 1573/cpukit

diff -u rtems/cpukit/score/cpu/m32r/rtems/score/cpu.h:1.5 rtems/cpukit/score/cpu/m32r/rtems/score/cpu.h:1.6
--- rtems/cpukit/score/cpu/m32r/rtems/score/cpu.h:1.5	Mon Jun 28 19:31:16 2010
+++ rtems/cpukit/score/cpu/m32r/rtems/score/cpu.h	Fri Jul 16 03:40:07 2010
@@ -37,10 +37,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/m32r.h>            /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/m32r.h>
 
 /* conditional compilation parameters */
 

diff -u rtems/cpukit/score/cpu/m32r/rtems/score/types.h:1.2 rtems/cpukit/score/cpu/m32r/rtems/score/types.h:1.3
--- rtems/cpukit/score/cpu/m32r/rtems/score/types.h:1.2	Wed Dec 10 18:45:34 2008
+++ rtems/cpukit/score/cpu/m32r/rtems/score/types.h	Fri Jul 16 03:40:07 2010
@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {

diff -u rtems/cpukit/score/cpu/m68k/ChangeLog:1.123 rtems/cpukit/score/cpu/m68k/ChangeLog:1.124
--- rtems/cpukit/score/cpu/m68k/ChangeLog:1.123	Mon Jun 28 19:31:18 2010
+++ rtems/cpukit/score/cpu/m68k/ChangeLog	Fri Jul 16 03:41:18 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	PR 1573/cpukit

diff -u rtems/cpukit/score/cpu/m68k/rtems/score/cpu.h:1.43 rtems/cpukit/score/cpu/m68k/rtems/score/cpu.h:1.44
--- rtems/cpukit/score/cpu/m68k/rtems/score/cpu.h:1.43	Mon Jun 28 19:31:18 2010
+++ rtems/cpukit/score/cpu/m68k/rtems/score/cpu.h	Fri Jul 16 03:40:58 2010
@@ -23,14 +23,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/m68k.h>              /* pick up machine definitions */
-#ifndef ASM
-  #include <rtems/score/types.h>
-#else
-  /* FIXME */
-  #define TRUE 1
-  #define FALSE 0
-#endif
+#include <rtems/score/types.h>
+#include <rtems/score/m68k.h>
 
 /* conditional compilation parameters */
 

diff -u rtems/cpukit/score/cpu/m68k/rtems/score/types.h:1.14 rtems/cpukit/score/cpu/m68k/rtems/score/types.h:1.15
--- rtems/cpukit/score/cpu/m68k/rtems/score/types.h:1.14	Wed Dec 10 18:45:34 2008
+++ rtems/cpukit/score/cpu/m68k/rtems/score/types.h	Fri Jul 16 03:40:58 2010
@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@
 typedef void m68k_isr;
 typedef void ( *m68k_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff -u rtems/cpukit/score/cpu/mips/ChangeLog:1.140 rtems/cpukit/score/cpu/mips/ChangeLog:1.141
--- rtems/cpukit/score/cpu/mips/ChangeLog:1.140	Thu Jul  1 14:43:28 2010
+++ rtems/cpukit/score/cpu/mips/ChangeLog	Fri Jul 16 03:41:50 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-07-01	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	* rtems/asm.h, rtems/score/cpu.h: cpu.h defines were not available to

diff -u rtems/cpukit/score/cpu/mips/rtems/score/cpu.h:1.58 rtems/cpukit/score/cpu/mips/rtems/score/cpu.h:1.59
--- rtems/cpukit/score/cpu/mips/rtems/score/cpu.h:1.58	Thu Jul  1 14:43:29 2010
+++ rtems/cpukit/score/cpu/mips/rtems/score/cpu.h	Fri Jul 16 03:41:50 2010
@@ -43,18 +43,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/mips.h>       /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-
+#include <rtems/score/mips.h>
 
 /* conditional compilation parameters */
 

diff -u rtems/cpukit/score/cpu/mips/rtems/score/types.h:1.15 rtems/cpukit/score/cpu/mips/rtems/score/types.h:1.16
--- rtems/cpukit/score/cpu/mips/rtems/score/types.h:1.15	Wed Dec 10 18:45:34 2008
+++ rtems/cpukit/score/cpu/mips/rtems/score/types.h	Fri Jul 16 03:41:50 2010
@@ -20,10 +20,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,12 +36,6 @@
 typedef void mips_isr;
 typedef void ( *mips_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool 	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff -u rtems/cpukit/score/cpu/nios2/ChangeLog:1.22 rtems/cpukit/score/cpu/nios2/ChangeLog:1.23
--- rtems/cpukit/score/cpu/nios2/ChangeLog:1.22	Mon Jun 28 19:31:46 2010
+++ rtems/cpukit/score/cpu/nios2/ChangeLog	Fri Jul 16 03:42:14 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	PR 1573/cpukit

diff -u rtems/cpukit/score/cpu/nios2/rtems/score/cpu.h:1.14 rtems/cpukit/score/cpu/nios2/rtems/score/cpu.h:1.15
--- rtems/cpukit/score/cpu/nios2/rtems/score/cpu.h:1.14	Mon Jun 28 19:31:47 2010
+++ rtems/cpukit/score/cpu/nios2/rtems/score/cpu.h	Fri Jul 16 03:42:14 2010
@@ -36,10 +36,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/nios2.h>            /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/nios2.h>
 
 /* conditional compilation parameters */
 

diff -u rtems/cpukit/score/cpu/nios2/rtems/score/types.h:1.8 rtems/cpukit/score/cpu/nios2/rtems/score/types.h:1.9
--- rtems/cpukit/score/cpu/nios2/rtems/score/types.h:1.8	Wed Dec  2 03:48:25 2009
+++ rtems/cpukit/score/cpu/nios2/rtems/score/types.h	Fri Jul 16 03:42:15 2010
@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@
 typedef void nios2_isr;
 typedef void ( *nios2_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff -u rtems/cpukit/score/cpu/no_cpu/ChangeLog:1.82 rtems/cpukit/score/cpu/no_cpu/ChangeLog:1.83
--- rtems/cpukit/score/cpu/no_cpu/ChangeLog:1.82	Mon Jun 28 19:33:12 2010
+++ rtems/cpukit/score/cpu/no_cpu/ChangeLog	Fri Jul 16 03:42:46 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	PR 1573/cpukit

diff -u rtems/cpukit/score/cpu/no_cpu/rtems/score/cpu.h:1.32 rtems/cpukit/score/cpu/no_cpu/rtems/score/cpu.h:1.33
--- rtems/cpukit/score/cpu/no_cpu/rtems/score/cpu.h:1.32	Mon Jun 28 19:33:12 2010
+++ rtems/cpukit/score/cpu/no_cpu/rtems/score/cpu.h	Fri Jul 16 03:42:46 2010
@@ -37,10 +37,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/no_cpu.h>            /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/no_cpu.h>
 
 /* conditional compilation parameters */
 

diff -u rtems/cpukit/score/cpu/no_cpu/rtems/score/types.h:1.17 rtems/cpukit/score/cpu/no_cpu/rtems/score/types.h:1.18
--- rtems/cpukit/score/cpu/no_cpu/rtems/score/types.h:1.17	Wed Dec 10 18:45:34 2008
+++ rtems/cpukit/score/cpu/no_cpu/rtems/score/types.h	Fri Jul 16 03:42:46 2010
@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {

diff -u rtems/cpukit/score/cpu/sh/ChangeLog:1.95 rtems/cpukit/score/cpu/sh/ChangeLog:1.96
--- rtems/cpukit/score/cpu/sh/ChangeLog:1.95	Mon Jun 28 19:33:58 2010
+++ rtems/cpukit/score/cpu/sh/ChangeLog	Fri Jul 16 03:45:28 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	PR 1573/cpukit

diff -u rtems/cpukit/score/cpu/sh/rtems/score/cpu.h:1.32 rtems/cpukit/score/cpu/sh/rtems/score/cpu.h:1.33
--- rtems/cpukit/score/cpu/sh/rtems/score/cpu.h:1.32	Mon Jun 28 19:33:58 2010
+++ rtems/cpukit/score/cpu/sh/rtems/score/cpu.h	Fri Jul 16 03:45:28 2010
@@ -33,13 +33,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/sh.h>              /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
-#if 0 && defined(__SH4__)
-#include <rtems/score/sh4_regs.h>
-#endif
+#include <rtems/score/sh.h>
 
 /* conditional compilation parameters */
 

diff -u rtems/cpukit/score/cpu/sh/rtems/score/types.h:1.14 rtems/cpukit/score/cpu/sh/rtems/score/types.h:1.15
--- rtems/cpukit/score/cpu/sh/rtems/score/types.h:1.14	Wed Dec 10 18:45:34 2008
+++ rtems/cpukit/score/cpu/sh/rtems/score/types.h	Fri Jul 16 03:45:28 2010
@@ -29,10 +29,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,12 +46,6 @@
 typedef void sh_isr;
 typedef void ( *sh_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool boolean;	     			/* Boolean value, external */
-typedef float          single_precision;     	/* single precision float */
-typedef double         double_precision;     	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff -u rtems/cpukit/score/cpu/sparc/ChangeLog:1.96 rtems/cpukit/score/cpu/sparc/ChangeLog:1.97
--- rtems/cpukit/score/cpu/sparc/ChangeLog:1.96	Mon Jun 28 19:34:00 2010
+++ rtems/cpukit/score/cpu/sparc/ChangeLog	Fri Jul 16 03:45:55 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	PR 1573/cpukit

diff -u rtems/cpukit/score/cpu/sparc/rtems/score/cpu.h:1.36 rtems/cpukit/score/cpu/sparc/rtems/score/cpu.h:1.37
--- rtems/cpukit/score/cpu/sparc/rtems/score/cpu.h:1.36	Mon Jun 28 19:34:00 2010
+++ rtems/cpukit/score/cpu/sparc/rtems/score/cpu.h	Fri Jul 16 03:45:55 2010
@@ -23,10 +23,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/sparc.h>               /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/sparc.h>
 
 /* conditional compilation parameters */
 

diff -u rtems/cpukit/score/cpu/sparc/rtems/score/types.h:1.16 rtems/cpukit/score/cpu/sparc/rtems/score/types.h:1.17
--- rtems/cpukit/score/cpu/sparc/rtems/score/types.h:1.16	Wed Dec  2 03:46:16 2009
+++ rtems/cpukit/score/cpu/sparc/rtems/score/types.h	Fri Jul 16 03:45:55 2010
@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@
 typedef void sparc_isr;
 typedef void ( *sparc_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;              /* Boolean value   */
-typedef float	single_precision;     /* single precision float */
-typedef double	double_precision;     /* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff -u rtems/cpukit/score/cpu/sparc64/ChangeLog:1.1 rtems/cpukit/score/cpu/sparc64/ChangeLog:1.2
--- rtems/cpukit/score/cpu/sparc64/ChangeLog:1.1	Tue Jun 15 17:43:56 2010
+++ rtems/cpukit/score/cpu/sparc64/ChangeLog	Fri Jul 16 03:46:28 2010
@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-15	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	PR 1561/cpukit

diff -u rtems/cpukit/score/cpu/sparc64/rtems/score/cpu.h:1.1 rtems/cpukit/score/cpu/sparc64/rtems/score/cpu.h:1.2
--- rtems/cpukit/score/cpu/sparc64/rtems/score/cpu.h:1.1	Tue Jun 15 17:43:56 2010
+++ rtems/cpukit/score/cpu/sparc64/rtems/score/cpu.h	Fri Jul 16 03:46:28 2010
@@ -27,10 +27,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/sparc64.h>               /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/sparc64.h>
 
 /* conditional compilation parameters */
 

diff -u rtems/cpukit/score/cpu/sparc64/rtems/score/types.h:1.1 rtems/cpukit/score/cpu/sparc64/rtems/score/types.h:1.2
--- rtems/cpukit/score/cpu/sparc64/rtems/score/types.h:1.1	Tue Jun 15 17:43:56 2010
+++ rtems/cpukit/score/cpu/sparc64/rtems/score/types.h	Fri Jul 16 03:46:29 2010
@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
-#include <stdint.h>
+#ifndef ASM
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@
 typedef void sparc_isr;
 typedef void ( *sparc_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;              /* Boolean value   */
-typedef float	single_precision;     /* single precision float */
-typedef double	double_precision;     /* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100716/1436edf1/attachment-0001.html>


More information about the vc mailing list