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

Revert "hal: Fix incorrect spi_hal log usage"

Browse Source 
This reverts commit a65165dd52dfdc26ed17e0c78a12c4a44a805524.
This commit is contained in:
Sudeep Mohanty 2022-06-29 12:27:57 +02:00 committed by BOT
parent 1d482a32df
commit 3cd2b67f84
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/spi_flash/esp_flash_api.c
View File

@ -292,21 +292,21 @@ esp_err_t IRAM_ATTR esp_flash_init_main(esp_flash_t *chip)
uint32_t size; uint32_t size;
err = esp_flash_get_size(chip, &size); err = esp_flash_get_size(chip, &size);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_EARLY_LOGE(TAG, "failed to get chip size"); ESP_LOGE(TAG, "failed to get chip size");
return err; return err;
} }
if (chip->chip_drv->get_chip_caps == NULL) { if (chip->chip_drv->get_chip_caps == NULL) {
// chip caps get failed, pass the flash capability check. // chip caps get failed, pass the flash capability check.
ESP_EARLY_LOGW(TAG, "get_chip_caps function pointer hasn't been initialized"); ESP_LOGW(TAG, "get_chip_caps function pointer hasn't been initialized");
} else { } else {
if (((chip->chip_drv->get_chip_caps(chip) & SPI_FLASH_CHIP_CAP_32MB_SUPPORT) == 0) && (size > (16 *1024 * 1024))) { if (((chip->chip_drv->get_chip_caps(chip) & SPI_FLASH_CHIP_CAP_32MB_SUPPORT) == 0) && (size > (16 *1024 * 1024))) {
ESP_EARLY_LOGW(TAG, "Detected flash size > 16 MB, but access beyond 16 MB is not supported for this flash model yet."); ESP_LOGW(TAG, "Detected flash size > 16 MB, but access beyond 16 MB is not supported for this flash model yet.");
size = (16 * 1024 * 1024); size = (16 * 1024 * 1024);
} }
} }
ESP_EARLY_LOGI(TAG, "flash io: %s", io_mode_str[chip->read_mode]); ESP_LOGI(TAG, "flash io: %s", io_mode_str[chip->read_mode]);
err = rom_spiflash_api_funcs->start(chip); err = rom_spiflash_api_funcs->start(chip);
if (err != ESP_OK) { if (err != ESP_OK) {
return err; return err;
@ -423,7 +423,7 @@ static esp_err_t IRAM_ATTR detect_spi_flash_chip(esp_flash_t *chip)
chip->chip_drv = *drivers; chip->chip_drv = *drivers;
// start/end SPI operation each time, for multitasking // start/end SPI operation each time, for multitasking
// and also so esp_flash_registered_flash_drivers can live in flash // and also so esp_flash_registered_flash_drivers can live in flash
ESP_EARLY_LOGD(TAG, "trying chip: %s", chip->chip_drv->name); ESP_LOGD(TAG, "trying chip: %s", chip->chip_drv->name);
err = rom_spiflash_api_funcs->start(chip); err = rom_spiflash_api_funcs->start(chip);
if (err != ESP_OK) { if (err != ESP_OK) {
@ -444,7 +444,7 @@ static esp_err_t IRAM_ATTR detect_spi_flash_chip(esp_flash_t *chip)
if (!esp_flash_chip_driver_initialized(chip)) { if (!esp_flash_chip_driver_initialized(chip)) {
return ESP_ERR_NOT_FOUND; return ESP_ERR_NOT_FOUND;
} }
ESP_EARLY_LOGI(TAG, "detected chip: %s", chip->chip_drv->name); ESP_LOGI(TAG, "detected chip: %s", chip->chip_drv->name);
return ESP_OK; return ESP_OK;
} }