From 2572a3f1c058c4e63cadf274752a52358f76e069 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 14 Oct 2020 10:25:59 +0200 Subject: rtems: Move _Partition_Is_buffer_valid() It is used only in one place. Make the PTCB the first parameter. Rename it to _Partition_Is_address_a_buffer_begin(). --- cpukit/include/rtems/rtems/partimpl.h | 23 ----------------------- cpukit/rtems/src/partreturnbuffer.c | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/cpukit/include/rtems/rtems/partimpl.h b/cpukit/include/rtems/rtems/partimpl.h index fc17311803..23d5422bec 100644 --- a/cpukit/include/rtems/rtems/partimpl.h +++ b/cpukit/include/rtems/rtems/partimpl.h @@ -56,29 +56,6 @@ RTEMS_INLINE_ROUTINE bool _Partition_Is_buffer_on_boundary ( return ((offset % the_partition->buffer_size) == 0); } -/** - * @brief Checks whether the_buffer is a valid buffer from the_partition. - * - * This function returns TRUE if the_buffer is a valid buffer from - * the_partition, otherwise FALSE is returned. - */ -RTEMS_INLINE_ROUTINE bool _Partition_Is_buffer_valid ( - Chain_Node *the_buffer, - Partition_Control *the_partition -) -{ - void *starting; - void *ending; - - starting = the_partition->starting_address; - ending = _Addresses_Add_offset( starting, the_partition->length ); - - return ( - _Addresses_Is_in_range( the_buffer, starting, ending ) && - _Partition_Is_buffer_on_boundary( the_buffer, the_partition ) - ); -} - RTEMS_INLINE_ROUTINE bool _Partition_Is_buffer_size_aligned( uint32_t buffer_size ) diff --git a/cpukit/rtems/src/partreturnbuffer.c b/cpukit/rtems/src/partreturnbuffer.c index 9afda8f85e..08cbf9ecee 100644 --- a/cpukit/rtems/src/partreturnbuffer.c +++ b/cpukit/rtems/src/partreturnbuffer.c @@ -21,8 +21,24 @@ #endif #include +#include #include +static bool _Partition_Is_address_a_buffer_begin( + const Partition_Control *the_partition, + const void *the_buffer +) +{ + void *starting; + void *ending; + + starting = the_partition->starting_address; + ending = _Addresses_Add_offset( starting, the_partition->length ); + + return _Addresses_Is_in_range( the_buffer, starting, ending ) + && _Partition_Is_buffer_on_boundary( the_buffer, the_partition ); +} + static void _Partition_Free_buffer( Partition_Control *the_partition, void *the_buffer @@ -51,7 +67,7 @@ rtems_status_code rtems_partition_return_buffer( _Partition_Acquire_critical( the_partition, &lock_context ); - if ( !_Partition_Is_buffer_valid( buffer, the_partition ) ) { + if ( !_Partition_Is_address_a_buffer_begin( the_partition, buffer ) ) { _Partition_Release( the_partition, &lock_context ); return RTEMS_INVALID_ADDRESS; } -- cgit v1.2.3