From 203ae646009bc5f3fe79b26c86facb03cc54b185 Mon Sep 17 00:00:00 2001 From: Richard Barry Date: Thu, 18 Jul 2013 14:41:15 +0000 Subject: [PATCH] Rename xTaskGetSystemState() uxTaskGetSystemState(). --- .../FreeRTOSConfig.h | 2 +- .../ConfigurationFiles/FreeRTOSConfig.h | 2 +- .../FreeRTOSConfig.h | 2 +- .../FreeRTOSConfig.h | 2 +- .../RTOSDemo/FreeRTOSConfig.h | 2 +- .../Demo/ARM7_LPC2138_Rowley/FreeRTOSConfig.h | 2 +- .../RTOSDemo/FreeRTOSConfig.h | 2 +- .../Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h | 2 +- .../Demo/ARM9_STR91X_IAR/FreeRTOSConfig.h | 2 +- .../FreeRTOSConfig.h | 2 +- .../FreeRTOSConfig.h | 2 +- .../Source/FreeRTOSConfig.h | 2 +- .../FreeRTOSConfig.h | 2 +- .../RTOSDemo/FreeRTOSConfig.h | 2 +- .../CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h | 2 +- .../CORTEX_LM3Sxxxx_Rowley/FreeRTOSConfig.h | 2 +- .../src/FreeRTOSConfig.h | 2 +- .../FreeRTOSConfig.h | 2 +- .../Demo/CORTEX_LPC1768_IAR/FreeRTOSConfig.h | 2 +- .../FreeRTOSConfig.h | 2 +- .../RTOSDemo/FreeRTOSConfig.h | 2 +- .../Sources/FreeRTOSConfig.h | 2 +- .../RTOSDemo/FreeRTOSConfig.h | 2 +- .../FreeRTOSConfig.h | 2 +- FreeRTOS/Demo/Flshlite/FreeRTOSConfig.h | 2 +- .../Demo/MB91460_Softune/SRC/FreeRTOSConfig.h | 2 +- .../Src/FreeRTOSConfig.h | 2 +- .../SDKProjects/RTOSDemo/FreeRTOSConfig.h | 2 +- FreeRTOS/Demo/PC/FreeRTOSConfig.h | 2 +- .../RTOSDemo/FreeRTOSConfig.h | 2 +- .../Demo/RX600_RX62N-RDK_IAR/FreeRTOSConfig.h | 2 +- .../RTOSDemo/FreeRTOSConfig.h | 2 +- .../RTOSDemo/FreeRTOSConfig.h | 2 +- .../Demo/RX600_RX62N-RSK_IAR/FreeRTOSConfig.h | 2 +- .../RTOSDemo/FreeRTOSConfig.h | 2 +- .../RTOSDemo/FreeRTOSConfig.h | 2 +- .../RTOSDemo/FreeRTOSConfig.h | 2 +- .../WizNET_DEMO_TERN_186/FreeRTOSConfig.h | 2 +- FreeRTOS/Demo/lwIP_AVR32_UC3/FreeRTOSConfig.h | 2 +- .../lwIP_Demo_Rowley_ARM7/FreeRTOSConfig.h | 2 +- .../Demo/lwIP_MCF5235_GCC/FreeRTOSConfig.h | 2 +- .../Demo/uIP_Demo_IAR_ARM7/FreeRTOSConfig.h | 2 +- FreeRTOS/Source/include/mpu_wrappers.h | 2 +- FreeRTOS/Source/include/task.h | 43 ++++++++++--------- .../Source/portable/GCC/ARM_CM3_MPU/port.c | 6 +-- FreeRTOS/Source/portable/MemMang/heap_2.c | 2 +- FreeRTOS/Source/tasks.c | 20 ++++----- 47 files changed, 79 insertions(+), 78 deletions(-) diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/FreeRTOSConfig.h index a73f20bafb..07c57bfe72 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/FreeRTOSConfig.h +++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/FreeRTOSConfig.h @@ -126,7 +126,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetSchedulerState 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/ConfigurationFiles/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/ConfigurationFiles/FreeRTOSConfig.h index c0dd48d387..e78473a7a5 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/ConfigurationFiles/FreeRTOSConfig.h +++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/ConfigurationFiles/FreeRTOSConfig.h @@ -146,7 +146,7 @@ to exclude the API function. */ #define INCLUDE_xQueueGetMutexHolder 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOSConfig.h index 6ab1d3869e..ac87ce95f0 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOSConfig.h +++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOSConfig.h @@ -137,7 +137,7 @@ to exclude the API function. */ #define INCLUDE_xQueueGetMutexHolder 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/FreeRTOSConfig.h index 19eb7f3671..749897ad40 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/FreeRTOSConfig.h +++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/FreeRTOSConfig.h @@ -136,7 +136,7 @@ to exclude the API function. */ #define INCLUDE_xQueueGetMutexHolder 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/FreeRTOSConfig.h index a6461da4d7..3d848ce2b3 100644 --- a/FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/FreeRTOSConfig.h @@ -112,7 +112,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetCurrentTaskHandle 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/ARM7_LPC2138_Rowley/FreeRTOSConfig.h b/FreeRTOS/Demo/ARM7_LPC2138_Rowley/FreeRTOSConfig.h index 83278cbbae..4f68fc4e54 100644 --- a/FreeRTOS/Demo/ARM7_LPC2138_Rowley/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/ARM7_LPC2138_Rowley/FreeRTOSConfig.h @@ -123,7 +123,7 @@ to exclude the API function. */ #define INCLUDE_vTaskDelay 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h index 40a7984f9b..c793ebefe7 100644 --- a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h @@ -122,7 +122,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetCurrentTaskHandle 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h b/FreeRTOS/Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h index 09d75d81d9..4c40c5d973 100644 --- a/FreeRTOS/Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h @@ -123,7 +123,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetCurrentTaskHandle 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/ARM9_STR91X_IAR/FreeRTOSConfig.h b/FreeRTOS/Demo/ARM9_STR91X_IAR/FreeRTOSConfig.h index cd9abe55cd..8334ba02fd 100644 --- a/FreeRTOS/Demo/ARM9_STR91X_IAR/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/ARM9_STR91X_IAR/FreeRTOSConfig.h @@ -118,7 +118,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetCurrentTaskHandle 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/CORTEX_A2F200_IAR_and_Keil/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_A2F200_IAR_and_Keil/FreeRTOSConfig.h index 87c381d138..85a448b529 100644 --- a/FreeRTOS/Demo/CORTEX_A2F200_IAR_and_Keil/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_A2F200_IAR_and_Keil/FreeRTOSConfig.h @@ -131,7 +131,7 @@ to exclude the API function. */ #define INCLUDE_vTaskDelay 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/CORTEX_A2F200_SoftConsole/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_A2F200_SoftConsole/FreeRTOSConfig.h index 0b26ae63bb..dac8c7bd5b 100644 --- a/FreeRTOS/Demo/CORTEX_A2F200_SoftConsole/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_A2F200_SoftConsole/FreeRTOSConfig.h @@ -134,7 +134,7 @@ to exclude the API function. */ #define INCLUDE_vTaskDelay 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/FreeRTOSConfig.h index 61b9f9176f..0cbfa8c80f 100644 --- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/FreeRTOSConfig.h @@ -148,7 +148,7 @@ to exclude the API function. */ #define INCLUDE_vTaskDelay 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/FreeRTOSConfig.h index 01f665a757..61b5149c9d 100644 --- a/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/FreeRTOSConfig.h @@ -119,7 +119,7 @@ to exclude the API function. */ #define INCLUDE_vTaskDelay 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/FreeRTOSConfig.h index a3d8d51bc3..606584ff94 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/FreeRTOSConfig.h @@ -111,7 +111,7 @@ to exclude the API function. */ #define INCLUDE_uxTaskGetStackHighWaterMark 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h index c41eee43ef..3819e94cd4 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h @@ -125,7 +125,7 @@ to exclude the API function. */ #define INCLUDE_xSemaphoreGetMutexHolder 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Rowley/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Rowley/FreeRTOSConfig.h index 32ab77ed2b..eb3ca50b32 100644 --- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Rowley/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_Rowley/FreeRTOSConfig.h @@ -123,7 +123,7 @@ to exclude the API function. */ #define INCLUDE_xSemaphoreGetMutexHolder 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h index d37558a1c0..b9ef9b3fff 100644 --- a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h @@ -122,7 +122,7 @@ to exclude the API function. */ #define INCLUDE_uxTaskGetStackHighWaterMark 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_Rowley/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_Rowley/FreeRTOSConfig.h index 6c10337908..47838db0fb 100644 --- a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_Rowley/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_Rowley/FreeRTOSConfig.h @@ -114,7 +114,7 @@ to exclude the API function. */ #define INCLUDE_uxTaskGetStackHighWaterMark 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_IAR/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_LPC1768_IAR/FreeRTOSConfig.h index c6205c0397..934830ad0e 100644 --- a/FreeRTOS/Demo/CORTEX_LPC1768_IAR/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_LPC1768_IAR/FreeRTOSConfig.h @@ -112,7 +112,7 @@ to exclude the API function. */ #define INCLUDE_uxTaskGetStackHighWaterMark 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/CORTEX_STM32F107_GCC_Rowley/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_STM32F107_GCC_Rowley/FreeRTOSConfig.h index 00e7586187..f58ac30b09 100644 --- a/FreeRTOS/Demo/CORTEX_STM32F107_GCC_Rowley/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_STM32F107_GCC_Rowley/FreeRTOSConfig.h @@ -114,7 +114,7 @@ to exclude the API function. */ #define INCLUDE_vTaskDelay 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/FreeRTOSConfig.h index 883d8f0548..d4d0d74227 100644 --- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/FreeRTOSConfig.h @@ -150,7 +150,7 @@ to exclude the API function. */ #define INCLUDE_vTaskDelay 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/FreeRTOSConfig.h b/FreeRTOS/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/FreeRTOSConfig.h index 4308fdba25..f1620aa838 100644 --- a/FreeRTOS/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/FreeRTOSConfig.h @@ -131,7 +131,7 @@ to exclude the API function. */ #define configMAX_SYSCALL_INTERRUPT_PRIORITY 7 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOSConfig.h index 65ff74dad7..4fc9053b90 100644 --- a/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOSConfig.h @@ -113,7 +113,7 @@ to exclude the API function. */ #define INCLUDE_uxTaskGetStackHighWaterMark 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOSConfig.h b/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOSConfig.h index f2c4cad130..4f861b12a7 100644 --- a/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOSConfig.h @@ -128,7 +128,7 @@ to exclude the API function. */ #define configMAX_SYSCALL_INTERRUPT_PRIORITY 4 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/Flshlite/FreeRTOSConfig.h b/FreeRTOS/Demo/Flshlite/FreeRTOSConfig.h index bcf11aaa7c..a94e4846eb 100644 --- a/FreeRTOS/Demo/Flshlite/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/Flshlite/FreeRTOSConfig.h @@ -109,7 +109,7 @@ to exclude the API function. */ /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h b/FreeRTOS/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h index 273e3d3486..80610b749c 100644 --- a/FreeRTOS/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h @@ -112,7 +112,7 @@ to exclude the API function. */ #define configKERNEL_INTERRUPT_PRIORITY 30 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h b/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h index 4397a48c64..99c8f6dd72 100644 --- a/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h @@ -128,7 +128,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetCurrentTaskHandle 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemo/FreeRTOSConfig.h index 8e1d0ce83d..412232c719 100644 --- a/FreeRTOS/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemo/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemo/FreeRTOSConfig.h @@ -142,7 +142,7 @@ to exclude the API function. */ #define INCLUDE_pcTaskGetTaskName 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/PC/FreeRTOSConfig.h b/FreeRTOS/Demo/PC/FreeRTOSConfig.h index d54d064a5e..de3e1587ef 100644 --- a/FreeRTOS/Demo/PC/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/PC/FreeRTOSConfig.h @@ -115,7 +115,7 @@ to exclude the API function. */ #define INCLUDE_uxTaskGetStackHighWaterMark 0 /* Do not use this option on the PC port. */ /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/RX600_RX62N-RDK_GNURX/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/RX600_RX62N-RDK_GNURX/RTOSDemo/FreeRTOSConfig.h index 1ef2875876..64ae93d47c 100644 --- a/FreeRTOS/Demo/RX600_RX62N-RDK_GNURX/RTOSDemo/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/RX600_RX62N-RDK_GNURX/RTOSDemo/FreeRTOSConfig.h @@ -146,7 +146,7 @@ required to ensure flase positive timing errors are not reported. */ #define intqHIGHER_PRIORITY ( configMAX_PRIORITIES - 3 ) /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/RX600_RX62N-RDK_IAR/FreeRTOSConfig.h b/FreeRTOS/Demo/RX600_RX62N-RDK_IAR/FreeRTOSConfig.h index a253c73cc0..6bed81ea52 100644 --- a/FreeRTOS/Demo/RX600_RX62N-RDK_IAR/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/RX600_RX62N-RDK_IAR/FreeRTOSConfig.h @@ -143,7 +143,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetSchedulerState 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/FreeRTOSConfig.h index 7dc51b01f4..a901e4788a 100644 --- a/FreeRTOS/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/RX600_RX62N-RDK_Renesas/RTOSDemo/FreeRTOSConfig.h @@ -138,7 +138,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetSchedulerState 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/RX600_RX62N-RSK_GNURX/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/RX600_RX62N-RSK_GNURX/RTOSDemo/FreeRTOSConfig.h index 16c3de3626..fe4e7240e5 100644 --- a/FreeRTOS/Demo/RX600_RX62N-RSK_GNURX/RTOSDemo/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/RX600_RX62N-RSK_GNURX/RTOSDemo/FreeRTOSConfig.h @@ -133,7 +133,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetSchedulerState 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/RX600_RX62N-RSK_IAR/FreeRTOSConfig.h b/FreeRTOS/Demo/RX600_RX62N-RSK_IAR/FreeRTOSConfig.h index bd36e98dc3..a86d279823 100644 --- a/FreeRTOS/Demo/RX600_RX62N-RSK_IAR/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/RX600_RX62N-RSK_IAR/FreeRTOSConfig.h @@ -143,7 +143,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetSchedulerState 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/RX600_RX62N-RSK_Renesas/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/RX600_RX62N-RSK_Renesas/RTOSDemo/FreeRTOSConfig.h index 65fe636e20..7bbfed1fca 100644 --- a/FreeRTOS/Demo/RX600_RX62N-RSK_Renesas/RTOSDemo/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/RX600_RX62N-RSK_Renesas/RTOSDemo/FreeRTOSConfig.h @@ -138,7 +138,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetSchedulerState 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/RX600_RX63N-RDK_Renesas/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/RX600_RX63N-RDK_Renesas/RTOSDemo/FreeRTOSConfig.h index e8e4da7629..cc9283b748 100644 --- a/FreeRTOS/Demo/RX600_RX63N-RDK_Renesas/RTOSDemo/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/RX600_RX63N-RDK_Renesas/RTOSDemo/FreeRTOSConfig.h @@ -138,7 +138,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetSchedulerState 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/SuperH_SH7216_Renesas/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/SuperH_SH7216_Renesas/RTOSDemo/FreeRTOSConfig.h index a4be76134a..18cf852f60 100644 --- a/FreeRTOS/Demo/SuperH_SH7216_Renesas/RTOSDemo/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/SuperH_SH7216_Renesas/RTOSDemo/FreeRTOSConfig.h @@ -117,7 +117,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetSchedulerState 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/WizNET_DEMO_TERN_186/FreeRTOSConfig.h b/FreeRTOS/Demo/WizNET_DEMO_TERN_186/FreeRTOSConfig.h index c43e225ffb..e548a020aa 100644 --- a/FreeRTOS/Demo/WizNET_DEMO_TERN_186/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/WizNET_DEMO_TERN_186/FreeRTOSConfig.h @@ -106,7 +106,7 @@ to exclude the API function. */ #define INCLUDE_vTaskDelay 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/lwIP_AVR32_UC3/FreeRTOSConfig.h b/FreeRTOS/Demo/lwIP_AVR32_UC3/FreeRTOSConfig.h index c72deb2517..5fde17e2dc 100644 --- a/FreeRTOS/Demo/lwIP_AVR32_UC3/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/lwIP_AVR32_UC3/FreeRTOSConfig.h @@ -102,7 +102,7 @@ to exclude the API function. */ #define configHEAP_INIT 0 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/FreeRTOSConfig.h b/FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/FreeRTOSConfig.h index 753f3a6bee..c147ac4203 100644 --- a/FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/FreeRTOSConfig.h @@ -111,7 +111,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetCurrentTaskHandle 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/lwIP_MCF5235_GCC/FreeRTOSConfig.h b/FreeRTOS/Demo/lwIP_MCF5235_GCC/FreeRTOSConfig.h index c1cefd4741..adc35477d7 100644 --- a/FreeRTOS/Demo/lwIP_MCF5235_GCC/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/lwIP_MCF5235_GCC/FreeRTOSConfig.h @@ -95,7 +95,7 @@ to exclude the API function. */ #define INCLUDE_xTaskGetCurrentTaskHandle 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Demo/uIP_Demo_IAR_ARM7/FreeRTOSConfig.h b/FreeRTOS/Demo/uIP_Demo_IAR_ARM7/FreeRTOSConfig.h index e8c88504bf..ab7ed472b4 100644 --- a/FreeRTOS/Demo/uIP_Demo_IAR_ARM7/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/uIP_Demo_IAR_ARM7/FreeRTOSConfig.h @@ -110,7 +110,7 @@ to exclude the API function. */ #define INCLUDE_vTaskDelay 1 /* This demo makes use of one or more example stats formatting functions. These -format the raw data provided by the xTaskGetSystemState() function in to human +format the raw data provided by the uxTaskGetSystemState() function in to human readable ASCII form. See the notes in the implementation of vTaskList() within FreeRTOS/Source/tasks.c for limitations. */ #define configUSE_STATS_FORMATTING_FUNCTIONS 1 diff --git a/FreeRTOS/Source/include/mpu_wrappers.h b/FreeRTOS/Source/include/mpu_wrappers.h index dcc1f3bc83..1a556f0349 100644 --- a/FreeRTOS/Source/include/mpu_wrappers.h +++ b/FreeRTOS/Source/include/mpu_wrappers.h @@ -98,7 +98,7 @@ only for ports that are using the MPU. */ #define xTaskGetCurrentTaskHandle MPU_xTaskGetCurrentTaskHandle #define xTaskGetSchedulerState MPU_xTaskGetSchedulerState #define xTaskGetIdleTaskHandle MPU_xTaskGetIdleTaskHandle - #define xTaskGetSystemState MPU_xTaskGetSystemState + #define uxTaskGetSystemState MPU_uxTaskGetSystemState #define xQueueGenericCreate MPU_xQueueGenericCreate #define xQueueCreateMutex MPU_xQueueCreateMutex diff --git a/FreeRTOS/Source/include/task.h b/FreeRTOS/Source/include/task.h index ee74210683..3e5a5dcb11 100644 --- a/FreeRTOS/Source/include/task.h +++ b/FreeRTOS/Source/include/task.h @@ -137,16 +137,16 @@ typedef struct xTASK_PARAMTERS xMemoryRegion xRegions[ portNUM_CONFIGURABLE_REGIONS ]; } xTaskParameters; -/* Used with the xTaskGetSystemState() function to return the state of each task +/* Used with the uxTaskGetSystemState() function to return the state of each task in the system. */ typedef struct xTASK_STATUS { xTaskHandle xHandle; /* The handle of the task to which the rest of the information in the structure relates. */ - const signed char *pcTaskName; /* A pointer to the task's name. This valid will be invalid if the task was deleted since the structure was populated! */ + const signed char *pcTaskName; /* A pointer to the task's name. This value will be invalid if the task was deleted since the structure was populated! */ unsigned portBASE_TYPE xTaskNumber; /* A number unique to the task. */ eTaskState eCurrentState; /* The state in which the task existed when the structure was populated. */ unsigned portBASE_TYPE uxCurrentPriority; /* The priority at which the task was running (may be inherited) when the structure was populated. */ - unsigned portBASE_TYPE uxBasePriority; /* The priority to which the task will return if the task's current priority has been inherited to avoid unbounded priority inversion when obtaining a mutex. Only valid is configUSE_MUTEXES is defined as 1 in FreeRTOSConfig.h. */ + unsigned portBASE_TYPE uxBasePriority; /* The priority to which the task will return if the task's current priority has been inherited to avoid unbounded priority inversion when obtaining a mutex. Only valid if configUSE_MUTEXES is defined as 1 in FreeRTOSConfig.h. */ unsigned long ulRunTimeCounter; /* The total run time allocated to the task so far, as defined by the run time stats clock. See http://www.freertos.org/rtos-run-time-stats.html. Only valid when configGENERATE_RUN_TIME_STATS is defined as 1 in FreeRTOSConfig.h. */ unsigned short usStackHighWaterMark; /* The minimum amount of stack space that has remained for the task since the task was created. The closer this value is to zero the closer the task has come to overflowing its stack. */ } xTaskStatusType; @@ -1145,9 +1145,9 @@ xTaskHandle xTaskGetIdleTaskHandle( void ); /** * configUSE_TRACE_FACILITY must bet defined as 1 in FreeRTOSConfig.h for - * xTaskGetSystemState() to be available. + * uxTaskGetSystemState() to be available. * - * xTaskGetSystemState() populates an xTaskStatusType structure for each task in + * uxTaskGetSystemState() populates an xTaskStatusType structure for each task in * the system. xTaskStatusType structures contain, among other things, members * for the task handle, task name, task priority, task state, and total amount * of run time consumed by the task. See the xTaskStatusType structure @@ -1157,29 +1157,30 @@ xTaskHandle xTaskGetIdleTaskHandle( void ); * the scheduler remaining suspended for an extended period. * * @param pxTaskStatusArray A pointer to an array of xTaskStatusType structures. - * The array contain at least one xTaskStatusType structure for each task that - * is under the control of the RTOS. The number of tasks under the control of - * the RTOS can be determined using the uxTaskGetNumberOfTasks() API function. + * The array must contain at least one xTaskStatusType structure for each task + * that is under the control of the RTOS. The number of tasks under the control + * of the RTOS can be determined using the uxTaskGetNumberOfTasks() API function. * * @param uxArraySize The size of the array pointed to by the pxTaskStatusArray * parameter. The size is specified as the number of indexes in the array, or * the number of xTaskStatusType structures contained in the array, not by the * number of bytes in the array. * - * @param pultotalRunTime If configGENERATE_RUN_TIME_STATS is set to 1 in - * FreeRTOSConfig.h then *pulTotalRunTime is set by xTaskGetSystemState() to the + * @param pulTotalRunTime If configGENERATE_RUN_TIME_STATS is set to 1 in + * FreeRTOSConfig.h then *pulTotalRunTime is set by uxTaskGetSystemState() to the * total run time (as defined by the run time stats clock, see * http://www.freertos.org/rtos-run-time-stats.html) since the target booted. + * pulTotalRunTime can be set to NULL to omit the total run time information. * * @return The number of xTaskStatusType structures that were populated by - * xTaskGetSystemState(). This should equal the number returned by the + * uxTaskGetSystemState(). This should equal the number returned by the * uxTaskGetNumberOfTasks() API function, but will be zero if the value passed * in the uxArraySize parameter was too small. * * Example usage: 
     // This example demonstrates how a human readable table of run time stats
