Remove unnecessary use of portLONG, portCHAR and portSHORT.

[freertos] / Demo / NiosII_CycloneIII_DBC3C40_GCC / RTOSDemo / main.c

diff --git a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c
index 629f9a127525b9b3a467adf13669ae771527c79f..815fe9fc0055b212e1a44722c3ccfea441815513 100644 (file)
--- a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c
+++ b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c
@@ -1,19 +1,19 @@
 /*\r
-    FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.\r
+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.\r
 \r
     This file is part of the FreeRTOS distribution.\r
 \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
+    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
     **NOTE** The exception to the GPL is included to allow you to distribute a\r
-    combined work that includes FreeRTOS without being obliged to provide the \r
-    source code for proprietary components outside of the FreeRTOS kernel.  \r
-    Alternative commercial license and support terms are also available upon \r
-    request.  See the licensing section of http://www.FreeRTOS.org for full \r
+    combined work that includes FreeRTOS without being obliged to provide the\r
+    source code for proprietary components outside of the FreeRTOS kernel.\r
+    Alternative commercial license and support terms are also available upon\r
+    request.  See the licensing section of http://www.FreeRTOS.org for full\r
     license details.\r
 \r
-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT\r
+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT\r
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
     more details.\r
@@ -25,8 +25,9 @@
 \r
     ***************************************************************************\r
     *                                                                         *\r
-    * Looking for a quick start?  Then check out the FreeRTOS eBook!          *\r
-    * See http://www.FreeRTOS.org/Documentation for details                   *\r
+    * The FreeRTOS eBook and reference manual are available to purchase for a *\r
+    * small fee. Help yourself get started quickly while also helping the     *\r
+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *\r
     *                                                                         *\r
     ***************************************************************************\r
 \r
@@ -97,7 +98,7 @@
 \r
 /*-----------------------------------------------------------*/\r
 \r
-#error The batch file Demo\NiosII_CycloneIII_DBC3C40_GCC\CreateProjectDirectoryStructure.bat must be executed before the first build.  After executing the batch file hit F5 to refrech the Eclipse project, then delete this line.\r
+#error The batch file Demo\NiosII_CycloneIII_DBC3C40_GCC\CreateProjectDirectoryStructure.bat must be executed before the project is imported into the workspace.  Failure to do this will result in the include paths stored in the project being deleted.  Remove this line after CreateProjectDirectoryStructure.bat has been executed.\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -222,7 +223,7 @@ void vApplicationStackOverflowHook( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-void _general_exception_handler( unsigned portLONG ulCause, unsigned portLONG ulStatus )\r
+void _general_exception_handler( unsigned long ulCause, unsigned long ulStatus )\r
 {\r
        /* This overrides the definition provided by the kernel.  Other exceptions \r
        should be handled here. */\r
@@ -237,7 +238,7 @@ static void prvCheckTask( void *pvParameters )
 {\r
 portTickType xLastExecutionTime, ulTicksToWait = mainNO_ERROR_PERIOD;\r
 unsigned long ulLastRegTest1 = 0UL, ulLastRegTest2 = 0UL;\r
-const portCHAR * pcMessage;\r
+const char * pcMessage;\r
 \r
        /* Initialise the variable used to control our iteration rate prior to\r
        its first use. */\r