RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

rtems: Create options implementation header

Browse Source 
Move implementation specific parts of options.h and options.inl into new
header file optionsimpl.h.  The options.h contains now only the
application visible API.
This commit is contained in:
Sebastian Huber
2013-07-23 11:03:13 +02:00
parent faa2f8c4e9
commit caab339b6c
12 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpukit/rtems/Makefile.am
View File

@@ -30,6 +30,7 @@ include_rtems_rtems_HEADERS += include/rtems/rtems/messageimpl.h
include_rtems_rtems_HEADERS += include/rtems/rtems/modes.h
include_rtems_rtems_HEADERS += include/rtems/rtems/object.h
include_rtems_rtems_HEADERS += include/rtems/rtems/options.h
include_rtems_rtems_HEADERS += include/rtems/rtems/optionsimpl.h
include_rtems_rtems_HEADERS += include/rtems/rtems/part.h
include_rtems_rtems_HEADERS += include/rtems/rtems/ratemon.h
include_rtems_rtems_HEADERS += include/rtems/rtems/region.h
@@ -67,7 +68,6 @@ include_rtems_rtems_HEADERS += inline/rtems/rtems/dpmem.inl
include_rtems_rtems_HEADERS += inline/rtems/rtems/event.inl
include_rtems_rtems_HEADERS += inline/rtems/rtems/eventset.inl
include_rtems_rtems_HEADERS += inline/rtems/rtems/modes.inl
include_rtems_rtems_HEADERS += inline/rtems/rtems/options.inl
include_rtems_rtems_HEADERS += inline/rtems/rtems/part.inl
include_rtems_rtems_HEADERS += inline/rtems/rtems/ratemon.inl
include_rtems_rtems_HEADERS += inline/rtems/rtems/region.inl

8
cpukit/rtems/include/rtems/rtems/options.h
View File

@@ -21,6 +21,8 @@
#ifndef _RTEMS_RTEMS_OPTIONS_H
#define _RTEMS_RTEMS_OPTIONS_H
#include <rtems/score/basedefs.h>
#ifdef __cplusplus
extern "C" {
#endif
@@ -71,15 +73,11 @@ typedef uint32_t rtems_option;
*/
#define RTEMS_EVENT_ANY 0x00000002
#ifndef __RTEMS_APPLICATION__
#include <rtems/rtems/options.inl>
#endif
/**@}*/
#ifdef __cplusplus
}
#endif
/**@}*/
#endif
/* end of include file */

32
cpukit/rtems/inline/rtems/rtems/options.inl → cpukit/rtems/include/rtems/rtems/optionsimpl.h
View File

@@ -1,8 +1,9 @@
/**
* @file rtems/rtems/options.inl
* @file
*
* This file contains the static inline implementation of the inlined
* routines from the Options Handler.
* @ingroup ClassicOptionsImpl
*
* @brief Classic Options Implementation
*/
/* COPYRIGHT (c) 1989-2008.
@@ -13,18 +14,21 @@
* http://www.rtems.com/license/LICENSE.
*/
#ifndef _RTEMS_RTEMS_OPTIONS_H
# error "Never use <rtems/rtems/options.inl> directly; include <rtems/rtems/options.h> instead."
#ifndef _RTEMS_RTEMS_OPTIONSIMPL_H
#define _RTEMS_RTEMS_OPTIONSIMPL_H
#include <rtems/rtems/options.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _RTEMS_RTEMS_OPTIONS_INL
#define _RTEMS_RTEMS_OPTIONS_INL
#include <rtems/score/basedefs.h> /* RTEMS_INLINE_ROUTINE */
/**
* @addtogroup ClassicOptions
* @{
* @defgroup ClassicOptionsImpl Classic Options Implementation
*
* @ingroup ClassicOptions
*
* @{
*/
/**
@@ -55,5 +59,9 @@ RTEMS_INLINE_ROUTINE bool _Options_Is_any (
/**@}*/
#ifdef __cplusplus
}
#endif
#endif
/* end of include file */

