diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-02-07 19:22:32 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-02-07 19:22:32 +0000 |
| commit | 285d06f3b69fd996abc669050da21f7b5db83010 (patch) | |
| tree | 3ea6c50045a3fe90c53f21713a5b5a51be3958b7 /os | |
| parent | 6583405cee23c86dd6c9ac77a46dbbf58077760a (diff) | |
| download | ChibiOS-285d06f3b69fd996abc669050da21f7b5db83010.tar.gz ChibiOS-285d06f3b69fd996abc669050da21f7b5db83010.tar.bz2 ChibiOS-285d06f3b69fd996abc669050da21f7b5db83010.zip | |
Fixed ADC divider in STM32F4 demos. Completed implemetation of new RR scheduling.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3941 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/ports/IAR/ARMCMx/chcore.h | 2 | ||||
| -rw-r--r-- | os/ports/RVCT/ARMCMx/chcore.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/os/ports/IAR/ARMCMx/chcore.h b/os/ports/IAR/ARMCMx/chcore.h index 5441afead..0b18c92bc 100644 --- a/os/ports/IAR/ARMCMx/chcore.h +++ b/os/ports/IAR/ARMCMx/chcore.h @@ -169,7 +169,7 @@ struct intctx {}; * @brief Inlineable version of this kernel function.
*/
#define chSchIsPreemptionRequired() \
- (rlist.r_preempt ? firstprio(&rlist.r_queue) > currp->p_prio : \
+ (currp->p_preempt ? firstprio(&rlist.r_queue) > currp->p_prio : \
firstprio(&rlist.r_queue) >= currp->p_prio)
#else /* CH_TIME_QUANTUM == 0 */
#define chSchIsPreemptionRequired() \
diff --git a/os/ports/RVCT/ARMCMx/chcore.h b/os/ports/RVCT/ARMCMx/chcore.h index f15df5f90..521f7ea73 100644 --- a/os/ports/RVCT/ARMCMx/chcore.h +++ b/os/ports/RVCT/ARMCMx/chcore.h @@ -168,7 +168,7 @@ struct intctx {}; * @brief Inlineable version of this kernel function.
*/
#define chSchIsPreemptionRequired() \
- (rlist.r_preempt ? firstprio(&rlist.r_queue) > currp->p_prio : \
+ (currp->p_preempt ? firstprio(&rlist.r_queue) > currp->p_prio : \
firstprio(&rlist.r_queue) >= currp->p_prio)
#else /* CH_TIME_QUANTUM == 0 */
#define chSchIsPreemptionRequired() \
|