Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

drivers/input/ft5x06: Fix a misconception.. WAKE is an output, not an input.

Browse Source
This commit is contained in:
Gregory Nutt
2017-12-18 06:36:44 -06:00
parent 30070b06df
commit c014400895
4 changed files with 53 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/input/ft5x06.c
+15 -19
View File
@@ -299,7 +299,7 @@ static void ft5x06_data_worker(FAR void *arg)
/* Exit, re-enabling FT5x06 interrupts */
config->enable(config, FT5X06_DATA_SOURCE, true);
config->enable(config, true);
nxsem_post(&priv->devsem);
}
@@ -322,7 +322,7 @@ static int ft5x06_data_interrupt(int irq, FAR void *context, FAR void *arg)
/* Disable further interrupts */
config->enable(config, FT5X06_DATA_SOURCE, false);
config->enable(config, false);
/* Transfer processing to the worker thread. Since FT5x06 interrupts are
* disabled while the work is pending, no special action should be required
@@ -338,7 +338,7 @@ static int ft5x06_data_interrupt(int irq, FAR void *context, FAR void *arg)
/* Clear any pending interrupts and return success */
config->clear(config, FT5X06_DATA_SOURCE);
config->clear(config);
return OK;
}
@@ -384,6 +384,8 @@ static ssize_t ft5x06_sample(FAR struct ft5x06_dev_s *priv, FAR char *buffer,
return 0; /* No touches read. */
}
DEBUGASSERT(ntouches <= FT5x06_MAX_TOUCHES);
/* User data buffer points (sink) */
sample = (FAR struct touch_sample_s *)buffer;
@@ -523,8 +525,8 @@ static int ft5x06_bringup(FAR struct ft5x06_dev_s *priv)
/* Enable FT5x06 interrupts */
config->clear(config, FT5X06_DATA_SOURCE);
config->enable(config, FT5X06_DATA_SOURCE, true);
config->clear(config);
config->enable(config, true);
return OK;
}
@@ -536,17 +538,14 @@ static void ft5x06_shutdown(FAR struct ft5x06_dev_s *priv)
{
FAR const struct ft5x06_config_s *config = priv->config;
/* Make sure that interrupts are disabled */
/* Make sure that the FT5x06 interrupt is disabled */
config->clear(config, FT5X06_DATA_SOURCE);
config->enable(config, FT5X06_DATA_SOURCE, false);
config->clear(config, FT5X06_WAKE_SOURCE);
config->enable(config, FT5X06_WAKE_SOURCE, false);
config->clear(config);
config->enable(config, false);
/* Attach the interrupt handler */
(void)config->attach(config, FT5X06_DATA_SOURCE, NULL, NULL);
(void)config->attach(config, NULL, NULL);
}
/****************************************************************************
@@ -957,17 +956,14 @@ int ft5x06_register(FAR struct i2c_master_s *i2c,
nxsem_setprotocol(&priv->waitsem, SEM_PRIO_NONE);
/* Make sure that interrupts are disabled */
/* Make sure that the FT5x06 interrupt interrupt is disabled */
config->clear(config, FT5X06_DATA_SOURCE);
config->enable(config, FT5X06_DATA_SOURCE, false);
config->clear(config, FT5X06_WAKE_SOURCE);
config->enable(config, FT5X06_WAKE_SOURCE, false);
config->clear(config);
config->enable(config, false);
/* Attach the interrupt handler */
ret = config->attach(config, FT5X06_DATA_SOURCE, ft5x06_data_interrupt,
ret = config->attach(config, ft5x06_data_interrupt,
priv);
if (ret < 0)
{