summaryrefslogtreecommitdiffstats
path: root/nuttx/drivers
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-05-15 20:10:32 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-05-15 20:10:32 +0000
commit3e886927b5b4c5751626c26c4c0b2d693a72a355 (patch)
tree51e09899dc63fadd94c36505db44c511e5483f4f /nuttx/drivers
parentff243fbb128267bece372efa0960e3b523fdddab (diff)
NXWidgets::CNxTkWindow must subtract the height of the toolbar (if any) when reporting the size of the window
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4741 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/drivers')
-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 afe27ac899..ca6d92ce03 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 */