Skip to content

Commit ce9d466

Browse files
author
Zim Kalinowski
committed
Merge branch 'bugfix/esp-system-ignored-warnings' into 'master'
esp_system: fixed and reenable no-format warnings Closes IDF-6801 See merge request espressif/esp-idf!22710
2 parents 6e1d60e + fb7aafd commit ce9d466

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

components/esp_system/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,5 +129,3 @@ if(NOT BOOTLOADER_BUILD)
129129
idf_component_optional_requires(PRIVATE esp_psram)
130130
endif()
131131
endif()
132-
133-
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")

components/esp_system/debug_stubs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -45,7 +45,7 @@ extern void esp_dbg_stubs_ll_init(void *stub_table_addr);
4545
// TODO: all called funcs should be in IRAM to work with disabled flash cache
4646
static void * esp_dbg_stubs_data_alloc(uint32_t size)
4747
{
48-
ESP_LOGV(TAG, "%s %d", __func__, size);
48+
ESP_LOGV(TAG, "%s %"PRIu32, __func__, size);
4949
void *p = malloc(size);
5050
ESP_LOGV(TAG, "%s EXIT %p", __func__, p);
5151
return p;

components/esp_system/port/arch/riscv/debug_stubs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -29,5 +29,5 @@ void esp_dbg_stubs_ll_init(void *stub_table_addr)
2929
// notify host about control block address
3030
int res = esp_dbg_stubs_advertise_table(stub_table_addr);
3131
assert(res == 0 && "Failed to send debug stubs table address to host!");
32-
ESP_LOGV(TAG, "%s stubs %x", __func__, stub_table_addr);
32+
ESP_LOGV(TAG, "%s stubs %p", __func__, stub_table_addr);
3333
}

components/esp_system/port/arch/xtensa/debug_stubs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2017-2023 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -19,5 +19,5 @@ const static char *TAG = "esp_dbg_stubs";
1919
void esp_dbg_stubs_ll_init(void *stub_table)
2020
{
2121
eri_write(ESP_DBG_STUBS_TRAX_REG, (uint32_t)stub_table);
22-
ESP_LOGV(TAG, "%s stubs %x", __func__, eri_read(ESP_DBG_STUBS_TRAX_REG));
22+
ESP_LOGV(TAG, "%s stubs %"PRIx32, __func__, eri_read(ESP_DBG_STUBS_TRAX_REG));
2323
}

components/esp_system/xt_wdt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -57,7 +57,7 @@ esp_err_t esp_xt_wdt_init(const esp_xt_wdt_config_t *cfg)
5757
if (cfg->auto_backup_clk_enable) {
5858
/* Estimate frequency of internal RTC oscillator */
5959
uint32_t rtc_clk_frequency_khz = rtc_clk_freq_cal(rtc_clk_cal(RTC_CAL_INTERNAL_OSC, RTC_CLK_CAL_CYCLES)) / 1000;
60-
ESP_LOGD(TAG, "Calibrating backup clock from rtc clock with frequency %d", rtc_clk_frequency_khz);
60+
ESP_LOGD(TAG, "Calibrating backup clock from rtc clock with frequency %"PRIu32, rtc_clk_frequency_khz);
6161

6262
xt_wdt_hal_enable_backup_clk(&s_hal_ctx, rtc_clk_frequency_khz);
6363
}

0 commit comments

Comments
 (0)