diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-07 16:58:43 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-07 16:58:43 +0000 |
commit | b5f347def1e037ee724266e1366ff1c66d5ebd9d (patch) | |
tree | 0de0d1418e3ef1f054e26b8887eef58142760fe4 /nuttx/sched/task_vfork.c | |
parent | 1b43865b1b95d798fef01711b0f4ebc0f136130a (diff) | |
download | px4-nuttx-b5f347def1e037ee724266e1366ff1c66d5ebd9d.tar.gz px4-nuttx-b5f347def1e037ee724266e1366ff1c66d5ebd9d.tar.bz2 px4-nuttx-b5f347def1e037ee724266e1366ff1c66d5ebd9d.zip |
Some fixes needed for STM32 build after recent scheduler changes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5620 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/sched/task_vfork.c')
-rw-r--r-- | nuttx/sched/task_vfork.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/sched/task_vfork.c b/nuttx/sched/task_vfork.c index 082854d60..5ac368cbf 100644 --- a/nuttx/sched/task_vfork.c +++ b/nuttx/sched/task_vfork.c @@ -105,7 +105,7 @@ * ****************************************************************************/ -FAR struct tcb_s *task_vforksetup(start_t retaddr) +FAR struct task_tcb_s *task_vforksetup(start_t retaddr) { struct tcb_s *parent = (FAR struct tcb_s *)g_readytorun.head; struct task_tcb_s *child; @@ -152,7 +152,7 @@ FAR struct tcb_s *task_vforksetup(start_t retaddr) } svdbg("parent=%p, returning child=%p\n", parent, child); - return (FAR struct tcb_s *)child; + return child; errout_with_tcb: sched_releasetcb((FAR struct tcb_s *)child); @@ -203,7 +203,7 @@ errout_with_tcb: * ****************************************************************************/ -pid_t task_vforkstart(FAR struct tcb_s *child) +pid_t task_vforkstart(FAR struct task_tcb_s *child) { #if CONFIG_TASK_NAME_SIZE > 0 struct tcb_s *parent = (FAR struct tcb_s *)g_readytorun.head; @@ -226,15 +226,15 @@ pid_t task_vforkstart(FAR struct tcb_s *child) name = NULL; #endif - (void)task_argsetup(child, name, (const char **)NULL); + (void)task_argsetup(child, name, (FAR char * const *)NULL); /* Get the assigned pid before we start the task */ - pid = (int)child->pid; + pid = (int)child->cmn.pid; /* Activate the task */ - ret = task_activate(child); + ret = task_activate((FAR struct tcb_s *)child); if (ret != OK) { task_vforkabort(child, -ret); @@ -317,7 +317,7 @@ pid_t task_vforkstart(FAR struct tcb_s *child) * ****************************************************************************/ -void task_vforkabort(FAR struct tcb_s *child, int errcode) +void task_vforkabort(FAR struct task_tcb_s *child, int errcode) { /* The TCB was added to the active task list by task_schedsetup() */ @@ -325,6 +325,6 @@ void task_vforkabort(FAR struct tcb_s *child, int errcode) /* Release the TCB */ - sched_releasetcb(child); + sched_releasetcb((FAR struct tcb_s *)child); set_errno(errcode); } |