diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-01 13:21:15 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-01 13:21:15 -0600 |
commit | 7bfdcaa22bd60cd34f11b0592c53fc5da1a37617 (patch) | |
tree | 77b4f3886eb3f4049545827c2008d161c318a9fa /nuttx/sched/init | |
parent | 9ee5cfaffa313949563fb37f7cd39a2b7620a4dd (diff) | |
download | nuttx-7bfdcaa22bd60cd34f11b0592c53fc5da1a37617.tar.gz nuttx-7bfdcaa22bd60cd34f11b0592c53fc5da1a37617.tar.bz2 nuttx-7bfdcaa22bd60cd34f11b0592c53fc5da1a37617.zip |
Remove final traces of the 8015 from the NuttX source tree
Diffstat (limited to 'nuttx/sched/init')
-rw-r--r-- | nuttx/sched/init/os_bringup.c | 10 | ||||
-rw-r--r-- | nuttx/sched/init/os_start.c | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/nuttx/sched/init/os_bringup.c b/nuttx/sched/init/os_bringup.c index b084bd1b0..f85a33ef1 100644 --- a/nuttx/sched/init/os_bringup.c +++ b/nuttx/sched/init/os_bringup.c @@ -182,7 +182,7 @@ static inline void os_pgworker(void) svdbg("Starting paging thread\n"); - g_pgworker = KERNEL_THREAD("pgfill", CONFIG_PAGING_DEFPRIO, + g_pgworker = kernel_thread("pgfill", CONFIG_PAGING_DEFPRIO, CONFIG_PAGING_STACKSIZE, (main_t)pg_worker, (FAR char * const *)NULL); DEBUGASSERT(g_pgworker > 0); @@ -221,7 +221,7 @@ static inline void os_workqueues(void) svdbg("Starting kernel worker thread\n"); #endif - g_work[HPWORK].pid = KERNEL_THREAD(HPWORKNAME, CONFIG_SCHED_WORKPRIORITY, + g_work[HPWORK].pid = kernel_thread(HPWORKNAME, CONFIG_SCHED_WORKPRIORITY, CONFIG_SCHED_WORKSTACKSIZE, (main_t)work_hpthread, (FAR char * const *)NULL); @@ -235,7 +235,7 @@ static inline void os_workqueues(void) svdbg("Starting low-priority kernel worker thread\n"); - g_work[LPWORK].pid = KERNEL_THREAD(LPWORKNAME, CONFIG_SCHED_LPWORKPRIORITY, + g_work[LPWORK].pid = kernel_thread(LPWORKNAME, CONFIG_SCHED_LPWORKPRIORITY, CONFIG_SCHED_LPWORKSTACKSIZE, (main_t)work_lpthread, (FAR char * const *)NULL); @@ -288,11 +288,11 @@ static inline void os_init_thread(void) #ifdef CONFIG_BUILD_PROTECTED DEBUGASSERT(USERSPACE->us_entrypoint != NULL); - taskid = TASK_CREATE("init", SCHED_PRIORITY_DEFAULT, + taskid = task_create("init", SCHED_PRIORITY_DEFAULT, CONFIG_USERMAIN_STACKSIZE, USERSPACE->us_entrypoint, (FAR char * const *)NULL); #else - taskid = TASK_CREATE("init", SCHED_PRIORITY_DEFAULT, + taskid = task_create("init", SCHED_PRIORITY_DEFAULT, CONFIG_USERMAIN_STACKSIZE, (main_t)CONFIG_USER_ENTRYPOINT, (FAR char * const *)NULL); diff --git a/nuttx/sched/init/os_start.c b/nuttx/sched/init/os_start.c index 4f6da4ea5..cf83b93b9 100644 --- a/nuttx/sched/init/os_start.c +++ b/nuttx/sched/init/os_start.c @@ -311,14 +311,13 @@ void os_start(void) * and there is no support that yet. */ -#if defined(CONFIG_CUSTOM_STACK) || (!defined(CONFIG_BUILD_PROTECTED) && \ - !defined(CONFIG_BUILD_KERNEL)) +#if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL) #if CONFIG_TASK_NAME_SIZE > 0 g_idletcb.argv[0] = g_idletcb.cmn.name; #else g_idletcb.argv[0] = (char*)g_idlename; #endif /* CONFIG_TASK_NAME_SIZE */ -#endif /* CONFIG_CUSTOM_STACK || (!CONFIG_BUILD_PROTECTED && !CONFIG_BUILD_KERNEL) */ +#endif /* !CONFIG_BUILD_PROTECTED && !CONFIG_BUILD_KERNEL */ /* Then add the idle task's TCB to the head of the ready to run list */ |