summaryrefslogtreecommitdiff
path: root/Source/portable/Keil
diff options
context:
space:
mode:
authorRichardBarry <RichardBarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>2007-11-05 16:44:39 +0000
committerRichardBarry <RichardBarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>2007-11-05 16:44:39 +0000
commita8f128f744271af1d6fcf9a350261828cfe4927e (patch)
treeda1fe867f34ec70ea1b7163a00d5bd2e68d738a1 /Source/portable/Keil
parent82aa29ae2f54490db8b576c4c476dcdb39517c08 (diff)
downloadfreertos-a8f128f744271af1d6fcf9a350261828cfe4927e.tar.gz
freertos-a8f128f744271af1d6fcf9a350261828cfe4927e.tar.bz2
freertos-a8f128f744271af1d6fcf9a350261828cfe4927e.tar.xz
Update to V4.6.1 - including PIC32MX port.
git-svn-id: https://freertos.svn.sourceforge.net/svnroot/freertos/trunk@115 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
Diffstat (limited to 'Source/portable/Keil')
-rw-r--r--Source/portable/Keil/ARM7/port.c7
-rw-r--r--Source/portable/Keil/ARM7/portISR.c7
-rw-r--r--Source/portable/Keil/ARM7/portmacro.h15
3 files changed, 20 insertions, 9 deletions
diff --git a/Source/portable/Keil/ARM7/port.c b/Source/portable/Keil/ARM7/port.c
index a06cffaa..c40ab038 100644
--- a/Source/portable/Keil/ARM7/port.c
+++ b/Source/portable/Keil/ARM7/port.c
@@ -1,5 +1,5 @@
/*
- FreeRTOS.org V4.6.0 - Copyright (C) 2003-2007 Richard Barry.
+ FreeRTOS.org V4.6.1 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.
@@ -28,8 +28,9 @@
and contact details. Please ensure to read the configuration and relevant
port sections of the online documentation.
- Also see http://www.SafeRTOS.com for an IEC 61508 compliant version along
- with commercial development and support options.
+ Also see http://www.SafeRTOS.com a version that has been certified for use
+ in safety critical systems, plus commercial licensing, development and
+ support options.
***************************************************************************
*/
diff --git a/Source/portable/Keil/ARM7/portISR.c b/Source/portable/Keil/ARM7/portISR.c
index 4408f30a..8c2171e2 100644
--- a/Source/portable/Keil/ARM7/portISR.c
+++ b/Source/portable/Keil/ARM7/portISR.c
@@ -1,5 +1,5 @@
/*
- FreeRTOS.org V4.6.0 - Copyright (C) 2003-2007 Richard Barry.
+ FreeRTOS.org V4.6.1 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.
@@ -28,8 +28,9 @@
and contact details. Please ensure to read the configuration and relevant
port sections of the online documentation.
- Also see http://www.SafeRTOS.com for an IEC 61508 compliant version along
- with commercial development and support options.
+ Also see http://www.SafeRTOS.com a version that has been certified for use
+ in safety critical systems, plus commercial licensing, development and
+ support options.
***************************************************************************
*/
diff --git a/Source/portable/Keil/ARM7/portmacro.h b/Source/portable/Keil/ARM7/portmacro.h
index 348874ac..cf3f0b56 100644
--- a/Source/portable/Keil/ARM7/portmacro.h
+++ b/Source/portable/Keil/ARM7/portmacro.h
@@ -1,5 +1,5 @@
/*
- FreeRTOS.org V4.6.0 - Copyright (C) 2003-2007 Richard Barry.
+ FreeRTOS.org V4.6.1 - Copyright (C) 2003-2007 Richard Barry.
This file is part of the FreeRTOS.org distribution.
@@ -28,8 +28,9 @@
and contact details. Please ensure to read the configuration and relevant
port sections of the online documentation.
- Also see http://www.SafeRTOS.com for an IEC 61508 compliant version along
- with commercial development and support options.
+ Also see http://www.SafeRTOS.com a version that has been certified for use
+ in safety critical systems, plus commercial licensing, development and
+ support options.
***************************************************************************
*/
@@ -37,6 +38,10 @@
#ifndef PORTMACRO_H
#define PORTMACRO_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*-----------------------------------------------------------
* Port specific definitions.
*
@@ -223,5 +228,9 @@ extern void vPortExitCritical( void );
#define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters ) __task
#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
+#ifdef __cplusplus
+}
+#endif
+
#endif /* PORTMACRO_H */