summaryrefslogtreecommitdiff
path: root/FreeRTOS
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-01-24 08:54:54 +0100
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-01-24 08:57:27 +0100
commite46ea682c1aa214ccb59c9871914993c9375e5c2 (patch)
tree6cb321024598fcc2a6cb9b3968834d7655bb26b1 /FreeRTOS
parent6a6e8752bdf9b7c11921c502f2433b8fdbf0c525 (diff)
Fixing a few templates, and making the various needed functions available.
Diffstat (limited to 'FreeRTOS')
-rw-r--r--FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c8
-rw-r--r--FreeRTOS/config.mk2
2 files changed, 3 insertions, 7 deletions
diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c
index 66dd5ba..d2f1de3 100644
--- a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c
@@ -153,7 +153,7 @@ static void prvRestoreContextOfFirstTask( void ) __attribute__(( naked )) PRIVIL
* C portion of the SVC handler. The SVC handler is split between an asm entry
* and a C wrapper for simplicity of coding and maintenance.
*/
-static void prvSVCHandler( unsigned long *pulRegisters ) __attribute__(( noinline )) PRIVILEGED_FUNCTION;
+void prvSVCHandler( unsigned long *pulRegisters ) PRIVILEGED_FUNCTION;
/*
* Prototypes for all the MPU wrappers.
@@ -246,14 +246,10 @@ void vPortSVCHandler( void )
" b prvSVCHandler \n"
:::"r0"
);
-
- /* This will never get executed, but is required to prevent prvSVCHandler
- being removed by the optimiser. */
- prvSVCHandler( NULL );
}
/*-----------------------------------------------------------*/
-static void prvSVCHandler( unsigned long *pulParam )
+void prvSVCHandler( unsigned long *pulParam )
{
unsigned char ucSVCNumber;
diff --git a/FreeRTOS/config.mk b/FreeRTOS/config.mk
index 188050d..d45722a 100644
--- a/FreeRTOS/config.mk
+++ b/FreeRTOS/config.mk
@@ -1,4 +1,4 @@
-TARGET_INCLUDES = $(ROOTDIR)/FreeRTOS/Source/include
+TARGET_INCLUDES += $(ROOTDIR)/FreeRTOS/Source/include
ifeq ($(USE_MPU),true)
TARGET_CPPFLAGS += -DportUSING_MPU_WRAPPERS=1