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

AP_FlashIface_JEDEC: make delays support bootloader builds

Browse Source
This commit is contained in:
Siddharth Purohit 2021-06-11 15:01:57 +05:30 committed by Andrew Tridgell
parent 1d3c001963
commit dd9f3257cc
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/AP_FlashIface/AP_FlashIface_JEDEC.cpp
View File

@ -41,6 +41,14 @@ static const struct supported_device supported_devices[] = {
{"w25q", 0xEF, 0x40} {"w25q", 0xEF, 0x40}
}; };
#ifdef HAL_BOOTLOADER_BUILD
#define DELAY_MILLIS(x) do { chThdSleepMilliseconds(x); } while(0)
#define DELAY_MICROS(x) do { chThdSleepMicroseconds(x); } while(0)
#else
#define DELAY_MILLIS(x) do { hal.scheduler->delay(x); } while(0)
#define DELAY_MICROS(x) do { hal.scheduler->delay_microseconds(x); } while(0)
#endif
#define MAX_SUPPORTED_FLASH_SIZE 0x1FFFFFFUL #define MAX_SUPPORTED_FLASH_SIZE 0x1FFFFFFUL
// Vendor Specific Constants // Vendor Specific Constants
// Following Commands Sets were found here: // Following Commands Sets were found here:
@ -103,13 +111,12 @@ bool AP_FlashIface_JEDEC::init()
} }
} }
hal.scheduler->delay(5); // required by w25q DELAY_MILLIS(5); // required by w25q
// Reset Device involves trying to soft reset the chip // Reset Device involves trying to soft reset the chip
// as when system reboots the device might not have. // as when system reboots the device might not have.
reset_device(); reset_device();
hal.scheduler->delay_microseconds(30); // required by w25q DELAY_MICROS(30); // required by w25q
// Detecting Device involves trying to read Device ID and matching // Detecting Device involves trying to read Device ID and matching
// with what we expect. Along with extracting info from SFDP // with what we expect. Along with extracting info from SFDP
@ -730,7 +737,7 @@ bool AP_FlashIface_JEDEC::start_erase_offset(uint32_t offset, uint32_t size, uin
return false; return false;
} }
if ((offset+erase_size) > _desc.flash_size) { if ((offset+erase_size) > _desc.flash_size) {
Debug("Requested erase overflows supported flash size") Debug("Requested erase overflows supported flash size");
return false; return false;
} }
// Start Erasing // Start Erasing
@ -930,7 +937,7 @@ bool AP_FlashIface_JEDEC::is_device_busy()
void AP_FlashIface_JEDEC::wait_ready() void AP_FlashIface_JEDEC::wait_ready()
{ {
while (is_device_busy()) { while (is_device_busy()) {
hal.scheduler->delay_microseconds(100); DELAY_MICROS(100);
} }
} }