summaryrefslogtreecommitdiff
path: root/nuttx/drivers/input
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-15 20:10:32 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-15 20:10:32 +0000
commit6d8337323f1d60e7845a83508d4bbd1e0318ec3b (patch)
tree51e09899dc63fadd94c36505db44c511e5483f4f /nuttx/drivers/input
parent91e38a73cd93af894ecaf44476ae8e6313670cb5 (diff)
downloadpx4-nuttx-6d8337323f1d60e7845a83508d4bbd1e0318ec3b.tar.gz
px4-nuttx-6d8337323f1d60e7845a83508d4bbd1e0318ec3b.tar.bz2
px4-nuttx-6d8337323f1d60e7845a83508d4bbd1e0318ec3b.zip
NXWidgets::CNxTkWindow must subtract the height of the toolbar (if any) when reporting the size of the window
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4741 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/input')
-rw-r--r--nuttx/drivers/input/stmpe11_tsc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/drivers/input/stmpe11_tsc.c b/nuttx/drivers/input/stmpe11_tsc.c
index afe27ac89..ca6d92ce0 100644
--- a/nuttx/drivers/input/stmpe11_tsc.c
+++ b/nuttx/drivers/input/stmpe11_tsc.c
@@ -929,7 +929,7 @@ void stmpe11_tscworker(FAR struct stmpe11_dev_s *priv, uint8_t intsta)
if (!pendown)
{
/* The pen is up.. reset thresholding variables. FIFOs will read zero if
- * there is no data available (hence the choice of (0,0)
+ * there is no data available (hence the choice of (0,0))
*/
priv->threshx = 0;
@@ -1050,11 +1050,11 @@ void stmpe11_tscworker(FAR struct stmpe11_dev_s *priv, uint8_t intsta)
stmpe11_notify(priv);
- /* Clear the interrupt pending bit and enable the FIFO again */
+ /* Reset and clear all data in the FIFO */
ignored:
- stmpe11_putreg8(priv, STMPE11_FIFO_STA, 0x01);
- stmpe11_putreg8(priv, STMPE11_FIFO_STA, 0x00);
+ stmpe11_putreg8(priv, STMPE11_FIFO_STA, FIFO_STA_FIFO_RESET);
+ stmpe11_putreg8(priv, STMPE11_FIFO_STA, 0);
}
#endif /* CONFIG_INPUT && CONFIG_INPUT_STMPE11 && !CONFIG_STMPE11_TSC_DISABLE */