Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix variable name mismatch, mpu_wrappers type mismatch. #1181

Merged
merged 1 commit into from
Nov 1, 2024
Merged

Fix variable name mismatch, mpu_wrappers type mismatch. #1181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/mpu_prototypes.h
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading