OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

A few fixes for compilation errors due to recent address environment fixes

This commit is contained in:
Gregory Nutt 2014-08-22 15:55:00 -06:00
parent f7899c655a
commit e79d6e3c8b
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/z80/src/z180/z180_mmu.c
View File

@ -498,8 +498,7 @@ int up_addrenv_attach(FAR struct task_group_s *group, FAR struct tcb_s *tcb)
* *
****************************************************************************/ ****************************************************************************/
int up_addrenv_detach(FAR struct task_group_s *group, int up_addrenv_detach(FAR struct task_group_s *group, FAR struct tcb_s *tcb);
FAR struct task_group_s *tcb);
{ {
/* There is nothing that needs to be done */ /* There is nothing that needs to be done */

2
binfmt/binfmt_execmodule.c
View File

@ -208,7 +208,7 @@ int exec_module(FAR const struct binary_s *binp)
/* Assign the address environment to the new task group */ /* Assign the address environment to the new task group */
#ifdef CONFIG_ADDRENV #ifdef CONFIG_ADDRENV
ret = up_addrenv_assign(binp->addrenv, tcb->group); ret = up_addrenv_assign(binp->addrenv, tcb->cmn.group);
if (ret < 0) if (ret < 0)
{ {
err = -ret; err = -ret;

4
configs/p112/README.txt
View File

@ -144,4 +144,6 @@ stopper" before I gave up for now was during building dependencies:
ASlink-Error-<cannot open> : "bin/mm_initialize.rel" ASlink-Error-<cannot open> : "bin/mm_initialize.rel"
Clearly there is something wrong with the command line options given to SDCC because it is Clearly there is something wrong with the command line options given to SDCC because it is
trying to compile and link when we really only want dependencies. trying to compile and link when we really only want dependencies. I did not spend very much
time trying to solve the problem; I assume that it is not too difficult.

3
include/nuttx/arch.h
View File

@ -879,8 +879,7 @@ int up_addrenv_attach(FAR struct task_group_s *group, FAR struct tcb_s *tcb);
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ADDRENV #ifdef CONFIG_ADDRENV
int up_addrenv_detach(FAR struct task_group_s *group, int up_addrenv_detach(FAR struct task_group_s *group, FAR struct tcb_s *tcb);
FAR struct task_group_s *tcb);
#endif #endif
/**************************************************************************** /****************************************************************************

2
include/nuttx/sched.h
View File

@ -55,6 +55,8 @@
#include <nuttx/fs/fs.h> #include <nuttx/fs/fs.h>
#include <nuttx/net/net.h> #include <nuttx/net/net.h>
#include <arch/arch.h>
/******************************************************************************** /********************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
********************************************************************************/ ********************************************************************************/

4
sched/pthread/pthread_create.c
View File

@ -270,8 +270,8 @@ int pthread_create(FAR pthread_t *thread, FAR pthread_attr_t *attr,
#ifdef CONFIG_ADDRENV #ifdef CONFIG_ADDRENV
/* Share the address environment of the parent task group. */ /* Share the address environment of the parent task group. */
ret = up_addrenv_attach(ptcb->group, ret = up_addrenv_attach(ptcb->cmn.group,
(FAR const struct tcb_s *)g_readytorun.head); (FAR struct tcb_s *)g_readytorun.head);
if (ret < 0) if (ret < 0)
{ {
errcode = -ret; errcode = -ret;

2
sched/sched/sched_releasetcb.c
View File

@ -193,7 +193,7 @@ int sched_releasetcb(FAR struct tcb_s *tcb, uint8_t ttype)
/* Release this thread's reference to the address environment */ /* Release this thread's reference to the address environment */
#ifdef CONFIG_ADDRENV #ifdef CONFIG_ADDRENV
ret = up_addrenv_detach(tcp->group, tcb); ret = up_addrenv_detach(tcb->group, tcb);
#endif #endif
/* Leave the group (if we did not already leave in task_exithook.c) */ /* Leave the group (if we did not already leave in task_exithook.c) */