summaryrefslogtreecommitdiff
path: root/nuttx/include
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-10-11 15:59:40 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-10-11 15:59:40 -0600
commit2caaf98951ff5389f7b48c253fecbcc45e9d32bc (patch)
treeecd081617cae23910bb60a59595d28e842fb9354 /nuttx/include
parent063645013a5e7632e2941afd5b1b5ed30d76ce43 (diff)
downloadpx4-nuttx-2caaf98951ff5389f7b48c253fecbcc45e9d32bc.tar.gz
px4-nuttx-2caaf98951ff5389f7b48c253fecbcc45e9d32bc.tar.bz2
px4-nuttx-2caaf98951ff5389f7b48c253fecbcc45e9d32bc.zip
Rename CONFIG_SCHED_USRWORK to CONFIG_LIB_USRWORK
Diffstat (limited to 'nuttx/include')
-rw-r--r--nuttx/include/nuttx/userspace.h2
-rw-r--r--nuttx/include/nuttx/wqueue.h36
2 files changed, 19 insertions, 19 deletions
diff --git a/nuttx/include/nuttx/userspace.h b/nuttx/include/nuttx/userspace.h
index ce47a90cd..db21e967d 100644
--- a/nuttx/include/nuttx/userspace.h
+++ b/nuttx/include/nuttx/userspace.h
@@ -149,7 +149,7 @@ struct userspace_s
/* User-space work queue support */
-#ifdef CONFIG_SCHED_USRWORK
+#ifdef CONFIG_LIB_USRWORK
int (*work_usrstart)(void);
#endif
};
diff --git a/nuttx/include/nuttx/wqueue.h b/nuttx/include/nuttx/wqueue.h
index e55bdd20b..363a0ae2a 100644
--- a/nuttx/include/nuttx/wqueue.h
+++ b/nuttx/include/nuttx/wqueue.h
@@ -98,13 +98,13 @@
* builds. This those configurations, the user-mode work queue provides the
* same (non-standard) facility for use by applications.
*
- * CONFIG_SCHED_USRWORK. If CONFIG_SCHED_USRWORK is also defined then the
+ * CONFIG_LIB_USRWORK. If CONFIG_LIB_USRWORK is also defined then the
* user-mode work queue will be created.
- * CONFIG_SCHED_USRWORKPRIORITY - The minimum execution priority of the lower
+ * CONFIG_LIB_USRWORKPRIORITY - The minimum execution priority of the lower
* priority worker thread. Default: 100
- * CONFIG_SCHED_USRWORKPERIOD - How often the lower priority worker thread
+ * CONFIG_LIB_USRWORKPERIOD - How often the lower priority worker thread
* checks for work in units of microseconds. Default: 100*1000 (100 MS).
- * CONFIG_SCHED_USRWORKSTACKSIZE - The stack size allocated for the lower
+ * CONFIG_LIB_USRWORKSTACKSIZE - The stack size allocated for the lower
* priority worker thread. Default: 2048.
*/
@@ -139,10 +139,10 @@
* (CONFIG_BUILD_PROTECTED=n && CONFIG_BUILD_KERNEL=n)
*/
-# undef CONFIG_SCHED_USRWORK
+# undef CONFIG_LIB_USRWORK
#endif
-#if defined(CONFIG_SCHED_WORKQUEUE) || defined(CONFIG_SCHED_USRWORK)
+#if defined(CONFIG_SCHED_WORKQUEUE) || defined(CONFIG_LIB_USRWORK)
/* High priority, kernel work queue configuration ***************************/
@@ -221,21 +221,21 @@
/* User space work queue configuration **************************************/
-#ifdef CONFIG_SCHED_USRWORK
+#ifdef CONFIG_LIB_USRWORK
-# ifndef CONFIG_SCHED_USRWORKPRIORITY
-# define CONFIG_SCHED_USRWORKPRIORITY 100
+# ifndef CONFIG_LIB_USRWORKPRIORITY
+# define CONFIG_LIB_USRWORKPRIORITY 100
# endif
-# ifndef CONFIG_SCHED_USRWORKPERIOD
-# define CONFIG_SCHED_USRWORKPERIOD (100*1000) /* 100 milliseconds */
+# ifndef CONFIG_LIB_USRWORKPERIOD
+# define CONFIG_LIB_USRWORKPERIOD (100*1000) /* 100 milliseconds */
# endif
-# ifndef CONFIG_SCHED_USRWORKSTACKSIZE
-# define CONFIG_SCHED_USRWORKSTACKSIZE CONFIG_IDLETHREAD_STACKSIZE
+# ifndef CONFIG_LIB_USRWORKSTACKSIZE
+# define CONFIG_LIB_USRWORKSTACKSIZE CONFIG_IDLETHREAD_STACKSIZE
# endif
-#endif /* CONFIG_SCHED_USRWORK */
+#endif /* CONFIG_LIB_USRWORK */
/* Work queue IDs:
*
@@ -254,7 +254,7 @@
* priority work queue (if there is one).
*/
-#if defined(CONFIG_SCHED_USRWORK) && !defined(__KERNEL__)
+#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__)
/* User mode */
# define USRWORK 2 /* User mode work queue */
@@ -272,7 +272,7 @@
# endif
# define USRWORK LPWORK /* Redirect user-mode references */
-#endif /* CONFIG_SCHED_USRWORK && !__KERNEL__
+#endif /* CONFIG_LIB_USRWORK && !__KERNEL__
/****************************************************************************
* Public Types
@@ -329,7 +329,7 @@ extern "C"
*
****************************************************************************/
-#if defined(CONFIG_SCHED_USRWORK) && !defined(__KERNEL__)
+#if defined(CONFIG_LIB_USRWORK) && !defined(__KERNEL__)
int work_usrstart(void);
#endif
@@ -469,5 +469,5 @@ void lpwork_restorepriority(uint8_t reqprio);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* CONFIG_SCHED_WORKQUEUE || CONFIG_SCHED_USRWORK */
+#endif /* CONFIG_SCHED_WORKQUEUE || CONFIG_LIB_USRWORK */
#endif /* __INCLUDE_NUTTX_WQUEUE_H */