zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6291 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
gdisirio 2013-09-11 12:00:01 +00:00
parent f238de5d39
commit 0e436b1cb6
8 changed files with 237 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
demos/nil/NIL-STM32F051-DISCOVERY/nilconf.h
View File

@ -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 http://www.apache.org/licenses/LICENSE-2.0
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.
Nil RTOS is distributed in the hope that it will be useful, Unless required by applicable law or agreed to in writing, software
but WITHOUT ANY WARRANTY; without even the implied warranty of distributed under the License is distributed on an "AS IS" BASIS,
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
GNU General Public License for more details. See the License for the specific language governing permissions and
limitations under the License.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
@ -31,6 +28,13 @@
#ifndef _NILCONF_H_ #ifndef _NILCONF_H_
#define _NILCONF_H_ #define _NILCONF_H_
/*===========================================================================*/
/**
* @name Kernel parameters and options
* @{
*/
/*===========================================================================*/
/** /**
* @brief Number of user threads in the application. * @brief Number of user threads in the application.
* @note This number is not inclusive of the idle thread which is * @note This number is not inclusive of the idle thread which is
@ -38,6 +42,15 @@
*/ */
#define NIL_CFG_NUM_THREADS 3 #define NIL_CFG_NUM_THREADS 3
/** @} */
/*===========================================================================*/
/**
* @name System timer settings
* @{
*/
/*===========================================================================*/
/** /**
* @brief System tick frequency. * @brief System tick frequency.
*/ */
@ -51,7 +64,16 @@
* The value one is not valid, timeouts are rounded up to * The value one is not valid, timeouts are rounded up to
* this value. * this value.
*/ */
#define NIL_CFG_TIMEDELTA 2 #define NIL_CFG_ST_TIMEDELTA 2
/** @} */
/*===========================================================================*/
/**
* @name Subsystem options
* @{
*/
/*===========================================================================*/
/** /**
* @brief Events Flags APIs. * @brief Events Flags APIs.
@ -61,6 +83,15 @@
*/ */
#define NIL_CFG_USE_EVENTS TRUE #define NIL_CFG_USE_EVENTS TRUE
/** @} */
/*===========================================================================*/
/**
* @name Debug options
* @{
*/
/*===========================================================================*/
/** /**
* @brief System assertions. * @brief System assertions.
*/ */
@ -71,6 +102,15 @@
*/ */
#define NIL_CFG_ENABLE_STACK_CHECK FALSE #define NIL_CFG_ENABLE_STACK_CHECK FALSE
/** @} */
/*===========================================================================*/
/**
* @name Kernel hooks
* @{
*/
/*===========================================================================*/
/** /**
* @brief Threads descriptor structure extension. * @brief Threads descriptor structure extension.
* @details User fields added to the end of the @p thread_t structure. * @details User fields added to the end of the @p thread_t structure.
@ -103,6 +143,8 @@
#define NIL_CFG_IDLE_LEAVE_HOOK() { \ #define NIL_CFG_IDLE_LEAVE_HOOK() { \
} }
/** @} */
/*===========================================================================*/ /*===========================================================================*/
/* Port-specific settings (override port settings defaulted in nilcore.h). */ /* Port-specific settings (override port settings defaulted in nilcore.h). */
/*===========================================================================*/ /*===========================================================================*/

70
demos/nil/NIL-STM32F303-DISCOVERY/nilconf.h
View File

