aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2017-07-01 16:54:16 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2017-07-01 16:54:16 +0000
commit3edd2f7ccb1ecca032efb47d3192c4f4065e20ed (patch)
tree54d09f713e649371a71e4cb5c588446ef2419f0c /os
parente46a8db1dffd3bc20495c6959381d063028ecf5e (diff)
downloadChibiOS-3edd2f7ccb1ecca032efb47d3192c4f4065e20ed.tar.gz
ChibiOS-3edd2f7ccb1ecca032efb47d3192c4f4065e20ed.tar.bz2
ChibiOS-3edd2f7ccb1ecca032efb47d3192c4f4065e20ed.zip
Fixed bug #850.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10272 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
-rw-r--r--os/common/oslib/include/chheap.h1
-rw-r--r--os/rt/dox/rt.dox25
-rw-r--r--os/rt/include/chalign.h2
3 files changed, 12 insertions, 16 deletions
diff --git a/os/common/oslib/include/chheap.h b/os/common/oslib/include/chheap.h
index db8b70269..0447d546d 100644
--- a/os/common/oslib/include/chheap.h
+++ b/os/common/oslib/include/chheap.h
@@ -163,6 +163,7 @@ static inline void *chHeapAlloc(memory_heap_t *heapp, size_t size) {
* same value aligned to the next @p CH_HEAP_ALIGNMENT multiple.
*
* @param[in] p pointer to the memory block
+ * @return Size of the block.
*
* @api
*/
diff --git a/os/rt/dox/rt.dox b/os/rt/dox/rt.dox
index 78b1baa09..0972a1dd5 100644
--- a/os/rt/dox/rt.dox
+++ b/os/rt/dox/rt.dox
@@ -34,11 +34,6 @@
*/
/**
- * @defgroup types Kernel Types
- * @ingroup kernel
- */
-
-/**
* @defgroup base Base Kernel Services
* @details Base kernel services, the base subsystems are always included in
* the OS builds.
@@ -112,6 +107,12 @@
*/
/**
+ * @defgroup mem Memory Alignment
+ * @details Memory Alignment services.
+ * @ingroup kernel
+ */
+
+/**
* @defgroup memory Memory Management
* @details Memory Management services.
* @ingroup kernel
@@ -137,24 +138,18 @@
* @ingroup memory
*/
- /**
- * @defgroup streams Streams and Files
- * @details Stream and Files interfaces.
- * @ingroup kernel
- */
-
/**
- * @defgroup data_streams Abstract Sequential Streams
- * @ingroup streams
+ * @defgroup registry Registry
+ * @ingroup kernel
*/
/**
- * @defgroup registry Registry
+ * @defgroup debug Debug
* @ingroup kernel
*/
/**
- * @defgroup debug Debug
+ * @defgroup trace Trace
* @ingroup kernel
*/
diff --git a/os/rt/include/chalign.h b/os/rt/include/chalign.h
index ae1a2184f..ac3b30d96 100644
--- a/os/rt/include/chalign.h
+++ b/os/rt/include/chalign.h
@@ -70,7 +70,7 @@
/*lint -restore*/
/**
- * @brief Aligns to the new aligned memory address.
+ * @brief Aligns to the next aligned memory address.
*
* @param[in] p variable to be aligned
* @param[in] a alignment, must be a power of two