len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-19 13:01:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix function parameter shadowing global variable. (#1221)

Browse source 
The function vApplicationFPUSafeIRQHandler gets the value of ICCIAR as
parameter, but a constant containing the address of ICCIAR was also
defined. Fix the name of the constant to align it with what it actually
holds.
This commit is contained in:
creiter64 2025-01-13 23:48:10 +01:00 committed by GitHub
parent 3a7b3082cf
commit c38427eea4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
portable/GCC/ARM_CA9/port.c
View file

@ -208,9 +208,9 @@ volatile uint32_t ulPortYieldRequired = pdFALSE;
volatile uint32_t ulPortInterruptNesting = 0UL; volatile uint32_t ulPortInterruptNesting = 0UL;
/* Used in the asm file. */ /* Used in the asm file. */
__attribute__( ( used ) ) const uint32_t ulICCIAR = portICCIAR_INTERRUPT_ACKNOWLEDGE_REGISTER_ADDRESS; __attribute__( ( used ) ) const uint32_t ulICCIARAddress = portICCIAR_INTERRUPT_ACKNOWLEDGE_REGISTER_ADDRESS;
__attribute__( ( used ) ) const uint32_t ulICCEOIR = portICCEOIR_END_OF_INTERRUPT_REGISTER_ADDRESS; __attribute__( ( used ) ) const uint32_t ulICCEOIRAddress = portICCEOIR_END_OF_INTERRUPT_REGISTER_ADDRESS;
__attribute__( ( used ) ) const uint32_t ulICCPMR = portICCPMR_PRIORITY_MASK_REGISTER_ADDRESS; __attribute__( ( used ) ) const uint32_t ulICCPMRAddress = portICCPMR_PRIORITY_MASK_REGISTER_ADDRESS;
__attribute__( ( used ) ) const uint32_t ulMaxAPIPriorityMask = ( configMAX_API_CALL_INTERRUPT_PRIORITY << portPRIORITY_SHIFT ); __attribute__( ( used ) ) const uint32_t ulMaxAPIPriorityMask = ( configMAX_API_CALL_INTERRUPT_PRIORITY << portPRIORITY_SHIFT );
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/

14
portable/GCC/ARM_CA9/portASM.S
View file

@ -33,10 +33,10 @@
.set SVC_MODE, 0x13 .set SVC_MODE, 0x13
.set IRQ_MODE, 0x12 .set IRQ_MODE, 0x12
/* Hardware registers. */ /* Hardware registers addresses. */
.extern ulICCIAR .extern ulICCIARAddress
.extern ulICCEOIR .extern ulICCEOIRAddress
.extern ulICCPMR .extern ulICCPMRAddress
/* Variables and functions. */ /* Variables and functions. */
.extern ulMaxAPIPriorityMask .extern ulMaxAPIPriorityMask
@ -317,9 +317,9 @@ vApplicationIRQHandler:
POP {PC} POP {PC}
ulICCIARConst: .word ulICCIAR ulICCIARConst: .word ulICCIARAddress
ulICCEOIRConst: .word ulICCEOIR ulICCEOIRConst: .word ulICCEOIRAddress
ulICCPMRConst: .word ulICCPMR ulICCPMRConst: .word ulICCPMRAddress
pxCurrentTCBConst: .word pxCurrentTCB pxCurrentTCBConst: .word pxCurrentTCB
ulCriticalNestingConst: .word ulCriticalNesting ulCriticalNestingConst: .word ulCriticalNesting
ulPortTaskHasFPUContextConst: .word ulPortTaskHasFPUContext ulPortTaskHasFPUContextConst: .word ulPortTaskHasFPUContext