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
commit fa947f95ee4d1f7affdc618e0c5bcd7e70aa7724 Author: Xiang Xiao <[email protected]> AuthorDate: Mon Feb 24 14:58:07 2025 +0800 drivers/rpmsg_port_spi/slave: add RPMSG_PORT_SPI_ prefix to BYTES2WORDS Code format optimization Signed-off-by: Xiang Xiao <[email protected]> --- drivers/rpmsg/rpmsg_port_spi.c | 13 ++++++------- drivers/rpmsg/rpmsg_port_spi_slave.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers/rpmsg/rpmsg_port_spi.c b/drivers/rpmsg/rpmsg_port_spi.c index 7aedb67ac55..15a6c6a71ec 100644 --- a/drivers/rpmsg/rpmsg_port_spi.c +++ b/drivers/rpmsg/rpmsg_port_spi.c @@ -45,15 +45,14 @@ ****************************************************************************/ #ifdef CONFIG_RPMSG_PORT_SPI_CRC -# define rpmsg_port_spi_crc16(hdr) crc16ibm((FAR uint8_t *)&(hdr)->cmd, \ - (hdr)->len - sizeof((hdr)->crc)) +# define rpmsg_port_spi_crc16(hdr) crc16ibm((FAR uint8_t *)&(hdr)->cmd, \ + (hdr)->len - sizeof((hdr)->crc)) #else -# define rpmsg_port_spi_crc16(hdr) 0 +# define rpmsg_port_spi_crc16(hdr) 0 #endif -#define RPMSG_PORT_SPI_CMD_TIMEOUT 1000 - -#define BYTES2WORDS(s,b) ((b) / ((s)->nbits >> 3)) +#define RPMSG_PORT_SPI_CMD_TIMEOUT 1000 +#define RPMSG_PORT_SPI_BYTES2WORDS(s,b) ((b) / ((s)->nbits >> 3)) /**************************************************************************** * Private Types @@ -351,7 +350,7 @@ static void rpmsg_port_spi_exchange(FAR struct rpmsg_port_spi_s *rpspi) rpmsg_port_spi_pm_action(rpspi, true); SPI_SELECT(rpspi->spi, rpspi->devid, true); SPI_EXCHANGE(rpspi->spi, txhdr, rpspi->rxhdr, - BYTES2WORDS(rpspi, rpspi->cmdhdr->len)); + RPMSG_PORT_SPI_BYTES2WORDS(rpspi, rpspi->cmdhdr->len)); rpspi->rxavail = txhdr->avail; } diff --git a/drivers/rpmsg/rpmsg_port_spi_slave.c b/drivers/rpmsg/rpmsg_port_spi_slave.c index d3dbb9f9d3f..f509b9627d8 100644 --- a/drivers/rpmsg/rpmsg_port_spi_slave.c +++ b/drivers/rpmsg/rpmsg_port_spi_slave.c @@ -45,15 +45,14 @@ ****************************************************************************/ #ifdef CONFIG_RPMSG_PORT_SPI_CRC -# define rpmsg_port_spi_crc16(hdr) crc16ibm((FAR uint8_t *)&(hdr)->cmd, \ - (hdr)->len - sizeof((hdr)->crc)) +# define rpmsg_port_spi_crc16(hdr) crc16ibm((FAR uint8_t *)&(hdr)->cmd, \ + (hdr)->len - sizeof((hdr)->crc)) #else -# define rpmsg_port_spi_crc16(hdr) 0 +# define rpmsg_port_spi_crc16(hdr) 0 #endif -#define RPMSG_PORT_SPI_CMD_TIMEOUT 1000 - -#define BYTES2WORDS(s,b) ((b) / ((s)->nbits >> 3)) +#define RPMSG_PORT_SPI_CMD_TIMEOUT 1000 +#define RPMSG_PORT_SPI_BYTES2WORDS(s,b) ((b) / ((s)->nbits >> 3)) /**************************************************************************** * Private Types @@ -312,7 +311,7 @@ static void rpmsg_port_spi_exchange(FAR struct rpmsg_port_spi_s *rpspi) rpmsg_port_spi_pm_action(rpspi, true); SPIS_CTRLR_ENQUEUE(rpspi->spictrlr, txhdr, - BYTES2WORDS(rpspi, rpspi->cmdhdr->len)); + RPMSG_PORT_SPI_BYTES2WORDS(rpspi, rpspi->cmdhdr->len)); IOEXP_WRITEPIN(rpspi->ioe, rpspi->sreq, 1); rpspi->rxavail = txhdr->avail; @@ -400,7 +399,7 @@ static size_t rpmsg_port_spi_slave_getdata(FAR struct spi_slave_dev_s *dev, container_of(dev, struct rpmsg_port_spi_s, spislv); *data = rpspi->rxhdr; - return BYTES2WORDS(rpspi, rpspi->cmdhdr->len); + return RPMSG_PORT_SPI_BYTES2WORDS(rpspi, rpspi->cmdhdr->len); } /****************************************************************************
