diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-03-19 10:47:17 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-03-19 10:47:17 +0000 |
| commit | d29098e7f64c4d15b5414447937bfd09f142f758 (patch) | |
| tree | 60b1a38771a8143fd2ef71ddf16cf66c6996f215 /os | |
| parent | b3fe630e4bab9a0af6f514ba086b26a1183fd333 (diff) | |
| download | ChibiOS-d29098e7f64c4d15b5414447937bfd09f142f758.tar.gz ChibiOS-d29098e7f64c4d15b5414447937bfd09f142f758.tar.bz2 ChibiOS-d29098e7f64c4d15b5414447937bfd09f142f758.zip | |
Guarded pools tested.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9137 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/common/oslib/include/chmempools.h | 8 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/OTGv1/usb_lld.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/os/common/oslib/include/chmempools.h b/os/common/oslib/include/chmempools.h index d617f648a..71f53a67d 100644 --- a/os/common/oslib/include/chmempools.h +++ b/os/common/oslib/include/chmempools.h @@ -120,21 +120,19 @@ typedef struct { */
#define _GUARDEDMEMORYPOOL_DATA(name, size) { \
_SEMAPHORE_DATA(name.sem, (cnt_t)0), \
- NULL, \
- size, \
- NULL \
+ _MEMORYPOOL_DATA(NULL, size, NULL) \
}
/**
* @brief Static guarded memory pool initializer.
- * @details Statically initialized guardedmemory pools require no explicit
+ * @details Statically initialized guarded memory pools require no explicit
* initialization using @p chGuardedPoolInit().
*
* @param[in] name the name of the guarded memory pool variable
* @param[in] size size of the memory pool contained objects
*/
#define GUARDEDMEMORYPOOL_DECL(name, size) \
- memory_pool_t name = _MEMORYPOOL_DATA(name, size)
+ guarded_memory_pool_t name = _GUARDEDMEMORYPOOL_DATA(name, size)
#endif /* CH_CFG_USE_SEMAPHORES == TRUE */
/*===========================================================================*/
diff --git a/os/hal/ports/STM32/LLD/OTGv1/usb_lld.h b/os/hal/ports/STM32/LLD/OTGv1/usb_lld.h index b08657008..8b3ee8957 100644 --- a/os/hal/ports/STM32/LLD/OTGv1/usb_lld.h +++ b/os/hal/ports/STM32/LLD/OTGv1/usb_lld.h @@ -265,7 +265,7 @@ typedef struct { #endif
/* End of the mandatory fields.*/
/**
- * @brief Total transmit transfer size.
+ * @brief Total receive transfer size.
*/
size_t totsize;
} USBOutEndpointState;
|