@ -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 http://www.apache.org/licenses/LICENSE-2.0
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.
Nil RTOS is distributed in the hope that it will be useful, Unless required by applicable law or agreed to in writing, software
but WITHOUT ANY WARRANTY; without even the implied warranty of distributed under the License is distributed on an "AS IS" BASIS,
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
GNU General Public License for more details. See the License for the specific language governing permissions and
limitations under the License.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
@ -31,6 +28,13 @@
#ifndef _NILCONF_H_ #ifndef _NILCONF_H_
#define _NILCONF_H_ #define _NILCONF_H_
/*===========================================================================*/
/**
* @name Kernel parameters and options
* @{
*/
/*===========================================================================*/
/** /**
* @brief Number of user threads in the application. * @brief Number of user threads in the application.
* @note This number is not inclusive of the idle thread which is * @note This number is not inclusive of the idle thread which is
@ -38,6 +42,15 @@
*/ */
#define NIL_CFG_NUM_THREADS 3 #define NIL_CFG_NUM_THREADS 3
/** @} */
/*===========================================================================*/
/**
* @name System timer settings
* @{
*/
/*===========================================================================*/
/** /**
* @brief System tick frequency. * @brief System tick frequency.
*/ */
@ -51,7 +64,16 @@
* The value one is not valid, timeouts are rounded up to * The value one is not valid, timeouts are rounded up to
* this value. * this value.
*/ */
#define NIL_CFG_TIMEDELTA 2 #define NIL_CFG_ST_TIMEDELTA 2
/** @} */
/*===========================================================================*/
/**
* @name Subsystem options
* @{
*/
/*===========================================================================*/
/** /**
* @brief Events Flags APIs. * @brief Events Flags APIs.
@ -61,6 +83,15 @@
*/ */
#define NIL_CFG_USE_EVENTS TRUE #define NIL_CFG_USE_EVENTS TRUE
/** @} */
/*===========================================================================*/
/**
* @name Debug options
* @{
*/
/*===========================================================================*/
/** /**
* @brief System assertions. * @brief System assertions.
*/ */
@ -71,6 +102,15 @@
*/ */
#define NIL_CFG_ENABLE_STACK_CHECK FALSE #define NIL_CFG_ENABLE_STACK_CHECK FALSE
/** @} */
/*===========================================================================*/
/**
* @name Kernel hooks
* @{
*/
/*===========================================================================*/
/** /**
* @brief Threads descriptor structure extension. * @brief Threads descriptor structure extension.
* @details User fields added to the end of the @p thread_t structure. * @details User fields added to the end of the @p thread_t structure.
@ -103,6 +143,8 @@
#define NIL_CFG_IDLE_LEAVE_HOOK() { \ #define NIL_CFG_IDLE_LEAVE_HOOK() { \
} }
/** @} */
/*===========================================================================*/ /*===========================================================================*/
/* Port-specific settings (override port settings defaulted in nilcore.h). */ /* Port-specific settings (override port settings defaulted in nilcore.h). */
/*===========================================================================*/ /*===========================================================================*/

70
demos/nil/NIL-STM32F373-STM32373C_EVAL/nilconf.h
View File

@ -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 http://www.apache.org/licenses/LICENSE-2.0
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.
Nil RTOS is distributed in the hope that it will be useful, Unless required by applicable law or agreed to in writing, software
but WITHOUT ANY WARRANTY; without even the implied warranty of distributed under the License is distributed on an "AS IS" BASIS,
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
GNU General Public License for more details. See the License for the specific language governing permissions and
limitations under the License.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
@ -31,6 +28,13 @@
#ifndef _NILCONF_H_ #ifndef _NILCONF_H_
#define _NILCONF_H_ #define _NILCONF_H_
/*===========================================================================*/
/**
* @name Kernel parameters and options
* @{
*/
/*===========================================================================*/
/** /**
* @brief Number of user threads in the application. * @brief Number of user threads in the application.
* @note This number is not inclusive of the idle thread which is * @note This number is not inclusive of the idle thread which is
@ -38,6 +42,15 @@
*/ */
#define NIL_CFG_NUM_THREADS 3 #define NIL_CFG_NUM_THREADS 3
/** @} */
/*===========================================================================*/
/**
* @name System timer settings
* @{
*/
/*===========================================================================*/
/** /**
* @brief System tick frequency. * @brief System tick frequency.
*/ */
@ -51,7 +64,16 @@
* The value one is not valid, timeouts are rounded up to * The value one is not valid, timeouts are rounded up to
* this value. * this value.
*/ */
#define NIL_CFG_TIMEDELTA 2 #define NIL_CFG_ST_TIMEDELTA 2
/** @} */
/*===========================================================================*/
/**
* @name Subsystem options
* @{
*/
/*===========================================================================*/
/** /**
* @brief Events Flags APIs. * @brief Events Flags APIs.
@ -61,6 +83,15 @@
*/ */
#define NIL_CFG_USE_EVENTS TRUE #define NIL_CFG_USE_EVENTS TRUE
/** @} */
/*===========================================================================*/
/**
* @name Debug options
* @{
*/
/*===========================================================================*/
/** /**
* @brief System assertions. * @brief System assertions.
*/ */
@ -71,6 +102,15 @@
*/ */
#define NIL_CFG_ENABLE_STACK_CHECK FALSE #define NIL_CFG_ENABLE_STACK_CHECK FALSE
/** @} */
/*===========================================================================*/
/**
* @name Kernel hooks
* @{
*/
/*===========================================================================*/
/** /**
* @brief Threads descriptor structure extension. * @brief Threads descriptor structure extension.
* @details User fields added to the end of the @p thread_t structure. * @details User fields added to the end of the @p thread_t structure.
@ -103,6 +143,8 @@
#define NIL_CFG_IDLE_LEAVE_HOOK() { \ #define NIL_CFG_IDLE_LEAVE_HOOK() { \
} }
/** @} */
/*===========================================================================*/ /*===========================================================================*/
/* Port-specific settings (override port settings defaulted in nilcore.h). */ /* Port-specific settings (override port settings defaulted in nilcore.h). */
/*===========================================================================*/ /*===========================================================================*/

