adafruit-mirror/arduino-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(esp): Fix getFlashChipMode breaking on S3 and C3 (#9758)

Browse source
This commit is contained in:
Me No Dev 2024-06-03 13:04:42 +03:00 committed by GitHub
parent e33022f3f0
commit ffeebf8da8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cores/esp32/Esp.cpp
View file

@ -71,9 +71,10 @@ extern "C" {
// REG_SPI_BASE is not defined for S3/C3 ?? // REG_SPI_BASE is not defined for S3/C3 ??
#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 #if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3
#ifndef REG_SPI_BASE #ifdef REG_SPI_BASE
#define REG_SPI_BASE(i) (DR_REG_SPI1_BASE + (((i) > 1) ? (((i) * 0x1000) + 0x20000) : (((~(i)) & 1) * 0x1000))) #undef REG_SPI_BASE
#endif // REG_SPI_BASE #endif // REG_SPI_BASE
#define REG_SPI_BASE(i) (DR_REG_SPI1_BASE + (((i) > 1) ? (((i) * 0x1000) + 0x20000) : (((~(i)) & 1) * 0x1000)))
#endif // TARGET #endif // TARGET
/** /**

5
cores/esp32/chip-debug-report.cpp
View file

@ -113,9 +113,10 @@ static void printFlashInfo(void) {
#endif #endif
// REG_SPI_BASE is not defined for S3/C3 ?? // REG_SPI_BASE is not defined for S3/C3 ??
#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3 #if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3
#ifndef REG_SPI_BASE #ifdef REG_SPI_BASE
#define REG_SPI_BASE(i) (DR_REG_SPI1_BASE + (((i) > 1) ? (((i) * 0x1000) + 0x20000) : (((~(i)) & 1) * 0x1000))) #undef REG_SPI_BASE
#endif // REG_SPI_BASE #endif // REG_SPI_BASE
#define REG_SPI_BASE(i) (DR_REG_SPI1_BASE + (((i) > 1) ? (((i) * 0x1000) + 0x20000) : (((~(i)) & 1) * 0x1000)))
#endif // TARGET #endif // TARGET
chip_report_printf("Flash Info:\n"); chip_report_printf("Flash Info:\n");