git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11804 110e8d01-0319-4d1e-a829-52ad28d1bb01
This commit is contained in:
Giovanni Di Sirio 2018-03-17 21:44:30 +00:00
parent 9752c1ff01
commit b16e783aae
7 changed files with 18 additions and 18 deletions

View File

@ -74,7 +74,7 @@ void _sim_check_for_interrupts(void) {
#if HAL_USE_SERIAL #if HAL_USE_SERIAL
if (sd_lld_interrupt_pending()) { if (sd_lld_interrupt_pending()) {
int_occured = true; int_occurred = true;
} }
#endif #endif

View File

@ -87,7 +87,7 @@ void _sim_check_for_interrupts(void) {
/* Interrupt Timer simulation (10ms interval).*/ /* Interrupt Timer simulation (10ms interval).*/
QueryPerformanceCounter(&n); QueryPerformanceCounter(&n);
if (n.QuadPart > nextcnt.QuadPart) { if (n.QuadPart > nextcnt.QuadPart) {
int_occured = true; int_occurred = true;
nextcnt.QuadPart += slice.QuadPart; nextcnt.QuadPart += slice.QuadPart;
CH_IRQ_PROLOGUE(); CH_IRQ_PROLOGUE();

View File

@ -210,9 +210,9 @@
#include "chbsem.h" #include "chbsem.h"
#include "chmboxes.h" #include "chmboxes.h"
#include "chmemcore.h" #include "chmemcore.h"
#include "chheap.h" #include "chmemheaps.h"
#include "chmempools.h" #include "chmempools.h"
#include "chfifo.h" #include "chobjfifos.h"
//#include "chpipes.h" //#include "chpipes.h"
#include "chfactory.h" #include "chfactory.h"

View File

@ -18,15 +18,15 @@
*/ */
/** /**
* @file chheap.h * @file chmemheaps.h
* @brief Heaps macros and structures. * @brief Memory heaps macros and structures.
* *
* @addtogroup heaps * @addtogroup heaps
* @{ * @{
*/ */
#ifndef CHHEAP_H #ifndef CHMEMHEAPS_H
#define CHHEAP_H #define CHMEMHEAPS_H
#if (CH_CFG_USE_HEAP == TRUE) || defined(__DOXYGEN__) #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 /* CH_CFG_USE_HEAP == TRUE */
#endif /* CHHEAP_H */ #endif /* CHMEMHEAPS_H */
/** @} */ /** @} */

View File

@ -18,7 +18,7 @@
*/ */
/** /**
* @file chfifo.h * @file chobjfifos.h
* @brief Objects FIFO structures and macros. * @brief Objects FIFO structures and macros.
* @details This module implements a generic FIFO queue of objects by * @details This module implements a generic FIFO queue of objects by
* coupling a Guarded Memory Pool (for objects storage) and * coupling a Guarded Memory Pool (for objects storage) and
@ -41,8 +41,8 @@
* @{ * @{
*/ */
#ifndef CHFIFO_H #ifndef CHOBJFIFOS_H
#define CHFIFO_H #define CHOBJFIFOS_H
#if (CH_CFG_USE_OBJ_FIFOS == TRUE) || defined(__DOXYGEN__) #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 /* CH_CFG_USE_OBJ_FIFOS == TRUE */
#endif /* CHFIFO_H */ #endif /* CHOBJFIFOS_H */
/** @} */ /** @} */

View File

@ -17,7 +17,7 @@ ifneq ($(findstring CH_CFG_USE_MEMCORE TRUE,$(CHLIBCONF)),)
LIBSRC += $(CHIBIOS)/os/lib/src/chmemcore.c LIBSRC += $(CHIBIOS)/os/lib/src/chmemcore.c
endif endif
ifneq ($(findstring CH_CFG_USE_HEAP TRUE,$(CHLIBCONF)),) ifneq ($(findstring CH_CFG_USE_HEAP TRUE,$(CHLIBCONF)),)
LIBSRC += $(CHIBIOS)/os/lib/src/chheap.c LIBSRC += $(CHIBIOS)/os/lib/src/chmemheaps.c
endif endif
ifneq ($(findstring CH_CFG_USE_MEMPOOLS TRUE,$(CHLIBCONF)),) ifneq ($(findstring CH_CFG_USE_MEMPOOLS TRUE,$(CHLIBCONF)),)
LIBSRC += $(CHIBIOS)/os/lib/src/chmempools.c LIBSRC += $(CHIBIOS)/os/lib/src/chmempools.c
@ -28,7 +28,7 @@ endif
else else
LIBSRC := $(CHIBIOS)/os/lib/src/chmboxes.c \ LIBSRC := $(CHIBIOS)/os/lib/src/chmboxes.c \
$(CHIBIOS)/os/lib/src/chmemcore.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/chmempools.c \
$(CHIBIOS)/os/lib/src/chfactory.c $(CHIBIOS)/os/lib/src/chfactory.c
endif endif

View File

@ -18,10 +18,10 @@
*/ */
/** /**
* @file chheap.c * @file chmemheaps.c
* @brief Heaps code. * @brief Memory heaps code.
* *
* @addtogroup heaps * @addtogroup memheaps
* @details Heap Allocator related APIs. * @details Heap Allocator related APIs.
* <h2>Operation mode</h2> * <h2>Operation mode</h2>
* The heap allocator implements a first-fit strategy and its APIs * The heap allocator implements a first-fit strategy and its APIs