diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-26 14:36:28 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-26 14:36:28 +0000 |
commit | b55eb97656c92bbb5f7bce796de5084cbbc890c7 (patch) | |
tree | fc7b9a9e3bcccfa11b7611218c9bbfb4a96f6900 /nuttx/configs/shenzhou/src/up_touchscreen.c | |
parent | 839a2cc356869a714978d154760fce9b55dd56ba (diff) | |
download | px4-nuttx-b55eb97656c92bbb5f7bce796de5084cbbc890c7.tar.gz px4-nuttx-b55eb97656c92bbb5f7bce796de5084cbbc890c7.tar.bz2 px4-nuttx-b55eb97656c92bbb5f7bce796de5084cbbc890c7.zip |
Fixes for clean compilation of NxWidgets/NxWM with Kconfig and changes to build system; Fixes to Shenzhou NxWM configuration for clean build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5193 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/shenzhou/src/up_touchscreen.c')
-rw-r--r-- | nuttx/configs/shenzhou/src/up_touchscreen.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nuttx/configs/shenzhou/src/up_touchscreen.c b/nuttx/configs/shenzhou/src/up_touchscreen.c index 4ed34c0ec..92b057f5d 100644 --- a/nuttx/configs/shenzhou/src/up_touchscreen.c +++ b/nuttx/configs/shenzhou/src/up_touchscreen.c @@ -52,7 +52,7 @@ #include <nuttx/input/ads7843e.h> #include "stm32_internal.h" -#include "shenzhou_internal.h" +#include "shenzhou-internal.h" /**************************************************************************** * Pre-Processor Definitions @@ -159,13 +159,14 @@ static struct stm32_config_s g_tscinfo = * pendown - Return the state of the pen down GPIO input */ -static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr) +static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t handler) { FAR struct stm32_config_s *priv = (FAR struct stm32_config_s *)state; /* Just save the handler for use when the interrupt is enabled */ priv->handler = handler; + return OK; } static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable) @@ -256,7 +257,7 @@ int arch_tcinitialize(int minor) /* Initialize and register the SPI touschscreen device */ - ret = ads7843e_register(dev, &g_tscinfo, CONFIG_ADS7843E_DEVMINOR); + ret = ads7843e_register(dev, &g_tscinfo.dev, CONFIG_ADS7843E_DEVMINOR); if (ret < 0) { idbg("Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV); |