Remove compiler warnings.

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

diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/.project b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/.project
index ef8123634a7997986bfe367a5e116c1d92cb1e73..5fa19f1cef72c94cb8495514f2664966655d9836 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/.project
+++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/.project
@@ -150,6 +150,11 @@
                        <type>1</type>\r
                        <locationURI>FreeRTOS_ROOT/FreeRTOS/Demo/Common/Minimal/GenQTest.c</locationURI>\r
                </link>\r
+               <link>\r
+                       <name>Source/Full-Demo/Common-Demo-Source/QueueOverwrite.c</name>\r
+                       <type>1</type>\r
+                       <locationURI>FreeRTOS_ROOT/FreeRTOS/Demo/Common/Minimal/QueueOverwrite.c</locationURI>\r
+               </link>\r
                <link>\r
                        <name>Source/Full-Demo/Common-Demo-Source/TimerDemo.c</name>\r
                        <type>1</type>\r

diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h
index 3138cde5328bd83f077e525df51d4e37bc7abe02..0911bd0b9da4f8cd879bbd35349904d3411956b4 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h
@@ -151,7 +151,7 @@ version. */
 \r
 #ifdef __ICCARM__\r
        void vAssertCalled( const char *pcFile, unsigned long ulLine );\r
-       #define configASSERT( x ) if( x == 0 ) vAssertCalled( __FILE__, __LINE__ );\r
+       #define configASSERT( x ) if( ( x ) == 0 ) vAssertCalled( __FILE__, __LINE__ );\r
 #endif\r
 \r
 #endif /* FREERTOS_CONFIG_H */\r

diff --git a/FreeRTOS/Source/include/task.h b/FreeRTOS/Source/include/task.h
index c40a92e589fad3e855ef252ab03f3d8491f7cc4e..ec294438ec6b538ff93b809d66000a0dee48ba2f 100644 (file)
--- a/FreeRTOS/Source/include/task.h
+++ b/FreeRTOS/Source/include/task.h
@@ -148,7 +148,7 @@ typedef struct xTASK_PARAMTERS
        xMemoryRegion xRegions[ portNUM_CONFIGURABLE_REGIONS ];\r
 } xTaskParameters;\r
 \r
-/* Used with the xTaskGetSystemState() function to return the state of each task \r
+/* Used with the xTaskGetSystemState() function to return the state of each task\r
 in the system. */\r
 typedef struct xTASK_STATUS\r
 {\r
@@ -1159,30 +1159,30 @@ xTaskHandle xTaskGetIdleTaskHandle( void );
  * xTaskGetSystemState() to be available.\r
  *\r
  * xTaskGetSystemState() populates an xTaskStatusType structure for each task in\r
- * the system.  xTaskStatusType structures contain, among other things, members \r
+ * the system.  xTaskStatusType structures contain, among other things, members\r
  * for the task handle, task name, task priority, task state, and total amount\r
- * of run time consumed by the task.  See the xTaskStatusType structure \r
+ * of run time consumed by the task.  See the xTaskStatusType structure\r
  * definition in this file for the full member list.\r
  *\r
  * NOTE:  This function is intended for debugging use only as its use results in\r
  * the scheduler remaining suspended for an extended period.\r
  *\r
- * @param pxTaskStatusArray A pointer to an array of xTaskStatusType structures.  \r
- * The array contain at least one xTaskStatusType structure for each task that \r
- * is under the control of the RTOS.  The number of tasks under the control of \r
+ * @param pxTaskStatusArray A pointer to an array of xTaskStatusType structures.\r
+ * The array contain at least one xTaskStatusType structure for each task that\r
+ * is under the control of the RTOS.  The number of tasks under the control of\r
  * the RTOS can be determined using the uxTaskGetNumberOfTasks() API function.\r
  *\r
  * @param uxArraySize The size of the array pointed to by the pxTaskStatusArray\r
  * parameter.  The size is specified as the number of indexes in the array, or\r
- * the number of xTaskStatusType structures contained in the array, not by the \r
+ * the number of xTaskStatusType structures contained in the array, not by the\r
  * number of bytes in the array.\r
  *\r
  * @param pultotalRunTime If configGENERATE_RUN_TIME_STATS is set to 1 in\r
  * FreeRTOSConfig.h then *pulTotalRunTime is set by xTaskGetSystemState() to the\r
- * total run time (as defined by the run time stats clock, see \r
+ * total run time (as defined by the run time stats clock, see\r
  * http://www.freertos.org/rtos-run-time-stats.html) since the target booted.\r
  *\r
- * @return The number of xTaskStatusType structures that were populated by \r
+ * @return The number of xTaskStatusType structures that were populated by\r
  * xTaskGetSystemState().  This should equal the number returned by the\r
  * uxTaskGetNumberOfTasks() API function, but will be zero if the value passed\r
  * in the uxArraySize parameter was too small.\r
@@ -1220,13 +1220,13 @@ xTaskHandle xTaskGetIdleTaskHandle( void );
                        // Avoid divide by zero errors.\r
                        if( ulTotalRunTime > 0 )\r
                        {\r
-                               // For each populated position in the pxTaskStatusArray array, \r
+                               // For each populated position in the pxTaskStatusArray array,\r
                                // format the raw data as human readable ASCII data\r
                                for( x = 0; x < uxArraySize; x++ )\r
                                {\r
-                                       /* What percentage of the total run time has the task used?\r
-                                       This will always be rounded down to the nearest integer.\r
-                                       ulTotalRunTimeDiv100 has already been divided by 100.\r
+                                       // What percentage of the total run time has the task used?\r
+                                       // This will always be rounded down to the nearest integer.\r
+                                       // ulTotalRunTimeDiv100 has already been divided by 100.\r
                                        ulStatsAsPercentage = pxTaskStatusArray[ x ].ulRunTimeCounter / ulTotalRunTime;\r
 \r
                                        if( ulStatsAsPercentage > 0UL )\r
@@ -1236,7 +1236,7 @@ xTaskHandle xTaskGetIdleTaskHandle( void );
                                        else\r
                                        {\r
                                                // If the percentage is zero here then the task has\r
-                                               // consumed less than 1% of the total run time. \r
+                                               // consumed less than 1% of the total run time.\r
                                                sprintf( ( char * ) pcWriteBuffer, ( char * ) "%s\t\t%lu\t\t<1%%\r\n", pxTaskStatusArray[ x ].pcTaskName, pxTaskStatusArray[ x ].ulRunTimeCounter );\r
                                        }\r
 \r