summaryrefslogtreecommitdiff
path: root/nuttx/drivers/input/stmpe11_base.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-11 18:27:46 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-11 18:27:46 +0000
commit186c49997038f34f2b3efd6fd9aa4fde8f4213e1 (patch)
tree77ec188ac358d775f36b3d77fde24509afe7fd26 /nuttx/drivers/input/stmpe11_base.c
parenta280d993608d0c40ad0b4efc8adcbf72f67d53a4 (diff)
downloadpx4-nuttx-186c49997038f34f2b3efd6fd9aa4fde8f4213e1.tar.gz
px4-nuttx-186c49997038f34f2b3efd6fd9aa4fde8f4213e1.tar.bz2
px4-nuttx-186c49997038f34f2b3efd6fd9aa4fde8f4213e1.zip
SMTPE11 and NxWM touchscreen fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4722 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/input/stmpe11_base.c')
-rw-r--r--nuttx/drivers/input/stmpe11_base.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/nuttx/drivers/input/stmpe11_base.c b/nuttx/drivers/input/stmpe11_base.c
index f9f52fae9..34d13aeac 100644
--- a/nuttx/drivers/input/stmpe11_base.c
+++ b/nuttx/drivers/input/stmpe11_base.c
@@ -109,7 +109,7 @@ static void stmpe11_worker(FAR void *arg)
if (stmpe11_tscworker)
#endif
{
- stmpe11_tscworker(priv);
+ stmpe11_tscworker(priv, regval);
}
stmpe11_putreg8(priv, STMPE11_INT_STA, (INT_TOUCH_DET|INT_FIFO_TH|INT_FIFO_OFLOW));
@@ -349,7 +349,11 @@ STMPE11_HANDLE stmpe11_instantiate(FAR struct i2c_dev_s *dev,
#else
regval |= INT_CTRL_INT_POLARITY; /* Pin polarity: Active high / rising edge */
#endif
+#ifdef CONFIG_STMPE11_EDGE
+ regval |= INT_CTRL_INT_TYPE; /* Edge interrupt */
+#else
regval &= ~INT_CTRL_INT_TYPE; /* Level interrupt */
+#endif
stmpe11_putreg8(priv, STMPE11_INT_CTRL, regval);
/* Attach the STMPE11 interrupt handler. */