From ff55da639bb8476e1ea73e5f16968e477c5ca14b Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 23 Sep 2017 14:58:21 +0000 Subject: Fixed bug #887. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10691 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/SPC5/NIL-SPC560D-EVB/chconf.h | 2 +- demos/STM32/NIL-STM32F051-DISCOVERY/.project | 5 + demos/STM32/NIL-STM32F051-DISCOVERY/chconf.h | 2 +- demos/STM32/NIL-STM32F100-DISCOVERY/chconf.h | 2 +- demos/STM32/NIL-STM32F303-DISCOVERY/chconf.h | 2 +- ...2F303-DISCOVERY (OpenOCD, Flash and Run).launch | 1 + demos/STM32/NIL-STM32F373-STM32373C_EVAL/chconf.h | 2 +- demos/STM32/NIL-STM32F746G-DISCOVERY/chconf.h | 2 +- ...F746G-DISCOVERY (OpenOCD, Flash and Run).launch | 104 ++++++++++----------- demos/STM32/NIL-STM32L011K4-NUCLEO32/chconf.h | 2 +- demos/STM32/NIL-STM32L152-DISCOVERY/chconf.h | 2 +- os/nil/dox/nil.dox | 6 +- os/nil/include/ch.h | 48 +++++----- os/nil/templates/chconf.h | 2 +- readme.txt | 2 + 15 files changed, 96 insertions(+), 88 deletions(-) diff --git a/demos/SPC5/NIL-SPC560D-EVB/chconf.h b/demos/SPC5/NIL-SPC560D-EVB/chconf.h index 92e72a128..4338ce9ed 100644 --- a/demos/SPC5/NIL-SPC560D-EVB/chconf.h +++ b/demos/SPC5/NIL-SPC560D-EVB/chconf.h @@ -20,7 +20,7 @@ * @details A copy of this file must be placed in each project directory, it * contains the application specific kernel settings. * - * @addtogroup config + * @addtogroup NIL_CONFIG * @details Kernel related settings and hooks. * @{ */ diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/.project b/demos/STM32/NIL-STM32F051-DISCOVERY/.project index 041565660..e9049d85d 100644 --- a/demos/STM32/NIL-STM32F051-DISCOVERY/.project +++ b/demos/STM32/NIL-STM32F051-DISCOVERY/.project @@ -86,5 +86,10 @@ 2 CHIBIOS/os + + test + 2 + CHIBIOS/test + diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/chconf.h b/demos/STM32/NIL-STM32F051-DISCOVERY/chconf.h index 0304f2e61..8757fcfd9 100644 --- a/demos/STM32/NIL-STM32F051-DISCOVERY/chconf.h +++ b/demos/STM32/NIL-STM32F051-DISCOVERY/chconf.h @@ -20,7 +20,7 @@ * @details A copy of this file must be placed in each project directory, it * contains the application specific kernel settings. * - * @addtogroup config + * @addtogroup NIL_CONFIG * @details Kernel related settings and hooks. * @{ */ diff --git a/demos/STM32/NIL-STM32F100-DISCOVERY/chconf.h b/demos/STM32/NIL-STM32F100-DISCOVERY/chconf.h index c070f30c7..bcf8136b5 100644 --- a/demos/STM32/NIL-STM32F100-DISCOVERY/chconf.h +++ b/demos/STM32/NIL-STM32F100-DISCOVERY/chconf.h @@ -20,7 +20,7 @@ * @details A copy of this file must be placed in each project directory, it * contains the application specific kernel settings. * - * @addtogroup config + * @addtogroup NIL_CONFIG * @details Kernel related settings and hooks. * @{ */ diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/chconf.h b/demos/STM32/NIL-STM32F303-DISCOVERY/chconf.h index 1fbf86a1f..16645ca36 100644 --- a/demos/STM32/NIL-STM32F303-DISCOVERY/chconf.h +++ b/demos/STM32/NIL-STM32F303-DISCOVERY/chconf.h @@ -20,7 +20,7 @@ * @details A copy of this file must be placed in each project directory, it * contains the application specific kernel settings. * - * @addtogroup config + * @addtogroup NIL_CONFIG * @details Kernel related settings and hooks. * @{ */ diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/debug/NIL-STM32F303-DISCOVERY (OpenOCD, Flash and Run).launch b/demos/STM32/NIL-STM32F303-DISCOVERY/debug/NIL-STM32F303-DISCOVERY (OpenOCD, Flash and Run).launch index 9df8eea30..c4057fe37 100644 --- a/demos/STM32/NIL-STM32F303-DISCOVERY/debug/NIL-STM32F303-DISCOVERY (OpenOCD, Flash and Run).launch +++ b/demos/STM32/NIL-STM32F303-DISCOVERY/debug/NIL-STM32F303-DISCOVERY (OpenOCD, Flash and Run).launch @@ -46,6 +46,7 @@ + diff --git a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/chconf.h b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/chconf.h index dcde895c4..9e26d79b4 100644 --- a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/chconf.h +++ b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/chconf.h @@ -20,7 +20,7 @@ * @details A copy of this file must be placed in each project directory, it * contains the application specific kernel settings. * - * @addtogroup config + * @addtogroup NIL_CONFIG * @details Kernel related settings and hooks. * @{ */ diff --git a/demos/STM32/NIL-STM32F746G-DISCOVERY/chconf.h b/demos/STM32/NIL-STM32F746G-DISCOVERY/chconf.h index ad88fc1bd..d8d0bc139 100644 --- a/demos/STM32/NIL-STM32F746G-DISCOVERY/chconf.h +++ b/demos/STM32/NIL-STM32F746G-DISCOVERY/chconf.h @@ -20,7 +20,7 @@ * @details A copy of this file must be placed in each project directory, it * contains the application specific kernel settings. * - * @addtogroup config + * @addtogroup NIL_CONFIG * @details Kernel related settings and hooks. * @{ */ diff --git a/demos/STM32/NIL-STM32F746G-DISCOVERY/debug/NIL-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch b/demos/STM32/NIL-STM32F746G-DISCOVERY/debug/NIL-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch index 6068cf8e3..15b43d869 100644 --- a/demos/STM32/NIL-STM32F746G-DISCOVERY/debug/NIL-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch +++ b/demos/STM32/NIL-STM32F746G-DISCOVERY/debug/NIL-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch @@ -1,52 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/STM32/NIL-STM32L011K4-NUCLEO32/chconf.h b/demos/STM32/NIL-STM32L011K4-NUCLEO32/chconf.h index c5772de18..e64964905 100644 --- a/demos/STM32/NIL-STM32L011K4-NUCLEO32/chconf.h +++ b/demos/STM32/NIL-STM32L011K4-NUCLEO32/chconf.h @@ -20,7 +20,7 @@ * @details A copy of this file must be placed in each project directory, it * contains the application specific kernel settings. * - * @addtogroup config + * @addtogroup NIL_CONFIG * @details Kernel related settings and hooks. * @{ */ diff --git a/demos/STM32/NIL-STM32L152-DISCOVERY/chconf.h b/demos/STM32/NIL-STM32L152-DISCOVERY/chconf.h index c070f30c7..bcf8136b5 100644 --- a/demos/STM32/NIL-STM32L152-DISCOVERY/chconf.h +++ b/demos/STM32/NIL-STM32L152-DISCOVERY/chconf.h @@ -20,7 +20,7 @@ * @details A copy of this file must be placed in each project directory, it * contains the application specific kernel settings. * - * @addtogroup config + * @addtogroup NIL_CONFIG * @details Kernel related settings and hooks. * @{ */ diff --git a/os/nil/dox/nil.dox b/os/nil/dox/nil.dox index d539d8863..197eef91e 100644 --- a/os/nil/dox/nil.dox +++ b/os/nil/dox/nil.dox @@ -28,7 +28,7 @@ * @ingroup NIL */ -/** +/*-* * @defgroup NIL_TYPES Kernel Types * @ingroup NIL */ @@ -38,12 +38,12 @@ * @ingroup NIL */ -/** +/*-* * @defgroup NIL_CORE Port Layer * @ingroup NIL */ -/** +/*-* * @defgroup NIL_TIMER Timer Interface * @ingroup NIL */ diff --git a/os/nil/include/ch.h b/os/nil/include/ch.h index 8fc480776..0391af16e 100644 --- a/os/nil/include/ch.h +++ b/os/nil/include/ch.h @@ -55,7 +55,7 @@ /** * @brief Kernel version string. */ -#define CH_KERNEL_VERSION "2.0.0" +#define CH_KERNEL_VERSION "2.0.1" /** * @brief Kernel version major number. @@ -70,7 +70,7 @@ /** * @brief Kernel version patch number. */ -#define CH_KERNEL_PATCH 0 +#define CH_KERNEL_PATCH 1 /** @} */ /** @@ -139,7 +139,7 @@ /* Module pre-compile time settings. */ /*===========================================================================*/ -/** +/*-* * @brief Number of user threads in the application. * @note This number is not inclusive of the idle thread which is * implicitly handled. @@ -148,7 +148,7 @@ #define CH_CFG_NUM_THREADS 2 #endif -/** +/*-* * @brief System time counter resolution. * @note Allowed values are 16 or 32 bits. */ @@ -156,7 +156,7 @@ #define CH_CFG_ST_RESOLUTION 32 #endif -/** +/*-* * @brief System tick frequency. * @note This value together with the @p CH_CFG_ST_RESOLUTION * option defines the maximum amount of time allowed for @@ -166,7 +166,7 @@ #define CH_CFG_ST_FREQUENCY 100 #endif -/** +/*-* * @brief Time delta constant for the tick-less mode. * @note If this value is zero then the system uses the classic * periodic tick. This value represents the minimum number @@ -178,7 +178,7 @@ #define CH_CFG_ST_TIMEDELTA 0 #endif -/** +/*-* * @brief Semaphores APIs. * @details If enabled then the Semaphores APIs are included in the kernel. * @@ -188,7 +188,7 @@ #define CH_CFG_USE_SEMAPHORES TRUE #endif -/** +/*-* * @brief Mutexes APIs. * @details If enabled then the mutexes APIs are included in the kernel. * @@ -199,7 +199,7 @@ #define CH_CFG_USE_MUTEXES FALSE #endif -/** +/*-* * @brief Events Flags APIs. * @details If enabled then the event flags APIs are included in the kernel. * @@ -209,7 +209,7 @@ #define CH_CFG_USE_EVENTS TRUE #endif -/** +/*-* * @brief Mailboxes APIs. * @details If enabled then the asynchronous messages (mailboxes) APIs are * included in the kernel. @@ -221,7 +221,7 @@ #define CH_CFG_USE_MAILBOXES TRUE #endif -/** +/*-* * @brief Core Memory Manager APIs. * @details If enabled then the core memory manager APIs are included * in the kernel. @@ -232,7 +232,7 @@ #define CH_CFG_USE_MEMCORE TRUE #endif -/** +/*-* * @brief Heap Allocator APIs. * @details If enabled then the memory heap allocator APIs are included * in the kernel. @@ -243,7 +243,7 @@ #define CH_CFG_USE_HEAP TRUE #endif -/** +/*-* * @brief Memory Pools Allocator APIs. * @details If enabled then the memory pools allocator APIs are included * in the kernel. @@ -254,7 +254,7 @@ #define CH_CFG_USE_MEMPOOLS TRUE #endif -/** +/*-* * @brief Debug option, kernel statistics. * * @note Feature not currently implemented. @@ -264,7 +264,7 @@ #define CH_DBG_STATISTICS FALSE #endif -/** +/*-* * @brief Debug option, system state check. * @note This is a planned feature, not yet implemented. * @@ -274,7 +274,7 @@ #define CH_DBG_SYSTEM_STATE_CHECK FALSE #endif -/** +/*-* * @brief Debug option, parameters checks. * * @note The default is @p FALSE. @@ -283,7 +283,7 @@ #define CH_DBG_ENABLE_CHECKS FALSE #endif -/** +/*-* * @brief System assertions. * * @note The default is @p FALSE. @@ -292,7 +292,7 @@ #define CH_DBG_ENABLE_ASSERTS FALSE #endif -/** +/*-* * @brief Stack check. * * @note The default is @p FALSE. @@ -301,14 +301,14 @@ #define CH_DBG_ENABLE_STACK_CHECK FALSE #endif -/** +/*-* * @brief System initialization hook. */ #if !defined(CH_CFG_SYSTEM_INIT_HOOK) || defined(__DOXYGEN__) #define CH_CFG_SYSTEM_INIT_HOOK() {} #endif -/** +/*-* * @brief Threads descriptor structure extension. * @details User fields added to the end of the @p thread_t structure. */ @@ -316,14 +316,14 @@ #define CH_CFG_THREAD_EXT_FIELDS #endif -/** +/*-* * @brief Threads initialization hook. */ #if !defined(CH_CFG_THREAD_EXT_INIT_HOOK) || defined(__DOXYGEN__) #define CH_CFG_THREAD_EXT_INIT_HOOK(tr) {} #endif -/** +/*-* * @brief Idle thread enter hook. * @note This hook is invoked within a critical zone, no OS functions * should be invoked from here. @@ -333,7 +333,7 @@ #define CH_CFG_IDLE_ENTER_HOOK() {} #endif -/** +/*-* * @brief Idle thread leave hook. * @note This hook is invoked within a critical zone, no OS functions * should be invoked from here. @@ -343,7 +343,7 @@ #define CH_CFG_IDLE_LEAVE_HOOK() {} #endif -/** +/*-* * @brief System halt hook. */ #if !defined(CH_CFG_SYSTEM_HALT_HOOK) || defined(__DOXYGEN__) diff --git a/os/nil/templates/chconf.h b/os/nil/templates/chconf.h index 92e72a128..4338ce9ed 100644 --- a/os/nil/templates/chconf.h +++ b/os/nil/templates/chconf.h @@ -20,7 +20,7 @@ * @details A copy of this file must be placed in each project directory, it * contains the application specific kernel settings. * - * @addtogroup config + * @addtogroup NIL_CONFIG * @details Kernel related settings and hooks. * @{ */ diff --git a/readme.txt b/readme.txt index 8b925b0be..762c17b0f 100644 --- a/readme.txt +++ b/readme.txt @@ -122,6 +122,8 @@ dependencies and configuration directories. This makes possible to have multiple non-conflicting makefiles in the same project. Updated the various platform.mk implementing "smart build" mode. +- NIL: Fixed duplicated entries in NIL documentation (bug #887)(backported + to 17.6.1). - HAL: Fixed USB GET_DESCRIPTOR not handled for Interface Recipients (bug #885) (backported to 17.6.1 and 16.1.9). - RT: MAILBOX_DECL size parameter is actually a count (bug #884) -- cgit v1.2.3