From 023a554d8346539c905d042f0494475aea8a50ba Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 26 Jul 2014 08:40:58 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7094 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/AVR/NIL-ARDUINOMEGA/nilconf.h | 21 ++++++++++++++++++- demos/SPC5/NIL-SPC560D-EVB/nilconf.h | 13 +++++++++++- demos/STM32/NIL-STM32F051-DISCOVERY/nilconf.h | 21 ++++++++++++++++++- demos/STM32/NIL-STM32F100-DISCOVERY/nilconf.h | 18 +++++++++++++++- demos/STM32/NIL-STM32F303-DISCOVERY/nilconf.h | 18 +++++++++++++++- .../NIL-STM32F373-STM32373C_EVAL/nilconf.h | 21 ++++++++++++++++++- demos/STM32/NIL-STM32L152-DISCOVERY/nilconf.h | 21 ++++++++++++++++++- os/nil/templates/nilconf.h | 5 ++++- 8 files changed, 130 insertions(+), 8 deletions(-) diff --git a/demos/AVR/NIL-ARDUINOMEGA/nilconf.h b/demos/AVR/NIL-ARDUINOMEGA/nilconf.h index 3d78b2ffc..a7ab0039f 100644 --- a/demos/AVR/NIL-ARDUINOMEGA/nilconf.h +++ b/demos/AVR/NIL-ARDUINOMEGA/nilconf.h @@ -1,5 +1,5 @@ /* - ChibiOS/NIL - Copyright (C) 2014 Giovanni Di Sirio + ChibiOS/NIL - Copyright (C) 2013,2014 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -59,6 +59,9 @@ /** * @brief System tick frequency. + * @note This value together with the @p NIL_CFG_ST_RESOLUTION + * option defines the maximum amount of time allowed for + * timeouts. */ #define NIL_CFG_ST_FREQUENCY 1000 @@ -117,6 +120,14 @@ */ /*===========================================================================*/ +/** + * @brief System initialization hook. + */ +#if !defined(NIL_CFG_SYSTEM_INIT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_INIT_HOOK() { \ +} +#endif + /** * @brief Threads descriptor structure extension. * @details User fields added to the end of the @p thread_t structure. @@ -149,6 +160,14 @@ #define NIL_CFG_IDLE_LEAVE_HOOK() { \ } +/** + * @brief System halt hook. + */ +#if !defined(NIL_CFG_SYSTEM_HALT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_HALT_HOOK(reason) { \ +} +#endif + /** @} */ /*===========================================================================*/ diff --git a/demos/SPC5/NIL-SPC560D-EVB/nilconf.h b/demos/SPC5/NIL-SPC560D-EVB/nilconf.h index 1903f7dd1..dd66679d6 100644 --- a/demos/SPC5/NIL-SPC560D-EVB/nilconf.h +++ b/demos/SPC5/NIL-SPC560D-EVB/nilconf.h @@ -1,5 +1,5 @@ /* - ChibiOS/NIL - Copyright (C) 2013 Giovanni Di Sirio + ChibiOS/NIL - Copyright (C) 2013,2014 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -59,6 +59,9 @@ /** * @brief System tick frequency. + * @note This value together with the @p NIL_CFG_ST_RESOLUTION + * option defines the maximum amount of time allowed for + * timeouts. */ #define NIL_CFG_ST_FREQUENCY 1000 @@ -157,6 +160,14 @@ #define NIL_CFG_IDLE_LEAVE_HOOK() { \ } +/** + * @brief System halt hook. + */ +#if !defined(NIL_CFG_SYSTEM_HALT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_HALT_HOOK(reason) { \ +} +#endif + /** @} */ /*===========================================================================*/ diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/nilconf.h b/demos/STM32/NIL-STM32F051-DISCOVERY/nilconf.h index 54fb32ca4..bf815eb44 100644 --- a/demos/STM32/NIL-STM32F051-DISCOVERY/nilconf.h +++ b/demos/STM32/NIL-STM32F051-DISCOVERY/nilconf.h @@ -1,5 +1,5 @@ /* - ChibiOS/NIL - Copyright (C) 2013 Giovanni Di Sirio + ChibiOS/NIL - Copyright (C) 2013,2014 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -59,6 +59,9 @@ /** * @brief System tick frequency. + * @note This value together with the @p NIL_CFG_ST_RESOLUTION + * option defines the maximum amount of time allowed for + * timeouts. */ #define NIL_CFG_ST_FREQUENCY 50000 @@ -117,6 +120,14 @@ */ /*===========================================================================*/ +/** + * @brief System initialization hook. + */ +#if !defined(NIL_CFG_SYSTEM_INIT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_INIT_HOOK() { \ +} +#endif + /** * @brief Threads descriptor structure extension. * @details User fields added to the end of the @p thread_t structure. @@ -149,6 +160,14 @@ #define NIL_CFG_IDLE_LEAVE_HOOK() { \ } +/** + * @brief System halt hook. + */ +#if !defined(NIL_CFG_SYSTEM_HALT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_HALT_HOOK(reason) { \ +} +#endif + /** @} */ /*===========================================================================*/ diff --git a/demos/STM32/NIL-STM32F100-DISCOVERY/nilconf.h b/demos/STM32/NIL-STM32F100-DISCOVERY/nilconf.h index 35504197e..bf815eb44 100644 --- a/demos/STM32/NIL-STM32F100-DISCOVERY/nilconf.h +++ b/demos/STM32/NIL-STM32F100-DISCOVERY/nilconf.h @@ -1,5 +1,5 @@ /* - ChibiOS/NIL - Copyright (C) 2013 Giovanni Di Sirio + ChibiOS/NIL - Copyright (C) 2013,2014 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -120,6 +120,14 @@ */ /*===========================================================================*/ +/** + * @brief System initialization hook. + */ +#if !defined(NIL_CFG_SYSTEM_INIT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_INIT_HOOK() { \ +} +#endif + /** * @brief Threads descriptor structure extension. * @details User fields added to the end of the @p thread_t structure. @@ -152,6 +160,14 @@ #define NIL_CFG_IDLE_LEAVE_HOOK() { \ } +/** + * @brief System halt hook. + */ +#if !defined(NIL_CFG_SYSTEM_HALT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_HALT_HOOK(reason) { \ +} +#endif + /** @} */ /*===========================================================================*/ diff --git a/demos/STM32/NIL-STM32F303-DISCOVERY/nilconf.h b/demos/STM32/NIL-STM32F303-DISCOVERY/nilconf.h index 76028b31d..5f29f383b 100644 --- a/demos/STM32/NIL-STM32F303-DISCOVERY/nilconf.h +++ b/demos/STM32/NIL-STM32F303-DISCOVERY/nilconf.h @@ -1,5 +1,5 @@ /* - ChibiOS/NIL - Copyright (C) 2013 Giovanni Di Sirio + ChibiOS/NIL - Copyright (C) 2013,2014 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -120,6 +120,14 @@ */ /*===========================================================================*/ +/** + * @brief System initialization hook. + */ +#if !defined(NIL_CFG_SYSTEM_INIT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_INIT_HOOK() { \ +} +#endif + /** * @brief Threads descriptor structure extension. * @details User fields added to the end of the @p thread_t structure. @@ -152,6 +160,14 @@ #define NIL_CFG_IDLE_LEAVE_HOOK() { \ } +/** + * @brief System halt hook. + */ +#if !defined(NIL_CFG_SYSTEM_HALT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_HALT_HOOK(reason) { \ +} +#endif + /** @} */ /*===========================================================================*/ diff --git a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/nilconf.h b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/nilconf.h index 54fb32ca4..bf815eb44 100644 --- a/demos/STM32/NIL-STM32F373-STM32373C_EVAL/nilconf.h +++ b/demos/STM32/NIL-STM32F373-STM32373C_EVAL/nilconf.h @@ -1,5 +1,5 @@ /* - ChibiOS/NIL - Copyright (C) 2013 Giovanni Di Sirio + ChibiOS/NIL - Copyright (C) 2013,2014 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -59,6 +59,9 @@ /** * @brief System tick frequency. + * @note This value together with the @p NIL_CFG_ST_RESOLUTION + * option defines the maximum amount of time allowed for + * timeouts. */ #define NIL_CFG_ST_FREQUENCY 50000 @@ -117,6 +120,14 @@ */ /*===========================================================================*/ +/** + * @brief System initialization hook. + */ +#if !defined(NIL_CFG_SYSTEM_INIT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_INIT_HOOK() { \ +} +#endif + /** * @brief Threads descriptor structure extension. * @details User fields added to the end of the @p thread_t structure. @@ -149,6 +160,14 @@ #define NIL_CFG_IDLE_LEAVE_HOOK() { \ } +/** + * @brief System halt hook. + */ +#if !defined(NIL_CFG_SYSTEM_HALT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_HALT_HOOK(reason) { \ +} +#endif + /** @} */ /*===========================================================================*/ diff --git a/demos/STM32/NIL-STM32L152-DISCOVERY/nilconf.h b/demos/STM32/NIL-STM32L152-DISCOVERY/nilconf.h index eeec0899f..9798200b9 100644 --- a/demos/STM32/NIL-STM32L152-DISCOVERY/nilconf.h +++ b/demos/STM32/NIL-STM32L152-DISCOVERY/nilconf.h @@ -1,5 +1,5 @@ /* - ChibiOS/NIL - Copyright (C) 2013 Giovanni Di Sirio + ChibiOS/NIL - Copyright (C) 2013,2014 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -59,6 +59,9 @@ /** * @brief System tick frequency. + * @note This value together with the @p NIL_CFG_ST_RESOLUTION + * option defines the maximum amount of time allowed for + * timeouts. */ #define NIL_CFG_ST_FREQUENCY 1000 @@ -117,6 +120,14 @@ */ /*===========================================================================*/ +/** + * @brief System initialization hook. + */ +#if !defined(NIL_CFG_SYSTEM_INIT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_INIT_HOOK() { \ +} +#endif + /** * @brief Threads descriptor structure extension. * @details User fields added to the end of the @p thread_t structure. @@ -149,6 +160,14 @@ #define NIL_CFG_IDLE_LEAVE_HOOK() { \ } +/** + * @brief System halt hook. + */ +#if !defined(NIL_CFG_SYSTEM_HALT_HOOK) || defined(__DOXYGEN__) +#define NIL_CFG_SYSTEM_HALT_HOOK(reason) { \ +} +#endif + /** @} */ /*===========================================================================*/ diff --git a/os/nil/templates/nilconf.h b/os/nil/templates/nilconf.h index f95b082ee..bf815eb44 100644 --- a/os/nil/templates/nilconf.h +++ b/os/nil/templates/nilconf.h @@ -1,5 +1,5 @@ /* - ChibiOS/NIL - Copyright (C) 2013 Giovanni Di Sirio + ChibiOS/NIL - Copyright (C) 2013,2014 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -59,6 +59,9 @@ /** * @brief System tick frequency. + * @note This value together with the @p NIL_CFG_ST_RESOLUTION + * option defines the maximum amount of time allowed for + * timeouts. */ #define NIL_CFG_ST_FREQUENCY 50000