Minor updates to demo projects to ensure correct building with V8 rc1.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2150 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/RenesasFiles/include/r_typedefs.h b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/RenesasFiles/include/r_typedefs.h
index 68d659178ba7f1fa6e51502c6b8f2db03cbef9ac..9a14943428720b9370403e0068edafb5e35a57e1 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/RenesasFiles/include/r_typedefs.h
+++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/RenesasFiles/include/r_typedefs.h
@@ -33,6 +33,7 @@
 Includes <System Includes> , "Project Includes"\r
 ******************************************************************************/\r
 #include <stddef.h>\r
+#include <stdint.h>\r
 \r
 /******************************************************************************\r
 Macro definitions\r
@@ -45,20 +46,23 @@ Macro definitions
 /******************************************************************************\r
 Typedef definitions\r
 ******************************************************************************/\r
+\r
 typedef char                char_t;\r
-typedef unsigned int        bool_t;\r
 typedef int                 int_t;\r
-typedef signed char         int8_t;\r
-typedef signed short        int16_t;\r
-typedef signed long         int32_t;\r
-typedef signed long long    int64_t;\r
-typedef unsigned char       uint8_t;\r
-typedef unsigned short      uint16_t;\r
-typedef unsigned long       uint32_t;\r
-typedef unsigned long long  uint64_t;\r
-typedef float               float32_t;\r
-typedef double              float64_t;\r
-typedef long double         float128_t;\r
 \r
+#ifdef TYPES_ALREADY_DEFINED_IN_STDINT\r
+       typedef unsigned int        bool_t;\r
+       typedef signed char         int8_t;\r
+       typedef signed short        int16_t;\r
+       typedef signed long         int32_t;\r
+       typedef signed long long    int64_t;\r
+       typedef unsigned char       uint8_t;\r
+       typedef unsigned short      uint16_t;\r
+       typedef unsigned long       uint32_t;\r
+       typedef unsigned long long  uint64_t;\r
+       typedef float               float32_t;\r
+       typedef double              float64_t;\r
+       typedef long double         float128_t;\r
+#endif\r
 #endif /* R_TYPEDEFS_H */\r
 \r

diff --git a/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/FreeRTOSConfig.h
index 62aa94b8213c683ff25a611d26d5fbb6ecde5344..debcb0d9281d05c221edb9179ec3289305d1cc6c 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -84,7 +84,7 @@
 #define configUSE_TICK_HOOK                            1\r
 #define configCPU_CLOCK_HZ                             ( 96000000UL )\r
 #define configTICK_RATE_HZ                             ( ( portTickType ) 1000 )\r
-#define configMAX_PRIORITIES                   ( ( unsigned portBASE_TYPE ) 5 )\r
+#define configMAX_PRIORITIES                   ( 5 )\r
 #define configMINIMAL_STACK_SIZE               ( ( unsigned short ) 90 )\r
 #define configTOTAL_HEAP_SIZE                  ( ( size_t ) ( 30 * 1024 ) )\r
 #define configMAX_TASK_NAME_LEN                        ( 10 )\r
@@ -121,7 +121,7 @@ to exclude the API function. */
 \r
 /* This demo makes use of one or more example stats formatting functions.  These\r
 format the raw data provided by the uxTaskGetSystemState() function in to human\r
-readable ASCII form.  See the notes in the implementation of vTaskList() within \r
+readable ASCII form.  See the notes in the implementation of vTaskList() within\r
 FreeRTOS/Source/tasks.c for limitations. */\r
 #define configUSE_STATS_FORMATTING_FUNCTIONS   1\r
 \r
@@ -160,11 +160,11 @@ to all Cortex-M ports, and do not rely on any particular library functions. */
 /* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!\r
 See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */\r
 #define configMAX_SYSCALL_INTERRUPT_PRIORITY   ( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )\r
-       \r
+\r
 /* Normal assert() semantics without relying on the provision of an assert.h\r
 header file. */\r
-#define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); for( ;; ); }    \r
-       \r
+#define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); for( ;; ); }\r
+\r
 /* Definitions that map the FreeRTOS port interrupt handlers to their CMSIS\r
 standard names. */\r
 #define vPortSVCHandler SVC_Handler\r

diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/FreeRTOSConfig.h
index 5037a1187b9cf06617260a077a8459331ba46cfe..338d531a3416eeb9ef619ce845847fa2a6d43c8e 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/FreeRTOSConfig.h
@@ -106,6 +106,11 @@ extern uint32_t SystemCoreClock;
 #define configUSE_APPLICATION_TASK_TAG                 0\r
 #define configUSE_COUNTING_SEMAPHORES                  1\r
 \r
+/* The full demo always has tasks to run so the tick will never be turned off.\r
+The blinky demo will use the default tickless idle implementation to turn the\r
+tick off. */\r
+#define configUSE_TICKLESS_IDLE                                        1\r
+\r
 /* Run time stats gathering definitions. */\r
 void vConfigureTimerForRunTimeStats( void );\r
 uint32_t ulGetRunTimeCounterValue( void );\r

diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/SAM4L_low_power_tick_management.c b/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/SAM4L_low_power_tick_management.c
index 0f76945a4e8f204edfeefea57d569ad82d5fe257..98beefd73bfb495c8330fa530109ec41e562df8f 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/SAM4L_low_power_tick_management.c
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4L_Atmel_Studio/src/SAM4L_low_power_tick_management.c
@@ -88,7 +88,6 @@
 /* Constants required to pend a PendSV interrupt from the tick ISR if the\r
 preemptive scheduler is being used.  These are just standard bits and registers\r
 within the Cortex-M core itself. */\r
-#define portNVIC_INT_CTRL_REG  ( * ( ( volatile unsigned long * ) 0xe000ed04 ) )\r
 #define portNVIC_PENDSVSET_BIT ( 1UL << 28UL )\r
 \r
 /* The alarm used to generate interrupts in the asynchronous timer. */\r

diff --git a/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/FreeRTOSConfig.h
index 6212c4483d23532a8fc94830bd9dcdcb96227a2c..0f7bd26760fd8783da733b4577d3886f3de31c5b 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_MB9B500_IAR_Keil/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -91,7 +91,7 @@ assembly files that include this header file. */
 #define configUSE_TICK_HOOK                            1\r
 #define configCPU_CLOCK_HZ                             ( SystemCoreClock )\r
 #define configTICK_RATE_HZ                             ( ( portTickType ) 1000 )\r
-#define configMAX_PRIORITIES                   ( ( unsigned portBASE_TYPE ) 5 )\r
+#define configMAX_PRIORITIES                   ( 5 )\r
 #define configMINIMAL_STACK_SIZE               ( ( unsigned short ) 90 )\r
 #define configTOTAL_HEAP_SIZE                  ( ( size_t ) ( 60 * 1024 ) )\r
 #define configMAX_TASK_NAME_LEN                        ( 10 )\r
@@ -143,9 +143,9 @@ to exclude the API function. */
 /* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!\r
 See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */\r
 #define configMAX_SYSCALL_INTERRUPT_PRIORITY   ( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )\r
-       \r
-#define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); for( ;; ); }    \r
-       \r
+\r
+#define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); for( ;; ); }\r
+\r
 #define vPortSVCHandler SVC_Handler\r
 #define xPortPendSVHandler PendSV_Handler\r
 #define vPortSVCHandler SVC_Handler\r