mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-07-13 19:31:31 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
67c97da654
@ -130,10 +130,16 @@ bool spi_start_extended(spi_start_config_t *start_config) {
|
||||
#endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
|
||||
|
||||
if (spiStarted) {
|
||||
#if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
|
||||
spiReleaseBus(&SPI_DRIVER);
|
||||
#endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
|
||||
return false;
|
||||
}
|
||||
#if SPI_SELECT_MODE != SPI_SELECT_MODE_NONE
|
||||
if (start_config->slave_pin == NO_PIN) {
|
||||
# if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
|
||||
spiReleaseBus(&SPI_DRIVER);
|
||||
# endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
@ -146,10 +152,16 @@ bool spi_start_extended(spi_start_config_t *start_config) {
|
||||
|
||||
# if defined(AT32F415)
|
||||
if (roundedDivisor < 2 || roundedDivisor > 1024) {
|
||||
# if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
|
||||
spiReleaseBus(&SPI_DRIVER);
|
||||
# endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
|
||||
return false;
|
||||
}
|
||||
# else
|
||||
if (roundedDivisor < 2 || roundedDivisor > 256) {
|
||||
# if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
|
||||
spiReleaseBus(&SPI_DRIVER);
|
||||
# endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
|
||||
return false;
|
||||
}
|
||||
# endif
|
||||
@ -234,6 +246,9 @@ bool spi_start_extended(spi_start_config_t *start_config) {
|
||||
}
|
||||
|
||||
if (start_config->divisor < 1) {
|
||||
# if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
|
||||
spiReleaseBus(&SPI_DRIVER);
|
||||
# endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
|
||||
return false;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user