Changeset 9f9a82b in rtems


Ignore:
Timestamp:
Jul 16, 2010, 8:31:34 AM (9 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
af16a7d2
Parents:
17ecd5a0
Message:

2010-07-16 Sebastian Huber <sebastian.huber@…>

  • 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>.
Location:
cpukit
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r17ecd5a0 r9f9a82b  
     12010-07-16      Sebastian Huber <sebastian.huber@embedded-brains.de>
     2
     3        * score/include/rtems/score/basedefs.h: New file.
     4        * score/Makefile.am, score/preinstall.am: Reflect change above.
     5        * score/include/rtems/score/percpu.h: Include <rtems/score/cpu.h>.
     6        * score/include/rtems/system.h: Moved definition of SCORE_EXTERN,
     7        SAPI_EXTERN, RTEMS_EXTERN, POSIX_EXTERN, RTEMS_INLINE_ROUTINE,
     8        RTEMS_COMPILER_MEMORY_BARRIER, RTEMS_COMPILER_NO_RETURN_ATTRIBUTE,
     9        RTEMS_COMPILER_DEPRECATED_ATTRIBUTE, TRUE, and FALSE to
     10        <rtems/score/basedefs.h>.
     11        Removed include of <rtems/score/cpu.h>, <stdint.h> and <stddef.h>.
     12
    1132010-07-16      Sebastian Huber <sebastian.huber@embedded-brains.de>
    214
  • cpukit/score/Makefile.am

    r17ecd5a0 r9f9a82b  
    3333    include/rtems/score/tod.h include/rtems/score/tqdata.h \
    3434    include/rtems/score/userext.h include/rtems/score/watchdog.h \
    35     include/rtems/score/wkspace.h include/rtems/score/cpuopts.h
     35    include/rtems/score/wkspace.h include/rtems/score/cpuopts.h \
     36    include/rtems/score/basedefs.h
    3637
    3738if HAS_PTHREADS
  • cpukit/score/include/rtems/score/percpu.h

    r17ecd5a0 r9f9a82b  
    1919#ifndef _RTEMS_PERCPU_H
    2020#define _RTEMS_PERCPU_H
     21
     22#include <rtems/score/cpu.h>
    2123
    2224#ifdef ASM
  • cpukit/score/include/rtems/system.h

    r17ecd5a0 r9f9a82b  
    2121#define _RTEMS_SYSTEM_H
    2222
     23#include <rtems/score/percpu.h>
     24
    2325#ifdef __cplusplus
    2426extern "C" {
    2527#endif
    2628
    27 /*
    28  *  The cpu options include file defines all cpu dependent
    29  *  parameters for this build of RTEMS.  It must be included
    30  *  first so the basic macro definitions are in place.
    31  */
    32 #include <rtems/score/cpuopts.h>
     29#ifndef ASM
    3330
    34 /**
    35  *  The following ensures that all data is declared in the space
    36  *  of the initialization routine for either the Initialization Manager
    37  *  or the initialization file for the appropriate API.  It is
    38  *  referenced as "external" in every other file.
    39  */
    40 #ifdef SCORE_INIT
    41 #undef  SCORE_EXTERN
    42 #define SCORE_EXTERN
    43 #else
    44 #undef  SCORE_EXTERN
    45 #define SCORE_EXTERN  extern
    46 #endif
    47 
    48 /**
    49  *  The following ensures that all data is declared in the space
    50  *  of the initialization routine for either the Initialization Manager
    51  *  or the initialization file for the appropriate API.  It is
    52  *  referenced as "external" in every other file.
    53  */
    54 #ifdef SAPI_INIT
    55 #undef  SAPI_EXTERN
    56 #define SAPI_EXTERN
    57 #else
    58 #undef  SAPI_EXTERN
    59 #define SAPI_EXTERN  extern
    60 #endif
    61 
    62 /**
    63  *  The following ensures that all data is declared in the space
    64  *  of the initialization routine for either the Initialization Manager
    65  *  or the initialization file for the appropriate API.  It is
    66  *  referenced as "external" in every other file.
    67  */
    68 #ifdef RTEMS_API_INIT
    69 #undef  RTEMS_EXTERN
    70 #define RTEMS_EXTERN
    71 #else
    72 #undef  RTEMS_EXTERN
    73 #define RTEMS_EXTERN  extern
    74 #endif
    75 
    76 /**
    77  *  The following ensures that all data is declared in the space
    78  *  of the initialization routine for either the Initialization Manager
    79  *  or the initialization file for the appropriate API.  It is
    80  *  referenced as "external" in every other file.
    81  */
    82 #ifdef POSIX_API_INIT
    83 #undef  POSIX_EXTERN
    84 #define POSIX_EXTERN
    85 #else
    86 #undef  POSIX_EXTERN
    87 #define POSIX_EXTERN  extern
    88 #endif
    89 
    90 /**
    91  *  The following (in conjunction with compiler arguments) are used
    92  *  to choose between the use of static inline functions and macro
    93  *  functions.   The static inline implementation allows better
    94  *  type checking with no cost in code size or execution speed.
    95  */
    96 #ifdef __GNUC__
    97 #  define RTEMS_INLINE_ROUTINE static __inline__
    98 #else
    99 #  define RTEMS_INLINE_ROUTINE static inline
    100 #endif
    101 
    102 /**
    103  *  The following macro is a compiler specific way to ensure that memory
    104  *  writes are not reordered around certian points.  This specifically can
    105  *  impact interrupt disable and thread dispatching critical sections.
    106  */
    107 #ifdef __GNUC__
    108   #define RTEMS_COMPILER_MEMORY_BARRIER() asm volatile("" ::: "memory")
    109 #else
    110   #define RTEMS_COMPILER_MEMORY_BARRIER()
    111 #endif
    112 
    113 /**
    114  *  The following macro is a compiler specific way to indicate that
    115  *  the method will NOT return to the caller.  This can assist the
    116  *  compiler in code generation and avoid unreachable paths.  This
    117  *  can impact the code generated following calls to
    118  *  rtems_fatal_error_occurred and _Internal_error_Occurred.
    119  */
    120 #ifdef __GNUC__
    121   #define RTEMS_COMPILER_NO_RETURN_ATTRIBUTE \
    122       __attribute__ ((noreturn))
    123 #else
    124   #define RTEMS_COMPILER_NO_RETURN_ATTRIBUTE
    125 #endif
    126 
    127 /**
    128  *  Instructs the compiler to issue a warning whenever a variable or function
    129  *  with this attribute will be used.
    130  */
    131 #ifdef __GNUC__
    132   #define RTEMS_COMPILER_DEPRECATED_ATTRIBUTE \
    133      __attribute__ ((deprecated))
    134 #else
    135   #define RTEMS_COMPILER_DEPRECATED_ATTRIBUTE
    136 #endif
    137 
    138 #ifndef ASM
    13931#ifdef RTEMS_POSIX_API
    14032/** The following is used by the POSIX implementation to catch bad paths.  */
     
    14234#endif
    14335
    144 /*
    145  *  Include a base set of files.
    146  */
    147 
    148 /**
    149  * XXX: Eventually proc_ptr needs to disappear!!!
    150  */
    151 typedef void * proc_ptr;
    152 
    153 #include <stddef.h>
    154 #endif
    155 
    156 #if !defined( TRUE ) || (TRUE != 1)
    157 /**  Boolean constant TRUE */
    158 #undef TRUE
    159 #define TRUE     (1)
    160 #endif
    161 
    162 #if !defined( FALSE ) || (FALSE != 0)
    163 /**  Boolean constant FALSE */
    164 #undef FALSE
    165 #define FALSE     (0)
    166 #endif
    167 
    168 #ifndef ASM
    169 #include <stdint.h>
    170 #endif
    171 #include <rtems/score/cpu.h>        /* processor specific information */
    172 #include <rtems/score/percpu.h>
    173 
    174 #ifndef ASM
    17536/**
    17637 *  This macro is used to obtain the offset of a field in a structure.
     
    19354/** This macro defines the maximum length of a Classic API name. */
    19455#define RTEMS_MAXIMUM_NAME_LENGTH sizeof(rtems_name)
    195 #endif
     56
     57#endif /* ASM */
    19658
    19759#ifdef __cplusplus
  • cpukit/score/preinstall.am

    r17ecd5a0 r9f9a82b  
    168168PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpuopts.h
    169169
     170$(PROJECT_INCLUDE)/rtems/score/basedefs.h: include/rtems/score/basedefs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     171        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/basedefs.h
     172PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/basedefs.h
     173
    170174if HAS_PTHREADS
    171175$(PROJECT_INCLUDE)/rtems/score/corespinlock.h: include/rtems/score/corespinlock.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
Note: See TracChangeset for help on using the changeset viewer.