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

arch/sim/src/sim: Replace all CONFIG_DEV_CONSOLE with USE_DEVCONSOLE for arch/sim and compile up_devconsole.c conditionally.

Browse Source
This commit is contained in:
Xiang Xiao 2019-11-10 20:40:38 -06:00 committed by Gregory Nutt
parent db8a7ab39c
commit a4ce23518e
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sim/src/Makefile
View File

@ -61,7 +61,7 @@ CSRCS = up_initialize.c up_idle.c up_interruptcontext.c up_initialstate.c
CSRCS += up_createstack.c up_usestack.c up_releasestack.c up_stackframe.c
CSRCS += up_unblocktask.c up_blocktask.c up_releasepending.c
CSRCS += up_reprioritizertr.c up_exit.c up_schedulesigaction.c up_spiflash.c
CSRCS += up_allocateheap.c up_devconsole.c up_qspiflash.c
CSRCS += up_allocateheap.c up_qspiflash.c
VPATH = sim
DEPPATH = $(patsubst %,--dep-path %,$(subst :, ,$(VPATH)))
@ -92,7 +92,7 @@ endif
endif
ifeq ($(CONFIG_DEV_CONSOLE),y)
CSRCS += up_uartwait.c
CSRCS += up_devconsole.c up_uartwait.c
HOSTSRCS += up_simuart.c
endif

3
arch/sim/src/sim/up_head.c
View File

@ -95,9 +95,12 @@ int main(int argc, char **argv, char **envp)
#endif
}
#ifdef USE_DEVCONSOLE
/* Restore the original terminal mode and return the exit code */
simuart_terminate();
#endif
return g_exitcode;
}

2
arch/sim/src/sim/up_idle.c
View File

@ -132,7 +132,7 @@ void up_idle(void)
nxsched_process_timer();
#endif
#ifdef CONFIG_DEV_CONSOLE
#ifdef USE_DEVCONSOLE
/* Handle UART data availability */
if (g_uart_data_available)

2
arch/sim/src/sim/up_internal.h
View File

@ -204,7 +204,7 @@ extern volatile int g_eventloop;
#endif
#endif
#ifdef CONFIG_DEV_CONSOLE
#ifdef USE_DEVCONSOLE
extern volatile int g_uart_data_available;
#endif