sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix more compile errors and warnings introduced in recent commits

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5744 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2013-03-15 01:32:47 +00:00
parent c5b85860ba
commit 5b98834f2f
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/armv6-m/up_initialstate.c
View File

@ -115,17 +115,18 @@ void up_initial_state(struct tcb_s *tcb)
xcp->regs[REG_PIC] = (uint32_t)tcb->dspace->region;
}
#ifdef CONFIG_NXFLAT
/* Make certain that bit 0 is set in the main entry address. This is
* only an issue when NXFLAT is enabled. NXFLAT doesn't know anything
* about thumb; the addresses that NXFLAT sets are based on file header
* info and won't have bit 0 set.
*/
#ifdef CONFIG_NXFLAT
tcb->entry.main = (main_t)((uint32_t)tcb->entry.main | 1);
#endif
#endif /* CONFIG_PIC */
#ifdef CONFIG_NUTTX_KERNEL
/* All tasks start via a stub function in kernel space. So all
* tasks must start in privileged thread mode. If CONFIG_NUTTX_KERNEL
* is defined, then that stub function will switch to unprivileged
@ -133,6 +134,7 @@ void up_initial_state(struct tcb_s *tcb)
*/
xcp->regs[REG_EXC_RETURN] = EXC_RETURN_PRIVTHR;
#endif
/* Enable or disable interrupts, based on user configuration */

2
arch/arm/src/armv7-m/up_initialstate.c
View File

@ -115,13 +115,13 @@ void up_initial_state(struct tcb_s *tcb)
xcp->regs[REG_PIC] = (uint32_t)tcb->dspace->region;
}
#ifdef CONFIG_NXFLAT
/* Make certain that bit 0 is set in the main entry address. This
* is only an issue when NXFLAT is enabled. NXFLAT doesn't know
* anything about thumb; the addresses that NXFLAT sets are based
* on file header info and won't have bit 0 set.
*/
#ifdef CONFIG_NXFLAT
tcb->entry.main = (main_t)((uint32_t)tcb->entry.main | 1);
#endif
#endif /* CONFIG_PIC */

2
arch/mips/src/mips32/up_swint0.c
View File

@ -130,7 +130,7 @@ static void dispatch_syscall(void)
/* Refer to arch/arm/src/armv7-m/up_svcall.h for how this is done for ARM */
/* __asm__ __volatile__ */
/* (
/* ( */
/* Save registers */
/* Get the base of the stub lookup table */
/* Get the offset of the stub for this syscall */

2
sched/os_bringup.c
View File

@ -232,7 +232,7 @@ int os_bringup(void)
(main_t)CONFIG_USER_ENTRYPOINT,
(FAR char * const *)NULL);
#endif
DEBUGASSERT(taskid > 0);
ASSERT(taskid > 0);
/* We an save a few bytes by discarding the IDLE thread's environment. */