espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-03 01:17:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[posix] fix handling SPI interrupts (#4607)

Browse Source 
When SPI is already interrupted before select(), the wait timeout will
be set to 0, and select() will return 0 immediately if there are no
new events. As a result, cause an incorrect OT_ERROR_RESPONSE_TIMEOUT
error.

This commit fixes this issue by check if data is ready before checking
the select() result.
This commit is contained in:
Yakun Xu
2020-02-27 17:56:08 -08:00
committed by GitHub
parent a551133493
commit a613ff0ee4
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/posix/platform/spi_interface.cpp
+15 -14
View File
@@ -98,6 +98,9 @@ otError SpiInterface::Init(const otPlatformConfig &aPlatformConfig)
{
// If the interrupt pin is not set, SPI interface will use polling mode.
InitIntPin(aPlatformConfig.mSpiGpioIntDevice, aPlatformConfig.mSpiGpioIntLine);
}
else
{
otLogNotePlat("SPI interface enters polling mode.");
}
@@ -657,12 +660,13 @@ otError SpiInterface::WaitForFrame(const struct timeval &aTimeout)
struct timeval timeout = {kSecPerDay, 0};
fd_set readFdSet;
int ret;
bool isDataReady = false;
FD_ZERO(&readFdSet);
if (mIntGpioValueFd >= 0)
{
if (CheckInterrupt())
if ((isDataReady = CheckInterrupt()))
{
// Interrupt pin is asserted, set the timeout to be 0.
timeout.tv_sec = 0;
@@ -688,22 +692,19 @@ otError SpiInterface::WaitForFrame(const struct timeval &aTimeout)
}
ret = select(mIntGpioValueFd + 1, &readFdSet, NULL, NULL, &timeout);
if (ret > 0)
if (ret > 0 && FD_ISSET(mIntGpioValueFd, &readFdSet))
{
if (FD_ISSET(mIntGpioValueFd, &readFdSet))
{
struct gpioevent_data event;
struct gpioevent_data event;
// Read event data to clear interrupt.
VerifyOrDie(read(mIntGpioValueFd, &event, sizeof(event)) != -1, OT_EXIT_FAILURE);
}
// Read event data to clear interrupt.
VerifyOrDie(read(mIntGpioValueFd, &event, sizeof(event)) != -1, OT_EXIT_FAILURE);
isDataReady = true;
}
// If we can receive a packet.
if (CheckInterrupt())
{
otLogDebgPlat("WaitForFrame(): Interrupt.");
PushPullSpi();
}
if (isDataReady)
{
PushPullSpi();
}
else if (ret == 0)
{