diff options
| -rwxr-xr-x | os/hal/ports/simulator/posix/hal_lld.c | 2 | ||||
| -rw-r--r-- | os/hal/ports/simulator/win32/hal_lld.c | 2 | ||||
| -rw-r--r-- | os/lib/include/chlib.h | 4 | ||||
| -rw-r--r-- | os/lib/include/chmemheaps.h (renamed from os/lib/include/chheap.h) | 10 | ||||
| -rw-r--r-- | os/lib/include/chobjfifos.h (renamed from os/lib/include/chfifo.h) | 8 | ||||
| -rw-r--r-- | os/lib/lib.mk | 4 | ||||
| -rw-r--r-- | os/lib/src/chmemheaps.c (renamed from os/lib/src/chheap.c) | 6 |
7 files changed, 18 insertions, 18 deletions
diff --git a/os/hal/ports/simulator/posix/hal_lld.c b/os/hal/ports/simulator/posix/hal_lld.c index 449fd8e98..0015f5b24 100755 --- a/os/hal/ports/simulator/posix/hal_lld.c +++ b/os/hal/ports/simulator/posix/hal_lld.c @@ -74,7 +74,7 @@ void _sim_check_for_interrupts(void) { #if HAL_USE_SERIAL
if (sd_lld_interrupt_pending()) {
- int_occured = true;
+ int_occurred = true;
}
#endif
diff --git a/os/hal/ports/simulator/win32/hal_lld.c b/os/hal/ports/simulator/win32/hal_lld.c index e00aab428..6a0220b91 100644 --- a/os/hal/ports/simulator/win32/hal_lld.c +++ b/os/hal/ports/simulator/win32/hal_lld.c @@ -87,7 +87,7 @@ void _sim_check_for_interrupts(void) { /* Interrupt Timer simulation (10ms interval).*/
QueryPerformanceCounter(&n);
if (n.QuadPart > nextcnt.QuadPart) {
- int_occured = true;
+ int_occurred = true;
nextcnt.QuadPart += slice.QuadPart;
CH_IRQ_PROLOGUE();
diff --git a/os/lib/include/chlib.h b/os/lib/include/chlib.h index 6a1944e53..674561cb8 100644 --- a/os/lib/include/chlib.h +++ b/os/lib/include/chlib.h @@ -210,9 +210,9 @@ #include "chbsem.h"
#include "chmboxes.h"
#include "chmemcore.h"
-#include "chheap.h"
+#include "chmemheaps.h"
#include "chmempools.h"
-#include "chfifo.h"
+#include "chobjfifos.h"
//#include "chpipes.h"
#include "chfactory.h"
diff --git a/os/lib/include/chheap.h b/os/lib/include/chmemheaps.h index 24e8e4761..59248a89e 100644 --- a/os/lib/include/chheap.h +++ b/os/lib/include/chmemheaps.h @@ -18,15 +18,15 @@ */
/**
- * @file chheap.h
- * @brief Heaps macros and structures.
+ * @file chmemheaps.h
+ * @brief Memory heaps macros and structures.
*
* @addtogroup heaps
* @{
*/
-#ifndef CHHEAP_H
-#define CHHEAP_H
+#ifndef CHMEMHEAPS_H
+#define CHMEMHEAPS_H
#if (CH_CFG_USE_HEAP == TRUE) || defined(__DOXYGEN__)
@@ -173,6 +173,6 @@ static inline size_t chHeapGetSize(const void *p) { #endif /* CH_CFG_USE_HEAP == TRUE */
-#endif /* CHHEAP_H */
+#endif /* CHMEMHEAPS_H */
/** @} */
diff --git a/os/lib/include/chfifo.h b/os/lib/include/chobjfifos.h index 066de53e6..51e7bf0a8 100644 --- a/os/lib/include/chfifo.h +++ b/os/lib/include/chobjfifos.h @@ -18,7 +18,7 @@ */
/**
- * @file chfifo.h
+ * @file chobjfifos.h
* @brief Objects FIFO structures and macros.
* @details This module implements a generic FIFO queue of objects by
* coupling a Guarded Memory Pool (for objects storage) and
@@ -41,8 +41,8 @@ * @{
*/
-#ifndef CHFIFO_H
-#define CHFIFO_H
+#ifndef CHOBJFIFOS_H
+#define CHOBJFIFOS_H
#if (CH_CFG_USE_OBJ_FIFOS == TRUE) || defined(__DOXYGEN__)
@@ -333,6 +333,6 @@ static inline msg_t chFifoReceiveObjectTimeout(objects_fifo_t *ofp, }
#endif /* CH_CFG_USE_OBJ_FIFOS == TRUE */
-#endif /* CHFIFO_H */
+#endif /* CHOBJFIFOS_H */
/** @} */
diff --git a/os/lib/lib.mk b/os/lib/lib.mk index f515b0315..c84dd322f 100644 --- a/os/lib/lib.mk +++ b/os/lib/lib.mk @@ -17,7 +17,7 @@ ifneq ($(findstring CH_CFG_USE_MEMCORE TRUE,$(CHLIBCONF)),) LIBSRC += $(CHIBIOS)/os/lib/src/chmemcore.c
endif
ifneq ($(findstring CH_CFG_USE_HEAP TRUE,$(CHLIBCONF)),)
-LIBSRC += $(CHIBIOS)/os/lib/src/chheap.c
+LIBSRC += $(CHIBIOS)/os/lib/src/chmemheaps.c
endif
ifneq ($(findstring CH_CFG_USE_MEMPOOLS TRUE,$(CHLIBCONF)),)
LIBSRC += $(CHIBIOS)/os/lib/src/chmempools.c
@@ -28,7 +28,7 @@ endif else
LIBSRC := $(CHIBIOS)/os/lib/src/chmboxes.c \
$(CHIBIOS)/os/lib/src/chmemcore.c \
- $(CHIBIOS)/os/lib/src/chheap.c \
+ $(CHIBIOS)/os/lib/src/chmemheaps.c \
$(CHIBIOS)/os/lib/src/chmempools.c \
$(CHIBIOS)/os/lib/src/chfactory.c
endif
diff --git a/os/lib/src/chheap.c b/os/lib/src/chmemheaps.c index d3d25458f..ebbd46bad 100644 --- a/os/lib/src/chheap.c +++ b/os/lib/src/chmemheaps.c @@ -18,10 +18,10 @@ */
/**
- * @file chheap.c
- * @brief Heaps code.
+ * @file chmemheaps.c
+ * @brief Memory heaps code.
*
- * @addtogroup heaps
+ * @addtogroup memheaps
* @details Heap Allocator related APIs.
* <h2>Operation mode</h2>
* The heap allocator implements a first-fit strategy and its APIs
|