Skip to content

Commit b58005a

Browse files
kar-rahul-awskar-rahul-aws
authored
Add macro guard configUSE_MPU_WRAPPERS_V1 to remove definition missing warning. (#1208)
Add macro guard to removed definition missing warning
1 parent 974351f commit b58005a

File tree

23 files changed

+89
-84
lines changed

23 files changed

+89
-84
lines changed

‎.github/allowed_urls.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://www.renesas.com/us/en/document/mah/rh850f1k-group-users-manual-hardware?r=1170166
2+
https://www.renesas.com/us/en/products/microcontrollers-microprocessors/rh850-automotive-mcus
3+
https://www.renesas.com/us/en/software-tool/c-compiler-package-rh850-family#downloads

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ jobs:
3333
uses: actions/[email protected]
3434
- name: Link Verification
3535
uses: FreeRTOS/CI-CD-Github-Actions/link-verifier@main
36+
with:
37+
allowlist-file: '.github/allowed_urls.txt'
3638

3739
verify-manifest:
3840
runs-on: ubuntu-latest

‎portable/ARMv8M/non_secure/port.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
398398
*/
399399
static void prvTaskExitError( void );
400400

401-
#if ( configENABLE_MPU == 1 )
401+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
402402

403403
/**
404404
* @brief Extract MPU region's access permissions from the Region Base Address
@@ -409,7 +409,7 @@ static void prvTaskExitError( void );
409409
* @return uint32_t Access permissions.
410410
*/
411411
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
412-
#endif /* configENABLE_MPU */
412+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
413413

414414
#if ( configENABLE_MPU == 1 )
415415

@@ -871,7 +871,7 @@ static void prvTaskExitError( void )
871871
}
872872
/*-----------------------------------------------------------*/
873873

874-
#if ( configENABLE_MPU == 1 )
874+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
875875

876876
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
877877
{
@@ -890,7 +890,7 @@ static void prvTaskExitError( void )
890890
return ulAccessPermissions;
891891
}
892892

893-
#endif /* configENABLE_MPU */
893+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
894894
/*-----------------------------------------------------------*/
895895

896896
#if ( configENABLE_MPU == 1 )

‎portable/GCC/ARM_CM23/non_secure/port.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
398398
*/
399399
static void prvTaskExitError( void );
400400

401-
#if ( configENABLE_MPU == 1 )
401+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
402402

403403
/**
404404
* @brief Extract MPU region's access permissions from the Region Base Address
@@ -409,7 +409,7 @@ static void prvTaskExitError( void );
409409
* @return uint32_t Access permissions.
410410
*/
411411
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
412-
#endif /* configENABLE_MPU */
412+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
413413

414414
#if ( configENABLE_MPU == 1 )
415415

@@ -871,7 +871,7 @@ static void prvTaskExitError( void )
871871
}
872872
/*-----------------------------------------------------------*/
873873

874-
#if ( configENABLE_MPU == 1 )
874+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
875875

876876
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
877877
{
@@ -890,7 +890,7 @@ static void prvTaskExitError( void )
890890
return ulAccessPermissions;
891891
}
892892

893-
#endif /* configENABLE_MPU */
893+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
894894
/*-----------------------------------------------------------*/
895895

896896
#if ( configENABLE_MPU == 1 )

‎portable/GCC/ARM_CM23_NTZ/non_secure/port.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
398398
*/
399399
static void prvTaskExitError( void );
400400

401-
#if ( configENABLE_MPU == 1 )
401+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
402402

403403
/**
404404
* @brief Extract MPU region's access permissions from the Region Base Address
@@ -409,7 +409,7 @@ static void prvTaskExitError( void );
409409
* @return uint32_t Access permissions.
410410
*/
411411
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
412-
#endif /* configENABLE_MPU */
412+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
413413

414414
#if ( configENABLE_MPU == 1 )
415415

@@ -871,7 +871,7 @@ static void prvTaskExitError( void )
871871
}
872872
/*-----------------------------------------------------------*/
873873

874-
#if ( configENABLE_MPU == 1 )
874+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
875875

876876
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
877877
{
@@ -890,7 +890,7 @@ static void prvTaskExitError( void )
890890
return ulAccessPermissions;
891891
}
892892

893-
#endif /* configENABLE_MPU */
893+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
894894
/*-----------------------------------------------------------*/
895895

896896
#if ( configENABLE_MPU == 1 )

‎portable/GCC/ARM_CM33/non_secure/port.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
398398
*/
399399
static void prvTaskExitError( void );
400400

401-
#if ( configENABLE_MPU == 1 )
401+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
402402

403403
/**
404404
* @brief Extract MPU region's access permissions from the Region Base Address
@@ -409,7 +409,7 @@ static void prvTaskExitError( void );
409409
* @return uint32_t Access permissions.
410410
*/
411411
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
412-
#endif /* configENABLE_MPU */
412+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
413413

414414
#if ( configENABLE_MPU == 1 )
415415

