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

kstribrnAmzn · web-flow · commit a081ba8b9c0e · 2024-11-01T10:56:18.000-07:00
Fix variable name mismatch introduced by #1166. Fix MPU v2 wrappers incorrectly using UBaseType_t instead of BaseType.
diff --git a/include/mpu_prototypes.h b/include/mpu_prototypes.h
@@ -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;
diff --git a/portable/Common/mpu_wrappers.c b/portable/Common/mpu_wrappers.c
@@ -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 ) */
diff --git a/portable/Common/mpu_wrappers_v2.c b/portable/Common/mpu_wrappers_v2.c
@@ -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 )
                 {

Original file line number	Diff line number	Diff line change
`@@ -1806,15 +1806,15 @@`
`1806`	`1806`	`portRAISE_PRIVILEGE();`
`1807`	`1807`	`portMEMORY_BARRIER();`
`1808`	`1808`
`1809`		`- vTimerSetReloadMode( xTimer, uxAutoReload );`
	`1809`	`+ vTimerSetReloadMode( xTimer, xAutoReload );`
`1810`	`1810`	`portMEMORY_BARRIER();`
`1811`	`1811`
`1812`	`1812`	`portRESET_PRIVILEGE();`
`1813`	`1813`	`portMEMORY_BARRIER();`
`1814`	`1814`	`}`
`1815`	`1815`	`else`
`1816`	`1816`	`{`
`1817`		`- vTimerSetReloadMode( xTimer, uxAutoReload );`
	`1817`	`+ vTimerSetReloadMode( xTimer, xAutoReload );`
`1818`	`1818`	`}`
`1819`	`1819`	`}`
`1820`	`1820`	`#endif /* if ( configUSE_TIMERS == 1 ) */`
Original file line number	Diff line number	Diff line change
`@@ -3558,10 +3558,10 @@`
`3558`	`3558`	`#if ( configUSE_TIMERS == 1 )`
`3559`	`3559`
`3560`	`3560`	`void MPU_vTimerSetReloadModeImpl( TimerHandle_t xTimer,`
`3561`		`- const UBaseType_t uxAutoReload ) PRIVILEGED_FUNCTION;`
	`3561`	`+ const BaseType_t xAutoReload ) PRIVILEGED_FUNCTION;`
`3562`	`3562`
`3563`	`3563`	`void MPU_vTimerSetReloadModeImpl( TimerHandle_t xTimer,`
`3564`		`- const UBaseType_t uxAutoReload ) /* PRIVILEGED_FUNCTION */`
	`3564`	`+ const BaseType_t xAutoReload ) /* PRIVILEGED_FUNCTION */`
`3565`	`3565`	`{`
`3566`	`3566`	`TimerHandle_t xInternalTimerHandle = NULL;`
`3567`	`3567`	`int32_t lIndex;`
`@@ -3579,7 +3579,7 @@`
`3579`	`3579`
`3580`	`3580`	`if( xInternalTimerHandle != NULL )`
`3581`	`3581`	`{`
`3582`		`- vTimerSetReloadMode( xInternalTimerHandle, uxAutoReload );`
	`3582`	`+ vTimerSetReloadMode( xInternalTimerHandle, xAutoReload );`
`3583`	`3583`	`}`
`3584`	`3584`	`}`
`3585`	`3585`	`}`
`@@ -3733,7 +3733,7 @@`
`3733`	`3733`
`3734`	`3734`	`TimerHandle_t MPU_xTimerCreate( const char * const pcTimerName,`
`3735`	`3735`	`const TickType_t xTimerPeriodInTicks,`
`3736`		`- const UBaseType_t uxAutoReload,`
	`3736`	`+ const BaseType_t xAutoReload,`
`3737`	`3737`	`void * const pvTimerID,`
`3738`	`3738`	`TimerCallbackFunction_t pxCallbackFunction ) /* PRIVILEGED_FUNCTION */`
`3739`	`3739`	`{`
`@@ -3745,7 +3745,7 @@`
`3745`	`3745`
`3746`	`3746`	`if( lIndex != -1 )`
`3747`	`3747`	`{`
`3748`		`- xInternalTimerHandle = xTimerCreate( pcTimerName, xTimerPeriodInTicks, uxAutoReload, pvTimerID, MPU_TimerCallback );`
	`3748`	`+ xInternalTimerHandle = xTimerCreate( pcTimerName, xTimerPeriodInTicks, xAutoReload, pvTimerID, MPU_TimerCallback );`
`3749`	`3749`
`3750`	`3750`	`if( xInternalTimerHandle != NULL )`
`3751`	`3751`	`{`
`@@ -3768,7 +3768,7 @@`
`3768`	`3768`
`3769`	`3769`	`TimerHandle_t MPU_xTimerCreateStatic( const char * const pcTimerName,`
`3770`	`3770`	`const TickType_t xTimerPeriodInTicks,`
`3771`		`- const UBaseType_t uxAutoReload,`
	`3771`	`+ const BaseType_t xAutoReload,`
`3772`	`3772`	`void * const pvTimerID,`
`3773`	`3773`	`TimerCallbackFunction_t pxCallbackFunction,`
`3774`	`3774`	`StaticTimer_t * pxTimerBuffer ) /* PRIVILEGED_FUNCTION */`
`@@ -3781,7 +3781,7 @@`
`3781`	`3781`
`3782`	`3782`	`if( lIndex != -1 )`
`3783`	`3783`	`{`
`3784`		`- xInternalTimerHandle = xTimerCreateStatic( pcTimerName, xTimerPeriodInTicks, uxAutoReload, pvTimerID, MPU_TimerCallback, pxTimerBuffer );`
	`3784`	`+ xInternalTimerHandle = xTimerCreateStatic( pcTimerName, xTimerPeriodInTicks, xAutoReload, pvTimerID, MPU_TimerCallback, pxTimerBuffer );`
`3785`	`3785`
`3786`	`3786`	`if( xInternalTimerHandle != NULL )`
`3787`	`3787`	`{`