sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/ioexpander: fix output inversion for ioe_dummy

Browse Source 
Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
This commit is contained in:
Petro Karashchenko 2022-03-04 12:23:37 +01:00 committed by Xiang Xiao
parent fa0e5da18e
commit 041f25fe72
3 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/ioexpander/ioe_dummy.c
View File

@ -208,7 +208,7 @@ static int ioe_dummy_direction(FAR struct ioexpander_dev_s *dev,
{ {
/* Configure pin as input. */ /* Configure pin as input. */
priv->inpins |= (1 << pin); priv->inpins |= ((ioe_pinset_t)1 << pin);
} }
else /* if (direction == IOEXPANDER_DIRECTION_OUT) */ else /* if (direction == IOEXPANDER_DIRECTION_OUT) */
{ {
@ -219,7 +219,7 @@ static int ioe_dummy_direction(FAR struct ioexpander_dev_s *dev,
* put a glitch on the output. * put a glitch on the output.
*/ */
priv->inpins &= ~(1 << pin); priv->inpins &= ~((ioe_pinset_t)1 << pin);
} }
return OK; return OK;
@ -266,11 +266,11 @@ static int ioe_dummy_option(FAR struct ioexpander_dev_s *dev, uint8_t pin,
{ {
if ((uintptr_t)value == IOEXPANDER_VAL_INVERT) if ((uintptr_t)value == IOEXPANDER_VAL_INVERT)
{ {
priv->invert |= (1 << pin); priv->invert |= ((ioe_pinset_t)1 << pin);
} }
else else
{ {
priv->invert &= ~(1 << pin); priv->invert &= ~((ioe_pinset_t)1 << pin);
} }
} }
@ -362,13 +362,13 @@ static int ioe_dummy_writepin(FAR struct ioexpander_dev_s *dev,
* defined as outputs by the Configuration Register. * defined as outputs by the Configuration Register.
*/ */
if (value && (priv->invert & (1 << pin)) == 0) if (value == (((priv->invert >> pin) & 1) == 0))
{ {
priv->outval |= (1 << pin); priv->outval |= ((ioe_pinset_t)1 << pin);
} }
else else
{ {
priv->outval &= ~(1 << pin); priv->outval &= ~((ioe_pinset_t)1 << pin);
} }
return OK; return OK;
@ -394,11 +394,10 @@ static int ioe_dummy_writepin(FAR struct ioexpander_dev_s *dev,
****************************************************************************/ ****************************************************************************/
static int ioe_dummy_readpin(FAR struct ioexpander_dev_s *dev, static int ioe_dummy_readpin(FAR struct ioexpander_dev_s *dev,
uint8_t pin, FAR bool *value) uint8_t pin, FAR bool *value)
{ {
FAR struct ioe_dummy_dev_s *priv = (FAR struct ioe_dummy_dev_s *)dev; FAR struct ioe_dummy_dev_s *priv = (FAR struct ioe_dummy_dev_s *)dev;
ioe_pinset_t inval; ioe_pinset_t inval;
bool retval;
DEBUGASSERT(priv != NULL && pin < CONFIG_IOEXPANDER_NPINS && DEBUGASSERT(priv != NULL && pin < CONFIG_IOEXPANDER_NPINS &&
value != NULL); value != NULL);
@ -407,7 +406,7 @@ static int ioe_dummy_readpin(FAR struct ioexpander_dev_s *dev,
/* Is this an output pin? */ /* Is this an output pin? */
if ((priv->inpins & (1 << pin)) != 0) if (((priv->inpins >> pin) & 1) != 0)
{ {
inval = priv->inval; inval = priv->inval;
} }
@ -418,8 +417,8 @@ static int ioe_dummy_readpin(FAR struct ioexpander_dev_s *dev,
/* Return 0 or 1 to indicate the state of pin */ /* Return 0 or 1 to indicate the state of pin */
retval = (((inval >> pin) & 1) != 0); *value = ((((inval ^ priv->invert) >> pin) & 1) != 0);
*value = ((priv->invert & (1 << pin)) != 0) ? !retval : retval;
return OK; return OK;
} }
@ -459,13 +458,13 @@ static int ioe_dummy_multiwritepin(FAR struct ioexpander_dev_s *dev,
pin = pins[i]; pin = pins[i];
DEBUGASSERT(pin < CONFIG_IOEXPANDER_NPINS); DEBUGASSERT(pin < CONFIG_IOEXPANDER_NPINS);
if (values[i] && (priv->invert & (1 << pin)) == 0) if (values[i] == (((priv->invert >> pin) & 1) == 0))
{ {
priv->outval |= (1 << pin); priv->outval |= ((ioe_pinset_t)1 << pin);
} }
else else
{ {
priv->outval &= ~(1 << pin); priv->outval &= ~((ioe_pinset_t)1 << pin);
} }
} }
@ -498,7 +497,6 @@ static int ioe_dummy_multireadpin(FAR struct ioexpander_dev_s *dev,
FAR struct ioe_dummy_dev_s *priv = (FAR struct ioe_dummy_dev_s *)dev; FAR struct ioe_dummy_dev_s *priv = (FAR struct ioe_dummy_dev_s *)dev;
ioe_pinset_t inval; ioe_pinset_t inval;
uint8_t pin; uint8_t pin;
bool pinval;
int i; int i;
gpioinfo("count=%d\n", count); gpioinfo("count=%d\n", count);
@ -513,7 +511,7 @@ static int ioe_dummy_multireadpin(FAR struct ioexpander_dev_s *dev,
/* Is this an output pin? */ /* Is this an output pin? */
if ((priv->inpins & (1 << pin)) != 0) if (((priv->inpins >> pin) & 1) != 0)
{ {
inval = priv->inval; inval = priv->inval;
} }
@ -522,8 +520,7 @@ static int ioe_dummy_multireadpin(FAR struct ioexpander_dev_s *dev,
inval = priv->outval; inval = priv->outval;
} }
pinval = ((inval & (1 << pin)) != 0); values[i] = ((((inval ^ priv->invert) >> pin) & 1) != 0);
values[i] = ((priv->invert & (1 << pin)) != 0) ? !pinval : pinval;
} }
return OK; return OK;
@ -677,11 +674,7 @@ static ioe_pinset_t ioe_dummy_int_update(FAR struct ioe_dummy_dev_s *priv)
{ {
/* Get the value of the pin (accounting for inversion) */ /* Get the value of the pin (accounting for inversion) */
pinval = ((input & 1) != 0); pinval = ((((input ^ priv->invert) >> pin) & 1) != 0);
if ((priv->invert & (1 << pin)) != 0)
{
pinval = !pinval;
}
if (IOE_DUMMY_INT_DISABLED(priv, pin)) if (IOE_DUMMY_INT_DISABLED(priv, pin))
{ {
@ -700,7 +693,7 @@ static ioe_pinset_t ioe_dummy_int_update(FAR struct ioe_dummy_dev_s *priv)
if ((!pinval && IOE_DUMMY_EDGE_FALLING(priv, pin)) || if ((!pinval && IOE_DUMMY_EDGE_FALLING(priv, pin)) ||
(pinval && IOE_DUMMY_EDGE_RISING(priv, pin))) (pinval && IOE_DUMMY_EDGE_RISING(priv, pin)))
{ {
intstat |= 1 << pin; intstat |= ((ioe_pinset_t)1 << pin);
} }
} }
} }
@ -711,7 +704,7 @@ static ioe_pinset_t ioe_dummy_int_update(FAR struct ioe_dummy_dev_s *priv)
if ((pinval && IOE_DUMMY_LEVEL_HIGH(priv, pin)) || if ((pinval && IOE_DUMMY_LEVEL_HIGH(priv, pin)) ||
(!pinval && IOE_DUMMY_LEVEL_LOW(priv, pin))) (!pinval && IOE_DUMMY_LEVEL_LOW(priv, pin)))
{ {
intstat |= 1 << pin; intstat |= ((ioe_pinset_t)1 << pin);
} }
} }
@ -762,8 +755,7 @@ static void ioe_dummy_interrupt_work(void *arg)
{ {
/* Yes.. perform the callback */ /* Yes.. perform the callback */
priv->cb[i].cbfunc(&priv->dev, match, priv->cb[i].cbfunc(&priv->dev, match, priv->cb[i].cbarg);
priv->cb[i].cbarg);
} }
} }
} }

