github-forks
/
FreeRTOS-Kernel
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix variable name mismatch, mpu_wrappers type mismatch. (#1181)

Browse Source 
Fix variable name mismatch introduced by #1166.
Fix MPU v2 wrappers incorrectly using UBaseType_t instead
of BaseType.
pull/1177/head^2
Kody Stribrny 3 months ago committed by GitHub
parent de276eb023
commit a081ba8b9c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

4
include/mpu_prototypes.h
Unescape Escape View File

@ -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;

4
portable/Common/mpu_wrappers.c
Unescape Escape View File

@ -1806,7 +1806,7 @@
portRAISE_PRIVILEGE();
portMEMORY_BARRIER();
vTimerSetReloadMode( xTimer, uxAutoReload );
vTimerSetReloadMode( xTimer, xAutoReload );
portMEMORY_BARRIER();
portRESET_PRIVILEGE();
@ -1814,7 +1814,7 @@
}
else
{
vTimerSetReloadMode( xTimer, uxAutoReload );
vTimerSetReloadMode( xTimer, xAutoReload );
}
}
#endif /* if ( configUSE_TIMERS == 1 ) */

14
portable/Common/mpu_wrappers_v2.c
Unescape Escape View File

@ -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;
@ -3579,7 +3579,7 @@
if( xInternalTimerHandle != NULL )
{
vTimerSetReloadMode( xInternalTimerHandle, uxAutoReload );
vTimerSetReloadMode( xInternalTimerHandle, xAutoReload );
}
}
}
@ -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 */
{
@ -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 )
{
@ -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 */
@ -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 )
{

Write Preview
Loading…
Cancel
Save