You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by mi...@apache.org on 2026/10/19 08:22:47 UTC
(nuttx) 02/06: drivers/input: Fix the nxstyle errors in 10 files.
This is an automated email from the ASF dual-hosted git repository.
michallenc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 7afa83b70fa6edccebdfb3eab5fb6aa86622d267
Author: Marco Casaroli <ma...@gmail.com>
AuthorDate: Mon Oct 19 00:19:20 2026 +0200
drivers/input: Fix the nxstyle errors in 10 files.
Fix the older nxstyle errors in these files: indentation, alignment of
braces and comments, and the blank line after declarations. This is a
layout change only. The C tokens do not change. tools/nxstyle.c reports
no error for them now.
Assisted-by: Claude Code:claude-opus-5-5
Signed-off-by: Marco Casaroli <ma...@gmail.com>
---
drivers/input/ads7843e.c | 5 +-
drivers/input/ajoystick.c | 179 +++++++++++++++++++-------------------
drivers/input/cypress_mbr3108.c | 79 ++++++++---------
drivers/input/djoystick.c | 179 +++++++++++++++++++-------------------
drivers/input/max11802.c | 6 +-
drivers/input/mxt.c | 31 ++++---
drivers/input/spq10kbd.c | 3 +
drivers/input/stmpe811_tsc.c | 11 ++-
drivers/input/touchscreen_upper.c | 2 +
drivers/input/tsc2007.c | 9 +-
10 files changed, 268 insertions(+), 236 deletions(-)
diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c
index 73362bdd523..9c974f1bf4f 100644
--- a/drivers/input/ads7843e.c
+++ b/drivers/input/ads7843e.c
@@ -543,7 +543,7 @@ static void ads7843e_worker(FAR void *arg)
* after the loss of contact is sampled.
*/
- priv->sample.contact = CONTACT_UP;
+ priv->sample.contact = CONTACT_UP;
}
/* It is a pen down event. If the last loss-of-contact event has not been
@@ -957,6 +957,7 @@ static int ads7843e_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_SETFREQUENCY: /* arg: Pointer to uint32_t frequency value */
{
FAR uint32_t *ptr = (FAR uint32_t *)((uintptr_t)arg);
+
DEBUGASSERT(priv->config != NULL && ptr != NULL);
priv->config->frequency = SPI_SETFREQUENCY(priv->spi, *ptr);
}
@@ -965,6 +966,7 @@ static int ads7843e_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_GETFREQUENCY: /* arg: Pointer to uint32_t frequency value */
{
FAR uint32_t *ptr = (FAR uint32_t *)((uintptr_t)arg);
+
DEBUGASSERT(priv->config != NULL && ptr != NULL);
*ptr = priv->config->frequency;
}
@@ -1053,6 +1055,7 @@ static int ads7843e_poll(FAR struct file *filep, FAR struct pollfd *fds,
/* This is a request to tear down the poll. */
FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
+
DEBUGASSERT(slot != NULL);
/* Remove all memory of the poll setup */
diff --git a/drivers/input/ajoystick.c b/drivers/input/ajoystick.c
index 389f0e9df9a..32dc50caa29 100644
--- a/drivers/input/ajoystick.c
+++ b/drivers/input/ajoystick.c
@@ -488,99 +488,100 @@ static int ajoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
ret = -EINVAL;
switch (cmd)
{
- /* Command: AJOYIOC_SUPPORTED
- * Description: Report the set of button events supported by the
- * hardware;
- * Argument: A pointer to writeable integer value in which to return
- * the set of supported buttons.
- * Return: Zero (OK) on success. Minus one will be returned on
- * failure with the errno value set appropriately.
- */
-
- case AJOYIOC_SUPPORTED:
- {
- FAR int *supported = (FAR int *)((uintptr_t)arg);
-
- if (supported)
- {
- lower = priv->au_lower;
- DEBUGASSERT(lower && lower->al_supported);
-
- *supported = (int)lower->al_supported(lower);
- ret = OK;
- }
- }
- break;
-
- /* Command: AJOYIOC_POLLEVENTS
- * Description: Specify the set of button events that can cause a poll()
- * to awaken. The default is all button depressions and
- * all button releases (all supported buttons);
- * Argument: A read-only pointer to an instance of struct
- * ajoy_pollevents_s
- * Return: Zero (OK) on success. Minus one will be returned on
- * failure with the errno value set appropriately.
- */
-
- case AJOYIOC_POLLEVENTS:
- {
- FAR struct ajoy_pollevents_s *pollevents =
- (FAR struct ajoy_pollevents_s *)((uintptr_t)arg);
-
- if (pollevents)
- {
- /* Save the poll events */
-
- opriv->ao_pollevents.ap_press = pollevents->ap_press;
- opriv->ao_pollevents.ap_release = pollevents->ap_release;
-
- /* Enable/disable interrupt handling */
-
- ajoy_enable(priv);
- ret = OK;
- }
- }
- break;
-
- /* Command: AJOYIOC_REGISTER
- * Description: Register to receive a signal whenever there is a change
- * in any of the joystick discrete inputs. This feature,
- * of course, depends upon interrupt GPIO support from the
- * platform.
- * Argument: A read-only pointer to an instance of struct
- * ajoy_notify_s
- * Return: Zero (OK) on success. Minus one will be returned on
- * failure with the errno value set appropriately.
- */
+ /* Command: AJOYIOC_SUPPORTED
+ * Description: Report the set of button events supported by the
+ * hardware;
+ * Argument: A pointer to writeable integer value in which to return
+ * the set of supported buttons.
+ * Return: Zero (OK) on success. Minus one will be returned on
+ * failure with the errno value set appropriately.
+ */
+
+ case AJOYIOC_SUPPORTED:
+ {
+ FAR int *supported = (FAR int *)((uintptr_t)arg);
+
+ if (supported)
+ {
+ lower = priv->au_lower;
+ DEBUGASSERT(lower && lower->al_supported);
+
+ *supported = (int)lower->al_supported(lower);
+ ret = OK;
+ }
+ }
+ break;
+
+ /* Command: AJOYIOC_POLLEVENTS
+ * Description: Specify the set of button events that can cause a
+ * poll() to awaken. The default is all button
+ * depressions and all button releases (all supported
+ * buttons);
+ * Argument: A read-only pointer to an instance of struct
+ * ajoy_pollevents_s
+ * Return: Zero (OK) on success. Minus one will be returned on
+ * failure with the errno value set appropriately.
+ */
+
+ case AJOYIOC_POLLEVENTS:
+ {
+ FAR struct ajoy_pollevents_s *pollevents =
+ (FAR struct ajoy_pollevents_s *)((uintptr_t)arg);
+
+ if (pollevents)
+ {
+ /* Save the poll events */
+
+ opriv->ao_pollevents.ap_press = pollevents->ap_press;
+ opriv->ao_pollevents.ap_release = pollevents->ap_release;
+
+ /* Enable/disable interrupt handling */
+
+ ajoy_enable(priv);
+ ret = OK;
+ }
+ }
+ break;
+
+ /* Command: AJOYIOC_REGISTER
+ * Description: Register to receive a signal whenever there is a change
+ * in any of the joystick discrete inputs. This feature,
+ * of course, depends upon interrupt GPIO support from the
+ * platform.
+ * Argument: A read-only pointer to an instance of struct
+ * ajoy_notify_s
+ * Return: Zero (OK) on success. Minus one will be returned on
+ * failure with the errno value set appropriately.
+ */
#ifndef CONFIG_DISABLE_ALL_SIGNALS
- case AJOYIOC_REGISTER:
- {
- FAR struct ajoy_notify_s *notify =
- (FAR struct ajoy_notify_s *)((uintptr_t)arg);
-
- if (notify)
- {
- /* Save the notification events */
-
- opriv->ao_notify.an_press = notify->an_press;
- opriv->ao_notify.an_release = notify->an_release;
- opriv->ao_notify.an_event = notify->an_event;
- opriv->ao_pid = nxsched_getpid();
-
- /* Enable/disable interrupt handling */
-
- ajoy_enable(priv);
- ret = OK;
- }
- }
- break;
+ case AJOYIOC_REGISTER:
+ {
+ FAR struct ajoy_notify_s *notify =
+ (FAR struct ajoy_notify_s *)((uintptr_t)arg);
+
+ if (notify)
+ {
+ /* Save the notification events */
+
+ opriv->ao_notify.an_press = notify->an_press;
+ opriv->ao_notify.an_release = notify->an_release;
+ opriv->ao_notify.an_event = notify->an_event;
+ opriv->ao_pid = nxsched_getpid();
+
+ /* Enable/disable interrupt handling */
+
+ ajoy_enable(priv);
+ ret = OK;
+ }
+ }
+ break;
#endif
- default:
- ierr("ERROR: Unrecognized command: %ld\n", cmd);
- ret = -ENOTTY;
- break;
+ default:
+ ierr("ERROR: Unrecognized command: %ld\n", cmd);
+ ret = -ENOTTY;
+ break;
}
leave_critical_section(flags);
diff --git a/drivers/input/cypress_mbr3108.c b/drivers/input/cypress_mbr3108.c
index 5b9aa4a143d..8d12091b747 100644
--- a/drivers/input/cypress_mbr3108.c
+++ b/drivers/input/cypress_mbr3108.c
@@ -804,51 +804,51 @@ static ssize_t mbr3108_write(FAR struct file *filep, FAR const char *buffer,
switch (type)
{
- case CYPRESS_MBR3108_CMD_SENSOR_CONF:
- {
- FAR const struct mbr3108_cmd_sensor_conf_s *conf =
- (FAR const struct mbr3108_cmd_sensor_conf_s *)buffer;
-
- if (buflen != sizeof(*conf))
- {
- ret = -EINVAL;
- goto out;
- }
-
- ret = mbr3108_device_configuration(priv, &conf->conf);
- break;
- }
+ case CYPRESS_MBR3108_CMD_SENSOR_CONF:
+ {
+ FAR const struct mbr3108_cmd_sensor_conf_s *conf =
+ (FAR const struct mbr3108_cmd_sensor_conf_s *)buffer;
- case CYPRESS_MBR3108_CMD_DEBUG_CONF:
- {
- FAR const struct mbr3108_cmd_debug_conf_s *conf =
- (FAR const struct mbr3108_cmd_debug_conf_s *)buffer;
+ if (buflen != sizeof(*conf))
+ {
+ ret = -EINVAL;
+ goto out;
+ }
- if (buflen != sizeof(*conf))
- {
- ret = -EINVAL;
- goto out;
- }
+ ret = mbr3108_device_configuration(priv, &conf->conf);
+ break;
+ }
- ret = mbr3108_debug_setup(priv, &conf->conf);
- break;
- }
+ case CYPRESS_MBR3108_CMD_DEBUG_CONF:
+ {
+ FAR const struct mbr3108_cmd_debug_conf_s *conf =
+ (FAR const struct mbr3108_cmd_debug_conf_s *)buffer;
- case CYPRESS_MBR3108_CMD_CLEAR_LATCHED:
- {
- if (buflen != sizeof(type))
- {
- ret = -EINVAL;
- goto out;
- }
+ if (buflen != sizeof(*conf))
+ {
+ ret = -EINVAL;
+ goto out;
+ }
- ret = mbr3108_clear_latched(priv);
- break;
- }
+ ret = mbr3108_debug_setup(priv, &conf->conf);
+ break;
+ }
+
+ case CYPRESS_MBR3108_CMD_CLEAR_LATCHED:
+ {
+ if (buflen != sizeof(type))
+ {
+ ret = -EINVAL;
+ goto out;
+ }
- default:
- ret = -EINVAL;
- break;
+ ret = mbr3108_clear_latched(priv);
+ break;
+ }
+
+ default:
+ ret = -EINVAL;
+ break;
}
out:
@@ -1045,6 +1045,7 @@ static int mbr3108_poll(FAR struct file *filep, FAR struct pollfd *fds,
/* This is a request to tear down the poll. */
FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
+
DEBUGASSERT(slot != NULL);
/* Remove all memory of the poll setup */
diff --git a/drivers/input/djoystick.c b/drivers/input/djoystick.c
index 6689d59985d..041f3bffbf5 100644
--- a/drivers/input/djoystick.c
+++ b/drivers/input/djoystick.c
@@ -481,99 +481,100 @@ static int djoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
ret = -EINVAL;
switch (cmd)
{
- /* Command: DJOYIOC_SUPPORTED
- * Description: Report the set of button events supported by the
- * hardware;
- * Argument: A pointer to writeable integer value in which to return
- * the set of supported buttons.
- * Return: Zero (OK) on success. Minus one will be returned on
- * failure with the errno value set appropriately.
- */
-
- case DJOYIOC_SUPPORTED:
- {
- FAR int *supported = (FAR int *)((uintptr_t)arg);
-
- if (supported)
- {
- lower = priv->du_lower;
- DEBUGASSERT(lower && lower->dl_supported);
-
- *supported = (int)lower->dl_supported(lower);
- ret = OK;
- }
- }
- break;
-
- /* Command: DJOYIOC_POLLEVENTS
- * Description: Specify the set of button events that can cause a poll()
- * to awaken. The default is all button depressions and
- * all button releases (all supported buttons);
- * Argument: A read-only pointer to an instance of struct
- * djoy_pollevents_s
- * Return: Zero (OK) on success. Minus one will be returned on
- * failure with the errno value set appropriately.
- */
-
- case DJOYIOC_POLLEVENTS:
- {
- FAR struct djoy_pollevents_s *pollevents =
- (FAR struct djoy_pollevents_s *)((uintptr_t)arg);
-
- if (pollevents)
- {
- /* Save the poll events */
-
- opriv->do_pollevents.dp_press = pollevents->dp_press;
- opriv->do_pollevents.dp_release = pollevents->dp_release;
-
- /* Enable/disable interrupt handling */
-
- djoy_enable(priv);
- ret = OK;
- }
- }
- break;
-
- /* Command: DJOYIOC_REGISTER
- * Description: Register to receive a signal whenever there is a change
- * in any of the joystick discrete inputs. This feature,
- * of course, depends upon interrupt GPIO support from the
- * platform.
- * Argument: A read-only pointer to an instance of struct
- * djoy_notify_s
- * Return: Zero (OK) on success. Minus one will be returned on
- * failure with the errno value set appropriately.
- */
+ /* Command: DJOYIOC_SUPPORTED
+ * Description: Report the set of button events supported by the
+ * hardware;
+ * Argument: A pointer to writeable integer value in which to return
+ * the set of supported buttons.
+ * Return: Zero (OK) on success. Minus one will be returned on
+ * failure with the errno value set appropriately.
+ */
+
+ case DJOYIOC_SUPPORTED:
+ {
+ FAR int *supported = (FAR int *)((uintptr_t)arg);
+
+ if (supported)
+ {
+ lower = priv->du_lower;
+ DEBUGASSERT(lower && lower->dl_supported);
+
+ *supported = (int)lower->dl_supported(lower);
+ ret = OK;
+ }
+ }
+ break;
+
+ /* Command: DJOYIOC_POLLEVENTS
+ * Description: Specify the set of button events that can cause a
+ * poll() to awaken. The default is all button
+ * depressions and all button releases (all supported
+ * buttons);
+ * Argument: A read-only pointer to an instance of struct
+ * djoy_pollevents_s
+ * Return: Zero (OK) on success. Minus one will be returned on
+ * failure with the errno value set appropriately.
+ */
+
+ case DJOYIOC_POLLEVENTS:
+ {
+ FAR struct djoy_pollevents_s *pollevents =
+ (FAR struct djoy_pollevents_s *)((uintptr_t)arg);
+
+ if (pollevents)
+ {
+ /* Save the poll events */
+
+ opriv->do_pollevents.dp_press = pollevents->dp_press;
+ opriv->do_pollevents.dp_release = pollevents->dp_release;
+
+ /* Enable/disable interrupt handling */
+
+ djoy_enable(priv);
+ ret = OK;
+ }
+ }
+ break;
+
+ /* Command: DJOYIOC_REGISTER
+ * Description: Register to receive a signal whenever there is a change
+ * in any of the joystick discrete inputs. This feature,
+ * of course, depends upon interrupt GPIO support from the
+ * platform.
+ * Argument: A read-only pointer to an instance of struct
+ * djoy_notify_s
+ * Return: Zero (OK) on success. Minus one will be returned on
+ * failure with the errno value set appropriately.
+ */
#ifndef CONFIG_DISABLE_ALL_SIGNALS
- case DJOYIOC_REGISTER:
- {
- FAR struct djoy_notify_s *notify =
- (FAR struct djoy_notify_s *)((uintptr_t)arg);
-
- if (notify)
- {
- /* Save the notification events */
-
- opriv->do_notify.dn_press = notify->dn_press;
- opriv->do_notify.dn_release = notify->dn_release;
- opriv->do_notify.dn_event = notify->dn_event;
- opriv->do_pid = nxsched_getpid();
-
- /* Enable/disable interrupt handling */
-
- djoy_enable(priv);
- ret = OK;
- }
- }
- break;
+ case DJOYIOC_REGISTER:
+ {
+ FAR struct djoy_notify_s *notify =
+ (FAR struct djoy_notify_s *)((uintptr_t)arg);
+
+ if (notify)
+ {
+ /* Save the notification events */
+
+ opriv->do_notify.dn_press = notify->dn_press;
+ opriv->do_notify.dn_release = notify->dn_release;
+ opriv->do_notify.dn_event = notify->dn_event;
+ opriv->do_pid = nxsched_getpid();
+
+ /* Enable/disable interrupt handling */
+
+ djoy_enable(priv);
+ ret = OK;
+ }
+ }
+ break;
#endif
- default:
- ierr("ERROR: Unrecognized command: %d\n", cmd);
- ret = -ENOTTY;
- break;
+ default:
+ ierr("ERROR: Unrecognized command: %d\n", cmd);
+ ret = -ENOTTY;
+ break;
}
leave_critical_section(flags);
diff --git a/drivers/input/max11802.c b/drivers/input/max11802.c
index be27523f9a8..ae93470276b 100644
--- a/drivers/input/max11802.c
+++ b/drivers/input/max11802.c
@@ -518,7 +518,7 @@ static void max11802_worker(FAR void *arg)
* after the loss of contact is sampled.
*/
- priv->sample.contact = CONTACT_UP;
+ priv->sample.contact = CONTACT_UP;
}
/* It is a pen down event. If the last loss-of-contact event has not been
@@ -556,6 +556,7 @@ static void max11802_worker(FAR void *arg)
*/
int readycount = 0;
+
do
{
#ifdef CONFIG_MAX11802_SWAPXY
@@ -950,6 +951,7 @@ static int max11802_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_SETFREQUENCY: /* arg: Pointer to uint32_t frequency value */
{
FAR uint32_t *ptr = (FAR uint32_t *)((uintptr_t)arg);
+
DEBUGASSERT(priv->config != NULL && ptr != NULL);
priv->config->frequency = SPI_SETFREQUENCY(priv->spi, *ptr);
}
@@ -958,6 +960,7 @@ static int max11802_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_GETFREQUENCY: /* arg: Pointer to uint32_t frequency value */
{
FAR uint32_t *ptr = (FAR uint32_t *)((uintptr_t)arg);
+
DEBUGASSERT(priv->config != NULL && ptr != NULL);
*ptr = priv->config->frequency;
}
@@ -1046,6 +1049,7 @@ static int max11802_poll(FAR struct file *filep, FAR struct pollfd *fds,
/* This is a request to tear down the poll. */
FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
+
DEBUGASSERT(slot != NULL);
/* Remove all memory of the poll setup */
diff --git a/drivers/input/mxt.c b/drivers/input/mxt.c
index e41610ca908..e832f26ea66 100644
--- a/drivers/input/mxt.c
+++ b/drivers/input/mxt.c
@@ -773,6 +773,7 @@ static void mxt_touch_event(FAR struct mxt_dev_s *priv,
if (priv->lower->swapxy)
{
uint16_t tmp = x;
+
y = x;
x = tmp;
}
@@ -850,7 +851,7 @@ static void mxt_touch_event(FAR struct mxt_dev_s *priv,
if (sample->contact == CONTACT_LOST)
{
- priv->id++;
+ priv->id++;
}
/* Save the measurements */
@@ -1362,6 +1363,7 @@ static ssize_t mxt_read(FAR struct file *filep, FAR char *buffer, size_t len)
/* Yes.. transfer the sample data */
FAR struct touch_point_s *point = &report->point[j];
+
j++;
/* REVISIT: height and width are not set, area is
@@ -1484,6 +1486,7 @@ static int mxt_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_SETFREQUENCY: /* arg: Pointer to uint32_t frequency value */
{
FAR uint32_t *ptr = (FAR uint32_t *)((uintptr_t)arg);
+
DEBUGASSERT(priv->lower != NULL && ptr != NULL);
priv->frequency = *ptr;
@@ -1493,6 +1496,7 @@ static int mxt_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_GETFREQUENCY: /* arg: Pointer to uint32_t frequency value */
{
FAR uint32_t *ptr = (FAR uint32_t *)((uintptr_t)arg);
+
DEBUGASSERT(priv->lower != NULL && ptr != NULL);
*ptr = priv->frequency;
}
@@ -1584,6 +1588,7 @@ static int mxt_poll(FAR struct file *filep, FAR struct pollfd *fds,
/* This is a request to tear down the poll. */
FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
+
DEBUGASSERT(slot != NULL);
/* Remove all memory of the poll setup */
@@ -1669,23 +1674,23 @@ static int mxt_getobjtab(FAR struct mxt_dev_s *priv)
switch (object->type)
{
#ifdef MXT_SUPPORT_T6
- case MXT_GEN_COMMAND_T6:
- priv->t6id = idmin;
- break;
+ case MXT_GEN_COMMAND_T6:
+ priv->t6id = idmin;
+ break;
#endif
- case MXT_TOUCH_MULTI_T9:
- priv->t9idmin = idmin;
- priv->t9idmax = idmax;
- break;
+ case MXT_TOUCH_MULTI_T9:
+ priv->t9idmin = idmin;
+ priv->t9idmax = idmax;
+ break;
#ifdef CONFIG_MXT_BUTTONS
- case MXT_SPT_GPIOPWM_T19:
- priv->t19id = idmin;
- break;
+ case MXT_SPT_GPIOPWM_T19:
+ priv->t19id = idmin;
+ break;
#endif
- default:
- break;
+ default:
+ break;
}
}
diff --git a/drivers/input/spq10kbd.c b/drivers/input/spq10kbd.c
index b6693b13395..341d3e40c60 100644
--- a/drivers/input/spq10kbd.c
+++ b/drivers/input/spq10kbd.c
@@ -296,6 +296,7 @@ static djoy_buttonset_t djoy_sample(
{
FAR struct spq10kbd_dev_s *priv =
(FAR struct spq10kbd_dev_s *)(lower->config);
+
return priv->djoystate;
}
@@ -314,6 +315,7 @@ static void djoy_enable(FAR const struct djoy_lowerhalf_s *lower,
{
FAR struct spq10kbd_dev_s *priv =
(FAR struct spq10kbd_dev_s *)(lower->config);
+
priv->djoypressmask = press;
priv->djoyreleasemask = release;
priv->djoyhandle = handler;
@@ -661,6 +663,7 @@ static int spq10kbd_poll(FAR struct file *filep, FAR struct pollfd *fds,
/* This is a request to tear down the poll. */
FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
+
DEBUGASSERT(slot);
/* Remove all memory of the poll setup */
diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c
index 2f4080c2763..8032118cd22 100644
--- a/drivers/input/stmpe811_tsc.c
+++ b/drivers/input/stmpe811_tsc.c
@@ -217,7 +217,7 @@ static int stmpe811_sample(FAR struct stmpe811_dev_s *priv,
* movement events.
*/
- priv->sample.contact = CONTACT_MOVE;
+ priv->sample.contact = CONTACT_MOVE;
}
priv->penchange = false;
@@ -557,6 +557,7 @@ static int stmpe811_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_SETFREQUENCY: /* arg: Pointer to uint32_t frequency value */
{
FAR uint32_t *ptr = (FAR uint32_t *)((uintptr_t)arg);
+
DEBUGASSERT(priv->config != NULL && ptr != NULL);
priv->config->frequency = *ptr;
}
@@ -565,6 +566,7 @@ static int stmpe811_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_GETFREQUENCY: /* arg: Pointer to uint32_t frequency value */
{
FAR uint32_t *ptr = (FAR uint32_t *)((uintptr_t)arg);
+
DEBUGASSERT(priv->config != NULL && ptr != NULL);
*ptr = priv->config->frequency;
}
@@ -573,6 +575,7 @@ static int stmpe811_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_GETOFFSETX: /* arg: Pointer to int offsetx config value */
{
FAR int *ptr = (FAR int *)((uintptr_t)arg);
+
DEBUGASSERT(ptr != NULL);
*ptr = CONFIG_STMPE811_OFFSETX;
}
@@ -581,6 +584,7 @@ static int stmpe811_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_GETOFFSETY: /* arg: Pointer to int offsety config value */
{
FAR int *ptr = (FAR int *)((uintptr_t)arg);
+
DEBUGASSERT(ptr != NULL);
*ptr = CONFIG_STMPE811_OFFSETY;
}
@@ -589,6 +593,7 @@ static int stmpe811_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_GETTHRESHX: /* arg: Pointer to int threshx config value */
{
FAR int *ptr = (FAR int *)((uintptr_t)arg);
+
DEBUGASSERT(ptr != NULL);
*ptr = CONFIG_STMPE811_THRESHX;
}
@@ -597,6 +602,7 @@ static int stmpe811_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_GETTHRESHY: /* arg: Pointer to int threshy config value */
{
FAR int *ptr = (FAR int *)((uintptr_t)arg);
+
DEBUGASSERT(ptr != NULL);
*ptr = CONFIG_STMPE811_THRESHY;
}
@@ -695,6 +701,7 @@ static int stmpe811_poll(FAR struct file *filep, FAR struct pollfd *fds,
/* This is a request to tear down the poll. */
FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
+
DEBUGASSERT(slot != NULL);
/* Remove all memory of the poll setup */
@@ -982,7 +989,7 @@ void stmpe811_tscworker(FAR struct stmpe811_dev_s *priv, uint8_t intsta)
* CONTACT_NONE after the loss of contact is sampled.
*/
- priv->sample.contact = CONTACT_UP;
+ priv->sample.contact = CONTACT_UP;
}
/* The pen is down... check for data in the FIFO */
diff --git a/drivers/input/touchscreen_upper.c b/drivers/input/touchscreen_upper.c
index 001783f3e39..331ca049063 100644
--- a/drivers/input/touchscreen_upper.c
+++ b/drivers/input/touchscreen_upper.c
@@ -290,6 +290,7 @@ static int touch_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_GRAB:
{
int enable = (int)arg;
+
ret = OK;
if (enable)
{
@@ -398,6 +399,7 @@ static void touch_event_notify(FAR struct touch_upperhalf_s *upper,
if (lower->flags & TOUCH_FLAG_SWAPXY)
{
int16_t p = point[n].x;
+
point[n].x = point[n].y;
point[n].y = p;
}
diff --git a/drivers/input/tsc2007.c b/drivers/input/tsc2007.c
index 780dfc9e1b9..3217cc60568 100644
--- a/drivers/input/tsc2007.c
+++ b/drivers/input/tsc2007.c
@@ -634,7 +634,7 @@ static void tsc2007_worker(FAR void *arg)
/* Power down ADC and enable PENIRQ */
- tsc2007_transfer(priv, TSC2007_ENABLE_PENIRQ);
+ tsc2007_transfer(priv, TSC2007_ENABLE_PENIRQ);
/* Now calculate the pressure using the first method, reduced to:
*
@@ -696,7 +696,7 @@ static void tsc2007_worker(FAR void *arg)
* after the loss of contact is sampled.
*/
- priv->sample.contact = CONTACT_UP;
+ priv->sample.contact = CONTACT_UP;
}
/* Indicate the availability of new sample data for this ID */
@@ -1023,6 +1023,7 @@ static int tsc2007_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_SETXRCAL: /* arg: Pointer to int calibration value */
{
FAR int *ptr = (FAR int *)((uintptr_t)arg);
+
DEBUGASSERT(priv->config != NULL && ptr != NULL);
priv->config->rxplate = *ptr;
}
@@ -1031,6 +1032,7 @@ static int tsc2007_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_GETXRCAL: /* arg: Pointer to int calibration value */
{
FAR int *ptr = (FAR int *)((uintptr_t)arg);
+
DEBUGASSERT(priv->config != NULL && ptr != NULL);
*ptr = priv->config->rxplate;
}
@@ -1039,6 +1041,7 @@ static int tsc2007_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_SETFREQUENCY: /* arg: Pointer to uint32_t frequency value */
{
FAR uint32_t *ptr = (FAR uint32_t *)((uintptr_t)arg);
+
DEBUGASSERT(priv->config != NULL && ptr != NULL);
priv->config->frequency = *ptr;
}
@@ -1047,6 +1050,7 @@ static int tsc2007_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
case TSIOC_GETFREQUENCY: /* arg: Pointer to uint32_t frequency value */
{
FAR uint32_t *ptr = (FAR uint32_t *)((uintptr_t)arg);
+
DEBUGASSERT(priv->config != NULL && ptr != NULL);
*ptr = priv->config->frequency;
}
@@ -1139,6 +1143,7 @@ static int tsc2007_poll(FAR struct file *filep, FAR struct pollfd *fds,
/* This is a request to tear down the poll. */
FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
+
DEBUGASSERT(slot != NULL);
/* Remove all memory of the poll setup */