diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-10-11 15:59:40 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-10-11 15:59:40 -0600 |
commit | 2caaf98951ff5389f7b48c253fecbcc45e9d32bc (patch) | |
tree | ecd081617cae23910bb60a59595d28e842fb9354 /nuttx/libc | |
parent | 063645013a5e7632e2941afd5b1b5ed30d76ce43 (diff) | |
download | nuttx-2caaf98951ff5389f7b48c253fecbcc45e9d32bc.tar.gz nuttx-2caaf98951ff5389f7b48c253fecbcc45e9d32bc.tar.bz2 nuttx-2caaf98951ff5389f7b48c253fecbcc45e9d32bc.zip |
Rename CONFIG_SCHED_USRWORK to CONFIG_LIB_USRWORK
Diffstat (limited to 'nuttx/libc')
-rw-r--r-- | nuttx/libc/Kconfig | 12 | ||||
-rw-r--r-- | nuttx/libc/wqueue/Make.defs | 2 | ||||
-rw-r--r-- | nuttx/libc/wqueue/work_cancel.c | 4 | ||||
-rw-r--r-- | nuttx/libc/wqueue/work_lock.c | 4 | ||||
-rw-r--r-- | nuttx/libc/wqueue/work_queue.c | 4 | ||||
-rw-r--r-- | nuttx/libc/wqueue/work_signal.c | 6 | ||||
-rw-r--r-- | nuttx/libc/wqueue/work_usrthread.c | 14 | ||||
-rw-r--r-- | nuttx/libc/wqueue/wqueue.h | 4 |
8 files changed, 25 insertions, 25 deletions
diff --git a/nuttx/libc/Kconfig b/nuttx/libc/Kconfig index 8226793f7..d3030ef05 100644 --- a/nuttx/libc/Kconfig +++ b/nuttx/libc/Kconfig @@ -395,7 +395,7 @@ comment "Non-standard Library Support" if BUILD_PROTECTED || BUILD_KERNEL -config SCHED_USRWORK +config LIB_USRWORK bool "User mode worker thread" default n depends on !DISABLE_SIGNALS @@ -403,28 +403,28 @@ config SCHED_USRWORK User space work queues can also be made available for deferred processing in the NuttX kernel build. -if SCHED_USRWORK +if LIB_USRWORK -config SCHED_USRWORKPRIORITY +config LIB_USRWORKPRIORITY int "User mode priority worker thread priority" default 100 ---help--- The execution priority of the lopwer priority worker thread. Default: 192 -config SCHED_USRWORKPERIOD +config LIB_USRWORKPERIOD int "User mode worker thread period" default 100000 ---help--- How often the lower priority worker thread checks for work in units of microseconds. Default: 100*1000 (100 MS). -config SCHED_USRWORKSTACKSIZE +config LIB_USRWORKSTACKSIZE int "User mode worker thread stack size" default 2048 ---help--- The stack size allocated for the lower priority worker thread. Default: 2K. -endif # SCHED_USRWORK +endif # LIB_USRWORK endif # BUILD_PROTECTED config LIB_KBDCODEC diff --git a/nuttx/libc/wqueue/Make.defs b/nuttx/libc/wqueue/Make.defs index ae2d6d5f4..a22192dd6 100644 --- a/nuttx/libc/wqueue/Make.defs +++ b/nuttx/libc/wqueue/Make.defs @@ -33,7 +33,7 @@ # ############################################################################ -ifeq ($(CONFIG_SCHED_USRWORK),y) +ifeq ($(CONFIG_LIB_USRWORK),y) # Add the work queue C files to the build diff --git a/nuttx/libc/wqueue/work_cancel.c b/nuttx/libc/wqueue/work_cancel.c index 0db49f246..c7b1a8435 100644 --- a/nuttx/libc/wqueue/work_cancel.c +++ b/nuttx/libc/wqueue/work_cancel.c @@ -48,7 +48,7 @@ #include "wqueue/wqueue.h" -#if defined(CONFIG_SCHED_USRWORK) && !defined(__KERNEL__) +#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__) /**************************************************************************** * Pre-processor Definitions @@ -162,4 +162,4 @@ int work_cancel(int qid, FAR struct work_s *work) } } -#endif /* CONFIG_SCHED_USRWORK && !__KERNEL__ */ +#endif /* CONFIG_LIB_USRWORK && !__KERNEL__ */ diff --git a/nuttx/libc/wqueue/work_lock.c b/nuttx/libc/wqueue/work_lock.c index 59de461bc..d6aea231e 100644 --- a/nuttx/libc/wqueue/work_lock.c +++ b/nuttx/libc/wqueue/work_lock.c @@ -46,7 +46,7 @@ #include "wqueue/wqueue.h" -#if defined(CONFIG_SCHED_USRWORK) && !defined(__KERNEL__) +#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__) /**************************************************************************** * Pre-processor Definitions @@ -135,4 +135,4 @@ void work_unlock(void) #endif } -#endif /* CONFIG_SCHED_USRWORK && !__KERNEL__*/ +#endif /* CONFIG_LIB_USRWORK && !__KERNEL__*/ diff --git a/nuttx/libc/wqueue/work_queue.c b/nuttx/libc/wqueue/work_queue.c index 78280baac..ffe98af8c 100644 --- a/nuttx/libc/wqueue/work_queue.c +++ b/nuttx/libc/wqueue/work_queue.c @@ -50,7 +50,7 @@ #include "wqueue/wqueue.h" -#if defined(CONFIG_SCHED_USRWORK) && !defined(__KERNEL__) +#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__) /**************************************************************************** * Pre-processor Definitions @@ -174,4 +174,4 @@ int work_queue(int qid, FAR struct work_s *work, worker_t worker, } } -#endif /* CONFIG_SCHED_USRWORK && !__KERNEL__ */ +#endif /* CONFIG_LIB_USRWORK && !__KERNEL__ */ diff --git a/nuttx/libc/wqueue/work_signal.c b/nuttx/libc/wqueue/work_signal.c index 62a29e26c..01c492af7 100644 --- a/nuttx/libc/wqueue/work_signal.c +++ b/nuttx/libc/wqueue/work_signal.c @@ -46,7 +46,7 @@ #include "wqueue/wqueue.h" -#if defined(CONFIG_SCHED_USRWORK) && !defined(__KERNEL__) +#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__) /**************************************************************************** * Pre-processor Definitions @@ -87,7 +87,7 @@ * ****************************************************************************/ -#if defined(CONFIG_SCHED_USRWORK) && !defined(__KERNEL__) +#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__) int work_signal(int qid) { @@ -112,4 +112,4 @@ int work_signal(int qid) return ret; } -#endif /* CONFIG_SCHED_USRWORK && !__KERNEL__ */ +#endif /* CONFIG_LIB_USRWORK && !__KERNEL__ */ diff --git a/nuttx/libc/wqueue/work_usrthread.c b/nuttx/libc/wqueue/work_usrthread.c index fc41837cc..9fbe560ee 100644 --- a/nuttx/libc/wqueue/work_usrthread.c +++ b/nuttx/libc/wqueue/work_usrthread.c @@ -52,7 +52,7 @@ #include "wqueue/wqueue.h" -#if defined(CONFIG_SCHED_USRWORK) && !defined(__KERNEL__) +#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__) /**************************************************************************** * Pre-processor Definitions @@ -339,7 +339,7 @@ int work_usrstart(void) { /* Initialize work queue data structures */ - g_usrwork.delay = CONFIG_SCHED_USRWORKPERIOD / USEC_PER_TICK; + g_usrwork.delay = CONFIG_LIB_USRWORKPERIOD / USEC_PER_TICK; dq_init(&g_usrwork.q); #ifdef CONFIG_BUILD_PROTECTED @@ -351,8 +351,8 @@ int work_usrstart(void) /* Start a user-mode worker thread for use by applications. */ g_usrwork.pid = task_create("uwork", - CONFIG_SCHED_USRWORKPRIORITY, - CONFIG_SCHED_USRWORKSTACKSIZE, + CONFIG_LIB_USRWORKPRIORITY, + CONFIG_LIB_USRWORKSTACKSIZE, (main_t)work_usrthread, (FAR char * const *)NULL); @@ -380,9 +380,9 @@ int work_usrstart(void) /* Start a user-mode worker thread for use by applications. */ (void)pthread_attr_init(&attr); - (void)pthread_attr_setstacksize(&attr, CONFIG_SCHED_USRWORKSTACKSIZE); + (void)pthread_attr_setstacksize(&attr, CONFIG_LIB_USRWORKSTACKSIZE); - param.sched_priority = CONFIG_SCHED_USRWORKPRIORITY; + param.sched_priority = CONFIG_LIB_USRWORKPRIORITY; (void)pthread_attr_setschedparam(&attr, ¶m); status = pthread_create(&usrwork, &attr, work_usrthread, NULL); @@ -403,4 +403,4 @@ int work_usrstart(void) #endif } -#endif /* CONFIG_SCHED_USRWORK && !__KERNEL__*/ +#endif /* CONFIG_LIB_USRWORK && !__KERNEL__*/ diff --git a/nuttx/libc/wqueue/wqueue.h b/nuttx/libc/wqueue/wqueue.h index e40a7f037..05b6a1223 100644 --- a/nuttx/libc/wqueue/wqueue.h +++ b/nuttx/libc/wqueue/wqueue.h @@ -47,7 +47,7 @@ #include <nuttx/wqueue.h> -#if defined(CONFIG_SCHED_USRWORK) && !defined(__KERNEL__) +#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__) /**************************************************************************** * Pre-processor Definitions @@ -122,5 +122,5 @@ int work_lock(void); void work_unlock(void); -#endif /* CONFIG_SCHED_USRWORK && !__KERNEL__*/ +#endif /* CONFIG_LIB_USRWORK && !__KERNEL__*/ #endif /* __LIBC_WQUEUE_WQUEUE_H */ |