diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-11-09 20:47:08 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-11-09 20:47:08 +0000 |
| commit | 727ba84c9b99c7a1e06bf344b58c55f24472e5ba (patch) | |
| tree | 8d8707351f233c0b7bb668dacd69e92b9bd7418a /os/io/spi.c | |
| parent | 85cf8d37b5923dfa3e324c0e13e5e4d6efb884df (diff) | |
| download | ChibiOS-727ba84c9b99c7a1e06bf344b58c55f24472e5ba.tar.gz ChibiOS-727ba84c9b99c7a1e06bf344b58c55f24472e5ba.tar.bz2 ChibiOS-727ba84c9b99c7a1e06bf344b58c55f24472e5ba.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1278 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/io/spi.c')
| -rw-r--r-- | os/io/spi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/os/io/spi.c b/os/io/spi.c index 11247f24a..5ece51b77 100644 --- a/os/io/spi.c +++ b/os/io/spi.c @@ -99,7 +99,8 @@ void spiSelect(SPIDriver *spip) { chDbgCheck(spip != NULL, "spiSelect");
chSysLock();
- chDbgAssert(spip->spd_state == SPI_READY,
+ chDbgAssert((spip->spd_state == SPI_READY) ||
+ (spip->spd_state == SPI_ACTIVE),
"spiSelect(), #1",
"not idle");
spi_lld_select(spip);
@@ -118,7 +119,8 @@ void spiUnselect(SPIDriver *spip) { chDbgCheck(spip != NULL, "spiUnselect");
chSysLock();
- chDbgAssert(spip->spd_state == SPI_ACTIVE,
+ chDbgAssert((spip->spd_state == SPI_READY) ||
+ (spip->spd_state == SPI_ACTIVE),
"spiUnselect(), #1",
"not locked");
spi_lld_unselect(spip);
|