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

Merge pull request #15910 from maribu/sys-arduino-spi-fix

Browse Source 
sys/arduino: Bug and style fixes in SPI
This commit is contained in:
benpicco 2021-02-02 23:41:04 +01:00 committed by GitHub
commit 2313cefbd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
sys/arduino/SPI.cpp
View File

@ -39,19 +39,19 @@ SPISettings::SPISettings(uint32_t clock_hz, uint8_t bitOrder, uint8_t dataMode)
assert(bitOrder == MSBFIRST); assert(bitOrder == MSBFIRST);
switch(dataMode) { switch(dataMode) {
default: default:
case SPI_MODE0: case SPI_MODE0:
mode = SPI_MODE_0; mode = SPI_MODE_0;
break; break;
case SPI_MODE1: case SPI_MODE1:
mode = SPI_MODE_1; mode = SPI_MODE_1;
break; break;
case SPI_MODE2: case SPI_MODE2:
mode = SPI_MODE_2; mode = SPI_MODE_2;
break; break;
case SPI_MODE3: case SPI_MODE3:
mode = SPI_MODE_3; mode = SPI_MODE_3;
break; break;
} }
for (uint8_t i = 0; i < ARRAY_SIZE(steps); i++) { for (uint8_t i = 0; i < ARRAY_SIZE(steps); i++) {
@ -90,8 +90,8 @@ void SPIClass::beginTransaction(SPISettings settings)
void SPIClass::endTransaction() void SPIClass::endTransaction()
{ {
spi_release(spi_dev);
is_transaction = false; is_transaction = false;
spi_release(spi_dev);
rmutex_unlock(&mut); rmutex_unlock(&mut);
} }
@ -125,19 +125,19 @@ void SPIClass::setBitOrder(uint8_t order)
void SPIClass::setDataMode(uint8_t dataMode) void SPIClass::setDataMode(uint8_t dataMode)
{ {
switch(dataMode) { switch(dataMode) {
default: default:
case SPI_MODE0: case SPI_MODE0:
settings.mode = SPI_MODE_0; settings.mode = SPI_MODE_0;
break; break;
case SPI_MODE1: case SPI_MODE1:
settings.mode = SPI_MODE_1; settings.mode = SPI_MODE_1;
break; break;
case SPI_MODE2: case SPI_MODE2:
settings.mode = SPI_MODE_2; settings.mode = SPI_MODE_2;
break; break;
case SPI_MODE3: case SPI_MODE3:
settings.mode = SPI_MODE_3; settings.mode = SPI_MODE_3;
break; break;
} }
} }