alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

esp_flash: fix the data type of delay_us

Browse Source 
unsigned can be 16-bit on some architecture, which doesn't meet the
requirements of delaying for several hundreds of us.
This commit is contained in:
Michael (XIAO Xufeng) 2020-08-21 12:09:52 +08:00 committed by bot
parent 5a9a42b079
commit 2d440e408a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/spi_flash/include/esp_flash.h
View File

@ -57,7 +57,7 @@ typedef struct {
esp_err_t (*region_protected)(void* arg, size_t start_addr, size_t size); esp_err_t (*region_protected)(void* arg, size_t start_addr, size_t size);
/** Delay for at least 'us' microseconds. Called in between 'start' and 'end'. */ /** Delay for at least 'us' microseconds. Called in between 'start' and 'end'. */
esp_err_t (*delay_us)(void *arg, unsigned us); esp_err_t (*delay_us)(void *arg, uint32_t us);
/** Called for get temp buffer when buffer from application cannot be directly read into/write from. */ /** Called for get temp buffer when buffer from application cannot be directly read into/write from. */
void *(*get_temp_buffer)(void* arg, size_t reqest_size, size_t* out_size); void *(*get_temp_buffer)(void* arg, size_t reqest_size, size_t* out_size);

2
components/spi_flash/include/spi_flash_chip_driver.h
View File

@ -152,7 +152,7 @@ struct spi_flash_chip_t {
timeout_ms should be a timeout (in milliseconds) before the function returns ESP_ERR_TIMEOUT. This is useful to avoid hanging timeout_ms should be a timeout (in milliseconds) before the function returns ESP_ERR_TIMEOUT. This is useful to avoid hanging
if the chip is otherwise unresponsive (ie returns all 0xFF or similar.) if the chip is otherwise unresponsive (ie returns all 0xFF or similar.)
*/ */
esp_err_t (*wait_idle)(esp_flash_t *chip, unsigned timeout_ms); esp_err_t (*wait_idle)(esp_flash_t *chip, uint32_t timeout_us);
/* Configure both the SPI host and the chip for the read mode specified in chip->read_mode. /* Configure both the SPI host and the chip for the read mode specified in chip->read_mode.
* *

2
components/spi_flash/spi_flash_os_func_app.c
View File

@ -96,7 +96,7 @@ static IRAM_ATTR esp_err_t spi1_end(void *arg)
#endif #endif
} }
static IRAM_ATTR esp_err_t delay_us(void *arg, unsigned us) static IRAM_ATTR esp_err_t delay_us(void *arg, uint32_t us)
{ {
esp_rom_delay_us(us); esp_rom_delay_us(us);
return ESP_OK; return ESP_OK;

2
components/spi_flash/spi_flash_os_func_noos.c
View File

@ -64,7 +64,7 @@ static IRAM_ATTR esp_err_t end(void *arg)
return ESP_OK; return ESP_OK;
} }
static IRAM_ATTR esp_err_t delay_us(void *arg, unsigned us) static IRAM_ATTR esp_err_t delay_us(void *arg, uint32_t us)
{ {
esp_rom_delay_us(us); esp_rom_delay_us(us);
return ESP_OK; return ESP_OK;