@@ -871,7 +871,7 @@ static void prvTaskExitError( void )
871871
}
872872
/*-----------------------------------------------------------*/
873873

874-
#if ( configENABLE_MPU == 1 )
874+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
875875

876876
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
877877
{
@@ -890,7 +890,7 @@ static void prvTaskExitError( void )
890890
return ulAccessPermissions;
891891
}
892892

893-
#endif /* configENABLE_MPU */
893+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
894894
/*-----------------------------------------------------------*/
895895

896896
#if ( configENABLE_MPU == 1 )

‎portable/GCC/ARM_CM33_NTZ/non_secure/port.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
398398
*/
399399
static void prvTaskExitError( void );
400400

401-
#if ( configENABLE_MPU == 1 )
401+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
402402

403403
/**
404404
* @brief Extract MPU region's access permissions from the Region Base Address
@@ -409,7 +409,7 @@ static void prvTaskExitError( void );
409409
* @return uint32_t Access permissions.
410410
*/
411411
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
412-
#endif /* configENABLE_MPU */
412+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
413413

414414
#if ( configENABLE_MPU == 1 )
415415

@@ -871,7 +871,7 @@ static void prvTaskExitError( void )
871871
}
872872
/*-----------------------------------------------------------*/
873873

874-
#if ( configENABLE_MPU == 1 )
874+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
875875

876876
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
877877
{
@@ -890,7 +890,7 @@ static void prvTaskExitError( void )
890890
return ulAccessPermissions;
891891
}
892892

893-
#endif /* configENABLE_MPU */
893+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
894894
/*-----------------------------------------------------------*/
895895

896896
#if ( configENABLE_MPU == 1 )

‎portable/GCC/ARM_CM35P/non_secure/port.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
398398
*/
399399
static void prvTaskExitError( void );
400400

401-
#if ( configENABLE_MPU == 1 )
401+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
402402

403403
/**
404404
* @brief Extract MPU region's access permissions from the Region Base Address
@@ -409,7 +409,7 @@ static void prvTaskExitError( void );
409409
* @return uint32_t Access permissions.
410410
*/
411411
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
412-
#endif /* configENABLE_MPU */
412+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
413413

414414
#if ( configENABLE_MPU == 1 )
415415

@@ -871,7 +871,7 @@ static void prvTaskExitError( void )
871871
}
872872
/*-----------------------------------------------------------*/
873873

874-
#if ( configENABLE_MPU == 1 )
874+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
875875

876876
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
877877
{
@@ -890,7 +890,7 @@ static void prvTaskExitError( void )
890890
return ulAccessPermissions;
891891
}
892892

893-
#endif /* configENABLE_MPU */
893+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
894894
/*-----------------------------------------------------------*/
895895

896896
#if ( configENABLE_MPU == 1 )

‎portable/GCC/ARM_CM35P_NTZ/non_secure/port.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
398398
*/
399399
static void prvTaskExitError( void );
400400

401-
#if ( configENABLE_MPU == 1 )
401+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
402402

403403
/**
404404
* @brief Extract MPU region's access permissions from the Region Base Address
@@ -409,7 +409,7 @@ static void prvTaskExitError( void );
409409
* @return uint32_t Access permissions.
410410
*/
411411
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
412-
#endif /* configENABLE_MPU */
412+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
413413

414414
#if ( configENABLE_MPU == 1 )
415415

@@ -871,7 +871,7 @@ static void prvTaskExitError( void )
871871
}
872872
/*-----------------------------------------------------------*/
873873

874-
#if ( configENABLE_MPU == 1 )
874+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
875875

876876
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
877877
{
@@ -890,7 +890,7 @@ static void prvTaskExitError( void )
890890
return ulAccessPermissions;
891891
}
892892

893-
#endif /* configENABLE_MPU */
893+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
894894
/*-----------------------------------------------------------*/
895895

896896
#if ( configENABLE_MPU == 1 )

‎portable/GCC/ARM_CM55/non_secure/port.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
398398
*/
399399
static void prvTaskExitError( void );
400400

401-
#if ( configENABLE_MPU == 1 )
401+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
402402

403403
/**
404404
* @brief Extract MPU region's access permissions from the Region Base Address
@@ -409,7 +409,7 @@ static void prvTaskExitError( void );
409409
* @return uint32_t Access permissions.
410410
*/
411411
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
412-
#endif /* configENABLE_MPU */
412+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
413413

414414
#if ( configENABLE_MPU == 1 )
415415

@@ -871,7 +871,7 @@ static void prvTaskExitError( void )
871871
}
872872
/*-----------------------------------------------------------*/
873873

874-
#if ( configENABLE_MPU == 1 )
874+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
875875

876876
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
877877
{
@@ -890,7 +890,7 @@ static void prvTaskExitError( void )
890890
return ulAccessPermissions;
891891
}
892892

893-
#endif /* configENABLE_MPU */
893+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
894894
/*-----------------------------------------------------------*/
895895

896896
#if ( configENABLE_MPU == 1 )

0 commit comments

Comments
 (0)