Skip to content

Commit

Permalink
Fix function parameter shadowing global variable. (FreeRTOS#1221)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
creiter64 authored Jan 13, 2025
1 parent 3a7b308 commit c38427e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions portable/GCC/ARM_CA9/port.c
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,9 @@ volatile uint32_t ulPortYieldRequired = pdFALSE;
volatile uint32_t ulPortInterruptNesting = 0UL;

/* Used in the asm file. */
__attribute__( ( used ) ) const uint32_t ulICCIAR = portICCIAR_INTERRUPT_ACKNOWLEDGE_REGISTER_ADDRESS;
__attribute__( ( used ) ) const uint32_t ulICCEOIR = portICCEOIR_END_OF_INTERRUPT_REGISTER_ADDRESS;
__attribute__( ( used ) ) const uint32_t ulICCPMR = portICCPMR_PRIORITY_MASK_REGISTER_ADDRESS;
__attribute__( ( used ) ) const uint32_t ulICCIARAddress = portICCIAR_INTERRUPT_ACKNOWLEDGE_REGISTER_ADDRESS;
__attribute__( ( used ) ) const uint32_t ulICCEOIRAddress = portICCEOIR_END_OF_INTERRUPT_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 );

/*-----------------------------------------------------------*/
Expand Down
14 changes: 7 additions & 7 deletions portable/GCC/ARM_CA9/portASM.S
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
.set SVC_MODE, 0x13
.set IRQ_MODE, 0x12

/* Hardware registers. */
.extern ulICCIAR
.extern ulICCEOIR
.extern ulICCPMR
/* Hardware registers addresses. */
.extern ulICCIARAddress
.extern ulICCEOIRAddress
.extern ulICCPMRAddress

/* Variables and functions. */
.extern ulMaxAPIPriorityMask
Expand Down Expand Up @@ -317,9 +317,9 @@ vApplicationIRQHandler:
POP {PC}


ulICCIARConst: .word ulICCIAR
ulICCEOIRConst: .word ulICCEOIR
ulICCPMRConst: .word ulICCPMR
ulICCIARConst: .word ulICCIARAddress
ulICCEOIRConst: .word ulICCEOIRAddress
ulICCPMRConst: .word ulICCPMRAddress
pxCurrentTCBConst: .word pxCurrentTCB
ulCriticalNestingConst: .word ulCriticalNesting
ulPortTaskHasFPUContextConst: .word ulPortTaskHasFPUContext
Expand Down

0 comments on commit c38427e

Please sign in to comment.