70
demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h
View File

@ -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 http://www.apache.org/licenses/LICENSE-2.0
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.
Nil RTOS is distributed in the hope that it will be useful, Unless required by applicable law or agreed to in writing, software
but WITHOUT ANY WARRANTY; without even the implied warranty of distributed under the License is distributed on an "AS IS" BASIS,
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
GNU General Public License for more details. See the License for the specific language governing permissions and
limitations under the License.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
@ -31,6 +28,13 @@
#ifndef _NILCONF_H_ #ifndef _NILCONF_H_
#define _NILCONF_H_ #define _NILCONF_H_
/*===========================================================================*/
/**
* @name Kernel parameters and options
* @{
*/
/*===========================================================================*/
/** /**
* @brief Number of user threads in the application. * @brief Number of user threads in the application.
* @note This number is not inclusive of the idle thread which is * @note This number is not inclusive of the idle thread which is
@ -38,6 +42,15 @@
*/ */
#define NIL_CFG_NUM_THREADS 3 #define NIL_CFG_NUM_THREADS 3
/** @} */
/*===========================================================================*/
/**
* @name System timer settings
* @{
*/
/*===========================================================================*/
/** /**
* @brief System tick frequency. * @brief System tick frequency.
*/ */
@ -51,7 +64,16 @@
* The value one is not valid, timeouts are rounded up to * The value one is not valid, timeouts are rounded up to
* this value. * this value.
*/ */
#define NIL_CFG_TIMEDELTA 0 #define NIL_CFG_ST_TIMEDELTA 0
/** @} */
/*===========================================================================*/
/**
* @name Subsystem options
* @{
*/
/*===========================================================================*/
/** /**
* @brief Events Flags APIs. * @brief Events Flags APIs.
@ -61,6 +83,15 @@
*/ */
#define NIL_CFG_USE_EVENTS TRUE #define NIL_CFG_USE_EVENTS TRUE
/** @} */
/*===========================================================================*/
/**
* @name Debug options
* @{
*/
/*===========================================================================*/
/** /**
* @brief System assertions. * @brief System assertions.
*/ */
@ -71,6 +102,15 @@
*/ */
#define NIL_CFG_ENABLE_STACK_CHECK FALSE #define NIL_CFG_ENABLE_STACK_CHECK FALSE
/** @} */
/*===========================================================================*/
/**
* @name Kernel hooks
* @{
*/
/*===========================================================================*/
/** /**
* @brief Threads descriptor structure extension. * @brief Threads descriptor structure extension.
* @details User fields added to the end of the @p thread_t structure. * @details User fields added to the end of the @p thread_t structure.
@ -103,6 +143,8 @@
#define NIL_CFG_IDLE_LEAVE_HOOK() { \ #define NIL_CFG_IDLE_LEAVE_HOOK() { \
} }
/** @} */
/*===========================================================================*/ /*===========================================================================*/
/* Port-specific settings (override port settings defaulted in nilcore.h). */ /* Port-specific settings (override port settings defaulted in nilcore.h). */
/*===========================================================================*/ /*===========================================================================*/

14
os/nil/include/nil.h
View File

