diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-09-09 11:19:42 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-09-09 11:19:42 +0000 |
| commit | fd1661f229375dff3fa49c627284b2e886237f06 (patch) | |
| tree | 4e1ab2b89809b152193bf2f3d8541d40a7cb3b3e /cpukit | |
| parent | 2011-09-09 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-fd1661f229375dff3fa49c627284b2e886237f06.tar.bz2 | |
2011-09-09 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1844/cpukit
* rtems/include/rtems/rtems/msgmp.h: Define
MESSAGE_QUEUE_MP_PACKET_SIZE.
* rtems/src/msgmp.c, rtems/src/msgqcreate.c: Use
MESSAGE_QUEUE_MP_PACKET_SIZE.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 8 | ||||
| -rw-r--r-- | cpukit/rtems/include/rtems/rtems/msgmp.h | 3 | ||||
| -rw-r--r-- | cpukit/rtems/src/msgmp.c | 11 | ||||
| -rw-r--r-- | cpukit/rtems/src/msgqcreate.c | 2 |
4 files changed, 16 insertions, 8 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index f24051bbe7..c18adb47af 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,13 @@ 2011-09-09 Sebastian Huber <sebastian.huber@embedded-brains.de> + PR 1844/cpukit + * rtems/include/rtems/rtems/msgmp.h: Define + MESSAGE_QUEUE_MP_PACKET_SIZE. + * rtems/src/msgmp.c, rtems/src/msgqcreate.c: Use + MESSAGE_QUEUE_MP_PACKET_SIZE. + +2011-09-09 Sebastian Huber <sebastian.huber@embedded-brains.de> + PR 1873/cpukit * score/include/rtems/score/heap.h: Revert previous commit. * sapi/include/confdefs.h: Use proper constants in diff --git a/cpukit/rtems/include/rtems/rtems/msgmp.h b/cpukit/rtems/include/rtems/rtems/msgmp.h index 8aa5f533ae..53b0849074 100644 --- a/cpukit/rtems/include/rtems/rtems/msgmp.h +++ b/cpukit/rtems/include/rtems/rtems/msgmp.h @@ -76,6 +76,9 @@ typedef struct { CORE_message_queue_Buffer Buffer; } Message_queue_MP_Packet; +#define MESSAGE_QUEUE_MP_PACKET_SIZE \ + offsetof(Message_queue_MP_Packet, Buffer.buffer) + /** * @brief _Message_queue_MP_Send_process_packet * diff --git a/cpukit/rtems/src/msgmp.c b/cpukit/rtems/src/msgmp.c index 83a28a4598..585afae823 100644 --- a/cpukit/rtems/src/msgmp.c +++ b/cpukit/rtems/src/msgmp.c @@ -27,9 +27,6 @@ #include <rtems/score/watchdog.h> #include <rtems/rtems/support.h> -#define MESSAGE_QUEUE_MP_PACKET_SIZE \ - offsetof(Message_queue_MP_Packet, Buffer.buffer) - RTEMS_STATIC_ASSERT( MESSAGE_QUEUE_MP_PACKET_SIZE <= MP_PACKET_MINIMUM_PACKET_SIZE, Message_queue_MP_Packet @@ -116,10 +113,10 @@ rtems_status_code _Message_queue_MP_Send_request_packet ( the_packet = _Message_queue_MP_Get_packet(); the_packet->Prefix.the_class = MP_PACKET_MESSAGE_QUEUE; - the_packet->Prefix.length = sizeof(Message_queue_MP_Packet); + the_packet->Prefix.length = MESSAGE_QUEUE_MP_PACKET_SIZE; if ( size_p ) the_packet->Prefix.length += *size_p; - the_packet->Prefix.to_convert = sizeof(Message_queue_MP_Packet); + the_packet->Prefix.to_convert = MESSAGE_QUEUE_MP_PACKET_SIZE; /* * make sure message is not too big for our MPCI driver @@ -162,8 +159,8 @@ rtems_status_code _Message_queue_MP_Send_request_packet ( the_packet = _Message_queue_MP_Get_packet(); the_packet->Prefix.the_class = MP_PACKET_MESSAGE_QUEUE; - the_packet->Prefix.length = sizeof(Message_queue_MP_Packet); - the_packet->Prefix.to_convert = sizeof(Message_queue_MP_Packet); + the_packet->Prefix.length = MESSAGE_QUEUE_MP_PACKET_SIZE; + the_packet->Prefix.to_convert = MESSAGE_QUEUE_MP_PACKET_SIZE; if (! _Options_Is_no_wait(option_set)) the_packet->Prefix.timeout = timeout; diff --git a/cpukit/rtems/src/msgqcreate.c b/cpukit/rtems/src/msgqcreate.c index e250a6c05c..39542a8213 100644 --- a/cpukit/rtems/src/msgqcreate.c +++ b/cpukit/rtems/src/msgqcreate.c @@ -95,7 +95,7 @@ rtems_status_code rtems_message_queue_create( */ max_packet_payload_size = _MPCI_table->maximum_packet_size - - sizeof ( Message_queue_MP_Packet ); + - MESSAGE_QUEUE_MP_PACKET_SIZE; if ( is_global && max_packet_payload_size < max_message_size ) return RTEMS_INVALID_SIZE; #endif |