From a0dd596821b8e784a12882d2d1b1d7ec10c13419 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Sat, 9 Jun 2007 15:08:43 +0000 Subject: [PATCH] Update in preparation for the V4.3.1 release. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@91 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- Demo/AVR32_UC3/main.c | 2 +- Demo/AVR_ATMega323_IAR/FreeRTOSConfig.h | 2 +- Demo/AVR_ATMega323_IAR/ParTest/ParTest.c | 2 +- Demo/AVR_ATMega323_IAR/main.c | 2 +- Demo/AVR_ATMega323_IAR/regtest.c | 2 +- Demo/AVR_ATMega323_IAR/regtest.h | 2 +- Demo/AVR_ATMega323_IAR/serial/serial.c | 2 +- Demo/AVR_ATMega323_WinAVR/FreeRTOSConfig.h | 2 +- Demo/AVR_ATMega323_WinAVR/ParTest/ParTest.c | 2 +- Demo/AVR_ATMega323_WinAVR/main.c | 2 +- Demo/AVR_ATMega323_WinAVR/regtest.c | 2 +- Demo/AVR_ATMega323_WinAVR/regtest.h | 2 +- Demo/AVR_ATMega323_WinAVR/serial/serial.c | 2 +- .../CORTEX_LM3S102_GCC/Demo1/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S102_GCC/Demo1/main.c | 2 +- .../CORTEX_LM3S102_GCC/Demo2/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S102_GCC/Demo2/main.c | 2 +- Demo/CORTEX_LM3S102_GCC/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S102_GCC/ParTest/ParTest.c | 2 +- Demo/CORTEX_LM3S102_GCC/main.c | 2 +- .../Demo1/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S102_KEIL/Demo1/main.c | 2 +- .../Demo2/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S102_KEIL/Demo2/main.c | 2 +- Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S102_KEIL/ParTest/ParTest.c | 2 +- Demo/CORTEX_LM3S102_KEIL/main.c | 2 +- .../Demo1/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S102_Rowley/Demo1/ParTest.c | 2 +- Demo/CORTEX_LM3S102_Rowley/Demo1/main.c | 2 +- .../Demo2/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S102_Rowley/Demo2/ParTest.c | 2 +- Demo/CORTEX_LM3S102_Rowley/Demo2/main.c | 2 +- .../Demo3/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S102_Rowley/Demo3/ParTest.c | 2 +- Demo/CORTEX_LM3S102_Rowley/Demo3/main.c | 2 +- Demo/CORTEX_LM3S2965_GCC/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S2965_GCC/ParTest/ParTest.c | 2 +- Demo/CORTEX_LM3S2965_GCC/main.c | 2 +- Demo/CORTEX_LM3S2965_GCC/timertest.c | 2 +- Demo/CORTEX_LM3S2965_IAR/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S2965_IAR/ParTest/ParTest.c | 2 +- Demo/CORTEX_LM3S2965_IAR/main.c | 2 +- Demo/CORTEX_LM3S2965_IAR/timertest.c | 2 +- Demo/CORTEX_LM3S2965_KEIL/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S2965_KEIL/ParTest/ParTest.c | 2 +- Demo/CORTEX_LM3S2965_KEIL/main.c | 2 +- Demo/CORTEX_LM3S2965_KEIL/timertest.c | 2 +- Demo/CORTEX_LM3S316_IAR/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S316_IAR/ParTest/ParTest.c | 2 +- Demo/CORTEX_LM3S316_IAR/commstest.c | 2 +- Demo/CORTEX_LM3S316_IAR/commstest.h | 2 +- Demo/CORTEX_LM3S316_IAR/main.c | 2 +- Demo/CORTEX_LM3S6965_GCC/FreeRTOSConfig.h | 2 +- .../LuminaryDrivers/ustdlib.c | 244 +++++++++++------- .../LuminaryDrivers/ustdlib.h | 14 +- Demo/CORTEX_LM3S6965_GCC/ParTest/ParTest.c | 2 +- Demo/CORTEX_LM3S6965_GCC/main.c | 2 +- Demo/CORTEX_LM3S6965_GCC/timertest.c | 2 +- Demo/CORTEX_LM3S6965_GCC/webserver/emac.c | 2 +- Demo/CORTEX_LM3S6965_GCC/webserver/uIP_Task.c | 2 +- Demo/CORTEX_LM3S6965_IAR/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S6965_IAR/ParTest/ParTest.c | 2 +- Demo/CORTEX_LM3S6965_IAR/main.c | 2 +- Demo/CORTEX_LM3S6965_IAR/timertest.c | 2 +- Demo/CORTEX_LM3S6965_IAR/webserver/emac.c | 2 +- Demo/CORTEX_LM3S6965_IAR/webserver/uIP_Task.c | 2 +- Demo/CORTEX_LM3S6965_KEIL/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S6965_KEIL/ParTest/ParTest.c | 2 +- Demo/CORTEX_LM3S6965_KEIL/main.c | 2 +- Demo/CORTEX_LM3S6965_KEIL/timertest.c | 2 +- Demo/CORTEX_LM3S6965_KEIL/webserver/emac.c | 2 +- .../CORTEX_LM3S6965_KEIL/webserver/uIP_Task.c | 2 +- Demo/CORTEX_LM3S811_GCC/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S811_GCC/main.c | 2 +- Demo/CORTEX_LM3S811_IAR/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S811_IAR/main.c | 2 +- Demo/CORTEX_LM3S811_KEIL/FreeRTOSConfig.h | 2 +- Demo/CORTEX_LM3S811_KEIL/heap/heap_1.c | 2 +- Demo/CORTEX_LM3S811_KEIL/main.c | 2 +- Demo/Common/Full/BlockQ.c | 2 +- Demo/Common/Full/PollQ.c | 2 +- Demo/Common/Full/comtest.c | 2 +- Demo/Common/Full/death.c | 2 +- Demo/Common/Full/dynamic.c | 2 +- Demo/Common/Full/events.c | 2 +- Demo/Common/Full/flash.c | 2 +- Demo/Common/Full/flop.c | 2 +- Demo/Common/Full/integer.c | 2 +- Demo/Common/Full/print.c | 2 +- Demo/Common/Full/semtest.c | 2 +- Demo/Common/Minimal/BlockQ.c | 2 +- Demo/Common/Minimal/PollQ.c | 2 +- Demo/Common/Minimal/blocktim.c | 39 +-- Demo/Common/Minimal/comtest.c | 2 +- Demo/Common/Minimal/crflash.c | 2 +- Demo/Common/Minimal/crhook.c | 2 +- Demo/Common/Minimal/death.c | 2 +- Demo/Common/Minimal/dynamic.c | 2 +- Demo/Common/Minimal/flash.c | 2 +- Demo/Common/Minimal/flop.c | 2 +- Demo/Common/Minimal/integer.c | 2 +- Demo/Common/Minimal/semtest.c | 2 +- Demo/Common/include/BlockQ.h | 2 +- Demo/Common/include/PollQ.h | 2 +- Demo/Common/include/blocktim.h | 2 +- Demo/Common/include/comtest.h | 2 +- Demo/Common/include/comtest2.h | 2 +- Demo/Common/include/crflash.h | 2 +- Demo/Common/include/crhook.h | 2 +- Demo/Common/include/death.h | 2 +- Demo/Common/include/dynamic.h | 2 +- Demo/Common/include/fileIO.h | 2 +- Demo/Common/include/flash.h | 2 +- Demo/Common/include/flop.h | 2 +- Demo/Common/include/integer.h | 2 +- Demo/Common/include/mevents.h | 2 +- Demo/Common/include/partest.h | 2 +- Demo/Common/include/print.h | 2 +- Demo/Common/include/semtest.h | 2 +- Demo/Common/include/serial.h | 2 +- 121 files changed, 294 insertions(+), 239 deletions(-) diff --git a/Demo/AVR32_UC3/main.c b/Demo/AVR32_UC3/main.c index 78ba4dedd..7556a9b5c 100644 --- a/Demo/AVR32_UC3/main.c +++ b/Demo/AVR32_UC3/main.c @@ -32,7 +32,7 @@ *****************************************************************************/ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/AVR_ATMega323_IAR/FreeRTOSConfig.h b/Demo/AVR_ATMega323_IAR/FreeRTOSConfig.h index 10ea3077e..9ca9c0873 100644 --- a/Demo/AVR_ATMega323_IAR/FreeRTOSConfig.h +++ b/Demo/AVR_ATMega323_IAR/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/AVR_ATMega323_IAR/ParTest/ParTest.c b/Demo/AVR_ATMega323_IAR/ParTest/ParTest.c index b5e1fdfed..631753ac7 100644 --- a/Demo/AVR_ATMega323_IAR/ParTest/ParTest.c +++ b/Demo/AVR_ATMega323_IAR/ParTest/ParTest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/AVR_ATMega323_IAR/main.c b/Demo/AVR_ATMega323_IAR/main.c index 75a8d781a..5eca0af68 100644 --- a/Demo/AVR_ATMega323_IAR/main.c +++ b/Demo/AVR_ATMega323_IAR/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/AVR_ATMega323_IAR/regtest.c b/Demo/AVR_ATMega323_IAR/regtest.c index f239cf648..665a8baee 100644 --- a/Demo/AVR_ATMega323_IAR/regtest.c +++ b/Demo/AVR_ATMega323_IAR/regtest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/AVR_ATMega323_IAR/regtest.h b/Demo/AVR_ATMega323_IAR/regtest.h index d76fa5760..612bdd601 100644 --- a/Demo/AVR_ATMega323_IAR/regtest.h +++ b/Demo/AVR_ATMega323_IAR/regtest.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/AVR_ATMega323_IAR/serial/serial.c b/Demo/AVR_ATMega323_IAR/serial/serial.c index 95e5314fb..57be66818 100644 --- a/Demo/AVR_ATMega323_IAR/serial/serial.c +++ b/Demo/AVR_ATMega323_IAR/serial/serial.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/AVR_ATMega323_WinAVR/FreeRTOSConfig.h b/Demo/AVR_ATMega323_WinAVR/FreeRTOSConfig.h index 90beb121c..055875a52 100644 --- a/Demo/AVR_ATMega323_WinAVR/FreeRTOSConfig.h +++ b/Demo/AVR_ATMega323_WinAVR/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/AVR_ATMega323_WinAVR/ParTest/ParTest.c b/Demo/AVR_ATMega323_WinAVR/ParTest/ParTest.c index b5e1fdfed..631753ac7 100644 --- a/Demo/AVR_ATMega323_WinAVR/ParTest/ParTest.c +++ b/Demo/AVR_ATMega323_WinAVR/ParTest/ParTest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/AVR_ATMega323_WinAVR/main.c b/Demo/AVR_ATMega323_WinAVR/main.c index 0a37c1816..de798ccd7 100644 --- a/Demo/AVR_ATMega323_WinAVR/main.c +++ b/Demo/AVR_ATMega323_WinAVR/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/AVR_ATMega323_WinAVR/regtest.c b/Demo/AVR_ATMega323_WinAVR/regtest.c index f239cf648..665a8baee 100644 --- a/Demo/AVR_ATMega323_WinAVR/regtest.c +++ b/Demo/AVR_ATMega323_WinAVR/regtest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/AVR_ATMega323_WinAVR/regtest.h b/Demo/AVR_ATMega323_WinAVR/regtest.h index d76fa5760..612bdd601 100644 --- a/Demo/AVR_ATMega323_WinAVR/regtest.h +++ b/Demo/AVR_ATMega323_WinAVR/regtest.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/AVR_ATMega323_WinAVR/serial/serial.c b/Demo/AVR_ATMega323_WinAVR/serial/serial.c index e36b024e3..e7de973b5 100644 --- a/Demo/AVR_ATMega323_WinAVR/serial/serial.c +++ b/Demo/AVR_ATMega323_WinAVR/serial/serial.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_GCC/Demo1/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_GCC/Demo1/FreeRTOSConfig.h index 991986e18..b2a091d7a 100644 --- a/Demo/CORTEX_LM3S102_GCC/Demo1/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S102_GCC/Demo1/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_GCC/Demo1/main.c b/Demo/CORTEX_LM3S102_GCC/Demo1/main.c index 679ade92c..43148b1db 100644 --- a/Demo/CORTEX_LM3S102_GCC/Demo1/main.c +++ b/Demo/CORTEX_LM3S102_GCC/Demo1/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_GCC/Demo2/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_GCC/Demo2/FreeRTOSConfig.h index cc95fab39..d0e4def97 100644 --- a/Demo/CORTEX_LM3S102_GCC/Demo2/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S102_GCC/Demo2/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_GCC/Demo2/main.c b/Demo/CORTEX_LM3S102_GCC/Demo2/main.c index 625313f34..2b7387afe 100644 --- a/Demo/CORTEX_LM3S102_GCC/Demo2/main.c +++ b/Demo/CORTEX_LM3S102_GCC/Demo2/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_GCC/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_GCC/FreeRTOSConfig.h index 991986e18..b2a091d7a 100644 --- a/Demo/CORTEX_LM3S102_GCC/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S102_GCC/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_GCC/ParTest/ParTest.c b/Demo/CORTEX_LM3S102_GCC/ParTest/ParTest.c index 277445c58..6d0197e28 100644 --- a/Demo/CORTEX_LM3S102_GCC/ParTest/ParTest.c +++ b/Demo/CORTEX_LM3S102_GCC/ParTest/ParTest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_GCC/main.c b/Demo/CORTEX_LM3S102_GCC/main.c index 679ade92c..43148b1db 100644 --- a/Demo/CORTEX_LM3S102_GCC/main.c +++ b/Demo/CORTEX_LM3S102_GCC/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_KEIL/Demo1/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_KEIL/Demo1/FreeRTOSConfig.h index 991986e18..b2a091d7a 100644 --- a/Demo/CORTEX_LM3S102_KEIL/Demo1/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S102_KEIL/Demo1/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c b/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c index 1fd87078b..647b92a58 100644 --- a/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c +++ b/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_KEIL/Demo2/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_KEIL/Demo2/FreeRTOSConfig.h index cc95fab39..d0e4def97 100644 --- a/Demo/CORTEX_LM3S102_KEIL/Demo2/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S102_KEIL/Demo2/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_KEIL/Demo2/main.c b/Demo/CORTEX_LM3S102_KEIL/Demo2/main.c index 5508cf030..74819e76f 100644 --- a/Demo/CORTEX_LM3S102_KEIL/Demo2/main.c +++ b/Demo/CORTEX_LM3S102_KEIL/Demo2/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h index 991986e18..b2a091d7a 100644 --- a/Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_KEIL/ParTest/ParTest.c b/Demo/CORTEX_LM3S102_KEIL/ParTest/ParTest.c index 277445c58..6d0197e28 100644 --- a/Demo/CORTEX_LM3S102_KEIL/ParTest/ParTest.c +++ b/Demo/CORTEX_LM3S102_KEIL/ParTest/ParTest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_KEIL/main.c b/Demo/CORTEX_LM3S102_KEIL/main.c index 1fd87078b..647b92a58 100644 --- a/Demo/CORTEX_LM3S102_KEIL/main.c +++ b/Demo/CORTEX_LM3S102_KEIL/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo1/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_Rowley/Demo1/FreeRTOSConfig.h index 991986e18..b2a091d7a 100644 --- a/Demo/CORTEX_LM3S102_Rowley/Demo1/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S102_Rowley/Demo1/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo1/ParTest.c b/Demo/CORTEX_LM3S102_Rowley/Demo1/ParTest.c index 277445c58..6d0197e28 100644 --- a/Demo/CORTEX_LM3S102_Rowley/Demo1/ParTest.c +++ b/Demo/CORTEX_LM3S102_Rowley/Demo1/ParTest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c b/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c index fab374ab7..a2c5b783b 100644 --- a/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c +++ b/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo2/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_Rowley/Demo2/FreeRTOSConfig.h index cc95fab39..d0e4def97 100644 --- a/Demo/CORTEX_LM3S102_Rowley/Demo2/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S102_Rowley/Demo2/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo2/ParTest.c b/Demo/CORTEX_LM3S102_Rowley/Demo2/ParTest.c index 277445c58..6d0197e28 100644 --- a/Demo/CORTEX_LM3S102_Rowley/Demo2/ParTest.c +++ b/Demo/CORTEX_LM3S102_Rowley/Demo2/ParTest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo2/main.c b/Demo/CORTEX_LM3S102_Rowley/Demo2/main.c index c1030309b..17cbe38d8 100644 --- a/Demo/CORTEX_LM3S102_Rowley/Demo2/main.c +++ b/Demo/CORTEX_LM3S102_Rowley/Demo2/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo3/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_Rowley/Demo3/FreeRTOSConfig.h index 5fa9d7dbf..a21fafe34 100644 --- a/Demo/CORTEX_LM3S102_Rowley/Demo3/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S102_Rowley/Demo3/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo3/ParTest.c b/Demo/CORTEX_LM3S102_Rowley/Demo3/ParTest.c index 0ece4651c..1d1ac56c6 100644 --- a/Demo/CORTEX_LM3S102_Rowley/Demo3/ParTest.c +++ b/Demo/CORTEX_LM3S102_Rowley/Demo3/ParTest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c b/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c index 64712377c..c0d2a322c 100644 --- a/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c +++ b/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S2965_GCC/FreeRTOSConfig.h b/Demo/CORTEX_LM3S2965_GCC/FreeRTOSConfig.h index e41bcd6a6..816f431e1 100644 --- a/Demo/CORTEX_LM3S2965_GCC/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S2965_GCC/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S2965_GCC/ParTest/ParTest.c b/Demo/CORTEX_LM3S2965_GCC/ParTest/ParTest.c index f16ae6291..48c35a523 100644 --- a/Demo/CORTEX_LM3S2965_GCC/ParTest/ParTest.c +++ b/Demo/CORTEX_LM3S2965_GCC/ParTest/ParTest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S2965_GCC/main.c b/Demo/CORTEX_LM3S2965_GCC/main.c index 9a0216cd2..af55f6932 100644 --- a/Demo/CORTEX_LM3S2965_GCC/main.c +++ b/Demo/CORTEX_LM3S2965_GCC/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S2965_GCC/timertest.c b/Demo/CORTEX_LM3S2965_GCC/timertest.c index 2eddbfcda..f73f935c1 100644 --- a/Demo/CORTEX_LM3S2965_GCC/timertest.c +++ b/Demo/CORTEX_LM3S2965_GCC/timertest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S2965_IAR/FreeRTOSConfig.h b/Demo/CORTEX_LM3S2965_IAR/FreeRTOSConfig.h index d17c161ba..b8c57065c 100644 --- a/Demo/CORTEX_LM3S2965_IAR/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S2965_IAR/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S2965_IAR/ParTest/ParTest.c b/Demo/CORTEX_LM3S2965_IAR/ParTest/ParTest.c index f16ae6291..48c35a523 100644 --- a/Demo/CORTEX_LM3S2965_IAR/ParTest/ParTest.c +++ b/Demo/CORTEX_LM3S2965_IAR/ParTest/ParTest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S2965_IAR/main.c b/Demo/CORTEX_LM3S2965_IAR/main.c index e73d68f5e..81c5b6b3b 100644 --- a/Demo/CORTEX_LM3S2965_IAR/main.c +++ b/Demo/CORTEX_LM3S2965_IAR/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S2965_IAR/timertest.c b/Demo/CORTEX_LM3S2965_IAR/timertest.c index 2eddbfcda..f73f935c1 100644 --- a/Demo/CORTEX_LM3S2965_IAR/timertest.c +++ b/Demo/CORTEX_LM3S2965_IAR/timertest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S2965_KEIL/FreeRTOSConfig.h b/Demo/CORTEX_LM3S2965_KEIL/FreeRTOSConfig.h index e41bcd6a6..816f431e1 100644 --- a/Demo/CORTEX_LM3S2965_KEIL/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S2965_KEIL/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S2965_KEIL/ParTest/ParTest.c b/Demo/CORTEX_LM3S2965_KEIL/ParTest/ParTest.c index f16ae6291..48c35a523 100644 --- a/Demo/CORTEX_LM3S2965_KEIL/ParTest/ParTest.c +++ b/Demo/CORTEX_LM3S2965_KEIL/ParTest/ParTest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S2965_KEIL/main.c b/Demo/CORTEX_LM3S2965_KEIL/main.c index 9a0216cd2..af55f6932 100644 --- a/Demo/CORTEX_LM3S2965_KEIL/main.c +++ b/Demo/CORTEX_LM3S2965_KEIL/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S2965_KEIL/timertest.c b/Demo/CORTEX_LM3S2965_KEIL/timertest.c index 2eddbfcda..f73f935c1 100644 --- a/Demo/CORTEX_LM3S2965_KEIL/timertest.c +++ b/Demo/CORTEX_LM3S2965_KEIL/timertest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S316_IAR/FreeRTOSConfig.h b/Demo/CORTEX_LM3S316_IAR/FreeRTOSConfig.h index 67e0427ea..b5740d0b4 100644 --- a/Demo/CORTEX_LM3S316_IAR/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S316_IAR/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S316_IAR/ParTest/ParTest.c b/Demo/CORTEX_LM3S316_IAR/ParTest/ParTest.c index 277445c58..6d0197e28 100644 --- a/Demo/CORTEX_LM3S316_IAR/ParTest/ParTest.c +++ b/Demo/CORTEX_LM3S316_IAR/ParTest/ParTest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S316_IAR/commstest.c b/Demo/CORTEX_LM3S316_IAR/commstest.c index 8615a26a3..a95fecd07 100644 --- a/Demo/CORTEX_LM3S316_IAR/commstest.c +++ b/Demo/CORTEX_LM3S316_IAR/commstest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S316_IAR/commstest.h b/Demo/CORTEX_LM3S316_IAR/commstest.h index 556f8e521..56ffa1458 100644 --- a/Demo/CORTEX_LM3S316_IAR/commstest.h +++ b/Demo/CORTEX_LM3S316_IAR/commstest.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S316_IAR/main.c b/Demo/CORTEX_LM3S316_IAR/main.c index 1d057f776..38f14fe0e 100644 --- a/Demo/CORTEX_LM3S316_IAR/main.c +++ b/Demo/CORTEX_LM3S316_IAR/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_GCC/FreeRTOSConfig.h b/Demo/CORTEX_LM3S6965_GCC/FreeRTOSConfig.h index e41bcd6a6..816f431e1 100644 --- a/Demo/CORTEX_LM3S6965_GCC/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S6965_GCC/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_GCC/LuminaryDrivers/ustdlib.c b/Demo/CORTEX_LM3S6965_GCC/LuminaryDrivers/ustdlib.c index 35de3580a..e68b143fa 100644 --- a/Demo/CORTEX_LM3S6965_GCC/LuminaryDrivers/ustdlib.c +++ b/Demo/CORTEX_LM3S6965_GCC/LuminaryDrivers/ustdlib.c @@ -44,15 +44,16 @@ static const char * const g_pcHex = "0123456789abcdef"; //***************************************************************************** // -//! A simple sprintf function supporting \%c, \%d, \%s, \%u, \%x, and \%X. +//! A simple vsnprintf function supporting \%c, \%d, \%s, \%u, \%x, and \%X. //! -//! \param pcBuf is the buffer where the converted string is stored. +//! \param pcBuf points to the buffer where the converted string is stored. +//! \param ulSize is the size of the buffer. //! \param pcString is the format string. -//! \param ... are the optional arguments, which depend on the contents of the -//! format string. +//! \param vaArgP is the list of optional arguments, which depend on the +//! contents of the format string. //! -//! This function is very similar to the C library sprintf() function. -//! Only the following formatting characters are supported: +//! This function is very similar to the C library vsnprintf() +//! function. Only the following formatting characters are supported: //! //! - \%c to print a character //! - \%d to print a decimal value @@ -75,18 +76,29 @@ static const char * const g_pcHex = "0123456789abcdef"; //! the format string. For example, if an integer was passed where a string //! was expected, an error of some kind will most likely occur. //! -//! The caller must ensure that the buffer pcBuf is large enough to hold the -//! entire converted string, including the null termination character. +//! The \b ulSize parameter limits the number of characters that will be +//! stored in the buffer pointed to by \b pcBuf to prevent the possibility +//! of a buffer overflow. The buffer size should be large enough to hold +//! the expected converted output string, including the null termination +//! character. +//! +//! The function will return the number of characters that would be +//! converted as if there were no limit on the buffer size. Therefore +//! it is possible for the function to return a count that is greater than +//! the specified buffer size. If this happens, it means that the output +//! was truncated. //! -//! \return None. +//! \return the number of characters that were to be stored, not including +//! the NULL termination character, regardless of space in the buffer. // //***************************************************************************** int uvsnprintf(char *pcBuf, unsigned long ulSize, const char *pcString, va_list vaArgP) { - unsigned long ulIdx, ulValue, ulPos, ulCount, ulBase; - char *pcStr, cFill, *pcOriginalBuf = pcBuf; + unsigned long ulIdx, ulValue, ulCount, ulBase; + char *pcStr, cFill; + int iConvertCount = 0; // // Check the arguments. @@ -104,10 +116,14 @@ uvsnprintf(char *pcBuf, unsigned long ulSize, const char *pcString, } // - // Loop while there are more characters in the string, and - // there is more room in the destination buffer. + // Initialize the count of characters converted. // - while(*pcString && ulSize) + iConvertCount = 0; + + // + // Loop while there are more characters in the format string. + // + while(*pcString) { // // Find the first non-% character, or the end of the string. @@ -118,32 +134,32 @@ uvsnprintf(char *pcBuf, unsigned long ulSize, const char *pcString, } // - // Limit the number of characters that can be copied to the - // space remaining in the buffer. + // Write this portion of the string to the output buffer. If + // there are more characters to write than there is space in the + // buffer, then only write as much as will fit in the buffer. // if(ulIdx > ulSize) { - ulIdx = ulSize; + strncpy(pcBuf, pcString, ulSize); + pcBuf += ulSize; + ulSize = 0; + } + else + { + strncpy(pcBuf, pcString, ulIdx); + pcBuf += ulIdx; + ulSize -= ulIdx; } // - // Write this portion of the string and update the buffer pointer. + // Update the conversion count. This will be the number of + // characters that should have been written, even if there was + // not room in the buffer. // - strncpy(pcBuf, pcString, ulIdx); - pcBuf += ulIdx; + iConvertCount += ulIdx; // - // Update the size limit, and check to see if the buffer - // limit is reached. - // - ulSize -= ulIdx; - if(ulSize == 0) - { - break; - } - - // - // Skip the portion of the string that was written. + // Skip the portion of the format string that was written. // pcString += ulIdx; @@ -222,14 +238,19 @@ again: ulValue = va_arg(vaArgP, unsigned long); // - // Print out the character. + // Copy the character to the output buffer, if + // there is room. Update the buffer size remaining. // - *pcBuf++ = (char)ulValue; + if(ulSize != 0) + { + *pcBuf++ = (char)ulValue; + ulSize--; + } // - // Decrement the buffer limit. + // Update the conversion count. // - ulSize--; + iConvertCount++; // // This command has been handled. @@ -247,30 +268,24 @@ again: // ulValue = va_arg(vaArgP, unsigned long); - // - // Reset the buffer position. - // - ulPos = 0; - // // If the value is negative, make it positive and stick a // minus sign in the beginning of the buffer. // if((long)ulValue < 0) { - *pcBuf++ = '-'; - ulPos++; ulValue = -(long)ulValue; - // - // Decrement the buffer size limit and check - // if the limit is reached. - // - ulSize--; - if(ulSize == 0) + if(ulSize != 0) { - break; + *pcBuf++ = '-'; + ulSize--; } + + // + // Update the conversion count. + // + iConvertCount++; } // @@ -302,24 +317,29 @@ again: } // - // Limit the number of characters that can be copied to the - // space remaining in the buffer. + // Copy the string to the output buffer. Only copy + // as much as will fit in the buffer. Update the + // output buffer pointer and the space remaining. // if(ulIdx > ulSize) { - ulIdx = ulSize; + strncpy(pcBuf, pcStr, ulSize); + pcBuf += ulSize; + ulSize = 0; + } + else + { + strncpy(pcBuf, pcStr, ulIdx); + pcBuf += ulIdx; + ulSize -= ulIdx; } // - // Write the string and update the buffer pointer. - // - strncpy(pcBuf, pcStr, ulIdx); - pcBuf += ulIdx; - - // - // Decrement the buffer size limit. + // Update the conversion count. This will be the number of + // characters that should have been written, even if there + // was not room in the buffer. // - ulSize -= ulIdx; + iConvertCount += ulIdx; // // @@ -338,11 +358,6 @@ again: // ulValue = va_arg(vaArgP, unsigned long); - // - // Reset the buffer position. - // - ulPos = 0; - // // Set the base to 10. // @@ -367,11 +382,6 @@ again: // ulValue = va_arg(vaArgP, unsigned long); - // - // Reset the buffer position. - // - ulPos = 0; - // // Set the base to 16. // @@ -397,18 +407,20 @@ convert: { for(ulCount--; ulCount; ulCount--) { - *pcBuf++ = cFill; - ulPos++; - // - // Decrement buffer size and check to see if - // buffer limit is reached. + // Copy the character to the output buffer if + // there is room. // - ulSize--; - if(ulSize == 0) + if(ulSize != 0) { - break; + *pcBuf++ = cFill; + ulSize--; } + + // + // Update the conversion count. + // + iConvertCount++; } } @@ -417,18 +429,20 @@ convert: // for(; ulIdx; ulIdx /= ulBase) { - *pcBuf++ = g_pcHex[(ulValue / ulIdx) % ulBase]; - ulPos++; - // - // Decrement buffer size and check to see if - // buffer limit is reached. + // Copy the character to the output buffer if + // there is room. // - ulSize--; - if(ulSize == 0) + if(ulSize != 0) { - break; + *pcBuf++ = g_pcHex[(ulValue / ulIdx) % ulBase]; + ulSize--; } + + // + // Update the conversion count. + // + iConvertCount++; } // @@ -445,8 +459,16 @@ convert: // // Simply write a single %. // - *pcBuf++ = pcString[-1]; - ulSize--; + if(ulSize != 0) + { + *pcBuf++ = pcString[-1]; + ulSize--; + } + + // + // Update the conversion count. + // + iConvertCount++; // // This command has been handled. @@ -462,12 +484,23 @@ convert: // // Indicate an error. // - if(ulSize > 5) + if(ulSize >= 5) { strncpy(pcBuf, "ERROR", 5); pcBuf += 5; ulSize -= 5; } + else + { + strncpy(pcBuf, "ERROR", ulSize); + pcBuf += ulSize; + ulSize = 0; + } + + // + // Update the conversion count. + // + iConvertCount += 5; // // This command has been handled. @@ -482,7 +515,7 @@ convert: // Null terminate the string in the buffer. // *pcBuf = 0; - return ( int ) pcBuf - ( int ) pcOriginalBuf; + return(iConvertCount); } //***************************************************************************** @@ -521,13 +554,15 @@ convert: //! The caller must ensure that the buffer pcBuf is large enough to hold the //! entire converted string, including the null termination character. //! -//! \return None. +//! \return The count of characters that were written to the output buffer, +//! not including the NULL termination character. // //***************************************************************************** -void +int usprintf(char *pcBuf, const char *pcString, ...) { va_list vaArgP; + int iRet; // // Start the varargs processing. @@ -538,12 +573,17 @@ usprintf(char *pcBuf, const char *pcString, ...) // Call vsnprintf to perform the conversion. Use a // large number for the buffer size. // - uvsnprintf(pcBuf, 0xffff, pcString, vaArgP); + iRet = uvsnprintf(pcBuf, 0xffff, pcString, vaArgP); // // End the varargs processing. // va_end(vaArgP); + + // + // Return the conversion count. + // + return(iRet); } //***************************************************************************** @@ -584,13 +624,20 @@ usprintf(char *pcBuf, const char *pcString, ...) //! buffer \b pcBuf. One space is reserved in the buffer for the null //! termination character. //! -//! \return None. +//! The function will return the number of characters that would be +//! converted as if there were no limit on the buffer size. Therefore +//! it is possible for the function to return a count that is greater than +//! the specified buffer size. If this happens, it means that the output +//! was truncated. +//! +//! \return the number of characters that were to be stored, not including +//! the NULL termination character, regardless of space in the buffer. // //***************************************************************************** int usnprintf(char *pcBuf, unsigned long ulSize, const char *pcString, ...) { -int iReturn; +int iRet; va_list vaArgP; @@ -602,14 +649,17 @@ int iReturn; // // Call vsnprintf to perform the conversion. // - iReturn = uvsnprintf(pcBuf, ulSize, pcString, vaArgP); + iRet = uvsnprintf(pcBuf, ulSize, pcString, vaArgP); // // End the varargs processing. // va_end(vaArgP); - return iReturn; + // + // Return the conversion count. + // + return(iRet); } //***************************************************************************** diff --git a/Demo/CORTEX_LM3S6965_GCC/LuminaryDrivers/ustdlib.h b/Demo/CORTEX_LM3S6965_GCC/LuminaryDrivers/ustdlib.h index f950d8173..811170cdc 100644 --- a/Demo/CORTEX_LM3S6965_GCC/LuminaryDrivers/ustdlib.h +++ b/Demo/CORTEX_LM3S6965_GCC/LuminaryDrivers/ustdlib.h @@ -3,24 +3,24 @@ // uartstdlib.h - Prototypes for simple standard library functions. // // Copyright (c) 2007 Luminary Micro, Inc. All rights reserved. -// +// // Software License Agreement -// +// // Luminary Micro, Inc. (LMI) is supplying this software for use solely and // exclusively on LMI's microcontroller products. -// +// // The software is owned by LMI and/or its suppliers, and is protected under // applicable copyright laws. All rights are reserved. Any use in violation // of the foregoing restrictions may subject the user to criminal sanctions // under applicable laws, as well as to civil liability for the breach of the // terms and conditions of this license. -// +// // THIS SOFTWARE IS PROVIDED "AS IS". NO WARRANTIES, WHETHER EXPRESS, IMPLIED // OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE APPLY TO THIS SOFTWARE. // LMI SHALL NOT, IN ANY CIRCUMSTANCES, BE LIABLE FOR SPECIAL, INCIDENTAL, OR // CONSEQUENTIAL DAMAGES, FOR ANY REASON WHATSOEVER. -// +// // //***************************************************************************** @@ -37,7 +37,9 @@ extern "C" // Prototypes for the APIs. // //***************************************************************************** -extern void usprintf(char *, const char *pcString, ...); +extern int usprintf(char *, const char *pcString, ...); +extern int usnprintf(char *pcBuf, unsigned long ulSize, + const char *pcString, ...); #ifdef __cplusplus } diff --git a/Demo/CORTEX_LM3S6965_GCC/ParTest/ParTest.c b/Demo/CORTEX_LM3S6965_GCC/ParTest/ParTest.c index f16ae6291..48c35a523 100644 --- a/Demo/CORTEX_LM3S6965_GCC/ParTest/ParTest.c +++ b/Demo/CORTEX_LM3S6965_GCC/ParTest/ParTest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_GCC/main.c b/Demo/CORTEX_LM3S6965_GCC/main.c index a95b43107..7d4426703 100644 --- a/Demo/CORTEX_LM3S6965_GCC/main.c +++ b/Demo/CORTEX_LM3S6965_GCC/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_GCC/timertest.c b/Demo/CORTEX_LM3S6965_GCC/timertest.c index 2eddbfcda..f73f935c1 100644 --- a/Demo/CORTEX_LM3S6965_GCC/timertest.c +++ b/Demo/CORTEX_LM3S6965_GCC/timertest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_GCC/webserver/emac.c b/Demo/CORTEX_LM3S6965_GCC/webserver/emac.c index 77e21c399..880f1200b 100644 --- a/Demo/CORTEX_LM3S6965_GCC/webserver/emac.c +++ b/Demo/CORTEX_LM3S6965_GCC/webserver/emac.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_GCC/webserver/uIP_Task.c b/Demo/CORTEX_LM3S6965_GCC/webserver/uIP_Task.c index 0b9a0f855..ef6103c52 100644 --- a/Demo/CORTEX_LM3S6965_GCC/webserver/uIP_Task.c +++ b/Demo/CORTEX_LM3S6965_GCC/webserver/uIP_Task.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_IAR/FreeRTOSConfig.h b/Demo/CORTEX_LM3S6965_IAR/FreeRTOSConfig.h index d17c161ba..b8c57065c 100644 --- a/Demo/CORTEX_LM3S6965_IAR/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S6965_IAR/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_IAR/ParTest/ParTest.c b/Demo/CORTEX_LM3S6965_IAR/ParTest/ParTest.c index f16ae6291..48c35a523 100644 --- a/Demo/CORTEX_LM3S6965_IAR/ParTest/ParTest.c +++ b/Demo/CORTEX_LM3S6965_IAR/ParTest/ParTest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_IAR/main.c b/Demo/CORTEX_LM3S6965_IAR/main.c index 2f16f4b33..376522692 100644 --- a/Demo/CORTEX_LM3S6965_IAR/main.c +++ b/Demo/CORTEX_LM3S6965_IAR/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_IAR/timertest.c b/Demo/CORTEX_LM3S6965_IAR/timertest.c index 2eddbfcda..f73f935c1 100644 --- a/Demo/CORTEX_LM3S6965_IAR/timertest.c +++ b/Demo/CORTEX_LM3S6965_IAR/timertest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_IAR/webserver/emac.c b/Demo/CORTEX_LM3S6965_IAR/webserver/emac.c index 77e21c399..880f1200b 100644 --- a/Demo/CORTEX_LM3S6965_IAR/webserver/emac.c +++ b/Demo/CORTEX_LM3S6965_IAR/webserver/emac.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_IAR/webserver/uIP_Task.c b/Demo/CORTEX_LM3S6965_IAR/webserver/uIP_Task.c index 92702105e..0fa06c3e5 100644 --- a/Demo/CORTEX_LM3S6965_IAR/webserver/uIP_Task.c +++ b/Demo/CORTEX_LM3S6965_IAR/webserver/uIP_Task.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_KEIL/FreeRTOSConfig.h b/Demo/CORTEX_LM3S6965_KEIL/FreeRTOSConfig.h index e41bcd6a6..816f431e1 100644 --- a/Demo/CORTEX_LM3S6965_KEIL/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S6965_KEIL/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_KEIL/ParTest/ParTest.c b/Demo/CORTEX_LM3S6965_KEIL/ParTest/ParTest.c index f16ae6291..48c35a523 100644 --- a/Demo/CORTEX_LM3S6965_KEIL/ParTest/ParTest.c +++ b/Demo/CORTEX_LM3S6965_KEIL/ParTest/ParTest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_KEIL/main.c b/Demo/CORTEX_LM3S6965_KEIL/main.c index 9e3babb5d..ce7a2e50f 100644 --- a/Demo/CORTEX_LM3S6965_KEIL/main.c +++ b/Demo/CORTEX_LM3S6965_KEIL/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_KEIL/timertest.c b/Demo/CORTEX_LM3S6965_KEIL/timertest.c index 2eddbfcda..f73f935c1 100644 --- a/Demo/CORTEX_LM3S6965_KEIL/timertest.c +++ b/Demo/CORTEX_LM3S6965_KEIL/timertest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_KEIL/webserver/emac.c b/Demo/CORTEX_LM3S6965_KEIL/webserver/emac.c index 77e21c399..880f1200b 100644 --- a/Demo/CORTEX_LM3S6965_KEIL/webserver/emac.c +++ b/Demo/CORTEX_LM3S6965_KEIL/webserver/emac.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S6965_KEIL/webserver/uIP_Task.c b/Demo/CORTEX_LM3S6965_KEIL/webserver/uIP_Task.c index 0b9a0f855..ef6103c52 100644 --- a/Demo/CORTEX_LM3S6965_KEIL/webserver/uIP_Task.c +++ b/Demo/CORTEX_LM3S6965_KEIL/webserver/uIP_Task.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S811_GCC/FreeRTOSConfig.h b/Demo/CORTEX_LM3S811_GCC/FreeRTOSConfig.h index 0211c3da0..960304e4f 100644 --- a/Demo/CORTEX_LM3S811_GCC/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S811_GCC/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S811_GCC/main.c b/Demo/CORTEX_LM3S811_GCC/main.c index 03cc5edba..dea227877 100644 --- a/Demo/CORTEX_LM3S811_GCC/main.c +++ b/Demo/CORTEX_LM3S811_GCC/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S811_IAR/FreeRTOSConfig.h b/Demo/CORTEX_LM3S811_IAR/FreeRTOSConfig.h index 872ac0a6e..e7fc8251b 100644 --- a/Demo/CORTEX_LM3S811_IAR/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S811_IAR/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S811_IAR/main.c b/Demo/CORTEX_LM3S811_IAR/main.c index 09dbd3267..a7b839085 100644 --- a/Demo/CORTEX_LM3S811_IAR/main.c +++ b/Demo/CORTEX_LM3S811_IAR/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S811_KEIL/FreeRTOSConfig.h b/Demo/CORTEX_LM3S811_KEIL/FreeRTOSConfig.h index 221a08411..8c77cbfc3 100644 --- a/Demo/CORTEX_LM3S811_KEIL/FreeRTOSConfig.h +++ b/Demo/CORTEX_LM3S811_KEIL/FreeRTOSConfig.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S811_KEIL/heap/heap_1.c b/Demo/CORTEX_LM3S811_KEIL/heap/heap_1.c index 4611258a9..27c733f66 100644 --- a/Demo/CORTEX_LM3S811_KEIL/heap/heap_1.c +++ b/Demo/CORTEX_LM3S811_KEIL/heap/heap_1.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/CORTEX_LM3S811_KEIL/main.c b/Demo/CORTEX_LM3S811_KEIL/main.c index cdf1cc69f..3171d30c4 100644 --- a/Demo/CORTEX_LM3S811_KEIL/main.c +++ b/Demo/CORTEX_LM3S811_KEIL/main.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Full/BlockQ.c b/Demo/Common/Full/BlockQ.c index a3dd52d1d..03841dd83 100644 --- a/Demo/Common/Full/BlockQ.c +++ b/Demo/Common/Full/BlockQ.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Full/PollQ.c b/Demo/Common/Full/PollQ.c index 05ef9266e..ab8793cd3 100644 --- a/Demo/Common/Full/PollQ.c +++ b/Demo/Common/Full/PollQ.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Full/comtest.c b/Demo/Common/Full/comtest.c index 82804fb98..a4399ec6d 100644 --- a/Demo/Common/Full/comtest.c +++ b/Demo/Common/Full/comtest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Full/death.c b/Demo/Common/Full/death.c index e5dfb9be9..f4e70ddfc 100644 --- a/Demo/Common/Full/death.c +++ b/Demo/Common/Full/death.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Full/dynamic.c b/Demo/Common/Full/dynamic.c index e27b70817..39fd485fb 100644 --- a/Demo/Common/Full/dynamic.c +++ b/Demo/Common/Full/dynamic.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Full/events.c b/Demo/Common/Full/events.c index 5b1c54cc4..399a034d5 100644 --- a/Demo/Common/Full/events.c +++ b/Demo/Common/Full/events.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Full/flash.c b/Demo/Common/Full/flash.c index 59d6d033c..e53ac6bba 100644 --- a/Demo/Common/Full/flash.c +++ b/Demo/Common/Full/flash.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Full/flop.c b/Demo/Common/Full/flop.c index a4f356579..99443ffa9 100644 --- a/Demo/Common/Full/flop.c +++ b/Demo/Common/Full/flop.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Full/integer.c b/Demo/Common/Full/integer.c index bf1f4ea53..871493017 100644 --- a/Demo/Common/Full/integer.c +++ b/Demo/Common/Full/integer.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Full/print.c b/Demo/Common/Full/print.c index 635de1f28..82e348b28 100644 --- a/Demo/Common/Full/print.c +++ b/Demo/Common/Full/print.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Full/semtest.c b/Demo/Common/Full/semtest.c index 5e9dd0a61..28e2b0ad4 100644 --- a/Demo/Common/Full/semtest.c +++ b/Demo/Common/Full/semtest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Minimal/BlockQ.c b/Demo/Common/Minimal/BlockQ.c index 8ab953784..964707d92 100644 --- a/Demo/Common/Minimal/BlockQ.c +++ b/Demo/Common/Minimal/BlockQ.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Minimal/PollQ.c b/Demo/Common/Minimal/PollQ.c index 681fd7033..f641f3939 100644 --- a/Demo/Common/Minimal/PollQ.c +++ b/Demo/Common/Minimal/PollQ.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Minimal/blocktim.c b/Demo/Common/Minimal/blocktim.c index 77b25f990..017233a3a 100644 --- a/Demo/Common/Minimal/blocktim.c +++ b/Demo/Common/Minimal/blocktim.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. @@ -19,13 +19,13 @@ A special exception to the GPL can be applied should you wish to distribute a combined work that includes FreeRTOS.org, without being obliged to provide - the source code for any proprietary components. See the licensing section + the source code for any proprietary components. See the licensing section of http://www.FreeRTOS.org for full details of how and when the exception can be applied. *************************************************************************** - See http://www.FreeRTOS.org for documentation, latest information, license - and contact details. Please ensure to read the configuration and relevant + See http://www.FreeRTOS.org for documentation, latest information, license + and contact details. Please ensure to read the configuration and relevant port sections of the online documentation. Also see http://www.SafeRTOS.com for an IEC 61508 compliant version along @@ -35,7 +35,7 @@ /* * This file contains some test scenarios that ensure tasks do not exit queue - * send or receive functions prematurely. A description of the tests is + * send or receive functions prematurely. A description of the tests is * included within the code. */ @@ -44,6 +44,9 @@ #include "task.h" #include "queue.h" +/* Demo includes. */ +#include "blocktim.h" + /* Task priorities. */ #define bktPRIMARY_PRIORITY ( 3 ) #define bktSECONDARY_PRIORITY ( 2 ) @@ -68,7 +71,7 @@ static xTaskHandle xSecondary; static portBASE_TYPE xPrimaryCycles = 0, xSecondaryCycles = 0; static portBASE_TYPE xErrorOccurred = pdFALSE; -/* Provides a simple mechanism for the primary task to know when the +/* Provides a simple mechanism for the primary task to know when the secondary task has executed. */ static volatile unsigned portBASE_TYPE xRunIndicator; @@ -125,7 +128,7 @@ portTickType xTimeToBlock, xBlockedTime; } portEXIT_CRITICAL(); - if( xBlockedTime < xTimeToBlock ) + if( xBlockedTime < xTimeToBlock ) { /* Should not have blocked for less than we requested. */ xErrorOccurred = pdTRUE; @@ -134,7 +137,7 @@ portTickType xTimeToBlock, xBlockedTime; if( xBlockedTime > ( xTimeToBlock + bktALLOWABLE_MARGIN ) ) { /* Should not have blocked for longer than we requested, - although we would not necessarily run as soon as we were + although we would not necessarily run as soon as we were unblocked so a margin is allowed. */ xErrorOccurred = pdTRUE; } @@ -176,7 +179,7 @@ portTickType xTimeToBlock, xBlockedTime; } portEXIT_CRITICAL(); - if( xBlockedTime < xTimeToBlock ) + if( xBlockedTime < xTimeToBlock ) { /* Should not have blocked for less than we requested. */ xErrorOccurred = pdTRUE; @@ -185,7 +188,7 @@ portTickType xTimeToBlock, xBlockedTime; if( xBlockedTime > ( xTimeToBlock + bktALLOWABLE_MARGIN ) ) { /* Should not have blocked for longer than we requested, - although we would not necessarily run as soon as we were + although we would not necessarily run as soon as we were unblocked so a margin is allowed. */ xErrorOccurred = pdTRUE; } @@ -227,7 +230,7 @@ portTickType xTimeToBlock, xBlockedTime; } /* Now fill the queue again before the other task gets a chance to - execute. If the other task had executed we would find the queue + execute. If the other task had executed we would find the queue full ourselves, and the other task have set xRunIndicator. */ if( xQueueSend( xTestQueue, &xItem, bktDONT_BLOCK ) != pdPASS ) { @@ -270,7 +273,7 @@ portTickType xTimeToBlock, xBlockedTime; /********************************************************************* Test 4 - As per test 3 - but with the send and receive the other way around. + As per test 3 - but with the send and receive the other way around. The other task blocks attempting to read from the queue. Empty the queue. We should find that it is full. */ @@ -282,7 +285,7 @@ portTickType xTimeToBlock, xBlockedTime; } } - /* Wake the other task so it blocks attempting to read from the + /* Wake the other task so it blocks attempting to read from the already empty queue. */ vTaskResume( xSecondary ); @@ -296,7 +299,7 @@ portTickType xTimeToBlock, xBlockedTime; for( xItem = 0; xItem < bktQUEUE_LENGTH; xItem++ ) { - /* Now when we place an item on the queue the other task should + /* Now when we place an item on the queue the other task should wake but not execute as this task has higher priority. */ if( xQueueSend( xTestQueue, &xItem, bktDONT_BLOCK ) != pdPASS ) { @@ -304,7 +307,7 @@ portTickType xTimeToBlock, xBlockedTime; } /* Now empty the queue again before the other task gets a chance to - execute. If the other task had executed we would find the queue + execute. If the other task had executed we would find the queue empty ourselves, and the other task would be suspended. */ if( xQueueReceive( xTestQueue, &xData, bktDONT_BLOCK ) != pdPASS ) { @@ -321,7 +324,7 @@ portTickType xTimeToBlock, xBlockedTime; on the queue again. */ vTaskPrioritySet( xSecondary, bktPRIMARY_PRIORITY + 2 ); - /* The other task should now have re-blocked without exiting the + /* The other task should now have re-blocked without exiting the queue function. */ if( xRunIndicator == bktRUN_INDICATOR ) { @@ -388,7 +391,7 @@ portBASE_TYPE xData; xErrorOccurred = pdTRUE; } - /* We should of not blocked for much longer than bktALLOWABLE_MARGIN + /* We should of not blocked for much longer than bktALLOWABLE_MARGIN either. A margin is permitted as we would not necessarily run as soon as we unblocked. */ if( xBlockedTime > ( bktTIME_TO_BLOCK + bktALLOWABLE_MARGIN ) ) @@ -426,7 +429,7 @@ portBASE_TYPE xData; xErrorOccurred = pdTRUE; } - /* We should of not blocked for much longer than bktALLOWABLE_MARGIN + /* We should of not blocked for much longer than bktALLOWABLE_MARGIN either. A margin is permitted as we would not necessarily run as soon as we unblocked. */ if( xBlockedTime > ( bktTIME_TO_BLOCK + bktALLOWABLE_MARGIN ) ) diff --git a/Demo/Common/Minimal/comtest.c b/Demo/Common/Minimal/comtest.c index 53c5ebf9a..d145b9a6c 100644 --- a/Demo/Common/Minimal/comtest.c +++ b/Demo/Common/Minimal/comtest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Minimal/crflash.c b/Demo/Common/Minimal/crflash.c index b2f15038e..cd68f0dc3 100644 --- a/Demo/Common/Minimal/crflash.c +++ b/Demo/Common/Minimal/crflash.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Minimal/crhook.c b/Demo/Common/Minimal/crhook.c index d9f735efa..838ab4224 100644 --- a/Demo/Common/Minimal/crhook.c +++ b/Demo/Common/Minimal/crhook.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Minimal/death.c b/Demo/Common/Minimal/death.c index f5a680782..b06061503 100644 --- a/Demo/Common/Minimal/death.c +++ b/Demo/Common/Minimal/death.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Minimal/dynamic.c b/Demo/Common/Minimal/dynamic.c index 6ea9a7e1e..05e79f122 100644 --- a/Demo/Common/Minimal/dynamic.c +++ b/Demo/Common/Minimal/dynamic.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Minimal/flash.c b/Demo/Common/Minimal/flash.c index 3765dd11e..43f5d92d7 100644 --- a/Demo/Common/Minimal/flash.c +++ b/Demo/Common/Minimal/flash.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Minimal/flop.c b/Demo/Common/Minimal/flop.c index 87d61219b..f193d0177 100644 --- a/Demo/Common/Minimal/flop.c +++ b/Demo/Common/Minimal/flop.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Minimal/integer.c b/Demo/Common/Minimal/integer.c index 26ebff36a..c3d1b7077 100644 --- a/Demo/Common/Minimal/integer.c +++ b/Demo/Common/Minimal/integer.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/Minimal/semtest.c b/Demo/Common/Minimal/semtest.c index 0e9059b39..fc762a9cd 100644 --- a/Demo/Common/Minimal/semtest.c +++ b/Demo/Common/Minimal/semtest.c @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/BlockQ.h b/Demo/Common/include/BlockQ.h index 6325ac905..6b1947272 100644 --- a/Demo/Common/include/BlockQ.h +++ b/Demo/Common/include/BlockQ.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/PollQ.h b/Demo/Common/include/PollQ.h index a5892b8cd..28155ea45 100644 --- a/Demo/Common/include/PollQ.h +++ b/Demo/Common/include/PollQ.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/blocktim.h b/Demo/Common/include/blocktim.h index d36ab9d10..9ac8df0fb 100644 --- a/Demo/Common/include/blocktim.h +++ b/Demo/Common/include/blocktim.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/comtest.h b/Demo/Common/include/comtest.h index 6536ffe62..1f15a755d 100644 --- a/Demo/Common/include/comtest.h +++ b/Demo/Common/include/comtest.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/comtest2.h b/Demo/Common/include/comtest2.h index 02ddc279f..3457309b4 100644 --- a/Demo/Common/include/comtest2.h +++ b/Demo/Common/include/comtest2.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/crflash.h b/Demo/Common/include/crflash.h index 53ba5020a..b117963b4 100644 --- a/Demo/Common/include/crflash.h +++ b/Demo/Common/include/crflash.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/crhook.h b/Demo/Common/include/crhook.h index 9a4c7840f..9338fe8a6 100644 --- a/Demo/Common/include/crhook.h +++ b/Demo/Common/include/crhook.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/death.h b/Demo/Common/include/death.h index 2f54f3272..01062928c 100644 --- a/Demo/Common/include/death.h +++ b/Demo/Common/include/death.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/dynamic.h b/Demo/Common/include/dynamic.h index c30b00b9c..77a7818b5 100644 --- a/Demo/Common/include/dynamic.h +++ b/Demo/Common/include/dynamic.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/fileIO.h b/Demo/Common/include/fileIO.h index afcab72de..80e747846 100644 --- a/Demo/Common/include/fileIO.h +++ b/Demo/Common/include/fileIO.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/flash.h b/Demo/Common/include/flash.h index 16708299d..9b4b32d3f 100644 --- a/Demo/Common/include/flash.h +++ b/Demo/Common/include/flash.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/flop.h b/Demo/Common/include/flop.h index 741f2f2ff..6863aa0ab 100644 --- a/Demo/Common/include/flop.h +++ b/Demo/Common/include/flop.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/integer.h b/Demo/Common/include/integer.h index 9a7db7bbb..a263d74ea 100644 --- a/Demo/Common/include/integer.h +++ b/Demo/Common/include/integer.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/mevents.h b/Demo/Common/include/mevents.h index 75d813296..0f9861368 100644 --- a/Demo/Common/include/mevents.h +++ b/Demo/Common/include/mevents.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/partest.h b/Demo/Common/include/partest.h index f1f78ae79..00678b713 100644 --- a/Demo/Common/include/partest.h +++ b/Demo/Common/include/partest.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/print.h b/Demo/Common/include/print.h index 56dd19b1c..7d973c144 100644 --- a/Demo/Common/include/print.h +++ b/Demo/Common/include/print.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/semtest.h b/Demo/Common/include/semtest.h index f34ab5bdb..9ea09d146 100644 --- a/Demo/Common/include/semtest.h +++ b/Demo/Common/include/semtest.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. diff --git a/Demo/Common/include/serial.h b/Demo/Common/include/serial.h index 9a7f97b2f..230d7f31f 100644 --- a/Demo/Common/include/serial.h +++ b/Demo/Common/include/serial.h @@ -1,5 +1,5 @@ /* - FreeRTOS.org V4.3.0 - Copyright (C) 2003-2007 Richard Barry. + FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 Richard Barry. This file is part of the FreeRTOS.org distribution. -- 2.39.5