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

CH_USE_MALLOC_HEAP and H_(UN)LOCK redefinition fix 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2055 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
ecarusi 2010-07-05 17:47:44 +00:00
parent f03a012a2d
commit e3a5e25315
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,8 @@
#if CH_USE_HEAP #if CH_USE_HEAP
#if !CH_USE_MALLOC_HEAP
/* /*
* Defaults on the best synchronization mechanism available. * Defaults on the best synchronization mechanism available.
*/ */
@ -52,8 +54,6 @@
#define H_UNLOCK(h) chSemSignal(&(h)->h_sem) #define H_UNLOCK(h) chSemSignal(&(h)->h_sem)
#endif #endif
#if !CH_USE_MALLOC_HEAP
/** /**
* @brief Default heap descriptor. * @brief Default heap descriptor.
*/ */
@ -253,7 +253,7 @@ size_t chHeapStatus(MemoryHeap *heapp, size_t *sizep) {
#if CH_USE_MUTEXES #if CH_USE_MUTEXES
#define H_LOCK() chMtxLock(&hmtx) #define H_LOCK() chMtxLock(&hmtx)
#define H_UNLOCK() chMtxUnock() #define H_UNLOCK() chMtxUnlock()
static Mutex hmtx; static Mutex hmtx;
#elif CH_USE_SEMAPHORES #elif CH_USE_SEMAPHORES
#define H_LOCK() chSemWait(&hsem) #define H_LOCK() chSemWait(&hsem)