diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-09-28 23:39:57 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-09-28 23:39:57 +0000 |
| commit | 23ddf8e48b573f08c96d1bcde85f2e3f029b806d (patch) | |
| tree | bd6d3a597498b29fc43985ca6fa75e581d065b28 /nuttx/arch/sim/src/up_internal.h | |
| parent | 4041d950714df40a207131894ca4121f53911820 (diff) | |
| download | px4-nuttx-23ddf8e48b573f08c96d1bcde85f2e3f029b806d.tar.gz px4-nuttx-23ddf8e48b573f08c96d1bcde85f2e3f029b806d.tar.bz2 px4-nuttx-23ddf8e48b573f08c96d1bcde85f2e3f029b806d.zip | |
Simulated touchscreen debug fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3994 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/sim/src/up_internal.h')
| -rw-r--r-- | nuttx/arch/sim/src/up_internal.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/arch/sim/src/up_internal.h b/nuttx/arch/sim/src/up_internal.h index 2a1d9372a..fdb798fc2 100644 --- a/nuttx/arch/sim/src/up_internal.h +++ b/nuttx/arch/sim/src/up_internal.h @@ -114,12 +114,16 @@ * Public Variables **************************************************************************/ +#ifndef __ASSEMBLY__ + +#if defined(CONFIG_SIM_X11FB) && defined(CONFIG_SIM_TOUCHSCREEN) +extern volatile int g_evloopactive; +#endif + /************************************************************************** * Public Function Prototypes **************************************************************************/ -#ifndef __ASSEMBLY__ - /* up_setjmp.S ************************************************************/ extern int up_setjmp(int *jb); @@ -160,20 +164,16 @@ extern int up_x11cmap(unsigned short first, unsigned short len, /* up_eventloop.c ***********************************************************/ -#ifdef CONFIG_SIM_X11FB -#ifdef CONFIG_SIM_TOUCHSCREEN +#if defined(CONFIG_SIM_X11FB) && defined(CONFIG_SIM_TOUCHSCREEN) extern int up_x11eventloop(void); #endif -#endif /* up_eventloop.c ***********************************************************/ -#ifdef CONFIG_SIM_X11FB -#ifdef CONFIG_SIM_TOUCHSCREEN +#if defined(CONFIG_SIM_X11FB) && defined(CONFIG_SIM_TOUCHSCREEN) extern int up_tcenter(int x, int y, int buttons); extern int up_tcleave(int x, int y, int buttons); #endif -#endif /* up_tapdev.c ************************************************************/ |