Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-09 01:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_BoardConfig: use take_blocking instead of HAL_SEMAPHORE_BLOCK_FOREVER

Browse Source 
this makes for cleaner and smaller code as the failure case is not
needed
This commit is contained in:
Andrew Tridgell 2020-01-19 08:42:32 +11:00
parent 8c563ef1bf
commit 8f867ddb2b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/AP_BoardConfig/board_drivers.cpp
View File

@ -136,9 +136,7 @@ bool AP_BoardConfig::spi_check_register(const char *devname, uint8_t regnum, uin
return false; return false;
} }
dev->set_read_flag(read_flag); dev->set_read_flag(read_flag);
if (!dev->get_semaphore()->take(HAL_SEMAPHORE_BLOCK_FOREVER)) { dev->get_semaphore()->take_blocking();
return false;
}
uint8_t v; uint8_t v;
if (!dev->read_registers(regnum, &v, 1)) { if (!dev->read_registers(regnum, &v, 1)) {
#if SPI_PROBE_DEBUG #if SPI_PROBE_DEBUG
@ -166,9 +164,10 @@ static bool check_ms5611(const char* devname) {
AP_HAL::Semaphore *dev_sem = dev->get_semaphore(); AP_HAL::Semaphore *dev_sem = dev->get_semaphore();
if (!dev_sem || !dev_sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) { if (!dev_sem) {
return false; return false;
} }
dev_sem->take_blocking();
static const uint8_t CMD_MS56XX_RESET = 0x1E; static const uint8_t CMD_MS56XX_RESET = 0x1E;
static const uint8_t CMD_MS56XX_PROM = 0xA0; static const uint8_t CMD_MS56XX_PROM = 0xA0;