Final check in before tagging V9.0.0.

[freertos] / FreeRTOS / Demo / CORTEX_A9_Zynq_ZC702 / RTOSDemo / src / main.c

diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/main.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/main.c
index 9e6a540be8f8cc751a030b1b9462791f6763ae11..12935c525dfaa2bfe64fe39e38f477ce8e12e73f 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/main.c
+++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/main.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V9.0.0rc2 - Copyright (C) 2016 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
@@ -68,6 +68,9 @@
 */\r
 \r
 /******************************************************************************\r
+ *\r
+ * See http://www.freertos.org/RTOS-Xilinx-Zynq.html for instructions.\r
+ *\r
  * This project provides three demo applications.  A simple blinky style\r
  * project, a more comprehensive test and demo application, and an lwIP example.\r
  * The mainSELECTED_APPLICATION setting (defined in this file) is used to\r
@@ -82,12 +85,16 @@
  * !!! IMPORTANT NOTE !!!\r
  * The GCC libraries that ship with the Xilinx SDK make use of the floating\r
  * point registers.  To avoid this causing corruption it is necessary to avoid\r
- * their use.  For this reason main.c contains very basic C implementations of\r
- * the standard C library functions memset(), memcpy() and memcmp(), which are\r
- * are used by FreeRTOS itself.  Defining these functions in the project\r
- * prevents the linker pulling them in from the library.  Any other standard C\r
- * library functions that are used by the application must likewise be defined\r
- * in C.\r
+ * their use unless a task has been given a floating point context.  See\r
+ * http://www.freertos.org/Using-FreeRTOS-on-Cortex-A-Embedded-Processors.html\r
+ * for information on how to give a task a floating point context, and how to\r
+ * handle floating point operations in interrupts.  As this demo does not give\r
+ * all tasks a floating point context main.c contains very basic C\r
+ * implementations of the standard C library functions memset(), memcpy() and\r
+ * memcmp(), which are are used by FreeRTOS itself.  Defining these functions in\r
+ * the project prevents the linker pulling them in from the library.  Any other\r
+ * standard C library functions that are used by the application must likewise\r
+ * be defined in C.\r
  *\r
  * ENSURE TO READ THE DOCUMENTATION PAGE FOR THIS PORT AND DEMO APPLICATION ON\r
  * THE http://www.FreeRTOS.org WEB SITE FOR FULL INFORMATION ON USING THIS DEMO\r
@@ -182,11 +189,13 @@ XScuGic xInterruptController;
 \r
 int main( void )\r
 {\r
+       /* See http://www.freertos.org/RTOS-Xilinx-Zynq.html for instructions. */\r
+\r
        /* Configure the hardware ready to run the demo. */\r
        prvSetupHardware();\r
 \r
-       /* The mainSELECTED_APPLICATION setting is described at the top\r
-       of this file. */\r
+       /* The mainSELECTED_APPLICATION setting is described at the top of this\r
+       file. */\r
        #if( mainSELECTED_APPLICATION == 0 )\r
        {\r
                main_blinky();\r
@@ -410,7 +419,7 @@ const uint32_t ulMaxDivisor = 0xff, ulDivisorShift = 0x08;
 /* configUSE_STATIC_ALLOCATION is set to 1, so the application must provide an\r
 implementation of vApplicationGetIdleTaskMemory() to provide the memory that is\r
 used by the Idle task. */\r
-void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint16_t *pusIdleTaskStackSize )\r
+void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize )\r
 {\r
 /* If the buffers to be provided to the Idle task are declared inside this\r
 function then they must be declared static - otherwise they will be allocated on\r
@@ -428,14 +437,14 @@ static StackType_t uxIdleTaskStack[ configMINIMAL_STACK_SIZE ];
        /* Pass out the size of the array pointed to by *ppxIdleTaskStackBuffer.\r
        Note that, as the array is necessarily of type StackType_t,\r
        configMINIMAL_STACK_SIZE is specified in words, not bytes. */\r
-       *pusIdleTaskStackSize = configMINIMAL_STACK_SIZE;\r
+       *pulIdleTaskStackSize = configMINIMAL_STACK_SIZE;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 /* configUSE_STATIC_ALLOCATION and configUSE_TIMERS are both set to 1, so the\r
 application must provide an implementation of vApplicationGetTimerTaskMemory()\r
 to provide the memory that is used by the Timer service task. */\r
-void vApplicationGetTimerTaskMemory( StaticTask_t **ppxTimerTaskTCBBuffer, StackType_t **ppxTimerTaskStackBuffer, uint16_t *pusTimerTaskStackSize )\r
+void vApplicationGetTimerTaskMemory( StaticTask_t **ppxTimerTaskTCBBuffer, StackType_t **ppxTimerTaskStackBuffer, uint32_t *pulTimerTaskStackSize )\r
 {\r
 /* If the buffers to be provided to the Timer task are declared inside this\r
 function then they must be declared static - otherwise they will be allocated on\r
@@ -453,7 +462,7 @@ static StackType_t uxTimerTaskStack[ configTIMER_TASK_STACK_DEPTH ];
        /* Pass out the size of the array pointed to by *ppxTimerTaskStackBuffer.\r
        Note that, as the array is necessarily of type StackType_t,\r
        configMINIMAL_STACK_SIZE is specified in words, not bytes. */\r
-       *pusTimerTaskStackSize = configMINIMAL_STACK_SIZE;\r
+       *pulTimerTaskStackSize = configTIMER_TASK_STACK_DEPTH;\r
 }\r
 \r
 \r