Skip to content

Commit

Permalink
Fix variable name mismatch, mpu_wrappers type mismatch. (#1181)
Browse files Browse the repository at this point in the history 
Fix variable name mismatch introduced by #1166.
Fix MPU v2 wrappers incorrectly using UBaseType_t instead
of BaseType.
  • Loading branch information
@kstribrnAmzn
kstribrnAmzn authored Nov 1, 2024
1 parent de276eb commit a081ba8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions include/mpu_prototypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,12 +346,12 @@ TickType_t MPU_xTimerGetExpiryTime( TimerHandle_t xTimer ) FREERTOS_SYSTEM_CALL;
* with all the APIs. */
TimerHandle_t MPU_xTimerCreate( const char * const pcTimerName,
const TickType_t xTimerPeriodInTicks,
const UBaseType_t uxAutoReload,
const BaseType_t xAutoReload,
void * const pvTimerID,
TimerCallbackFunction_t pxCallbackFunction ) PRIVILEGED_FUNCTION;
TimerHandle_t MPU_xTimerCreateStatic( const char * const pcTimerName,
const TickType_t xTimerPeriodInTicks,
const UBaseType_t uxAutoReload,
const BaseType_t xAutoReload,
void * const pvTimerID,
TimerCallbackFunction_t pxCallbackFunction,
StaticTimer_t * pxTimerBuffer ) PRIVILEGED_FUNCTION;
Expand Down
4 changes: 2 additions & 2 deletions portable/Common/mpu_wrappers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1806,15 +1806,15 @@
portRAISE_PRIVILEGE();
portMEMORY_BARRIER();

vTimerSetReloadMode( xTimer, uxAutoReload );
vTimerSetReloadMode( xTimer, xAutoReload );
portMEMORY_BARRIER();

portRESET_PRIVILEGE();
portMEMORY_BARRIER();
}
else
{
vTimerSetReloadMode( xTimer, uxAutoReload );
vTimerSetReloadMode( xTimer, xAutoReload );
}
}
#endif /* if ( configUSE_TIMERS == 1 ) */
Expand Down
14 changes: 7 additions & 7 deletions portable/Common/mpu_wrappers_v2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3558,10 +3558,10 @@
#if ( configUSE_TIMERS == 1 )

void MPU_vTimerSetReloadModeImpl( TimerHandle_t xTimer,
const UBaseType_t uxAutoReload ) PRIVILEGED_FUNCTION;
const BaseType_t xAutoReload ) PRIVILEGED_FUNCTION;

void MPU_vTimerSetReloadModeImpl( TimerHandle_t xTimer,
const UBaseType_t uxAutoReload ) /* PRIVILEGED_FUNCTION */
const BaseType_t xAutoReload ) /* PRIVILEGED_FUNCTION */
{
TimerHandle_t xInternalTimerHandle = NULL;
int32_t lIndex;
Expand All @@ -3579,7 +3579,7 @@

if( xInternalTimerHandle != NULL )
{
vTimerSetReloadMode( xInternalTimerHandle, uxAutoReload );
vTimerSetReloadMode( xInternalTimerHandle, xAutoReload );
}
}
}
Expand Down Expand Up @@ -3733,7 +3733,7 @@

TimerHandle_t MPU_xTimerCreate( const char * const pcTimerName,
const TickType_t xTimerPeriodInTicks,
const UBaseType_t uxAutoReload,
const BaseType_t xAutoReload,
void * const pvTimerID,
TimerCallbackFunction_t pxCallbackFunction ) /* PRIVILEGED_FUNCTION */
{
Expand All @@ -3745,7 +3745,7 @@

if( lIndex != -1 )
{
xInternalTimerHandle = xTimerCreate( pcTimerName, xTimerPeriodInTicks, uxAutoReload, pvTimerID, MPU_TimerCallback );
xInternalTimerHandle = xTimerCreate( pcTimerName, xTimerPeriodInTicks, xAutoReload, pvTimerID, MPU_TimerCallback );

if( xInternalTimerHandle != NULL )
{
Expand All @@ -3768,7 +3768,7 @@

TimerHandle_t MPU_xTimerCreateStatic( const char * const pcTimerName,
const TickType_t xTimerPeriodInTicks,
const UBaseType_t uxAutoReload,
const BaseType_t xAutoReload,
void * const pvTimerID,
TimerCallbackFunction_t pxCallbackFunction,
StaticTimer_t * pxTimerBuffer ) /* PRIVILEGED_FUNCTION */
Expand All @@ -3781,7 +3781,7 @@

if( lIndex != -1 )
{
xInternalTimerHandle = xTimerCreateStatic( pcTimerName, xTimerPeriodInTicks, uxAutoReload, pvTimerID, MPU_TimerCallback, pxTimerBuffer );
xInternalTimerHandle = xTimerCreateStatic( pcTimerName, xTimerPeriodInTicks, xAutoReload, pvTimerID, MPU_TimerCallback, pxTimerBuffer );

if( xInternalTimerHandle != NULL )
{
Expand Down

0 comments on commit a081ba8

Please sign in to comment.