summaryrefslogtreecommitdiffstats
path: root/cpukit/rtems
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1995-08-22 15:37:59 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1995-08-22 15:37:59 +0000
commitbb322a0ea63c1e75e4563e7fd366e78f202ad03d (patch)
tree47d25a6e5a1ba002c0203fc50977866dda2ae176 /cpukit/rtems
parentmake inline and macro implementations match (diff)
downloadrtems-bb322a0ea63c1e75e4563e7fd366e78f202ad03d.tar.bz2
make inline and macro implementations match
Diffstat (limited to 'cpukit/rtems')
-rw-r--r--cpukit/rtems/macros/rtems/rtems/message.inl19
-rw-r--r--cpukit/rtems/src/msg.c24
2 files changed, 26 insertions, 17 deletions
diff --git a/cpukit/rtems/macros/rtems/rtems/message.inl b/cpukit/rtems/macros/rtems/rtems/message.inl
index ac0b1afb3a..ef694fb11a 100644
--- a/cpukit/rtems/macros/rtems/rtems/message.inl
+++ b/cpukit/rtems/macros/rtems/rtems/message.inl
@@ -22,7 +22,7 @@
* _Message_queue_Copy_buffer
*/
-#define _Message_queue_Copy_buffer( _source, _destination ) \
+#define _Message_queue_Copy_buffer( _source, _destination, _size ) \
memcpy( _destination, _source, _size)
/*PAGE
@@ -31,9 +31,9 @@
*
*/
-#define _Message_queue_Allocate_message_buffer() \
- (Message_queue_Buffer_control *) \
- _Chain_Get( &_Message_queue_Inactive_messages )
+#define _Message_queue_Allocate_message_buffer( _the_message_queue ) \
+ (Message_queue_Buffer_control *) \
+ _Chain_Get( &(_the_message_queue)->Inactive_messages )
/*PAGE
*
@@ -41,8 +41,11 @@
*
*/
-#define _Message_queue_Free_message_buffer( _the_message ) \
- _Chain_Append( &_Message_queue_Inactive_messages, &(_the_message)->Node )
+#define _Message_queue_Free_message_buffer( _the_message_queue, _the_message ) \
+ _Chain_Append( \
+ &(_the_message_queue)->Inactive_messages, \
+ &(_the_message)->Node \
+ )
/*PAGE
*
@@ -92,10 +95,10 @@
#define _Message_queue_Free( _the_message_queue ) \
do { \
\
- if ( (_the_messsage_queue)->message_buffers ) { \
+ if ( (_the_message_queue)->message_buffers ) { \
_Workspace_Free((void *) (_the_message_queue)->message_buffers); \
(_the_message_queue)->message_buffers = 0; \
- }
+ } \
\
_Objects_Free( \
&_Message_queue_Information, \
diff --git a/cpukit/rtems/src/msg.c b/cpukit/rtems/src/msg.c
index dc136271fe..49d7d0b3f3 100644
--- a/cpukit/rtems/src/msg.c
+++ b/cpukit/rtems/src/msg.c
@@ -68,7 +68,9 @@ Message_queue_Control *_Message_queue_Allocate (
unsigned32 message_buffering_required;
unsigned32 allocated_message_size;
- mq = (Message_queue_Control *)_Objects_Allocate(&_Message_queue_Information);
+ mq = \
+ (Message_queue_Control *)_Objects_Allocate(&_Message_queue_Information);
+
if (mq == 0)
goto failed;
@@ -79,22 +81,26 @@ Message_queue_Control *_Message_queue_Allocate (
*/
allocated_message_size = max_message_size;
- if (allocated_message_size & (sizeof(unsigned32) - 1))
- {
+ if (allocated_message_size & (sizeof(unsigned32) - 1)) {
allocated_message_size += sizeof(unsigned32);
allocated_message_size &= ~(sizeof(unsigned32) - 1);
}
- message_buffering_required = count * (allocated_message_size + sizeof(Message_queue_Buffer_control));
+ message_buffering_required =
+ count * (allocated_message_size + sizeof(Message_queue_Buffer_control));
- mq->message_buffers = (Message_queue_Buffer *) _Workspace_Allocate(message_buffering_required);
+ mq->message_buffers =
+ (Message_queue_Buffer *) _Workspace_Allocate(message_buffering_required);
+
if (mq->message_buffers == 0)
goto failed;
- _Chain_Initialize(&mq->Inactive_messages,
- mq->message_buffers,
- count,
- allocated_message_size + sizeof(Message_queue_Buffer_control));
+ _Chain_Initialize
+ (&mq->Inactive_messages,
+ mq->message_buffers,
+ count,
+ allocated_message_size + sizeof(Message_queue_Buffer_control)
+ );
return mq;
failed: