summaryrefslogtreecommitdiff
path: root/nuttx/configs/sim
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-12-14 10:19:07 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-12-14 10:19:07 -0600
commitc4c14b4ea44e798b79b039bd597da6881956a34b (patch)
treef02b3d8c7cd98b1b8e24cd43a0724d832300a900 /nuttx/configs/sim
parentc627d15288f61aa2cbb4d1484cf06f497fd5a9c2 (diff)
downloadnuttx-c4c14b4ea44e798b79b039bd597da6881956a34b.tar.gz
nuttx-c4c14b4ea44e798b79b039bd597da6881956a34b.tar.bz2
nuttx-c4c14b4ea44e798b79b039bd597da6881956a34b.zip
SIM: Add an X11 mouse-based simulation of an analog joystick device
Diffstat (limited to 'nuttx/configs/sim')
-rw-r--r--nuttx/configs/sim/src/Makefile1
-rw-r--r--nuttx/configs/sim/src/sim_boot.c8
-rw-r--r--nuttx/configs/sim/traveler/defconfig2
3 files changed, 11 insertions, 0 deletions
diff --git a/nuttx/configs/sim/src/Makefile b/nuttx/configs/sim/src/Makefile
index 73de2f5b5..c07947f97 100644
--- a/nuttx/configs/sim/src/Makefile
+++ b/nuttx/configs/sim/src/Makefile
@@ -36,6 +36,7 @@
include $(TOPDIR)/Make.defs
CFLAGS += -I$(TOPDIR)/sched
+CFLAGS += -I$(TOPDIR)/arch/sim/src
ASRCS =
AOBJS = $(ASRCS:.S=$(OBJEXT))
diff --git a/nuttx/configs/sim/src/sim_boot.c b/nuttx/configs/sim/src/sim_boot.c
index ef84a689e..e4e282c78 100644
--- a/nuttx/configs/sim/src/sim_boot.c
+++ b/nuttx/configs/sim/src/sim_boot.c
@@ -40,6 +40,8 @@
#include <nuttx/config.h>
#include <nuttx/compiler.h>
+#include "up_internal.h"
+
#ifdef CONFIG_GRAPHICS_TRAVELER_ROMFSDEMO
int trv_mount_world(int minor, FAR const char *mountpoint);
#endif
@@ -80,6 +82,12 @@ int trv_mount_world(int minor, FAR const char *mountpoint);
#ifdef CONFIG_BOARD_INITIALIZE
void board_initialize(void)
{
+#ifdef CONFIG_AJOYSTICK
+ /* Initialize the simulated analog joystick input device */
+
+ sim_ajoy_initialize();
+#endif
+
#ifdef CONFIG_GRAPHICS_TRAVELER_ROMFSDEMO
/* Special initialization for the Traveler game simulation */
diff --git a/nuttx/configs/sim/traveler/defconfig b/nuttx/configs/sim/traveler/defconfig
index 4f4f2d63a..f12eb8df7 100644
--- a/nuttx/configs/sim/traveler/defconfig
+++ b/nuttx/configs/sim/traveler/defconfig
@@ -102,6 +102,8 @@ CONFIG_SIM_FBHEIGHT=400
CONFIG_SIM_FBWIDTH=640
CONFIG_SIM_FBBPP=32
# CONFIG_SIM_TOUCHSCREEN is not set
+CONFIG_SIM_AJOYSTICK=y
+# CONFIG_SIM_NOINPUT is not set
# CONFIG_SIM_SPIFLASH is not set
#