diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-07-19 14:51:35 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-07-19 14:51:35 +0000 |
| commit | 25ddb1c801f06a3be7171e20dcfd46d11a75f112 (patch) | |
| tree | 8a9cc02a0a62649b44821817b96a6c148ddfc9f8 /os/kernel/templates | |
| parent | d58064a533743df77e52f9d76385a9e0ea1d0227 (diff) | |
| download | ChibiOS-25ddb1c801f06a3be7171e20dcfd46d11a75f112.tar.gz ChibiOS-25ddb1c801f06a3be7171e20dcfd46d11a75f112.tar.bz2 ChibiOS-25ddb1c801f06a3be7171e20dcfd46d11a75f112.zip | |
First cleanup pass finished, queues and streams not yet removed.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@5999 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel/templates')
| -rw-r--r-- | os/kernel/templates/chconf.h | 14 | ||||
| -rw-r--r-- | os/kernel/templates/chtypes.h | 9 | ||||
| -rw-r--r-- | os/kernel/templates/module.h | 8 |
3 files changed, 11 insertions, 20 deletions
diff --git a/os/kernel/templates/chconf.h b/os/kernel/templates/chconf.h index 1e570c3cc..652a6adee 100644 --- a/os/kernel/templates/chconf.h +++ b/os/kernel/templates/chconf.h @@ -307,20 +307,6 @@ #endif
/**
- * @brief C-runtime allocator.
- * @details If enabled the the heap allocator APIs just wrap the C-runtime
- * @p malloc() and @p free() functions.
- *
- * @note The default is @p FALSE.
- * @note Requires @p CH_USE_HEAP.
- * @note The C-runtime may or may not require @p CH_USE_MEMCORE, see the
- * appropriate documentation.
- */
-#if !defined(CH_USE_MALLOC_HEAP) || defined(__DOXYGEN__)
-#define CH_USE_MALLOC_HEAP FALSE
-#endif
-
-/**
* @brief Memory Pools Allocator APIs.
* @details If enabled then the memory pools allocator APIs are included
* in the kernel.
diff --git a/os/kernel/templates/chtypes.h b/os/kernel/templates/chtypes.h index 52efee447..5bf0ff0f0 100644 --- a/os/kernel/templates/chtypes.h +++ b/os/kernel/templates/chtypes.h @@ -73,16 +73,21 @@ typedef uint32_t tprio_t; typedef int32_t msg_t;
/**
- * @brief Event Id, use fastest signed.
+ * @brief Numeric event identifier, use fastest signed.
*/
typedef int32_t eventid_t;
/**
- * @brief Event Mask, recommended fastest unsigned.
+ * @brief Mask of event identifiers, recommended fastest unsigned.
*/
typedef uint32_t eventmask_t;
/**
+ * @brief Mask of event flags, recommended fastest unsigned.
+ */
+typedef uint32_t eventflags_t;
+
+/**
* @brief System Time, recommended fastest unsigned.
*/
typedef uint32_t systime_t;
diff --git a/os/kernel/templates/module.h b/os/kernel/templates/module.h index 4761a947c..a76b8177e 100644 --- a/os/kernel/templates/module.h +++ b/os/kernel/templates/module.h @@ -66,12 +66,12 @@ extern "C" { }
#endif
-#endif /* CH_USE_XXX */
-
-#endif /* _CHXXX_H_ */
-
/*===========================================================================*/
/* Module inline functions. */
/*===========================================================================*/
+#endif /* CH_USE_XXX */
+
+#endif /* _CHXXX_H_ */
+
/** @} */
|