8
cpukit/rtems/preinstall.am
View File

@@ -91,6 +91,10 @@ $(PROJECT_INCLUDE)/rtems/rtems/options.h: include/rtems/rtems/options.h $(PROJEC
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/options.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/options.h
$(PROJECT_INCLUDE)/rtems/rtems/optionsimpl.h: include/rtems/rtems/optionsimpl.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/optionsimpl.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/optionsimpl.h
$(PROJECT_INCLUDE)/rtems/rtems/part.h: include/rtems/rtems/part.h $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/part.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/part.h
@@ -213,10 +217,6 @@ $(PROJECT_INCLUDE)/rtems/rtems/modes.inl: inline/rtems/rtems/modes.inl $(PROJECT
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/modes.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/modes.inl
$(PROJECT_INCLUDE)/rtems/rtems/options.inl: inline/rtems/rtems/options.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/options.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/options.inl
$(PROJECT_INCLUDE)/rtems/rtems/part.inl: inline/rtems/rtems/part.inl $(PROJECT_INCLUDE)/rtems/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtems/part.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/part.inl

1
cpukit/rtems/src/eventseize.c
View File

@@ -19,6 +19,7 @@
#endif
#include <rtems/rtems/event.h>
#include <rtems/rtems/optionsimpl.h>
#include <rtems/score/watchdogimpl.h>
/*

1
cpukit/rtems/src/eventsurrender.c
View File

@@ -19,6 +19,7 @@
#endif
#include <rtems/rtems/event.h>
#include <rtems/rtems/optionsimpl.h>
#include <rtems/score/watchdogimpl.h>
void _Event_Surrender(

2
cpukit/rtems/src/msgmp.c
View File

@@ -24,7 +24,7 @@
#include <rtems/score/mpci.h>
#include <rtems/rtems/msgmp.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
#include <rtems/rtems/optionsimpl.h>
#include <rtems/score/thread.h>
#include <rtems/score/watchdog.h>
#include <rtems/rtems/support.h>

2
cpukit/rtems/src/msgqreceive.c
View File

@@ -33,7 +33,7 @@
#include <rtems/rtems/status.h>
#include <rtems/rtems/attr.h>
#include <rtems/rtems/messageimpl.h>
#include <rtems/rtems/options.h>
#include <rtems/rtems/optionsimpl.h>
#include <rtems/rtems/support.h>
rtems_status_code rtems_message_queue_receive(

2
cpukit/rtems/src/regiongetsegment.c
View File

@@ -22,7 +22,7 @@
#include <rtems/rtems/status.h>
#include <rtems/rtems/support.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
#include <rtems/rtems/optionsimpl.h>
#include <rtems/rtems/region.h>
#include <rtems/score/states.h>
#include <rtems/score/thread.h>

2
cpukit/rtems/src/regionmp.c
View File

@@ -23,7 +23,7 @@
#include <rtems/score/mpci.h>
#include <rtems/score/mppkt.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
#include <rtems/rtems/optionsimpl.h>
#include <rtems/rtems/region.h>
#include <rtems/score/thread.h>
#include <rtems/rtems/support.h>

2
cpukit/rtems/src/semmp.c
View File

@@ -23,7 +23,7 @@
#include <rtems/score/mpci.h>
#include <rtems/score/mppkt.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
#include <rtems/rtems/optionsimpl.h>
#include <rtems/rtems/semimpl.h>
#include <rtems/score/thread.h>
#include <rtems/score/watchdog.h>

2
cpukit/rtems/src/semobtain.c
View File

@@ -24,7 +24,7 @@
#include <rtems/rtems/attr.h>
#include <rtems/score/isr.h>
#include <rtems/score/object.h>
#include <rtems/rtems/options.h>
#include <rtems/rtems/optionsimpl.h>
#include <rtems/rtems/semimpl.h>
#include <rtems/score/coremuteximpl.h>
#include <rtems/score/coresemimpl.h>