This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new a20b3e8335 arch/nrf{52|53|91}/spi: fix error message
a20b3e8335 is described below
commit a20b3e83359c406573dd6b384b40a88bd65978a3
Author: raiden00pl <[email protected]>
AuthorDate: Tue Mar 5 15:05:04 2024 +0100
arch/nrf{52|53|91}/spi: fix error message
wrong parameters were passed to spierr()
---
arch/arm/src/nrf52/nrf52_spi.c | 6 +++---
arch/arm/src/nrf53/nrf53_spi.c | 6 +++---
arch/arm/src/nrf91/nrf91_spi.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/src/nrf52/nrf52_spi.c b/arch/arm/src/nrf52/nrf52_spi.c
index f55e683928..65e6b70169 100644
--- a/arch/arm/src/nrf52/nrf52_spi.c
+++ b/arch/arm/src/nrf52/nrf52_spi.c
@@ -1164,11 +1164,11 @@ static void nrf52_spi_exchange(struct spi_dev_s *dev,
nxsem_wait_uninterruptible(&priv->sem_isr);
#endif
- if (nrf52_spi_getreg(priv, NRF52_SPIM_TXDAMOUNT_OFFSET) !=
- transfer_size)
+ regval = nrf52_spi_getreg(priv, NRF52_SPIM_TXDAMOUNT_OFFSET);
+ if (regval != transfer_size)
{
spierr("Incomplete transfer wrote %" PRId32 " expected %zu\n",
- regval, nwords);
+ regval, transfer_size);
}
/* SPI stop */
diff --git a/arch/arm/src/nrf53/nrf53_spi.c b/arch/arm/src/nrf53/nrf53_spi.c
index b15bf6306a..87550db0b2 100644
--- a/arch/arm/src/nrf53/nrf53_spi.c
+++ b/arch/arm/src/nrf53/nrf53_spi.c
@@ -1158,11 +1158,11 @@ static void nrf53_spi_exchange(struct spi_dev_s *dev,
nxsem_wait_uninterruptible(&priv->sem_isr);
#endif
- if (nrf53_spi_getreg(priv, NRF53_SPIM_TXDAMOUNT_OFFSET) !=
- transfer_size)
+ regval = nrf53_spi_getreg(priv, NRF53_SPIM_TXDAMOUNT_OFFSET);
+ if (regval != transfer_size)
{
spierr("Incomplete transfer wrote %" PRId32 " expected %zu\n",
- regval, nwords);
+ regval, transfer_size);
}
/* SPI stop */
diff --git a/arch/arm/src/nrf91/nrf91_spi.c b/arch/arm/src/nrf91/nrf91_spi.c
index c0361375fb..4443277209 100644
--- a/arch/arm/src/nrf91/nrf91_spi.c
+++ b/arch/arm/src/nrf91/nrf91_spi.c
@@ -1158,11 +1158,11 @@ static void nrf91_spi_exchange(struct spi_dev_s *dev,
nxsem_wait_uninterruptible(&priv->sem_isr);
#endif
- if (nrf91_spi_getreg(priv, NRF91_SPIM_TXDAMOUNT_OFFSET) !=
- transfer_size)
+ regval = nrf91_spi_getreg(priv, NRF91_SPIM_TXDAMOUNT_OFFSET);
+ if (regval != transfer_size)
{
spierr("Incomplete transfer wrote %" PRId32 " expected %zu\n",
- regval, nwords);
+ regval, transfer_size);
}
/* SPI stop */
