diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-06 10:13:59 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-06 10:13:59 +0000 |
| commit | a380d9ad03f2fcf950dad0f08652a03b738dc0e8 (patch) | |
| tree | 78dfbd7a271ba17cbb8cd7383a5c7edcb87f448b /os/rt/src/chheap.c | |
| parent | b53489d0e4252aafe5ada7466e0b3b7c4ad5aaaf (diff) | |
| download | ChibiOS-a380d9ad03f2fcf950dad0f08652a03b738dc0e8.tar.gz ChibiOS-a380d9ad03f2fcf950dad0f08652a03b738dc0e8.tar.bz2 ChibiOS-a380d9ad03f2fcf950dad0f08652a03b738dc0e8.zip | |
More MISRA.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7716 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/src/chheap.c')
| -rw-r--r-- | os/rt/src/chheap.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/os/rt/src/chheap.c b/os/rt/src/chheap.c index 305b88795..a2ed3ddb0 100644 --- a/os/rt/src/chheap.c +++ b/os/rt/src/chheap.c @@ -35,7 +35,7 @@ #include "ch.h"
-#if CH_CFG_USE_HEAP || defined(__DOXYGEN__)
+#if (CH_CFG_USE_HEAP == TRUE) || defined(__DOXYGEN__)
/*===========================================================================*/
/* Module local definitions. */
@@ -44,7 +44,7 @@ /*
* Defaults on the best synchronization mechanism available.
*/
-#if CH_CFG_USE_MUTEXES || defined(__DOXYGEN__)
+#if (CH_CFG_USE_MUTEXES == TRUE) || defined(__DOXYGEN__)
#define H_LOCK(h) chMtxLock(&(h)->h_mtx)
#define H_UNLOCK(h) chMtxUnlock(&(h)->h_mtx)
#else
@@ -87,7 +87,7 @@ void _heap_init(void) { default_heap.h_provider = chCoreAlloc;
default_heap.h_free.h.u.next = (union heap_header *)NULL;
default_heap.h_free.h.size = 0;
-#if CH_CFG_USE_MUTEXES || defined(__DOXYGEN__)
+#if (CH_CFG_USE_MUTEXES == TRUE) || defined(__DOXYGEN__)
chMtxObjectInit(&default_heap.h_mtx);
#else
chSemObjectInit(&default_heap.h_sem, 1);
@@ -115,7 +115,7 @@ void chHeapObjectInit(memory_heap_t *heapp, void *buf, size_t size) { heapp->h_free.h.size = 0;
hp->h.u.next = NULL;
hp->h.size = size - sizeof(union heap_header);
-#if CH_CFG_USE_MUTEXES || defined(__DOXYGEN__)
+#if (CH_CFG_USE_MUTEXES == TRUE) || defined(__DOXYGEN__)
chMtxObjectInit(&heapp->h_mtx);
#else
chSemObjectInit(&heapp->h_sem, 1);
@@ -215,8 +215,11 @@ void chHeapFree(void *p) { while (true) {
chDbgAssert((hp < qp) || (hp >= LIMIT(qp)), "within free block");
+ /*lint -save -e946 -e947 [18.2, 18.3] Normal pointers arithmetic, it
+ is safe.*/
if (((qp == &heapp->h_free) || (hp > qp)) &&
((qp->h.u.next == NULL) || (hp < qp->h.u.next))) {
+ /*lint -restore*/
/* Insertion after qp.*/
hp->h.u.next = qp->h.u.next;
qp->h.u.next = hp;
@@ -274,6 +277,6 @@ size_t chHeapStatus(memory_heap_t *heapp, size_t *sizep) { return n;
}
-#endif /* CH_CFG_USE_HEAP */
+#endif /* CH_CFG_USE_HEAP == TRUE */
/** @} */
|