nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

arch/sim: Remove the redundant Kconfig variable dependence check

Browse source 
because Kconfig system already guarantee the invariance

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2020-08-23 10:53:12 +08:00 committed by Masayuki Ishikawa
parent 52286f6dec
commit 1e21c97744
1 changed files with 1 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
arch/sim/src/sim/up_internal.h
View file

@ -53,30 +53,6 @@
* Pre-processor Definitions
****************************************************************************/
/* Configuration ************************************************************/
#ifndef CONFIG_SIM_X11FB
# ifdef CONFIG_SIM_TOUCHSCREEN
# error "CONFIG_SIM_TOUCHSCREEN depends on CONFIG_SIM_X11FB"
# undef CONFIG_SIM_TOUCHSCREEN
# endif
# ifdef CONFIG_SIM_AJOYSTICK
# error "CONFIG_SIM_AJOYSTICK depends on CONFIG_SIM_X11FB"
# undef CONFIG_SIM_AJOYSTICK
# endif
#endif
#ifndef CONFIG_INPUT
# ifdef CONFIG_SIM_TOUCHSCREEN
# error "CONFIG_SIM_TOUCHSCREEN depends on CONFIG_INPUT"
# undef CONFIG_SIM_TOUCHSCREEN
# endif
# ifdef CONFIG_SIM_AJOYSTICK
# error "CONFIG_SIM_AJOYSTICK depends on CONFIG_INPUT"
# undef CONFIG_SIM_AJOYSTICK
# endif
#endif
/* Determine which (if any) console driver to use */
#ifndef CONFIG_DEV_CONSOLE
@ -299,8 +275,7 @@ int sim_tsc_uninitialize(void);
/* up_eventloop.c ***********************************************************/
#if defined(CONFIG_SIM_X11FB) && \
(defined(CONFIG_SIM_TOUCHSCREEN) || defined(CONFIG_SIM_AJOYSTICK))
#if defined(CONFIG_SIM_TOUCHSCREEN) || defined(CONFIG_SIM_AJOYSTICK)
void up_x11events(void);
void up_buttonevent(int x, int y, int buttons);
#endif