-	// information is generated from raw data provided by xTaskGetSystemState().
+	// information is generated from raw data provided by uxTaskGetSystemState().
 	// The human readable table is written to pcWriteBuffer
 	void vTaskGetRunTimeStats( signed char *pcWriteBuffer )
 	{
@@ -1192,7 +1193,7 @@ xTaskHandle xTaskGetIdleTaskHandle( void );
 
 		// Take a snapshot of the number of tasks in case it changes while this
 		// function is executing.
-		uxArraySize = uxCurrentNumberOfTasks;
+		uxArraySize = uxCurrentNumberOfTasks();
 
 		// Allocate a xTaskStatusType structure for each task.  An array could be
 		// allocated statically at compile time.
@@ -1201,7 +1202,7 @@ xTaskHandle xTaskGetIdleTaskHandle( void );
 		if( pxTaskStatusArray != NULL )
 		{
 			// Generate raw status information about each task.
-			uxArraySize = xTaskGetSystemState( pxTaskStatusArray, uxArraySize, &ulTotalRunTime );
+			uxArraySize = uxTaskGetSystemState( pxTaskStatusArray, uxArraySize, &ulTotalRunTime );
 
 			// For percentage calculations.
 			ulTotalRunTime /= 100UL;
@@ -1239,7 +1240,7 @@ xTaskHandle xTaskGetIdleTaskHandle( void );
 	}
*/ -unsigned portBASE_TYPE xTaskGetSystemState( xTaskStatusType *pxTaskStatusArray, unsigned portBASE_TYPE uxArraySize, unsigned long *pulTotalRunTime ); +unsigned portBASE_TYPE uxTaskGetSystemState( xTaskStatusType *pxTaskStatusArray, unsigned portBASE_TYPE uxArraySize, unsigned long *pulTotalRunTime ); /** * task. h @@ -1263,8 +1264,8 @@ unsigned portBASE_TYPE xTaskGetSystemState( xTaskStatusType *pxTaskStatusArray, * This function is provided for convenience only, and is used by many of the * demo applications. Do not consider it to be part of the scheduler. * - * vTaskList() calls xTaskGetSystemState(), then formats part of the - * xTaskGetSystemState() output into a human readable table that displays task + * vTaskList() calls uxTaskGetSystemState(), then formats part of the + * uxTaskGetSystemState() output into a human readable table that displays task * names, states and stack usage. * * vTaskList() has a dependency on the sprintf() C library function that might @@ -1274,7 +1275,7 @@ unsigned portBASE_TYPE xTaskGetSystemState( xTaskStatusType *pxTaskStatusArray, * FreeRTOS/Demo sub-directories in a file called printf-stdarg.c (note * printf-stdarg.c does not provide a full snprintf() implementation!). * - * It is recommended that production systems call xTaskGetSystemState() + * It is recommended that production systems call uxTaskGetSystemState() * directly to get access to raw stats data, rather than indirectly through a * call to vTaskList(). * @@ -1316,8 +1317,8 @@ void vTaskList( signed char *pcWriteBuffer ) PRIVILEGED_FUNCTION; * This function is provided for convenience only, and is used by many of the * demo applications. Do not consider it to be part of the scheduler. * - * vTaskGetRunTimeStats() calls xTaskGetSystemState(), then formats part of the - * xTaskGetSystemState() output into a human readable table that displays the + * vTaskGetRunTimeStats() calls uxTaskGetSystemState(), then formats part of the + * uxTaskGetSystemState() output into a human readable table that displays the * amount of time each task has spent in the Running state in both absolute and * percentage terms. * @@ -1328,7 +1329,7 @@ void vTaskList( signed char *pcWriteBuffer ) PRIVILEGED_FUNCTION; * FreeRTOS/Demo sub-directories in a file called printf-stdarg.c (note * printf-stdarg.c does not provide a full snprintf() implementation!). * - * It is recommended that production systems call xTaskGetSystemState() directly + * It is recommended that production systems call uxTaskGetSystemState() directly * to get access to raw stats data, rather than indirectly through a call to * vTaskGetRunTimeStats(). * diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c index 748b67b2d1..651a1111af 100644 --- a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c +++ b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c @@ -193,7 +193,7 @@ unsigned portBASE_TYPE MPU_uxTaskGetStackHighWaterMark( xTaskHandle xTask ); xTaskHandle MPU_xTaskGetCurrentTaskHandle( void ); portBASE_TYPE MPU_xTaskGetSchedulerState( void ); xTaskHandle MPU_xTaskGetIdleTaskHandle( void ); -unsigned portBASE_TYPE MPU_xTaskGetSystemState( xTaskStatusType *pxTaskStatusArray, unsigned portBASE_TYPE uxArraySize, unsigned long *pulTotalRunTime ); +unsigned portBASE_TYPE MPU_uxTaskGetSystemState( xTaskStatusType *pxTaskStatusArray, unsigned portBASE_TYPE uxArraySize, unsigned long *pulTotalRunTime ); xQueueHandle MPU_xQueueGenericCreate( unsigned portBASE_TYPE uxQueueLength, unsigned portBASE_TYPE uxItemSize, unsigned char ucQueueType ); signed portBASE_TYPE MPU_xQueueGenericSend( xQueueHandle xQueue, const void * const pvItemToQueue, portTickType xTicksToWait, portBASE_TYPE xCopyPosition ); portBASE_TYPE MPU_xQueueGenericReset( xQueueHandle pxQueue, portBASE_TYPE xNewQueue ); @@ -910,12 +910,12 @@ portBASE_TYPE xRunningPrivileged = prvRaisePrivilege(); /*-----------------------------------------------------------*/ #if ( configUSE_TRACE_FACILITY == 1 ) - unsigned portBASE_TYPE MPU_xTaskGetSystemState( xTaskStatusType *pxTaskStatusArray, unsigned portBASE_TYPE uxArraySize, unsigned long *pulTotalRunTime ) + unsigned portBASE_TYPE MPU_uxTaskGetSystemState( xTaskStatusType *pxTaskStatusArray, unsigned portBASE_TYPE uxArraySize, unsigned long *pulTotalRunTime ) { unsigned portBASE_TYPE uxReturn; portBASE_TYPE xRunningPrivileged = prvRaisePrivilege(); - uxReturn = xTaskGetSystemState( pxTaskStatusArray, uxArraySize, pulTotalRunTime ); + uxReturn = uxTaskGetSystemState( pxTaskStatusArray, uxArraySize, pulTotalRunTime ); portRESET_PRIVILEGE( xRunningPrivileged ); return xReturn; } diff --git a/FreeRTOS/Source/portable/MemMang/heap_2.c b/FreeRTOS/Source/portable/MemMang/heap_2.c index e2c6c7f68d..cb119e6e7f 100644 --- a/FreeRTOS/Source/portable/MemMang/heap_2.c +++ b/FreeRTOS/Source/portable/MemMang/heap_2.c @@ -66,7 +66,7 @@ * A sample implementation of pvPortMalloc() and vPortFree() that permits * allocated blocks to be freed, but does not combine adjacent free blocks * into a single larger block (and so will fragment memory). See heap_4.c for - * an aquivalent that does combine adjacent blocks into single larger blocks. + * an equivalent that does combine adjacent blocks into single larger blocks. * * See heap_1.c, heap_3.c and heap_4.c for alternative implementations, and the * memory management pages of http://www.FreeRTOS.org for more information. diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c index 1c37c85bdc..1b873e77d9 100644 --- a/FreeRTOS/Source/tasks.c +++ b/FreeRTOS/Source/tasks.c @@ -86,7 +86,7 @@ privileged Vs unprivileged linkage and placement. */ #if ( ( configGENERATE_RUN_TIME_STATS == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS == 1 ) ) /* At the bottom of this file are two optional functions that can be used to generate human readable text from the raw data generated by the - xTaskGetSystemState() function. Note the formatting functions are provided + uxTaskGetSystemState() function. Note the formatting functions are provided for convenience only, and are NOT considered part of the kernel. */ #include #endif /* ( ( configGENERATE_RUN_TIME_STATS == 1 ) && ( configUSE_STATS_FORMATTING_FUNCTIONS == 1 ) ) */ @@ -1472,7 +1472,7 @@ unsigned portBASE_TYPE uxTaskGetNumberOfTasks( void ) #if ( configUSE_TRACE_FACILITY == 1 ) - unsigned portBASE_TYPE xTaskGetSystemState( xTaskStatusType *pxTaskStatusArray, unsigned portBASE_TYPE uxArraySize, unsigned long *pulTotalRunTime ) + unsigned portBASE_TYPE uxTaskGetSystemState( xTaskStatusType *pxTaskStatusArray, unsigned portBASE_TYPE uxArraySize, unsigned long *pulTotalRunTime ) { unsigned portBASE_TYPE uxTask = 0, uxQueue = configMAX_PRIORITIES; @@ -2755,8 +2755,8 @@ tskTCB *pxNewTCB; * of the demo applications. Do not consider it to be part of the * scheduler. * - * vTaskList() calls xTaskGetSystemState(), then formats part of the - * xTaskGetSystemState() output into a human readable table that + * vTaskList() calls uxTaskGetSystemState(), then formats part of the + * uxTaskGetSystemState() output into a human readable table that * displays task names, states and stack usage. * * vTaskList() has a dependency on the sprintf() C library function that @@ -2767,7 +2767,7 @@ tskTCB *pxNewTCB; * printf-stdarg.c (note printf-stdarg.c does not provide a full * snprintf() implementation!). * - * It is recommended that production systems call xTaskGetSystemState() + * It is recommended that production systems call uxTaskGetSystemState() * directly to get access to raw stats data, rather than indirectly * through a call to vTaskList(). */ @@ -2786,7 +2786,7 @@ tskTCB *pxNewTCB; if( pxTaskStatusArray != NULL ) { /* Generate the (binary) data. */ - uxArraySize = xTaskGetSystemState( pxTaskStatusArray, uxArraySize, NULL ); + uxArraySize = uxTaskGetSystemState( pxTaskStatusArray, uxArraySize, NULL ); /* Create a human readable table from the binary data. */ for( x = 0; x < uxArraySize; x++ ) @@ -2838,8 +2838,8 @@ tskTCB *pxNewTCB; * of the demo applications. Do not consider it to be part of the * scheduler. * - * vTaskGetRunTimeStats() calls xTaskGetSystemState(), then formats part - * of the xTaskGetSystemState() output into a human readable table that + * vTaskGetRunTimeStats() calls uxTaskGetSystemState(), then formats part + * of the uxTaskGetSystemState() output into a human readable table that * displays the amount of time each task has spent in the Running state * in both absolute and percentage terms. * @@ -2851,7 +2851,7 @@ tskTCB *pxNewTCB; * a file called printf-stdarg.c (note printf-stdarg.c does not provide * a full snprintf() implementation!). * - * It is recommended that production systems call xTaskGetSystemState() + * It is recommended that production systems call uxTaskGetSystemState() * directly to get access to raw stats data, rather than indirectly * through a call to vTaskGetRunTimeStats(). */ @@ -2869,7 +2869,7 @@ tskTCB *pxNewTCB; if( pxTaskStatusArray != NULL ) { /* Generate the (binary) data. */ - uxArraySize = xTaskGetSystemState( pxTaskStatusArray, uxArraySize, &ulTotalTime ); + uxArraySize = uxTaskGetSystemState( pxTaskStatusArray, uxArraySize, &ulTotalTime ); /* For percentage calculations. */ ulTotalTime /= 100UL;