aboutsummaryrefslogtreecommitdiffstats
path: root/os/kernel/include/chheap.h
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-07-20 10:12:44 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-07-20 10:12:44 +0000
commit49d71a01abeefa000a4cd7a556052d826b096d49 (patch)
tree8c5ce964f194d9f7b17e91d912d9e6d723e4b8ae /os/kernel/include/chheap.h
parentdc7b36df31f4d9dbd9a039319df74f4b2c8eed0c (diff)
downloadChibiOS-49d71a01abeefa000a4cd7a556052d826b096d49.tar.gz
ChibiOS-49d71a01abeefa000a4cd7a556052d826b096d49.tar.bz2
ChibiOS-49d71a01abeefa000a4cd7a556052d826b096d49.zip
Renamed or added prefix to all hernel configuration options.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6010 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel/include/chheap.h')
-rw-r--r--os/kernel/include/chheap.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/os/kernel/include/chheap.h b/os/kernel/include/chheap.h
index bc5a9afb4..73e0d4148 100644
--- a/os/kernel/include/chheap.h
+++ b/os/kernel/include/chheap.h
@@ -29,7 +29,7 @@
#ifndef _CHHEAP_H_
#define _CHHEAP_H_
-#if CH_USE_HEAP || defined(__DOXYGEN__)
+#if CH_CFG_USE_HEAP || defined(__DOXYGEN__)
/*===========================================================================*/
/* Module constants. */
@@ -43,12 +43,12 @@
/* Derived constants and error checks. */
/*===========================================================================*/
-#if !CH_USE_MEMCORE
-#error "CH_USE_HEAP requires CH_USE_MEMCORE"
+#if !CH_CFG_USE_MEMCORE
+#error "CH_CFG_USE_HEAP requires CH_CFG_USE_MEMCORE"
#endif
-#if !CH_USE_MUTEXES && !CH_USE_SEMAPHORES
-#error "CH_USE_HEAP requires CH_USE_MUTEXES and/or CH_USE_SEMAPHORES"
+#if !CH_CFG_USE_MUTEXES && !CH_CFG_USE_SEMAPHORES
+#error "CH_CFG_USE_HEAP requires CH_CFG_USE_MUTEXES and/or CH_CFG_USE_SEMAPHORES"
#endif
/*===========================================================================*/
@@ -81,7 +81,7 @@ struct memory_heap {
memgetfunc_t h_provider; /**< @brief Memory blocks provider for
this heap. */
union heap_header h_free; /**< @brief Free blocks list header. */
-#if CH_USE_MUTEXES
+#if CH_CFG_USE_MUTEXES
mutex_t h_mtx; /**< @brief Heap access mutex. */
#else
semaphore_t h_sem; /**< @brief Heap access semaphore. */
@@ -112,7 +112,7 @@ extern "C" {
/* Module inline functions. */
/*===========================================================================*/
-#endif /* CH_USE_HEAP */
+#endif /* CH_CFG_USE_HEAP */
#endif /* _CHHEAP_H_ */