summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2013-07-23 15:32:50 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2013-07-23 17:19:07 +0200
commit1cb75cc4c2683b9287f3e91e46b5185fce65780a (patch)
tree2270847e5f375d8e41c23184aa0a6a45ad2b08bd
parentf26f5fc12446e8e35bdcf0da30d271896a62a946 (diff)
downloadrtems-1cb75cc4c2683b9287f3e91e46b5185fce65780a.tar.bz2
score: Merge wkspace API into one file
-rw-r--r--cpukit/libmisc/capture/capture.c19
-rw-r--r--cpukit/score/Makefile.am1
-rw-r--r--cpukit/score/include/rtems/score/wkspace.h20
-rw-r--r--cpukit/score/inline/rtems/score/wkspace.inl35
-rw-r--r--cpukit/score/preinstall.am4
5 files changed, 17 insertions, 62 deletions
diff --git a/cpukit/libmisc/capture/capture.c b/cpukit/libmisc/capture/capture.c
index c31a0790fc..1acfc0dc89 100644
--- a/cpukit/libmisc/capture/capture.c
+++ b/cpukit/libmisc/capture/capture.c
@@ -30,8 +30,6 @@
#include "capture.h"
#include <rtems/score/states.inl>
-#include <rtems/score/wkspace.h>
-#include <rtems/score/wkspace.inl>
/*
* These events are always recorded and are not part of the
@@ -347,9 +345,9 @@ rtems_capture_create_control (rtems_name name, rtems_id id)
if (control == NULL)
{
- control = _Workspace_Allocate (sizeof (rtems_capture_control_t));
+ bool ok = rtems_workspace_allocate (sizeof (*control), (void **) &control);
- if (control == NULL)
+ if (!ok)
{
capture_flags |= RTEMS_CAPTURE_NO_MEMORY;
return NULL;
@@ -398,10 +396,11 @@ rtems_capture_create_capture_task (rtems_tcb* new_task)
rtems_capture_task_t* task;
rtems_capture_control_t* control;
rtems_name name;
+ bool ok;
- task = _Workspace_Allocate (sizeof (rtems_capture_task_t));
+ ok = rtems_workspace_allocate (sizeof (*task), (void **) &task);
- if (task == NULL)
+ if (!ok)
{
capture_flags |= RTEMS_CAPTURE_NO_MEMORY;
return NULL;
@@ -492,7 +491,7 @@ rtems_capture_destroy_capture_task (rtems_capture_task_t* task)
rtems_interrupt_enable (level);
- _Workspace_Free (task);
+ rtems_workspace_free (task);
}
}
@@ -1105,7 +1104,7 @@ rtems_capture_close (void)
{
rtems_capture_task_t* delete = task;
task = task->forw;
- _Workspace_Free (delete);
+ rtems_workspace_free (delete);
}
capture_tasks = NULL;
@@ -1116,7 +1115,7 @@ rtems_capture_close (void)
{
rtems_capture_control_t* delete = control;
control = control->next;
- _Workspace_Free (delete);
+ rtems_workspace_free (delete);
}
capture_controls = NULL;
@@ -1306,7 +1305,7 @@ rtems_capture_watch_del (rtems_name name, rtems_id id)
rtems_interrupt_enable (level);
- _Workspace_Free (control);
+ rtems_workspace_free (control);
control = *prev_control;
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index eee4ce3331..d174c37056 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -106,7 +106,6 @@ include_rtems_score_HEADERS += inline/rtems/score/thread.inl
include_rtems_score_HEADERS += inline/rtems/score/threadq.inl
include_rtems_score_HEADERS += inline/rtems/score/tod.inl
include_rtems_score_HEADERS += inline/rtems/score/tqdata.inl
-include_rtems_score_HEADERS += inline/rtems/score/wkspace.inl
if HAS_MP
## We only build multiprocessing related files if HAS_MP was defined
diff --git a/cpukit/score/include/rtems/score/wkspace.h b/cpukit/score/include/rtems/score/wkspace.h
index 91059f734f..7adf9dff07 100644
--- a/cpukit/score/include/rtems/score/wkspace.h
+++ b/cpukit/score/include/rtems/score/wkspace.h
@@ -20,6 +20,13 @@
#ifndef _RTEMS_SCORE_WKSPACE_H
#define _RTEMS_SCORE_WKSPACE_H
+#include <rtems/score/heap.h>
+#include <rtems/score/interr.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**
* @defgroup ScoreWorkspace Workspace Handler
*
@@ -30,13 +37,6 @@
*/
/**@{*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rtems/score/heap.h>
-#include <rtems/score/interr.h>
-
/**
* @brief Executive workspace control.
*
@@ -117,15 +117,11 @@ char *_Workspace_String_duplicate(
size_t len
);
-#ifndef __RTEMS_APPLICATION__
-#include <rtems/score/wkspace.inl>
-#endif
+/**@}*/
#ifdef __cplusplus
}
#endif
-/**@}*/
-
#endif
/* end of include file */
diff --git a/cpukit/score/inline/rtems/score/wkspace.inl b/cpukit/score/inline/rtems/score/wkspace.inl
deleted file mode 100644
index 16679c8ff3..0000000000
--- a/cpukit/score/inline/rtems/score/wkspace.inl
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @file
- *
- * @brief Inlined Routines Associated with the RAM Workspace
- *
- * This include file contains the bodies of the routines which contains
- * information related to the RAM Workspace.
- */
-
-/*
- * COPYRIGHT (c) 1989-2007.
- * On-Line Applications Research Corporation (OAR).
- *
- * 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.
- */
-
-#ifndef _RTEMS_SCORE_WKSPACE_H
-# error "Never use <rtems/score/wkspace.inl> directly; include <rtems/score/wkspace.h> instead."
-#endif
-
-#ifndef _RTEMS_SCORE_WKSPACE_INL
-#define _RTEMS_SCORE_WKSPACE_INL
-
-/**
- * @addtogroup ScoreWorkspace
- *
- * @{
- */
-
-/** @} */
-
-#endif
-/* end of include file */
diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am
index cb21cbd1db..73d088c665 100644
--- a/cpukit/score/preinstall.am
+++ b/cpukit/score/preinstall.am
@@ -355,10 +355,6 @@ $(PROJECT_INCLUDE)/rtems/score/tqdata.inl: inline/rtems/score/tqdata.inl $(PROJE
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/tqdata.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/tqdata.inl
-$(PROJECT_INCLUDE)/rtems/score/wkspace.inl: inline/rtems/score/wkspace.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/wkspace.inl
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/wkspace.inl
-
if HAS_MP
$(PROJECT_INCLUDE)/rtems/score/mppkt.inl: inline/rtems/score/mppkt.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/mppkt.inl