diff options
| author | Bernard Xiong <[email protected]> | 2018-12-29 13:38:56 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-12-29 13:38:56 +0800 |
| commit | af33226fab71a6a93e88ce1372509d6667ccd4af (patch) | |
| tree | a066d99a5dc6c9223d84b30df6a2649d377437d5 /src | |
| parent | b7e2cd0eb3afee99601633964bb63f6db3e4cdf9 (diff) | |
| parent | 77623e8119e9b4634fc26443af4623856b25804c (diff) | |
Merge pull request #2135 from armink/lts-v3.1.x
Sync the code to v3.1.2
Diffstat (limited to 'src')
| -rw-r--r-- | src/Kconfig | 6 | ||||
| -rw-r--r-- | src/idle.c | 6 | ||||
| -rw-r--r-- | src/kservice.c | 2 | ||||
| -rw-r--r-- | src/signal.c | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/Kconfig b/src/Kconfig index 78a3bf6d67..138130dbaa 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -300,4 +300,10 @@ menu "Kernel Device Object" endmenu +config RT_VER_NUM + hex + default 0x30102 + help + RT-Thread version number + endmenu diff --git a/src/idle.c b/src/idle.c index ec7d6bea6e..da9fefb3fd 100644 --- a/src/idle.c +++ b/src/idle.c @@ -221,14 +221,12 @@ void rt_thread_idle_excute(void) static void rt_thread_idle_entry(void *parameter) { -#ifdef RT_USING_IDLE_HOOK - rt_size_t i; -#endif - while (1) { #ifdef RT_USING_IDLE_HOOK + rt_size_t i; + for (i = 0; i < RT_IDEL_HOOK_LIST_SIZE; i++) { if (idle_hook_list[i] != RT_NULL) diff --git a/src/kservice.c b/src/kservice.c index dbc4a2fb0e..698033d0e4 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -535,7 +535,7 @@ void rt_show_version(void) rt_kprintf("- RT - Thread Operating System\n"); rt_kprintf(" / | \\ %d.%d.%d build %s\n", RT_VERSION, RT_SUBVERSION, RT_REVISION, __DATE__); - rt_kprintf(" 2006 - 2018 Copyright by rt-thread team\n"); + rt_kprintf(" 2006 - 2019 Copyright by rt-thread team\n"); } RTM_EXPORT(rt_show_version); diff --git a/src/signal.c b/src/signal.c index 890f16f497..7a7b8877ba 100644 --- a/src/signal.c +++ b/src/signal.c @@ -108,7 +108,7 @@ static void _signal_deliver(rt_thread_t tid) /* do signal action in self thread context */ rt_thread_handle_sig(RT_TRUE); } - else if (!((tid->stat & RT_THREAD_STAT_MASK) & RT_THREAD_STAT_SIGNAL)) + else if (!((tid->stat & RT_THREAD_STAT_SIGNAL_MASK) & RT_THREAD_STAT_SIGNAL)) { /* add signal state */ tid->stat |= RT_THREAD_STAT_SIGNAL; |