You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ma...@apache.org on 2020/08/24 12:18:41 UTC
[incubator-nuttx] branch master updated: arch/sim: Remove the
redundant Kconfig variable dependence check
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 1e21c97 arch/sim: Remove the redundant Kconfig variable dependence check
1e21c97 is described below
commit 1e21c97744574469edd1b9b556be903a6e5f6753
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Aug 23 10:53:12 2020 +0800
arch/sim: Remove the redundant Kconfig variable dependence check
because Kconfig system already guarantee the invariance
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/sim/src/sim/up_internal.h | 27 +--------------------------
1 file changed, 1 insertion(+), 26 deletions(-)
diff --git a/arch/sim/src/sim/up_internal.h b/arch/sim/src/sim/up_internal.h
index 81f98b3..33a875a 100644
--- a/arch/sim/src/sim/up_internal.h
+++ b/arch/sim/src/sim/up_internal.h
@@ -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