diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-10-30 15:45:38 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-10-30 15:45:38 +0000 |
| commit | 43f9fd4180030081daae9122bd57a521ec9c58e1 (patch) | |
| tree | af4185a0b33d984503a16c0b55e2febe2a9a73bf /os/kernel/src | |
| parent | 5ccb308ed861f6f7a42b7d826e939fd8efa68bac (diff) | |
| download | ChibiOS-43f9fd4180030081daae9122bd57a521ec9c58e1.tar.gz ChibiOS-43f9fd4180030081daae9122bd57a521ec9c58e1.tar.bz2 ChibiOS-43f9fd4180030081daae9122bd57a521ec9c58e1.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1258 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel/src')
| -rw-r--r-- | os/kernel/src/chheap.c | 2 | ||||
| -rw-r--r-- | os/kernel/src/chschd.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/os/kernel/src/chheap.c b/os/kernel/src/chheap.c index d1dab1580..203d69d13 100644 --- a/os/kernel/src/chheap.c +++ b/os/kernel/src/chheap.c @@ -255,7 +255,7 @@ size_t chHeapStatus(MemoryHeap *heapp, size_t *sizep) { #if CH_USE_MUTEXES
#define H_LOCK() chMtxLock(&hmtx)
-#define H_UNLOCK() chMtxLock(&hmtx)
+#define H_UNLOCK() chMtxUnock()
static Mutex hmtx;
#elif CH_USE_SEMAPHORES
#define H_LOCK() chSemWait(&hsem)
diff --git a/os/kernel/src/chschd.c b/os/kernel/src/chschd.c index 150169481..87c2e2f8c 100644 --- a/os/kernel/src/chschd.c +++ b/os/kernel/src/chschd.c @@ -268,7 +268,9 @@ void chSchDoYieldS(void) { /* Pick the first thread from the ready queue and makes it current.*/ (currp = fifo_remove(&rlist.r_queue))->p_state = PRCURR; +#if CH_TIME_QUANTUM > 0 rlist.r_preempt = CH_TIME_QUANTUM; +#endif chDbgTrace(otp, currp); chSysSwitchI(otp, currp); } |