andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TIME_IMMEDIATE and TIME_INFINITE values swapped. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2757 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2011-02-21 19:06:46 +00:00
parent 17f0815d52
commit b3b1028036
9 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reports/STM32F103-72-GCC.txt
View File

@ -130,7 +130,7 @@ Settings: SYSCLK=72, ACR=0x12 (2 wait states)
--- Result: SUCCESS --- Result: SUCCESS
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
--- Test Case 11.9 (Benchmark, I/O Queues throughput) --- Test Case 11.9 (Benchmark, I/O Queues throughput)
--- Score : 465772 bytes/S --- Score : 474232 bytes/S
--- Result: SUCCESS --- Result: SUCCESS
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
--- Test Case 11.10 (Benchmark, virtual timers set/reset) --- Test Case 11.10 (Benchmark, virtual timers set/reset)

38
docs/reports/kernel.txt
View File

@ -38,67 +38,67 @@ Platform : ARM Cortex-M3
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -O2 -mthumb -DCH_OPTIMIZE_SPEED=TRUE Options : -O2 -mthumb -DCH_OPTIMIZE_SPEED=TRUE
Kernel Size = 6180 Kernel Size = 6172
Platform : ARM Cortex-M3 Platform : ARM Cortex-M3
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -O2 -mthumb -DCH_OPTIMIZE_SPEED=FALSE Options : -O2 -mthumb -DCH_OPTIMIZE_SPEED=FALSE
Kernel Size = 5680 Kernel Size = 5672
Platform : ARM Cortex-M3 Platform : ARM Cortex-M3
OS Setup : Minimal kernel OS Setup : Minimal kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -O2 -mthumb Options : -O2 -mthumb
Kernel Size = 1428 Kernel Size = 1432
Platform : ARM Cortex-M3 Platform : ARM Cortex-M3
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -Os -mthumb -DCH_OPTIMIZE_SPEED=TRUE Options : -Os -mthumb -DCH_OPTIMIZE_SPEED=TRUE
Kernel Size = 5576 Kernel Size = 5568
Platform : ARM Cortex-M3 Platform : ARM Cortex-M3
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -Os -mthumb -DCH_OPTIMIZE_SPEED=FALSE Options : -Os -mthumb -DCH_OPTIMIZE_SPEED=FALSE
Kernel Size = 5168 Kernel Size = 5156
Platform : ARM Cortex-M3 Platform : ARM Cortex-M3
OS Setup : Minimal kernel OS Setup : Minimal kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -Os -mthumb Options : -Os -mthumb
Kernel Size = 1244 Kernel Size = 1248
Platform : ARM Cortex-M3 Platform : ARM Cortex-M3
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -Os -mthumb -ffixed-r7 -DCH_CURRP_REGISTER_CACHE=\"r7\" -DCH_OPTIMIZE_SPEED=TRUE Options : -Os -mthumb -ffixed-r7 -DCH_CURRP_REGISTER_CACHE=\"r7\" -DCH_OPTIMIZE_SPEED=TRUE
Kernel Size = 5356 Kernel Size = 5348
Platform : ARM Cortex-M3 Platform : ARM Cortex-M3
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -Os -mthumb -ffixed-r7 -DCH_CURRP_REGISTER_CACHE=\"r7\" -DCH_OPTIMIZE_SPEED=FALSE Options : -Os -mthumb -ffixed-r7 -DCH_CURRP_REGISTER_CACHE=\"r7\" -DCH_OPTIMIZE_SPEED=FALSE
Kernel Size = 4976 Kernel Size = 4964
Platform : ARM Cortex-M3 Platform : ARM Cortex-M3
OS Setup : Minimal kernel OS Setup : Minimal kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -Os -mthumb -ffixed-r7 -DCH_CURRP_REGISTER_CACHE=\"r7\" Options : -Os -mthumb -ffixed-r7 -DCH_CURRP_REGISTER_CACHE=\"r7\"
Kernel Size = 1196 Kernel Size = 1200
Platform : ARM Cortex-M0 Platform : ARM Cortex-M0
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -O2 -mthumb -DCH_OPTIMIZE_SPEED=TRUE Options : -O2 -mthumb -DCH_OPTIMIZE_SPEED=TRUE
Kernel Size = 5428 Kernel Size = 5432
Platform : ARM Cortex-M0 Platform : ARM Cortex-M0
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -O2 -mthumb -DCH_OPTIMIZE_SPEED=FALSE Options : -O2 -mthumb -DCH_OPTIMIZE_SPEED=FALSE
Kernel Size = 5232 Kernel Size = 5236
Platform : ARM Cortex-M0 Platform : ARM Cortex-M0
OS Setup : Minimal kernel OS Setup : Minimal kernel
@ -146,13 +146,13 @@ Platform : ARM7TDMI (ARM mode)
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -Os -DCH_OPTIMIZE_SPEED=TRUE Options : -Os -DCH_OPTIMIZE_SPEED=TRUE
Kernel Size = 8340 Kernel Size = 8344
Platform : ARM7TDMI (ARM mode) Platform : ARM7TDMI (ARM mode)
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -Os -DCH_OPTIMIZE_SPEED=FALSE Options : -Os -DCH_OPTIMIZE_SPEED=FALSE
Kernel Size = 7984 Kernel Size = 7988
Platform : ARM7TDMI (ARM mode) Platform : ARM7TDMI (ARM mode)
OS Setup : Minimal kernel OS Setup : Minimal kernel
@ -182,13 +182,13 @@ Platform : ARM7TDMI (ARM mode)
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -Os -ffixed-r7 -DCH_CURRP_REGISTER_CACHE=\"r7\" -DCH_OPTIMIZE_SPEED=TRUE Options : -Os -ffixed-r7 -DCH_CURRP_REGISTER_CACHE=\"r7\" -DCH_OPTIMIZE_SPEED=TRUE
Kernel Size = 8048 Kernel Size = 8052
Platform : ARM7TDMI (ARM mode) Platform : ARM7TDMI (ARM mode)
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -Os -ffixed-r7 -DCH_CURRP_REGISTER_CACHE=\"r7\" -DCH_OPTIMIZE_SPEED=FALSE Options : -Os -ffixed-r7 -DCH_CURRP_REGISTER_CACHE=\"r7\" -DCH_OPTIMIZE_SPEED=FALSE
Kernel Size = 7712 Kernel Size = 7716
Platform : ARM7TDMI (ARM mode) Platform : ARM7TDMI (ARM mode)
OS Setup : Minimal kernel OS Setup : Minimal kernel
@ -200,13 +200,13 @@ Platform : ARM7TDMI (THUMB mode)
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -O2 -mthumb -DCH_OPTIMIZE_SPEED=TRUE -DTHUMB -DTHUMB_PRESENT -DTHUMB_NO_INTERWORKING Options : -O2 -mthumb -DCH_OPTIMIZE_SPEED=TRUE -DTHUMB -DTHUMB_PRESENT -DTHUMB_NO_INTERWORKING
Kernel Size = 6004 Kernel Size = 6008
Platform : ARM7TDMI (THUMB mode) Platform : ARM7TDMI (THUMB mode)
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -O2 -mthumb -DCH_OPTIMIZE_SPEED=FALSE -DTHUMB -DTHUMB_PRESENT -DTHUMB_NO_INTERWORKING Options : -O2 -mthumb -DCH_OPTIMIZE_SPEED=FALSE -DTHUMB -DTHUMB_PRESENT -DTHUMB_NO_INTERWORKING
Kernel Size = 5796 Kernel Size = 5800
Platform : ARM7TDMI (THUMB mode) Platform : ARM7TDMI (THUMB mode)
OS Setup : Minimal kernel OS Setup : Minimal kernel
@ -236,7 +236,7 @@ Platform : ARM7TDMI (THUMB mode)
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -O2 -mthumb -ffixed-r7 -DCH_CURRP_REGISTER_CACHE=\"r7\" -DCH_OPTIMIZE_SPEED=TRUE -DTHUMB -DTHUMB_PRESENT -DTHUMB_NO_INTERWORKING Options : -O2 -mthumb -ffixed-r7 -DCH_CURRP_REGISTER_CACHE=\"r7\" -DCH_OPTIMIZE_SPEED=TRUE -DTHUMB -DTHUMB_PRESENT -DTHUMB_NO_INTERWORKING
Kernel Size = 5848 Kernel Size = 5852
Platform : ARM7TDMI (THUMB mode) Platform : ARM7TDMI (THUMB mode)
OS Setup : Full kernel OS Setup : Full kernel
@ -260,7 +260,7 @@ Platform : ARM7TDMI (THUMB mode)
OS Setup : Full kernel OS Setup : Full kernel
Compiler : arm-none-eabi-gcc (GCC) 4.5.2 Compiler : arm-none-eabi-gcc (GCC) 4.5.2
Options : -Os -mthumb -ffixed-r7 -DCH_CURRP_REGISTER_CACHE=\"r7\" -DCH_OPTIMIZE_SPEED=FALSE -DTHUMB -DTHUMB_PRESENT -DTHUMB_NO_INTERWORKING Options : -Os -mthumb -ffixed-r7 -DCH_CURRP_REGISTER_CACHE=\"r7\" -DCH_OPTIMIZE_SPEED=FALSE -DTHUMB -DTHUMB_PRESENT -DTHUMB_NO_INTERWORKING
Kernel Size = 5208 Kernel Size = 5212
Platform : ARM7TDMI (THUMB mode) Platform : ARM7TDMI (THUMB mode)
OS Setup : Minimal kernel OS Setup : Minimal kernel

