riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys/arduino: fix of compilation error with NDEBUG

Browse Source 
When NDEBUG macro is defined during compilation, the assert macro produces empty code. Parameters or variables checked with assert are then unused.
This commit is contained in:
Gunar Schorcht 2020-02-03 00:22:07 +01:00
parent f760625cd0
commit 34555748dd
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arduino/SPI.cpp
View File

@ -28,6 +28,8 @@ extern "C" {
SPISettings::SPISettings(uint32_t clock_hz, uint8_t bitOrder, uint8_t dataMode) SPISettings::SPISettings(uint32_t clock_hz, uint8_t bitOrder, uint8_t dataMode)
{ {
(void)bitOrder;
static const spi_clk_t clocks[] = { static const spi_clk_t clocks[] = {
SPI_CLK_10MHZ, SPI_CLK_5MHZ, SPI_CLK_1MHZ, SPI_CLK_400KHZ SPI_CLK_10MHZ, SPI_CLK_5MHZ, SPI_CLK_1MHZ, SPI_CLK_400KHZ
}; };
@ -80,6 +82,9 @@ void SPIClass::beginTransaction(SPISettings settings)
settings.mode, settings.clock); settings.mode, settings.clock);
/* No support for exceptions (at least on AVR), resort to assert() */ /* No support for exceptions (at least on AVR), resort to assert() */
assert(retval == SPI_OK); assert(retval == SPI_OK);
if (retval != SPI_OK) {
return;
}
is_transaction = true; is_transaction = true;
} }
@ -99,6 +104,9 @@ void SPIClass::transfer(void *buf, size_t count)
settings.mode, settings.clock); settings.mode, settings.clock);
/* No support for exceptions (at least on AVR), resort to assert() */ /* No support for exceptions (at least on AVR), resort to assert() */
assert(retval == SPI_OK); assert(retval == SPI_OK);
if (retval != SPI_OK) {
return;
}
} }
spi_transfer_bytes(spi_dev, SPI_CS_UNDEF, false, buf, buf, count); spi_transfer_bytes(spi_dev, SPI_CS_UNDEF, false, buf, buf, count);
if (!is_transaction) { if (!is_transaction) {
@ -110,6 +118,7 @@ void SPIClass::transfer(void *buf, size_t count)
void SPIClass::setBitOrder(uint8_t order) void SPIClass::setBitOrder(uint8_t order)
{ {
(void)order;
assert(order == MSBFIRST); assert(order == MSBFIRST);
} }