len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-08-20 10:08:33 -04:00
Code Issues Projects Releases Packages Wiki Activity

Code cleanup (#288)

Browse source 
* Update port.c

* Code cleanup

Misc coding style cleanup and typo fixes

* Fix ASM style

Fix ASM style

* Fix header check

Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com>

Co-authored-by: Carl Lundin <53273776+lundinc2@users.noreply.github.com>
Co-authored-by: Gaurav Aggarwal <aggarg@amazon.com>
Co-authored-by: Gaurav-Aggarwal-AWS <33462878+aggarg@users.noreply.github.com>
This commit is contained in:
carlo-dev-git 2021-04-07 23:19:31 +02:00 • committed by GitHub
parent b08c19f745
commit 75e0c36eb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

17
portable/RVDS/ARM_CM7/r0p1/port.c
View file

@ -233,15 +233,15 @@ static void prvTaskExitError( void )
__asm void vPortSVCHandler( void )
{
/* *INDENT-OFF* */
PRESERVE8
/* *INDENT-OFF* */
/* Get the location of the current TCB. */
ldr r3, =pxCurrentTCB
ldr r1, [ r3 ]
ldr r0, [ r1 ]
/* Pop the core registers. */
ldmia r0 !, { r4 - r11, r14 }
ldmia r0!, { r4-r11, r14 }
msr psp, r0
isb
mov r0, #0
@ -374,7 +374,6 @@ BaseType_t xPortStartScheduler( void )
/* Make PendSV and SysTick the lowest priority interrupts. */
portNVIC_SHPR3_REG |= portNVIC_PENDSV_PRI;
portNVIC_SHPR3_REG |= portNVIC_SYSTICK_PRI;
/* Start the timer that generates the tick ISR. Interrupts are disabled
@ -453,15 +452,15 @@ __asm void xPortPendSVHandler( void )
/* Is the task using the FPU context? If so, push high vfp registers. */
tst r14, #0x10
it eq
vstmdbeq r0 !, { s16 - s31 }
vstmdbeq r0!, {s16-s31}
/* Save the core registers. */
stmdb r0 !, { r4 - r11, r14 }
stmdb r0!, {r4-r11, r14 }
/* Save the new top of stack into the first member of the TCB. */
str r0, [ r2 ]
stmdb sp !, { r0, r3 }
stmdb sp!, { r0, r3 }
mov r0, #configMAX_SYSCALL_INTERRUPT_PRIORITY
cpsid i
msr basepri, r0
@ -471,20 +470,20 @@ __asm void xPortPendSVHandler( void )
bl vTaskSwitchContext
mov r0, #0
msr basepri, r0
ldmia sp !, { r0, r3 }
ldmia sp!, { r0, r3 }
/* The first item in pxCurrentTCB is the task top of stack. */
ldr r1, [ r3 ]
ldr r0, [ r1 ]
/* Pop the core registers. */
ldmia r0 !, { r4 - r11, r14 }
ldmia r0!, { r4-r11, r14 }
/* Is the task using the FPU context? If so, pop the high vfp registers
* too. */
tst r14, #0x10
it eq
vldmiaeq r0 !, { s16 - s31 }
vldmiaeq r0!, { s16-s31 }
msr psp, r0
isb

20
portable/RVDS/ARM_CM7/r0p1/portmacro.h
View file

@ -22,16 +22,17 @@
* https://www.FreeRTOS.org
* https://github.com/FreeRTOS
*
* 1 tab == 4 spaces!
*/
#ifndef PORTMACRO_H
#define PORTMACRO_H
#define PORTMACRO_H
#ifdef __cplusplus
extern "C" {
#endif
/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
/* *INDENT-ON* */
/*-----------------------------------------------------------
* Port specific definitions.
@ -257,9 +258,10 @@
return xReturn;
}
#ifdef __cplusplus
}
#endif
/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
/* *INDENT-ON* */
#endif /* PORTMACRO_H */