@ -142,8 +142,8 @@ typedef struct nil_thread thread_t;
* The value one is not valid, timeouts are rounded up to * The value one is not valid, timeouts are rounded up to
* this value. * this value.
*/ */
#if !defined(NIL_CFG_TIMEDELTA) || defined(__DOXYGEN__) #if !defined(NIL_CFG_ST_TIMEDELTA) || defined(__DOXYGEN__)
#define NIL_CFG_TIMEDELTA 0 #define NIL_CFG_ST_TIMEDELTA 0
#endif #endif
/** /**
@ -195,8 +195,8 @@ typedef struct nil_thread thread_t;
#error "invalid NIL_CFG_ST_FREQUENCY specified" #error "invalid NIL_CFG_ST_FREQUENCY specified"
#endif #endif
#if (NIL_CFG_TIMEDELTA < 0) || (NIL_CFG_TIMEDELTA == 1) #if (NIL_CFG_ST_TIMEDELTA < 0) || (NIL_CFG_ST_TIMEDELTA == 1)
#error "invalid NIL_CFG_TIMEDELTA specified" #error "invalid NIL_CFG_ST_TIMEDELTA specified"
#endif #endif
#if NIL_CFG_ENABLE_ASSERTS #if NIL_CFG_ENABLE_ASSERTS
@ -309,13 +309,13 @@ typedef struct {
* or to an higher priority thread if a switch is required. * or to an higher priority thread if a switch is required.
*/ */
thread_t *next; thread_t *next;
#if NIL_CFG_TIMEDELTA == 0 || defined(__DOXYGEN__) #if NIL_CFG_ST_TIMEDELTA == 0 || defined(__DOXYGEN__)
/** /**
* @brief System time. * @brief System time.
*/ */
systime_t systime; systime_t systime;
#endif #endif
#if NIL_CFG_TIMEDELTA > 0 || defined(__DOXYGEN__) #if NIL_CFG_ST_TIMEDELTA > 0 || defined(__DOXYGEN__)
/** /**
* @brief System time of the last tick event. * @brief System time of the last tick event.
*/ */
@ -702,7 +702,7 @@ typedef struct {
* *
* @xclass * @xclass
*/ */
#if NIL_CFG_TIMEDELTA == 0 || defined(__DOXYGEN__) #if NIL_CFG_ST_TIMEDELTA == 0 || defined(__DOXYGEN__)
#define chVTGetSystemTimeX() (nil.systime) #define chVTGetSystemTimeX() (nil.systime)
#else #else
#define chVTGetSystemTimeX() port_timer_get_time() #define chVTGetSystemTimeX() port_timer_get_time()

2
os/nil/osal/osal.h
View File

@ -88,7 +88,7 @@
/** /**
* @brief Systick mode required by the underlying OS. * @brief Systick mode required by the underlying OS.
*/ */
#if (NIL_CFG_TIMEDELTA == 0) || defined(__DOXYGEN__) #if (NIL_CFG_ST_TIMEDELTA == 0) || defined(__DOXYGEN__)
#define OSAL_ST_MODE OSAL_ST_MODE_PERIODIC #define OSAL_ST_MODE OSAL_ST_MODE_PERIODIC
#else #else
#define OSAL_ST_MODE OSAL_ST_MODE_FREERUNNING #define OSAL_ST_MODE OSAL_ST_MODE_FREERUNNING

2
os/nil/ports/ARMCMx/nilcore.h
View File

@ -197,7 +197,7 @@ struct port_intctx {};
#endif #endif
#if !defined(_FROM_ASM_) #if !defined(_FROM_ASM_)
#if NIL_CFG_TIMEDELTA > 0 #if NIL_CFG_ST_TIMEDELTA > 0
#include "nilcore_timer.h" #include "nilcore_timer.h"
#endif #endif
#endif /* !defined(_FROM_ASM_) */ #endif /* !defined(_FROM_ASM_) */

8
os/nil/src/nil.c
View File

@ -147,7 +147,7 @@ void chSysHalt(const char *reason) {
*/ */
void chSysTimerHandlerI(void) { void chSysTimerHandlerI(void) {
#if NIL_CFG_TIMEDELTA == 0 #if NIL_CFG_ST_TIMEDELTA == 0
thread_t *tp = &nil.threads[0]; thread_t *tp = &nil.threads[0];
nil.systime++; nil.systime++;
do { do {
@ -335,14 +335,14 @@ msg_t chSchGoSleepTimeoutS(tstate_t newstate, systime_t timeout) {
/* Storing the wait object for the current thread.*/ /* Storing the wait object for the current thread.*/
otp->state = newstate; otp->state = newstate;
#if NIL_CFG_TIMEDELTA > 0 #if NIL_CFG_ST_TIMEDELTA > 0
if (timeout != TIME_INFINITE) { if (timeout != TIME_INFINITE) {
systime_t time = chVTGetSystemTimeX() + timeout; systime_t time = chVTGetSystemTimeX() + timeout;
/* TIMEDELTA makes sure to have enough time to reprogram the timer /* TIMEDELTA makes sure to have enough time to reprogram the timer
before the free-running timer counter reaches the selected timeout.*/ before the free-running timer counter reaches the selected timeout.*/
if (timeout < NIL_CFG_TIMEDELTA) if (timeout < NIL_CFG_ST_TIMEDELTA)
timeout = NIL_CFG_TIMEDELTA; timeout = NIL_CFG_ST_TIMEDELTA;
if (nil.lasttime == nil.nexttime) { if (nil.lasttime == nil.nexttime) {
/* Special case, first thread asking for a timeout.*/ /* Special case, first thread asking for a timeout.*/