summaryrefslogtreecommitdiffstats
path: root/cpukit/score/macros/rtems
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1995-08-16 19:42:41 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1995-08-16 19:42:41 +0000
commit45819022cee43c0cef9146ccd10aaf20f99b489b (patch)
tree08693483f731596ca7ed879a2968508443f93317 /cpukit/score/macros/rtems
parent7285a0165601553e80df3b335d9c7d26c93a3ad8 (diff)
downloadrtems-45819022cee43c0cef9146ccd10aaf20f99b489b.tar.bz2
bug fixes to make macro implementations work
Diffstat (limited to 'cpukit/score/macros/rtems')
-rw-r--r--cpukit/score/macros/rtems/score/chain.inl4
-rw-r--r--cpukit/score/macros/rtems/score/heap.inl4
-rw-r--r--cpukit/score/macros/rtems/score/object.inl3
-rw-r--r--cpukit/score/macros/rtems/score/priority.inl4
-rw-r--r--cpukit/score/macros/rtems/score/sysstate.inl4
-rw-r--r--cpukit/score/macros/rtems/score/wkspace.inl26
6 files changed, 11 insertions, 34 deletions
diff --git a/cpukit/score/macros/rtems/score/chain.inl b/cpukit/score/macros/rtems/score/chain.inl
index a53b3fc270..3e17c46bfa 100644
--- a/cpukit/score/macros/rtems/score/chain.inl
+++ b/cpukit/score/macros/rtems/score/chain.inl
@@ -11,7 +11,7 @@
* to the copyright license under the clause at DFARS 252.227-7013. This
* notice must appear in all copies of this file and its derivatives.
*
- * $Id$
+ * chain.inl,v 1.2 1995/05/31 16:48:59 joel Exp
*/
#ifndef __MACROS_CHAIN_h
@@ -145,7 +145,7 @@
#define _Chain_Get_unprotected( _the_chain ) \
(( !_Chain_Is_empty( (_the_chain) ) ) \
- ? _Chain_Get_unprotected( (_the_chain) ) \
+ ? _Chain_Get_first_unprotected( (_the_chain) ) \
: NULL)
/*PAGE
diff --git a/cpukit/score/macros/rtems/score/heap.inl b/cpukit/score/macros/rtems/score/heap.inl
index 6f06478207..1c2b20cbec 100644
--- a/cpukit/score/macros/rtems/score/heap.inl
+++ b/cpukit/score/macros/rtems/score/heap.inl
@@ -11,7 +11,7 @@
* to the copyright license under the clause at DFARS 252.227-7013. This
* notice must appear in all copies of this file and its derivatives.
*
- * $Id$
+ * heap.inl,v 1.2 1995/05/31 16:49:10 joel Exp
*/
#ifndef __HEAP_inl
@@ -44,6 +44,7 @@
( (Heap_Block *) _Addresses_Subtract_offset( \
(void *)(_the_block), \
(_the_block)->back_flag & ~ HEAP_BLOCK_USED \
+ ) \
)
/*PAGE
@@ -55,6 +56,7 @@
( (Heap_Block *) _Addresses_Add_offset( \
(void *)(_the_block), \
(_the_block)->front_flag & ~ HEAP_BLOCK_USED \
+ ) \
)
/*PAGE
diff --git a/cpukit/score/macros/rtems/score/object.inl b/cpukit/score/macros/rtems/score/object.inl
index f4fdc39d6e..ddd311689b 100644
--- a/cpukit/score/macros/rtems/score/object.inl
+++ b/cpukit/score/macros/rtems/score/object.inl
@@ -11,7 +11,7 @@
* to the copyright license under the clause at DFARS 252.227-7013. This
* notice must appear in all copies of this file and its derivatives.
*
- * $Id$
+ * object.inl,v 1.2 1995/05/31 16:49:20 joel Exp
*/
#ifndef __OBJECTS_inl
@@ -38,7 +38,6 @@
(*(_c3) = ((_name) >> 8) & 0xff; \
(*(_c4) = ((_name)) & 0xff; \
}
-);
/*PAGE
*
diff --git a/cpukit/score/macros/rtems/score/priority.inl b/cpukit/score/macros/rtems/score/priority.inl
index 7ad1fd909a..380df633d7 100644
--- a/cpukit/score/macros/rtems/score/priority.inl
+++ b/cpukit/score/macros/rtems/score/priority.inl
@@ -11,7 +11,7 @@
* to the copyright license under the clause at DFARS 252.227-7013. This
* notice must appear in all copies of this file and its derivatives.
*
- * $Id$
+ * priority.inl,v 1.2 1995/05/31 16:49:27 joel Exp
*/
#ifndef __PRIORITY_inl
@@ -139,6 +139,6 @@
#define _Priority_Is_group_empty ( _the_priority ) \
( (_the_priority) == 0 )
-}
+
#endif
/* end of include file */
diff --git a/cpukit/score/macros/rtems/score/sysstate.inl b/cpukit/score/macros/rtems/score/sysstate.inl
index 5cc9f9e9f9..89c5098341 100644
--- a/cpukit/score/macros/rtems/score/sysstate.inl
+++ b/cpukit/score/macros/rtems/score/sysstate.inl
@@ -11,7 +11,7 @@
* to the copyright license under the clause at DFARS 252.227-7013. This
* notice must appear in all copies of this file and its derivatives.
*
- * $Id$
+ * sysstate.inl,v 1.2 1995/05/31 16:49:39 joel Exp
*/
#ifndef __SYSTEM_STATE_inl
@@ -30,7 +30,7 @@
* _System_state_Get
*/
-#define _System_state_Get( void ) \
+#define _System_state_Get() \
(_System_state_Current)
/*PAGE
diff --git a/cpukit/score/macros/rtems/score/wkspace.inl b/cpukit/score/macros/rtems/score/wkspace.inl
index 3c516bfb93..d50bc110fb 100644
--- a/cpukit/score/macros/rtems/score/wkspace.inl
+++ b/cpukit/score/macros/rtems/score/wkspace.inl
@@ -11,7 +11,7 @@
* to the copyright license under the clause at DFARS 252.227-7013. This
* notice must appear in all copies of this file and its derivatives.
*
- * $Id$
+ * wkspace.inl,v 1.2 1995/05/31 16:49:53 joel Exp
*/
#ifndef __WORKSPACE_inl
@@ -66,30 +66,6 @@
/*PAGE
*
- * _Workspace_Allocate_or_fatal_error
- *
- * NOTE: XXX FIX ME
- *
- * When not using static inlines, this should really be a function
- * somewhere.
- */
-
-static inline void _Workspace_Allocate_or_fatal_error(
- unsigned32 size
-)
-{
- void *memory;
-
- memory = _Workspace_Allocate( size );
-
- if ( memory == NULL )
- rtems_fatal_error_occurred( RTEMS_UNSATISFIED );
-
- return memory;
-}
-
-/*PAGE
- *
* _Workspace_Free
*
*/