4
os/kernel/include/chschd.h
View File

@ -48,13 +48,13 @@
* @note Not all functions accept @p TIME_IMMEDIATE as timeout parameter, * @note Not all functions accept @p TIME_IMMEDIATE as timeout parameter,
* see the specific function documentation. * see the specific function documentation.
*/ */
#define TIME_IMMEDIATE ((systime_t)-1) #define TIME_IMMEDIATE ((systime_t)0)
/** /**
* @brief Infinite time specification for all the syscalls with a timeout * @brief Infinite time specification for all the syscalls with a timeout
* specification. * specification.
*/ */
#define TIME_INFINITE ((systime_t)0) #define TIME_INFINITE ((systime_t)-1)
/** /**
* @brief Returns the priority of the first thread on the given ready list. * @brief Returns the priority of the first thread on the given ready list.

4
os/kernel/include/chthreads.h
View File

@ -292,9 +292,7 @@ extern "C" {
* handled as follow: * handled as follow:
* - @a TIME_INFINITE the thread enters an infinite sleep * - @a TIME_INFINITE the thread enters an infinite sleep
* state. * state.
* - @a TIME_IMMEDIATE this value is accepted but * - @a TIME_IMMEDIATE this value is not allowed.
* interpreted as a normal time specification not as
* an immediate timeout specification.
* . * .
* *
* @sclass * @sclass

22
os/kernel/src/chcond.c
View File

@ -203,11 +203,11 @@ msg_t chCondWaitS(CondVar *cp) {
* mutex, the mutex ownership is lost. * mutex, the mutex ownership is lost.
* *
* @param[in] cp pointer to the @p CondVar structure * @param[in] cp pointer to the @p CondVar structure
* @param[in] time the number of ticks before the operation timeouts, * @param[in] time the number of ticks before the operation timeouts, the
* the special value @p TIME_INFINITE is allowed. * special values are handled as follow:
* It is not possible to specify zero @p TIME_IMMEDIATE * - @a TIME_INFINITE no timeout.
* as timeout specification because it would make no sense * - @a TIME_IMMEDIATE this value is not allowed.
* in this function. * .
* @return A message specifying how the invoking thread has been * @return A message specifying how the invoking thread has been
* released from the condition variable. * released from the condition variable.
* @retval RDY_OK if the condvar has been signaled using * @retval RDY_OK if the condvar has been signaled using
@ -240,11 +240,11 @@ msg_t chCondWaitTimeout(CondVar *cp, systime_t time) {
* mutex, the mutex ownership is lost. * mutex, the mutex ownership is lost.
* *
* @param[in] cp pointer to the @p CondVar structure * @param[in] cp pointer to the @p CondVar structure
* @param[in] time the number of ticks before the operation timeouts, * @param[in] time the number of ticks before the operation timeouts, the
* the special value @p TIME_INFINITE is allowed. * special values are handled as follow:
* It is not possible to specify zero @p TIME_IMMEDIATE * - @a TIME_INFINITE no timeout.
* as timeout specification because it would make no sense * - @a TIME_IMMEDIATE this value is not allowed.
* in this function. * .
* @return A message specifying how the invoking thread has been * @return A message specifying how the invoking thread has been
* released from the condition variable. * released from the condition variable.
* @retval RDY_OK if the condvar has been signaled using * @retval RDY_OK if the condvar has been signaled using
@ -260,7 +260,7 @@ msg_t chCondWaitTimeoutS(CondVar *cp, systime_t time) {
Mutex *mp; Mutex *mp;
msg_t msg; msg_t msg;
chDbgCheck(cp != NULL, "chCondWaitTimeoutS"); chDbgCheck((cp != NULL) && (time != TIME_IMMEDIATE), "chCondWaitTimeoutS");
chDbgAssert(currp->p_mtxlist != NULL, chDbgAssert(currp->p_mtxlist != NULL,
"chCondWaitTimeoutS(), #1", "chCondWaitTimeoutS(), #1",
"not owning a mutex"); "not owning a mutex");

4
os/kernel/src/chschd.c
View File

@ -160,9 +160,7 @@ static void wakeup(void *p) {
* - @a TIME_INFINITE the thread enters an infinite sleep * - @a TIME_INFINITE the thread enters an infinite sleep
* state, this is equivalent to invoking * state, this is equivalent to invoking
* @p chSchGoSleepS() but, of course, less efficient. * @p chSchGoSleepS() but, of course, less efficient.
* - @a TIME_IMMEDIATE this value is accepted but * - @a TIME_IMMEDIATE this value is not allowed.
* interpreted as a normal time specification not as an
* immediate timeout specification.
* . * .
* @return The wakeup message. * @return The wakeup message.
* @retval RDY_TIMEOUT if a timeout occurs. * @retval RDY_TIMEOUT if a timeout occurs.

6
os/kernel/src/chthreads.c
View File

@ -273,16 +273,14 @@ void chThdTerminate(Thread *tp) {
* handled as follow: * handled as follow:
* - @a TIME_INFINITE the thread enters an infinite sleep * - @a TIME_INFINITE the thread enters an infinite sleep
* state. * state.
* - @a TIME_IMMEDIATE this value is accepted but * - @a TIME_IMMEDIATE this value is not allowed.
* interpreted as a normal time specification not as an
* immediate timeout specification.
* . * .
* *
* @api * @api
*/ */
void chThdSleep(systime_t time) { void chThdSleep(systime_t time) {
chDbgCheck(time != TIME_INFINITE, "chThdSleep"); chDbgCheck(time != TIME_IMMEDIATE, "chThdSleep");
chSysLock(); chSysLock();
chThdSleepS(time); chThdSleepS(time);

12
os/kernel/src/chvt.c
View File

@ -52,10 +52,12 @@ void vt_init(void) {
* the I-Locked state, see @ref system_states. * the I-Locked state, see @ref system_states.
* *
* @param[out] vtp the @p VirtualTimer structure pointer * @param[out] vtp the @p VirtualTimer structure pointer
* @param[in] time the number of time ticks, the value @p TIME_INFINITE * @param[in] time the number of ticks before the operation timeouts, the
* is notallowed. The value @p TIME_IMMEDIATE is allowed * special values are handled as follow:
* but interpreted as a normal time specification not as * - @a TIME_INFINITE is allowed but interpreted as a
* an immediate timeout specification. * normal time specification.
* - @a TIME_IMMEDIATE this value is not allowed.
* .
* @param[in] vtfunc the timer callback function. After invoking the * @param[in] vtfunc the timer callback function. After invoking the
* callback the timer is disabled and the structure can * callback the timer is disabled and the structure can
* be disposed or reused. * be disposed or reused.
@ -67,7 +69,7 @@ void vt_init(void) {
void chVTSetI(VirtualTimer *vtp, systime_t time, vtfunc_t vtfunc, void *par) { void chVTSetI(VirtualTimer *vtp, systime_t time, vtfunc_t vtfunc, void *par) {
VirtualTimer *p; VirtualTimer *p;
chDbgCheck((vtp != NULL) && (vtfunc != NULL) && (time != TIME_INFINITE), chDbgCheck((vtp != NULL) && (vtfunc != NULL) && (time != TIME_IMMEDIATE),
"chVTSetI"); "chVTSetI");
vtp->vt_par = par; vtp->vt_par = par;

2
readme.txt
View File

@ -94,6 +94,8 @@
driver. This event marks the physical transmission end of a data stream. driver. This event marks the physical transmission end of a data stream.
- NEW: Implemented the new IO_TRANSMISSION_END event in the STM32 serial - NEW: Implemented the new IO_TRANSMISSION_END event in the STM32 serial
driver. driver.
- CHANGE: Swapped the numeric values of the TIME_IMMEDIATE and TIME_INFINITE
constants. Fixed the relative documentation in various places.
*** 2.1.8 *** *** 2.1.8 ***
- FIX: Fixed error in STM32 ADC driver macro names (bug 3160306)(backported - FIX: Fixed error in STM32 ADC driver macro names (bug 3160306)(backported