From 0e436b1cb6c0dea2280b09208a43af636a29ce64 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Wed, 11 Sep 2013 12:00:01 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6291 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/nil/NIL-STM32F051-DISCOVERY/nilconf.h | 70 +++++++++++++++++++----- demos/nil/NIL-STM32F303-DISCOVERY/nilconf.h | 70 +++++++++++++++++++----- demos/nil/NIL-STM32F373-STM32373C_EVAL/nilconf.h | 70 +++++++++++++++++++----- demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h | 70 +++++++++++++++++++----- 4 files changed, 224 insertions(+), 56 deletions(-) (limited to 'demos') diff --git a/demos/nil/NIL-STM32F051-DISCOVERY/nilconf.h b/demos/nil/NIL-STM32F051-DISCOVERY/nilconf.h index 5276a3f2a..220ce8b37 100644 --- a/demos/nil/NIL-STM32F051-DISCOVERY/nilconf.h +++ b/demos/nil/NIL-STM32F051-DISCOVERY/nilconf.h @@ -1,20 +1,17 @@ /* - Nil RTOS - Copyright (C) 2012 Giovanni Di Sirio. + ChibiOS/NIL - Copyright (C) 2013 Giovanni Di Sirio - This file is part of Nil RTOS. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at - Nil RTOS is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + http://www.apache.org/licenses/LICENSE-2.0 - Nil RTOS is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. */ /** @@ -31,6 +28,13 @@ #ifndef _NILCONF_H_ #define _NILCONF_H_ +/*===========================================================================*/ +/** + * @name Kernel parameters and options + * @{ + */ +/*===========================================================================*/ + /** * @brief Number of user threads in the application. * @note This number is not inclusive of the idle thread which is @@ -38,6 +42,15 @@ */ #define NIL_CFG_NUM_THREADS 3 +/** @} */ + +/*===========================================================================*/ +/** + * @name System timer settings + * @{ + */ +/*===========================================================================*/ + /** * @brief System tick frequency. */ @@ -51,7 +64,16 @@ * The value one is not valid, timeouts are rounded up to * this value. */ -#define NIL_CFG_TIMEDELTA 2 +#define NIL_CFG_ST_TIMEDELTA 2 + +/** @} */ + +/*===========================================================================*/ +/** + * @name Subsystem options + * @{ + */ +/*===========================================================================*/ /** * @brief Events Flags APIs. @@ -61,6 +83,15 @@ */ #define NIL_CFG_USE_EVENTS TRUE +/** @} */ + +/*===========================================================================*/ +/** + * @name Debug options + * @{ + */ +/*===========================================================================*/ + /** * @brief System assertions. */ @@ -71,6 +102,15 @@ */ #define NIL_CFG_ENABLE_STACK_CHECK FALSE +/** @} */ + +/*===========================================================================*/ +/** + * @name Kernel hooks + * @{ + */ +/*===========================================================================*/ + /** * @brief Threads descriptor structure extension. * @details User fields added to the end of the @p thread_t structure. @@ -103,6 +143,8 @@ #define NIL_CFG_IDLE_LEAVE_HOOK() { \ } +/** @} */ + /*===========================================================================*/ /* Port-specific settings (override port settings defaulted in nilcore.h). */ /*===========================================================================*/ diff --git a/demos/nil/NIL-STM32F303-DISCOVERY/nilconf.h b/demos/nil/NIL-STM32F303-DISCOVERY/nilconf.h index 5276a3f2a..220ce8b37 100644 --- a/demos/nil/NIL-STM32F303-DISCOVERY/nilconf.h +++ b/demos/nil/NIL-STM32F303-DISCOVERY/nilconf.h @@ -1,20 +1,17 @@ /* - Nil RTOS - Copyright (C) 2012 Giovanni Di Sirio. + ChibiOS/NIL - Copyright (C) 2013 Giovanni Di Sirio - This file is part of Nil RTOS. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at - Nil RTOS is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + http://www.apache.org/licenses/LICENSE-2.0 - Nil RTOS is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. */ /** @@ -31,6 +28,13 @@ #ifndef _NILCONF_H_ #define _NILCONF_H_ +/*===========================================================================*/ +/** + * @name Kernel parameters and options + * @{ + */ +/*===========================================================================*/ + /** * @brief Number of user threads in the application. * @note This number is not inclusive of the idle thread which is @@ -38,6 +42,15 @@ */ #define NIL_CFG_NUM_THREADS 3 +/** @} */ + +/*===========================================================================*/ +/** + * @name System timer settings + * @{ + */ +/*===========================================================================*/ + /** * @brief System tick frequency. */ @@ -51,7 +64,16 @@ * The value one is not valid, timeouts are rounded up to * this value. */ -#define NIL_CFG_TIMEDELTA 2 +#define NIL_CFG_ST_TIMEDELTA 2 + +/** @} */ + +/*===========================================================================*/ +/** + * @name Subsystem options + * @{ + */ +/*===========================================================================*/ /** * @brief Events Flags APIs. @@ -61,6 +83,15 @@ */ #define NIL_CFG_USE_EVENTS TRUE +/** @} */ + +/*===========================================================================*/ +/** + * @name Debug options + * @{ + */ +/*===========================================================================*/ + /** * @brief System assertions. */ @@ -71,6 +102,15 @@ */ #define NIL_CFG_ENABLE_STACK_CHECK FALSE +/** @} */ + +/*===========================================================================*/ +/** + * @name Kernel hooks + * @{ + */ +/*===========================================================================*/ + /** * @brief Threads descriptor structure extension. * @details User fields added to the end of the @p thread_t structure. @@ -103,6 +143,8 @@ #define NIL_CFG_IDLE_LEAVE_HOOK() { \ } +/** @} */ + /*===========================================================================*/ /* Port-specific settings (override port settings defaulted in nilcore.h). */ /*===========================================================================*/ diff --git a/demos/nil/NIL-STM32F373-STM32373C_EVAL/nilconf.h b/demos/nil/NIL-STM32F373-STM32373C_EVAL/nilconf.h index 5276a3f2a..220ce8b37 100644 --- a/demos/nil/NIL-STM32F373-STM32373C_EVAL/nilconf.h +++ b/demos/nil/NIL-STM32F373-STM32373C_EVAL/nilconf.h @@ -1,20 +1,17 @@ /* - Nil RTOS - Copyright (C) 2012 Giovanni Di Sirio. + ChibiOS/NIL - Copyright (C) 2013 Giovanni Di Sirio - This file is part of Nil RTOS. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at - Nil RTOS is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + http://www.apache.org/licenses/LICENSE-2.0 - Nil RTOS is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. */ /** @@ -31,6 +28,13 @@ #ifndef _NILCONF_H_ #define _NILCONF_H_ +/*===========================================================================*/ +/** + * @name Kernel parameters and options + * @{ + */ +/*===========================================================================*/ + /** * @brief Number of user threads in the application. * @note This number is not inclusive of the idle thread which is @@ -38,6 +42,15 @@ */ #define NIL_CFG_NUM_THREADS 3 +/** @} */ + +/*===========================================================================*/ +/** + * @name System timer settings + * @{ + */ +/*===========================================================================*/ + /** * @brief System tick frequency. */ @@ -51,7 +64,16 @@ * The value one is not valid, timeouts are rounded up to * this value. */ -#define NIL_CFG_TIMEDELTA 2 +#define NIL_CFG_ST_TIMEDELTA 2 + +/** @} */ + +/*===========================================================================*/ +/** + * @name Subsystem options + * @{ + */ +/*===========================================================================*/ /** * @brief Events Flags APIs. @@ -61,6 +83,15 @@ */ #define NIL_CFG_USE_EVENTS TRUE +/** @} */ + +/*===========================================================================*/ +/** + * @name Debug options + * @{ + */ +/*===========================================================================*/ + /** * @brief System assertions. */ @@ -71,6 +102,15 @@ */ #define NIL_CFG_ENABLE_STACK_CHECK FALSE +/** @} */ + +/*===========================================================================*/ +/** + * @name Kernel hooks + * @{ + */ +/*===========================================================================*/ + /** * @brief Threads descriptor structure extension. * @details User fields added to the end of the @p thread_t structure. @@ -103,6 +143,8 @@ #define NIL_CFG_IDLE_LEAVE_HOOK() { \ } +/** @} */ + /*===========================================================================*/ /* Port-specific settings (override port settings defaulted in nilcore.h). */ /*===========================================================================*/ diff --git a/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h b/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h index 7cdcfbf02..c43879adb 100644 --- a/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h +++ b/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h @@ -1,20 +1,17 @@ /* - Nil RTOS - Copyright (C) 2012 Giovanni Di Sirio. + ChibiOS/NIL - Copyright (C) 2013 Giovanni Di Sirio - This file is part of Nil RTOS. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at - Nil RTOS is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + http://www.apache.org/licenses/LICENSE-2.0 - Nil RTOS is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. */ /** @@ -31,6 +28,13 @@ #ifndef _NILCONF_H_ #define _NILCONF_H_ +/*===========================================================================*/ +/** + * @name Kernel parameters and options + * @{ + */ +/*===========================================================================*/ + /** * @brief Number of user threads in the application. * @note This number is not inclusive of the idle thread which is @@ -38,6 +42,15 @@ */ #define NIL_CFG_NUM_THREADS 3 +/** @} */ + +/*===========================================================================*/ +/** + * @name System timer settings + * @{ + */ +/*===========================================================================*/ + /** * @brief System tick frequency. */ @@ -51,7 +64,16 @@ * The value one is not valid, timeouts are rounded up to * this value. */ -#define NIL_CFG_TIMEDELTA 0 +#define NIL_CFG_ST_TIMEDELTA 0 + +/** @} */ + +/*===========================================================================*/ +/** + * @name Subsystem options + * @{ + */ +/*===========================================================================*/ /** * @brief Events Flags APIs. @@ -61,6 +83,15 @@ */ #define NIL_CFG_USE_EVENTS TRUE +/** @} */ + +/*===========================================================================*/ +/** + * @name Debug options + * @{ + */ +/*===========================================================================*/ + /** * @brief System assertions. */ @@ -71,6 +102,15 @@ */ #define NIL_CFG_ENABLE_STACK_CHECK FALSE +/** @} */ + +/*===========================================================================*/ +/** + * @name Kernel hooks + * @{ + */ +/*===========================================================================*/ + /** * @brief Threads descriptor structure extension. * @details User fields added to the end of the @p thread_t structure. @@ -103,6 +143,8 @@ #define NIL_CFG_IDLE_LEAVE_HOOK() { \ } +/** @} */ + /*===========================================================================*/ /* Port-specific settings (override port settings defaulted in nilcore.h). */ /*===========================================================================*/ -- cgit v1.2.3