Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-23 23:28:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rpmsg_port_spi: do not decrease when rx avail is already 0

Browse Source 
Bug fix about the rpmsg port spi

Signed-off-by: liaoao <liaoao@xiaomi.com>
This commit is contained in:
liaoao
2024-06-21 16:43:43 +08:00
committed by Xiang Xiao
parent 3fb39c6fc9
commit 4a356f6f6d
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/rpmsg/rpmsg_port_spi.c
+4 -16
View File
@@ -182,12 +182,6 @@ static void rpmsg_port_spi_complete_handler(FAR void *arg)
{
rpmsgerr("crc check fail received: %u calculated: %u\n",
rpspi->rxhdr->crc, crc);
/* Length may have been destroyed by a wrong data packet. we
* should reassign it, since it is used by SPI_EXCHANGE.
*/
rpspi->rxhdr->len = rpspi->cmdhdr->len;
return;
}
}
@@ -199,7 +193,6 @@ static void rpmsg_port_spi_complete_handler(FAR void *arg)
if (rpspi->txavail == RPMSG_SPI_PORT_UNCONNECTED &&
rpspi->rxhdr->cmd != RPMSG_PORT_SPI_CMD_CONNECT)
{
rpspi->rxhdr->len = rpspi->cmdhdr->len;
return;
}
@@ -218,13 +211,7 @@ static void rpmsg_port_spi_complete_handler(FAR void *arg)
return;
}
/* Drop invaild avail value in case of a wrong data packet received. */
if (avail != RPMSG_SPI_PORT_UNCONNECTED)
{
rpspi->txavail = avail;
}
rpspi->txavail = avail;
if (rpspi->txavail > 0 && rpmsg_port_queue_nused(&rpspi->port.txq) > 0)
{
IOEXP_WRITEPIN(rpspi->ioe, rpspi->mreq, 1);
@@ -265,13 +252,14 @@ static int rpmsg_port_spi_sreq_handler(FAR struct ioexpander_dev_s *dev,
txhdr->cmd = RPMSG_PORT_SPI_CMD_AVAIL;
}
txhdr->avail = rpmsg_port_queue_navail(&rpspi->port.rxq) - 1;
txhdr->avail = rpmsg_port_queue_navail(&rpspi->port.rxq);
txhdr->avail = txhdr->avail > 1 ? txhdr->avail - 1 : 0;
txhdr->crc = rpmsg_port_spi_crc16(txhdr);
rpmsginfo("irq send cmd:%u avail:%u\n", txhdr->cmd, txhdr->avail);
SPI_SELECT(rpspi->spi, rpspi->devid, true);
SPI_EXCHANGE(rpspi->spi, txhdr, rpspi->rxhdr, rpspi->rxhdr->len);
SPI_EXCHANGE(rpspi->spi, txhdr, rpspi->rxhdr, rpspi->cmdhdr->len);
rpspi->rxavail = txhdr->avail;
return 0;