Prepare for V9.0.0 release:

[freertos] / FreeRTOS / Demo / MSP430X_MSP430FR5969_LaunchPad_IAR_CCS / FreeRTOSConfig.h

diff --git a/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/FreeRTOSConfig.h b/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/FreeRTOSConfig.h
index f2f52e37046c9bc471db5ef7fb6ba121fdf221e7..004b5cde2cd402466a0a7e0edb77956a663e9fd4 100644 (file)
--- a/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/MSP430X_MSP430FR5969_LaunchPad_IAR_CCS/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.2.1 - Copyright (C) 2015 Real Time Engineers Ltd.\r
+    FreeRTOS V9.0.0 - Copyright (C) 2016 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -8,7 +8,7 @@
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.\r
 \r
     ***************************************************************************\r
     >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
@@ -88,7 +88,7 @@ __persistent keyword to be used.  See http://www.freertos.org/a00111.html#heap_4
 #define configMAX_PRIORITIES                                   ( 5 )\r
 #define configCPU_CLOCK_HZ                                             ( 8000000 )\r
 #define configTICK_RATE_HZ                                             ( 1000 ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */\r
-#define configTOTAL_HEAP_SIZE                                  ( 20 * 1024 )\r
+#define configTOTAL_HEAP_SIZE                                  ( 14 * 1024 )\r
 #define configMAX_TASK_NAME_LEN                                        ( 15 )\r
 #define configUSE_TRACE_FACILITY                               1\r
 #define configUSE_16_BIT_TICKS                                 0\r
@@ -103,12 +103,6 @@ __persistent keyword to be used.  See http://www.freertos.org/a00111.html#heap_4
 #define configNUM_THREAD_LOCAL_STORAGE_POINTERS        0\r
 #define configENABLE_BACKWARD_COMPATIBILITY            0\r
 \r
-#if __DATA_MODEL__ == __DATA_MODEL_SMALL__\r
-       #define configMINIMAL_STACK_SIZE                ( ( unsigned short ) 110 )\r
-#else\r
-       #define configMINIMAL_STACK_SIZE                ( ( unsigned short ) 80 )\r
-#endif\r
-\r
 /* Hook function related definitions. */\r
 #define configUSE_TICK_HOOK                            1\r
 #define configUSE_IDLE_HOOK                            1\r
@@ -124,13 +118,6 @@ __persistent keyword to be used.  See http://www.freertos.org/a00111.html#heap_4
 /* Event group related definitions. */\r
 #define configUSE_EVENT_GROUPS                 0\r
 \r
-/* Prevent the following line being included from IAR asm files. */\r
-#ifndef __IAR_SYSTEMS_ASM__\r
-       void vConfigureTimerForRunTimeStats( void );\r
-       extern volatile uint32_t ulRunTimeCounterOverflows;\r
-       void vConfigureTimerForRunTimeStats( void );\r
-#endif\r
-\r
 /* Run time stats gathering definitions. */\r
 #define configGENERATE_RUN_TIME_STATS  1\r
 #define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() vConfigureTimerForRunTimeStats()\r
@@ -157,9 +144,8 @@ left at 1 with no impact on the code size. */
 #define INCLUDE_xTaskGetIdleTaskHandle                 1\r
 #define INCLUDE_xQueueGetMutexHolder                   1\r
 #define INCLUDE_eTaskGetState                                  1\r
-#define INCLUDE_xEventGroupSetBitFromISR               1\r
+#define INCLUDE_xEventGroupSetBitsFromISR              1\r
 #define INCLUDE_xTimerPendFunctionCall                 1\r
-#define INCLUDE_pcTaskGetTaskName                              1\r
 \r
 /* Include functions that format system and run-time stats into human readable\r
 tables. */\r
@@ -193,5 +179,29 @@ CLI. */
 /* The baudrate used for the CLI. */\r
 #define configCLI_BAUD_RATE                    19200\r
 \r
+/* Compiler specifics below here. */\r
+/* Prevent the following line being included from IAR asm files. */\r
+#ifndef __IAR_SYSTEMS_ASM__\r
+       void vConfigureTimerForRunTimeStats( void );\r
+       extern volatile uint32_t ulRunTimeCounterOverflows;\r
+       void vConfigureTimerForRunTimeStats( void );\r
+#endif\r
+\r
+#ifdef __ICC430__\r
+       /* Using the IAR pre-processor constants. */\r
+       #if ( __DATA_MODEL__ == __DATA_MODEL_LARGE__ )\r
+               #define configMINIMAL_STACK_SIZE                ( ( unsigned short ) 80 )\r
+       #else\r
+               #define configMINIMAL_STACK_SIZE                ( ( unsigned short ) 130 )\r
+       #endif\r
+#else\r
+       /* Using the CCS pre-processor constants. */\r
+       #ifdef __LARGE_DATA_MODEL__\r
+               #define configMINIMAL_STACK_SIZE                ( ( unsigned short ) 85 )\r
+       #else\r
+               #define configMINIMAL_STACK_SIZE                ( ( unsigned short ) 140 )\r
+       #endif\r
+#endif /* IAR_MSP */\r
+\r
 #endif /* FREERTOS_CONFIG_H */\r
 \r