From d92e2b25ac1ac5c6961b43d6fccd2a2dc661ae79 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 15 Oct 2019 18:04:27 +0200 Subject: [PATCH] drivers/nrf24l01p: rename CMD_NOP -> CMD_NOOP This prevents a conflict with an unrelated Atmel header file. --- drivers/nrf24l01p/include/nrf24l01p_settings.h | 2 +- drivers/nrf24l01p/nrf24l01p.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/nrf24l01p/include/nrf24l01p_settings.h b/drivers/nrf24l01p/include/nrf24l01p_settings.h index 0fd03cd0a1..b214080d83 100644 --- a/drivers/nrf24l01p/include/nrf24l01p_settings.h +++ b/drivers/nrf24l01p/include/nrf24l01p_settings.h @@ -69,7 +69,7 @@ extern "C" { #define CMD_R_RX_PL_WID 0x60 #define CMD_W_ACK_PAYLOAD 0xa8 #define CMD_W_TX_PAYLOAD_NOACK 0xb0 -#define CMD_NOP 0xff +#define CMD_NOOP 0xff #define REGISTER_MASK 0x1F /** @} */ diff --git a/drivers/nrf24l01p/nrf24l01p.c b/drivers/nrf24l01p/nrf24l01p.c index f8ecf5d66f..ce580d79e6 100644 --- a/drivers/nrf24l01p/nrf24l01p.c +++ b/drivers/nrf24l01p/nrf24l01p.c @@ -40,7 +40,7 @@ int nrf24l01p_read_reg(const nrf24l01p_t *dev, char reg, char *answer) spi_acquire(dev->spi, dev->cs, SPI_MODE, SPI_CLK); *answer = (char)spi_transfer_reg(dev->spi, dev->cs, (CMD_R_REGISTER | (REGISTER_MASK & reg)), - CMD_NOP); + CMD_NOOP); /* Release the bus for other threads. */ spi_release(dev->spi); @@ -581,7 +581,7 @@ int nrf24l01p_get_status(const nrf24l01p_t *dev) /* Acquire exclusive access to the bus. */ spi_acquire(dev->spi, dev->cs, SPI_MODE, SPI_CLK); - status = spi_transfer_byte(dev->spi, dev->cs, false, CMD_NOP); + status = spi_transfer_byte(dev->spi, dev->cs, false, CMD_NOOP); /* Release the bus for other threads. */ spi_release(dev->spi);