From e6a6b84227364ec12b439eb5bc2621d6740bc0c2 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Wed, 25 Jan 2012 09:19:58 +0000 Subject: [PATCH] Revert the CM0 port layer exception handler names to the traditional FreeRTOS names as there seem to be two forms of the CMSIS names. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1678 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- Source/portable/GCC/ARM_CM0/port.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/portable/GCC/ARM_CM0/port.c b/Source/portable/GCC/ARM_CM0/port.c index e68ca16ce..85232dfe5 100644 --- a/Source/portable/GCC/ARM_CM0/port.c +++ b/Source/portable/GCC/ARM_CM0/port.c @@ -87,9 +87,9 @@ static void prvSetupTimerInterrupt( void ); /* * Exception handlers. */ -void PendSV_Handler( void ) __attribute__ (( naked )); -void SysTick_Handler( void ); -void SVCall_Handler( void ) __attribute__ (( naked )); +void xPortPendSVHandler( void ) __attribute__ (( naked )); +void xPortSysTickHandler( void ); +void vPortSVCHandler( void ) __attribute__ (( naked )); /* * Start first task is a separate function so it can be tested in isolation. @@ -117,7 +117,7 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE } /*-----------------------------------------------------------*/ -void SVCall_Handler( void ) +void vPortSVCHandler( void ) { __asm volatile ( " ldr r3, pxCurrentTCBConst2 \n" /* Restore the context. */ @@ -213,7 +213,7 @@ void vPortExitCritical( void ) } /*-----------------------------------------------------------*/ -void PendSV_Handler( void ) +void xPortPendSVHandler( void ) { /* This is a naked function. */ @@ -261,7 +261,7 @@ void PendSV_Handler( void ) } /*-----------------------------------------------------------*/ -void SysTick_Handler( void ) +void xPortSysTickHandler( void ) { unsigned long ulDummy; -- 2.39.5