RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 05:32:45 +01:00
Code Releases Activity

driver: fix cppcheck error in pn532

Browse Source 
cppcheck reported 'duplicateBranch' error in 2 if-else
    statements, b/c they are empty when running static-tests.
This commit is contained in:
smlng 2018-07-04 11:16:44 +02:00 committed by dylad
parent c26888c9f7
commit 11356f602f
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/pn532/pn532.c
View File

@ -164,18 +164,19 @@ static int _write(const pn532_t *dev, uint8_t *buff, unsigned len)
(void)buff;
(void)len;
if (dev->mode == PN532_I2C) {
switch (dev->mode) {
#ifdef PN532_SUPPORT_I2C
case PN532_I2C:
i2c_acquire(dev->conf->i2c);
ret = i2c_write_bytes(dev->conf->i2c, PN532_I2C_ADDRESS, buff, len, 0);
if (ret == 0) {
ret = (int)len;
}
i2c_release(dev->conf->i2c);
break;
#endif
}
else {
#ifdef PN532_SUPPORT_SPI
case PN532_SPI:
spi_acquire(dev->conf->spi, SPI_CS_UNDEF, SPI_MODE, SPI_CLK);
gpio_clear(dev->conf->nss);
xtimer_usleep(SPI_WRITE_DELAY_US);
@ -185,7 +186,10 @@ static int _write(const pn532_t *dev, uint8_t *buff, unsigned len)
gpio_set(dev->conf->nss);
spi_release(dev->conf->spi);
ret = (int)len;
break;
#endif
default:
DEBUG("pn532: invalid mode (%i)!\n", dev->mode);
}
DEBUG("pn532: -> ");
PRINTBUFF(buff, len);
@ -199,8 +203,9 @@ static int _read(const pn532_t *dev, uint8_t *buff, unsigned len)
(void)buff;
(void)len;
if (dev->mode == PN532_I2C) {
switch (dev->mode) {
#ifdef PN532_SUPPORT_I2C
case PN532_I2C:
i2c_acquire(dev->conf->i2c);
/* len+1 for RDY after read is accepted */
ret = i2c_read_bytes(dev->conf->i2c, PN532_I2C_ADDRESS, buff, len + 1, 0);
@ -208,10 +213,10 @@ static int _read(const pn532_t *dev, uint8_t *buff, unsigned len)
ret = (int)len + 1;
}
i2c_release(dev->conf->i2c);
break;
#endif
}
else {
#ifdef PN532_SUPPORT_SPI
case PN532_SPI:
spi_acquire(dev->conf->spi, SPI_CS_UNDEF, SPI_MODE, SPI_CLK);
gpio_clear(dev->conf->nss);
spi_transfer_byte(dev->conf->spi, SPI_CS_UNDEF, true, SPI_DATA_READ);
@ -222,10 +227,15 @@ static int _read(const pn532_t *dev, uint8_t *buff, unsigned len)
buff[0] = 0x80;
reverse(buff, len);
ret = (int)len + 1;
break;
#endif
default:
DEBUG("pn532: invalid mode (%i)!\n", dev->mode);
}
if (ret > 0) {
DEBUG("pn532: <- ");
PRINTBUFF(buff, len);
}
DEBUG("pn532: <- ");
PRINTBUFF(buff, len);
return ret;
}