6
drivers/ioexpander/skeleton.c
View File

@ -416,7 +416,7 @@ static int skel_getmultibits(FAR struct skel_dev_s *priv, FAR uint8_t *pins,
return -ENXIO; return -ENXIO;
} }
values[i] = ((pinset & (1 << pin)) != 0); values[i] = (((pinset >> pin) & 1) != 0);
} }
return OK; return OK;
@ -474,11 +474,11 @@ static int skel_multiwritepin(FAR struct ioexpander_dev_s *dev,
if (values[i]) if (values[i])
{ {
pinset |= (1 << pin); pinset |= ((ioe_pinset_t)1 << pin);
} }
else else
{ {
pinset &= ~(1 << pin); pinset &= ~((ioe_pinset_t)1 << pin);
} }
} }

10
drivers/ioexpander/tca64xx.c
View File

@ -833,11 +833,11 @@ static int tca64_multiwritepin(FAR struct ioexpander_dev_s *dev,
if (values[i]) if (values[i])
{ {
pinset |= (1 << pin); pinset |= ((ioe_pinset_t)1 << pin);
} }
else else
{ {
pinset &= ~(1 << pin); pinset &= ~((ioe_pinset_t)1 << pin);
} }
} }
@ -927,7 +927,7 @@ static int tca64_multireadpin(FAR struct ioexpander_dev_s *dev,
pin = pins[i]; pin = pins[i];
DEBUGASSERT(pin < CONFIG_IOEXPANDER_NPINS); DEBUGASSERT(pin < CONFIG_IOEXPANDER_NPINS);
values[i] = ((pinset & (1 << pin)) != 0); values[i] = (((pinset >> pin) & 1) != 0);
} }
#ifdef CONFIG_TCA64XX_INT_ENABLE #ifdef CONFIG_TCA64XX_INT_ENABLE
@ -1075,7 +1075,7 @@ static void tca64_int_update(FAR struct tca64_dev_s *priv,
if (((input & 1) == 0 && TCA64_EDGE_FALLING(priv, pin)) || if (((input & 1) == 0 && TCA64_EDGE_FALLING(priv, pin)) ||
((input & 1) != 0 && TCA64_EDGE_RISING(priv, pin))) ((input & 1) != 0 && TCA64_EDGE_RISING(priv, pin)))
{ {
priv->intstat |= 1 << pin; priv->intstat |= ((ioe_pinset_t)1 << pin);
} }
} }
} }
@ -1086,7 +1086,7 @@ static void tca64_int_update(FAR struct tca64_dev_s *priv,
if (((input & 1) != 0 && TCA64_LEVEL_HIGH(priv, pin)) || if (((input & 1) != 0 && TCA64_LEVEL_HIGH(priv, pin)) ||
((input & 1) == 0 && TCA64_LEVEL_LOW(priv, pin))) ((input & 1) == 0 && TCA64_LEVEL_LOW(priv, pin)))
{ {
priv->intstat |= 1 << pin; priv->intstat |= ((ioe_pinset_t)1 << pin);
} }
} }