summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2013-07-28 13:51:22 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2013-07-28 14:00:19 +0200
commitf6efd0bf8a846658cd6aae78d8c5774b7999a816 (patch)
treed7daa44d97dfcedc89c3df37a2a61fd35bf7b68e
parentscore: Move object MP content to public API (diff)
downloadrtems-f6efd0bf8a846658cd6aae78d8c5774b7999a816.tar.bz2
score: Move object content to public API
-rw-r--r--cpukit/score/include/rtems/score/object.h23
-rw-r--r--cpukit/score/include/rtems/score/objectimpl.h23
2 files changed, 23 insertions, 23 deletions
diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/score/include/rtems/score/object.h
index b231039c6a..9cd50db084 100644
--- a/cpukit/score/include/rtems/score/object.h
+++ b/cpukit/score/include/rtems/score/object.h
@@ -220,6 +220,9 @@ typedef enum {
OBJECTS_POSIX_API = 3
} Objects_APIs;
+/** This macro is used to generically specify the last API index. */
+#define OBJECTS_APIS_LAST OBJECTS_POSIX_API
+
/**
* The following defines the Object Control Block used to manage
* each object local to this node.
@@ -404,6 +407,26 @@ RTEMS_INLINE_ROUTINE Objects_Id _Objects_Build_id(
(( (Objects_Id) index ) << OBJECTS_INDEX_START_BIT);
}
+/**
+ * Returns if the object maximum specifies unlimited objects.
+ *
+ * @param[in] maximum The object maximum specification.
+ *
+ * @retval true Unlimited objects are available.
+ * @retval false The object count is fixed.
+ */
+RTEMS_INLINE_ROUTINE bool _Objects_Is_unlimited( uint32_t maximum )
+{
+ return (maximum & OBJECTS_UNLIMITED_OBJECTS) != 0;
+}
+
+/*
+ * We cannot use an inline function for this since it may be evaluated at
+ * compile time.
+ */
+#define _Objects_Maximum_per_allocation( maximum ) \
+ ((Objects_Maximum) ((maximum) & ~OBJECTS_UNLIMITED_OBJECTS))
+
/**@}*/
/**@}*/
/**@}*/
diff --git a/cpukit/score/include/rtems/score/objectimpl.h b/cpukit/score/include/rtems/score/objectimpl.h
index 742145387c..c7ed94c5f4 100644
--- a/cpukit/score/include/rtems/score/objectimpl.h
+++ b/cpukit/score/include/rtems/score/objectimpl.h
@@ -42,9 +42,6 @@ typedef bool (*Objects_Name_comparators)(
uint16_t /* length */
);
-/** This macro is used to generically specify the last API index. */
-#define OBJECTS_APIS_LAST OBJECTS_POSIX_API
-
/**
* This enumerated type is used in the class field of the object ID
* for RTEMS internal object classes.
@@ -854,26 +851,6 @@ RTEMS_INLINE_ROUTINE void _Objects_Open_string(
}
/**
- * Returns if the object maximum specifies unlimited objects.
- *
- * @param[in] maximum The object maximum specification.
- *
- * @retval true Unlimited objects are available.
- * @retval false The object count is fixed.
- */
-RTEMS_INLINE_ROUTINE bool _Objects_Is_unlimited( uint32_t maximum )
-{
- return (maximum & OBJECTS_UNLIMITED_OBJECTS) != 0;
-}
-
-/*
- * We cannot use an inline function for this since it may be evaluated at
- * compile time.
- */
-#define _Objects_Maximum_per_allocation( maximum ) \
- ((Objects_Maximum) ((maximum) & ~OBJECTS_UNLIMITED_OBJECTS))
-
-/**
* @brief Puts back an object obtained with _Objects_Get().
*
* This function decrements the thread dispatch disable level. The