From edf49a92b7452016de203c169ac75a548e0fa496 Mon Sep 17 00:00:00 2001 From: Ondrej Kosta Date: Fri, 1 Mar 2024 16:51:53 +0100 Subject: [PATCH] fix(esp_eth): Removed -Wno-format in esp_eth component --- components/esp_eth/CMakeLists.txt | 3 -- components/esp_eth/src/esp_eth_mac_dm9051.c | 13 +++++---- components/esp_eth/src/esp_eth_mac_esp.c | 13 +++++---- .../esp_eth/src/esp_eth_mac_ksz8851snl.c | 29 ++++++++++--------- components/esp_eth/src/esp_eth_mac_w5500.c | 17 ++++++----- components/esp_eth/src/esp_eth_netif_glue.c | 13 +++++---- components/esp_eth/src/esp_eth_phy_ip101.c | 2 ++ components/esp_eth/src/esp_eth_phy_ksz80xx.c | 7 +++-- .../esp_eth/src/esp_eth_phy_ksz8851snl.c | 2 +- 9 files changed, 52 insertions(+), 47 deletions(-) diff --git a/components/esp_eth/CMakeLists.txt b/components/esp_eth/CMakeLists.txt index 3756598cda..071cb776d8 100644 --- a/components/esp_eth/CMakeLists.txt +++ b/components/esp_eth/CMakeLists.txt @@ -63,9 +63,6 @@ idf_component_register(SRCS "${srcs}" LDFRAGMENTS ${ld_fragments} REQUIRES esp_event # For using "ESP_EVENT_DECLARE_BASE" in header file PRIV_REQUIRES ${priv_requires}) -if(CONFIG_ETH_ENABLED) - target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format") -endif() if(CONFIG_ETH_ENABLED) if(CONFIG_ETH_USE_SPI_ETHERNET) diff --git a/components/esp_eth/src/esp_eth_mac_dm9051.c b/components/esp_eth/src/esp_eth_mac_dm9051.c index eedfd39d42..f2d3116de7 100644 --- a/components/esp_eth/src/esp_eth_mac_dm9051.c +++ b/components/esp_eth/src/esp_eth_mac_dm9051.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "driver/gpio.h" #include "driver/spi_master.h" #include "esp_attr.h" @@ -95,7 +96,7 @@ static void *dm9051_spi_init(const void *spi_config) NULL, err, TAG, "incorrect SPI frame format (command_bits/address_bits)"); } ESP_GOTO_ON_FALSE(spi_bus_add_device(dm9051_config->spi_host_id, &spi_devcfg, &spi->hdl) == ESP_OK, - NULL, err, TAG, "adding device to SPI host #%d failed", dm9051_config->spi_host_id + 1); + NULL, err, TAG, "adding device to SPI host #%i failed", dm9051_config->spi_host_id + 1); /* create mutex */ spi->lock = xSemaphoreCreateMutex(); @@ -632,7 +633,7 @@ static esp_err_t emac_dm9051_transmit(esp_eth_mac_t *mac, uint8_t *buf, uint32_t uint8_t tcr = 0; ESP_GOTO_ON_FALSE(length <= ETH_MAX_PACKET_SIZE, ESP_ERR_INVALID_ARG, err, - TAG, "frame size is too big (actual %u, maximum %u)", length, ETH_MAX_PACKET_SIZE); + TAG, "frame size is too big (actual %" PRIu32 ", maximum %d)", length, ETH_MAX_PACKET_SIZE); int64_t wait_time = esp_timer_get_time(); do { @@ -698,7 +699,7 @@ static esp_err_t dm9051_get_recv_byte_count(emac_dm9051_t *emac, uint16_t *size) if (header.status & 0xBF) { /* erroneous frames should not be forwarded by DM9051, however, if it happens, just skip it */ dm9051_skip_recv_frame(emac, rx_len); - ESP_GOTO_ON_FALSE(false, ESP_FAIL, err, TAG, "receive status error: %xH", header.status); + ESP_GOTO_ON_FALSE(false, ESP_FAIL, err, TAG, "receive status error: %" PRIx8 "H", header.status); } *size = rx_len; } @@ -733,7 +734,7 @@ static esp_err_t dm9051_alloc_recv_buf(emac_dm9051_t *emac, uint8_t **buf, uint3 // frames larger than expected will be truncated uint16_t copy_len = rx_len > *length ? *length : rx_len; // runt frames are not forwarded, but check the length anyway since it could be corrupted at SPI bus - ESP_GOTO_ON_FALSE(copy_len >= ETH_MIN_PACKET_SIZE - ETH_CRC_LEN, ESP_ERR_INVALID_SIZE, err, TAG, "invalid frame length %u", copy_len); + ESP_GOTO_ON_FALSE(copy_len >= ETH_MIN_PACKET_SIZE - ETH_CRC_LEN, ESP_ERR_INVALID_SIZE, err, TAG, "invalid frame length %" PRIu16, copy_len); *buf = malloc(copy_len); if (*buf != NULL) { dm9051_auto_buf_info_t *buff_info = (dm9051_auto_buf_info_t *)*buf; @@ -876,7 +877,7 @@ static void emac_dm9051_task(void *arg) ESP_LOGE(TAG, "received frame was truncated"); free(buffer); } else { - ESP_LOGD(TAG, "receive len=%u", buf_len); + ESP_LOGD(TAG, "receive len=%" PRIu32, buf_len); /* pass the buffer to stack (e.g. TCP/IP layer) */ emac->eth->stack_input(emac->eth, buffer, buf_len); } @@ -886,7 +887,7 @@ static void emac_dm9051_task(void *arg) free(buffer); } } else if (frame_len) { - ESP_LOGE(TAG, "invalid combination of frame_len(%u) and buffer pointer(%p)", frame_len, buffer); + ESP_LOGE(TAG, "invalid combination of frame_len(%" PRIu32 ") and buffer pointer(%p)", frame_len, buffer); } } else if (ret == ESP_ERR_NO_MEM) { ESP_LOGE(TAG, "no mem for receive buffer"); diff --git a/components/esp_eth/src/esp_eth_mac_esp.c b/components/esp_eth/src/esp_eth_mac_esp.c index 33455dc421..82efca1835 100644 --- a/components/esp_eth/src/esp_eth_mac_esp.c +++ b/components/esp_eth/src/esp_eth_mac_esp.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "esp_private/periph_ctrl.h" #include "esp_attr.h" #include "esp_log.h" @@ -217,7 +218,7 @@ static esp_err_t emac_esp32_set_speed(esp_eth_mac_t *mac, eth_speed_t speed) } #endif emac_hal_set_speed(&emac->hal, speed); - ESP_LOGD(TAG, "working in %dMbps", speed == ETH_SPEED_10M ? 10 : 100); + ESP_LOGD(TAG, "working in %iMbps", speed == ETH_SPEED_10M ? 10 : 100); return ESP_OK; } return ret; @@ -334,7 +335,7 @@ static void emac_esp32_rx_task(void *arg) ESP_LOGE(TAG, "received frame was truncated"); free(buffer); } else { - ESP_LOGD(TAG, "receive len= %d", recv_len); + ESP_LOGD(TAG, "receive len= %" PRIu32, recv_len); emac->eth->stack_input(emac->eth, buffer, recv_len); } /* if allocation failed and there is a waiting frame */ @@ -368,7 +369,7 @@ static esp_err_t emac_config_pll_clock(emac_esp32_t *emac) esp_err_t ret = periph_rtc_apll_freq_set(expt_freq, &real_freq); ESP_RETURN_ON_FALSE(ret != ESP_ERR_INVALID_ARG, ESP_FAIL, TAG, "Set APLL clock coefficients failed"); if (ret == ESP_ERR_INVALID_STATE) { - ESP_LOGW(TAG, "APLL is occupied already, it is working at %d Hz", real_freq); + ESP_LOGW(TAG, "APLL is occupied already, it is working at %" PRIu32 " Hz", real_freq); } #elif CONFIG_IDF_TARGET_ESP32P4 // the RMII reference comes from the MPLL @@ -376,7 +377,7 @@ static esp_err_t emac_config_pll_clock(emac_esp32_t *emac) emac->use_pll = true; esp_err_t ret = periph_rtc_mpll_freq_set(expt_freq * 2, &real_freq); // cannot set 50MHz at MPLL, the nearest possible freq is 100 MHz if (ret == ESP_ERR_INVALID_STATE) { - ESP_LOGW(TAG, "MPLL is occupied already, it is working at %d Hz", real_freq); + ESP_LOGW(TAG, "MPLL is occupied already, it is working at %" PRIu32 " Hz", real_freq); } // Set divider of MPLL clock if (real_freq > RMII_CLK_HZ) { @@ -388,7 +389,7 @@ static esp_err_t emac_config_pll_clock(emac_esp32_t *emac) #endif // If the difference of real RMII CLK frequency is not within 50 ppm, i.e. 2500 Hz, the (A/M)PLL is unusable ESP_RETURN_ON_FALSE(abs((int)real_freq - (int)expt_freq) <= 2500, - ESP_ERR_INVALID_STATE, TAG, "The (A/M)PLL is working at an unusable frequency %lu Hz", real_freq); + ESP_ERR_INVALID_STATE, TAG, "The (A/M)PLL is working at an unusable frequency %" PRIu32 " Hz", real_freq); return ESP_OK; } @@ -651,7 +652,7 @@ static esp_err_t esp_emac_config_data_interface(const eth_esp32_emac_config_t *e } break; default: - ESP_GOTO_ON_FALSE(false, ESP_ERR_INVALID_ARG, err, TAG, "invalid EMAC Data Interface:%d", esp32_emac_config->interface); + ESP_GOTO_ON_FALSE(false, ESP_ERR_INVALID_ARG, err, TAG, "invalid EMAC Data Interface:%i", esp32_emac_config->interface); } err: return ret; diff --git a/components/esp_eth/src/esp_eth_mac_ksz8851snl.c b/components/esp_eth/src/esp_eth_mac_ksz8851snl.c index 7aad57d2a4..76fa5d9987 100644 --- a/components/esp_eth/src/esp_eth_mac_ksz8851snl.c +++ b/components/esp_eth/src/esp_eth_mac_ksz8851snl.c @@ -7,6 +7,7 @@ */ #include +#include #include "esp_log.h" #include "esp_check.h" #include "esp_cpu.h" @@ -103,7 +104,7 @@ static void *ksz8851_spi_init(const void *spi_config) // SPI device init ESP_GOTO_ON_FALSE(spi_bus_add_device(ksz8851snl_config->spi_host_id, ksz8851snl_config->spi_devcfg, &spi->hdl) == ESP_OK, NULL, - err, TAG, "adding device to SPI host #%d failed", ksz8851snl_config->spi_host_id + 1); + err, TAG, "adding device to SPI host #%i failed", ksz8851snl_config->spi_host_id + 1); ret = spi; return ret; err: @@ -203,7 +204,7 @@ static esp_err_t ksz8851_read_reg(emac_ksz8851snl_t *emac, uint32_t reg_addr, ui ret = ESP_ERR_TIMEOUT; } ksz8851_mutex_unlock(emac); - ESP_LOGV(TAG, "reading reg 0x%02x == 0x%02x", reg_addr, *value); + ESP_LOGV(TAG, "reading reg 0x%02" PRIx32 " = 0x%02" PRIx16, reg_addr, *value); err: return ret; @@ -213,7 +214,7 @@ static esp_err_t ksz8851_write_reg(emac_ksz8851snl_t *emac, uint32_t reg_addr, u { esp_err_t ret = ESP_OK; ESP_GOTO_ON_FALSE((reg_addr & ~KSZ8851_VALID_ADDRESS_MASK) == 0U, ESP_ERR_INVALID_ARG, err, TAG, "address is out of bounds"); - ESP_LOGV(TAG, "writing reg 0x%02x = 0x%02x", reg_addr, value); + ESP_LOGV(TAG, "writing reg 0x%02" PRIx32 " = 0x%02" PRIx16, reg_addr, value); // NOTE(v.chistyakov): select upper or lower word inside a dword const unsigned byte_mask = 0x3U << (KSZ8851_SPI_BYTE_MASK_SHIFT + (reg_addr & 0x2U)); @@ -236,9 +237,9 @@ static esp_err_t ksz8851_set_bits(emac_ksz8851snl_t *emac, uint32_t address, uin { esp_err_t ret = ESP_OK; uint16_t old; - ESP_GOTO_ON_ERROR(ksz8851_read_reg(emac, address, &old), err, TAG, "failed to read reg 0x%x", address); + ESP_GOTO_ON_ERROR(ksz8851_read_reg(emac, address, &old), err, TAG, "failed to read reg 0x%" PRIx32, address); old |= value; - ESP_GOTO_ON_ERROR(ksz8851_write_reg(emac, address, old), err, TAG, "failed to write reg 0x%x", address); + ESP_GOTO_ON_ERROR(ksz8851_write_reg(emac, address, old), err, TAG, "failed to write reg 0x%" PRIx32, address); err: return ret; } @@ -247,9 +248,9 @@ static esp_err_t ksz8851_clear_bits(emac_ksz8851snl_t *emac, uint32_t address, u { esp_err_t ret = ESP_OK; uint16_t old; - ESP_GOTO_ON_ERROR(ksz8851_read_reg(emac, address, &old), err, TAG, "failed to read reg 0x%x", address); + ESP_GOTO_ON_ERROR(ksz8851_read_reg(emac, address, &old), err, TAG, "failed to read reg 0x%" PRIx32, address); old &= ~value; - ESP_GOTO_ON_ERROR(ksz8851_write_reg(emac, address, old), err, TAG, "failed to write reg 0x%x", address); + ESP_GOTO_ON_ERROR(ksz8851_write_reg(emac, address, old), err, TAG, "failed to write reg 0x%" PRIx32, address); err: return ret; } @@ -288,7 +289,7 @@ static esp_err_t init_verify_chipid(emac_ksz8851snl_t *emac) uint8_t family_id = (id & CIDER_FAMILY_ID_MASK) >> CIDER_FAMILY_ID_SHIFT; uint8_t chip_id = (id & CIDER_CHIP_ID_MASK) >> CIDER_CHIP_ID_SHIFT; uint8_t revision = (id & CIDER_REVISION_ID_MASK) >> CIDER_REVISION_ID_SHIFT; - ESP_LOGI(TAG, "Family ID = 0x%x\t Chip ID = 0x%x\t Revision ID = 0x%x", family_id, chip_id, revision); + ESP_LOGI(TAG, "Family ID = 0x%" PRIx8 "\t Chip ID = 0x%" PRIx8 "\t Revision ID = 0x%" PRIx8, family_id, chip_id, revision); ESP_GOTO_ON_FALSE(family_id == CIDER_KSZ8851SNL_FAMILY_ID, ESP_FAIL, err, TAG, "wrong family id"); ESP_GOTO_ON_FALSE(chip_id == CIDER_KSZ8851SNL_CHIP_ID, ESP_FAIL, err, TAG, "wrong chip id"); return ESP_OK; @@ -400,7 +401,7 @@ static esp_err_t emac_ksz8851snl_transmit(esp_eth_mac_t *mac, uint8_t *buf, uint { static unsigned s_frame_id = 0U; - ESP_LOGV(TAG, "transmitting frame of size %u", length); + ESP_LOGV(TAG, "transmitting frame of size %" PRIu32, length); esp_err_t ret = ESP_OK; emac_ksz8851snl_t *emac = __containerof(mac, emac_ksz8851snl_t, parent); // Lock SPI since once `SDA Start DMA Access` bit is set, all registers access are disabled. @@ -409,13 +410,13 @@ static esp_err_t emac_ksz8851snl_transmit(esp_eth_mac_t *mac, uint8_t *buf, uint } ESP_GOTO_ON_FALSE(length <= KSZ8851_QMU_PACKET_LENGTH, ESP_ERR_INVALID_ARG, err, - TAG, "frame size is too big (actual %u, maximum %u)", length, ETH_MAX_PACKET_SIZE); + TAG, "frame size is too big (actual %" PRIu32 ", maximum %d)", length, ETH_MAX_PACKET_SIZE); // NOTE(v.chistyakov): 4 bytes header + length aligned to 4 bytes unsigned transmit_length = 4U + ((length + 3U) & ~0x3U); uint16_t free_space; ESP_GOTO_ON_ERROR(ksz8851_read_reg(emac, KSZ8851_TXMIR, &free_space), err, TAG, "TXMIR read failed"); - ESP_GOTO_ON_FALSE(transmit_length <= free_space, ESP_FAIL, err, TAG, "TXQ free space (%d) < send length (%d)", free_space, + ESP_GOTO_ON_FALSE(transmit_length <= free_space, ESP_FAIL, err, TAG, "TXQ free space (%" PRIu16 ") < send length (%" PRIu16 ")", free_space, transmit_length); emac->tx_buffer[0] = ++s_frame_id & TXSR_TXFID_MASK; @@ -474,7 +475,7 @@ static esp_err_t emac_ksz8851_alloc_recv_buf(emac_ksz8851snl_t *emac, uint8_t ** // frames larger than expected will be truncated uint16_t copy_len = rx_len > *length ? *length : rx_len; // runt frames are not forwarded, but check the length anyway since it could be corrupted at SPI bus - ESP_GOTO_ON_FALSE(copy_len >= ETH_MIN_PACKET_SIZE - ETH_CRC_LEN, ESP_ERR_INVALID_SIZE, err, TAG, "invalid frame length %u", copy_len); + ESP_GOTO_ON_FALSE(copy_len >= ETH_MIN_PACKET_SIZE - ETH_CRC_LEN, ESP_ERR_INVALID_SIZE, err, TAG, "invalid frame length %" PRIu16, copy_len); *buf = malloc(copy_len); if (*buf != NULL) { ksz8851_auto_buf_info_t *buff_info = (ksz8851_auto_buf_info_t *)*buf; @@ -789,7 +790,7 @@ static void emac_ksz8851snl_task(void *arg) ESP_LOGE(TAG, "received frame was truncated"); free(buffer); } else { - ESP_LOGD(TAG, "receive len=%u", buf_len); + ESP_LOGD(TAG, "receive len=%" PRIu32, buf_len); /* pass the buffer to stack (e.g. TCP/IP layer) */ emac->eth->stack_input(emac->eth, buffer, buf_len); } @@ -799,7 +800,7 @@ static void emac_ksz8851snl_task(void *arg) free(buffer); } } else if (frame_len) { - ESP_LOGE(TAG, "invalid combination of frame_len(%u) and buffer pointer(%p)", frame_len, buffer); + ESP_LOGE(TAG, "invalid combination of frame_len(%" PRIu32 ") and buffer pointer(%p)", frame_len, buffer); } } else if (ret == ESP_ERR_NO_MEM) { ESP_LOGE(TAG, "no mem for receive buffer"); diff --git a/components/esp_eth/src/esp_eth_mac_w5500.c b/components/esp_eth/src/esp_eth_mac_w5500.c index 6c9240f7b5..8955851603 100644 --- a/components/esp_eth/src/esp_eth_mac_w5500.c +++ b/components/esp_eth/src/esp_eth_mac_w5500.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "driver/gpio.h" #include "driver/spi_master.h" #include "esp_attr.h" @@ -84,7 +85,7 @@ static void *w5500_spi_init(const void *spi_config) NULL, err, TAG, "incorrect SPI frame format (command_bits/address_bits)"); } ESP_GOTO_ON_FALSE(spi_bus_add_device(w5500_config->spi_host_id, &spi_devcfg, &spi->hdl) == ESP_OK, NULL, - err, TAG, "adding device to SPI host #%d failed", w5500_config->spi_host_id + 1); + err, TAG, "adding device to SPI host #%i failed", w5500_config->spi_host_id + 1); /* create mutex */ spi->lock = xSemaphoreCreateMutex(); ESP_GOTO_ON_FALSE(spi->lock, NULL, err, TAG, "create lock failed"); @@ -326,7 +327,7 @@ static esp_err_t w5500_verify_id(emac_w5500_t *emac) vTaskDelay(pdMS_TO_TICKS(10)); } - ESP_LOGE(TAG, "W5500 version mismatched, expected 0x%02x, got 0x%02x", W5500_CHIP_VERSION, version); + ESP_LOGE(TAG, "W5500 version mismatched, expected 0x%02x, got 0x%02" PRIx8, W5500_CHIP_VERSION, version); return ESP_ERR_INVALID_VERSION; err: return ret; @@ -570,11 +571,11 @@ static esp_err_t emac_w5500_transmit(esp_eth_mac_t *mac, uint8_t *buf, uint32_t uint16_t offset = 0; ESP_GOTO_ON_FALSE(length <= ETH_MAX_PACKET_SIZE, ESP_ERR_INVALID_ARG, err, - TAG, "frame size is too big (actual %u, maximum %u)", length, ETH_MAX_PACKET_SIZE); + TAG, "frame size is too big (actual %" PRIu32 ", maximum %u)", length, ETH_MAX_PACKET_SIZE); // check if there're free memory to store this packet uint16_t free_size = 0; ESP_GOTO_ON_ERROR(w5500_get_tx_free_size(emac, &free_size), err, TAG, "get free size failed"); - ESP_GOTO_ON_FALSE(length <= free_size, ESP_ERR_NO_MEM, err, TAG, "free size (%d) < send length (%d)", free_size, length); + ESP_GOTO_ON_FALSE(length <= free_size, ESP_ERR_NO_MEM, err, TAG, "free size (%" PRIu16 ") < send length (%" PRIu32 ")", free_size, length); // get current write pointer ESP_GOTO_ON_ERROR(w5500_read(emac, W5500_REG_SOCK_TX_WR(0), &offset, sizeof(offset)), err, TAG, "read TX WR failed"); offset = __builtin_bswap16(offset); @@ -624,7 +625,7 @@ static esp_err_t emac_w5500_alloc_recv_buf(emac_w5500_t *emac, uint8_t **buf, ui // frames larger than expected will be truncated copy_len = rx_len > *length ? *length : rx_len; // runt frames are not forwarded by W5500 (tested on target), but check the length anyway since it could be corrupted at SPI bus - ESP_GOTO_ON_FALSE(copy_len >= ETH_MIN_PACKET_SIZE - ETH_CRC_LEN, ESP_ERR_INVALID_SIZE, err, TAG, "invalid frame length %u", copy_len); + ESP_GOTO_ON_FALSE(copy_len >= ETH_MIN_PACKET_SIZE - ETH_CRC_LEN, ESP_ERR_INVALID_SIZE, err, TAG, "invalid frame length %" PRIu32, copy_len); *buf = malloc(copy_len); if (*buf != NULL) { emac_w5500_auto_buf_info_t *buff_info = (emac_w5500_auto_buf_info_t *)*buf; @@ -677,7 +678,7 @@ static esp_err_t emac_w5500_receive(esp_eth_mac_t *mac, uint8_t *buf, uint32_t * // 2 bytes of header offset += 2; // read the payload - ESP_GOTO_ON_ERROR(w5500_read_buffer(emac, emac->rx_buffer, copy_len, offset), err, TAG, "read payload failed, len=%d, offset=%d", rx_len, offset); + ESP_GOTO_ON_ERROR(w5500_read_buffer(emac, emac->rx_buffer, copy_len, offset), err, TAG, "read payload failed, len=%" PRIu16 ", offset=%" PRIu16, rx_len, offset); memcpy(buf, emac->rx_buffer, copy_len); offset += rx_len; // update read pointer @@ -782,7 +783,7 @@ static void emac_w5500_task(void *arg) ESP_LOGE(TAG, "received frame was truncated"); free(buffer); } else { - ESP_LOGD(TAG, "receive len=%u", buf_len); + ESP_LOGD(TAG, "receive len=%" PRIu32, buf_len); /* pass the buffer to stack (e.g. TCP/IP layer) */ emac->eth->stack_input(emac->eth, buffer, buf_len); } @@ -791,7 +792,7 @@ static void emac_w5500_task(void *arg) free(buffer); } } else if (frame_len) { - ESP_LOGE(TAG, "invalid combination of frame_len(%u) and buffer pointer(%p)", frame_len, buffer); + ESP_LOGE(TAG, "invalid combination of frame_len(%" PRIu32 ") and buffer pointer(%p)", frame_len, buffer); } } else if (ret == ESP_ERR_NO_MEM) { ESP_LOGE(TAG, "no mem for receive buffer"); diff --git a/components/esp_eth/src/esp_eth_netif_glue.c b/components/esp_eth/src/esp_eth_netif_glue.c index 44de659b3f..ad33eb0d2f 100644 --- a/components/esp_eth/src/esp_eth_netif_glue.c +++ b/components/esp_eth/src/esp_eth_netif_glue.c @@ -1,9 +1,10 @@ /* - * SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ #include +#include #include "esp_netif.h" #include "esp_eth_driver.h" #include "esp_eth_netif_glue.h" @@ -76,7 +77,7 @@ static void eth_action_start(void *handler_args, esp_event_base_t base, int32_t { esp_eth_handle_t eth_handle = *(esp_eth_handle_t *)event_data; esp_eth_netif_glue_t *netif_glue = handler_args; - ESP_LOGD(TAG, "eth_action_start: %p, %p, %d, %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data); + ESP_LOGD(TAG, "eth_action_start: %p, %p, %" PRIi32 ", %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data); if (netif_glue->eth_driver == eth_handle) { esp_netif_action_start(netif_glue->base.netif, base, event_id, event_data); } @@ -86,7 +87,7 @@ static void eth_action_stop(void *handler_args, esp_event_base_t base, int32_t e { esp_eth_handle_t eth_handle = *(esp_eth_handle_t *)event_data; esp_eth_netif_glue_t *netif_glue = handler_args; - ESP_LOGD(TAG, "eth_action_stop: %p, %p, %d, %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data); + ESP_LOGD(TAG, "eth_action_stop: %p, %p, %" PRIi32 ", %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data); if (netif_glue->eth_driver == eth_handle) { esp_netif_action_stop(netif_glue->base.netif, base, event_id, event_data); } @@ -96,7 +97,7 @@ static void eth_action_connected(void *handler_args, esp_event_base_t base, int3 { esp_eth_handle_t eth_handle = *(esp_eth_handle_t *)event_data; esp_eth_netif_glue_t *netif_glue = handler_args; - ESP_LOGD(TAG, "eth_action_connected: %p, %p, %d, %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data); + ESP_LOGD(TAG, "eth_action_connected: %p, %p, %" PRIi32 ", %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data); if (netif_glue->eth_driver == eth_handle) { eth_speed_t speed; esp_eth_ioctl(eth_handle, ETH_CMD_G_SPEED, &speed); @@ -109,7 +110,7 @@ static void eth_action_disconnected(void *handler_args, esp_event_base_t base, i { esp_eth_handle_t eth_handle = *(esp_eth_handle_t *)event_data; esp_eth_netif_glue_t *netif_glue = handler_args; - ESP_LOGD(TAG, "eth_action_disconnected: %p, %p, %d, %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data); + ESP_LOGD(TAG, "eth_action_disconnected: %p, %p, %" PRIi32 ", %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data); if (netif_glue->eth_driver == eth_handle) { esp_netif_action_disconnected(netif_glue->base.netif, base, event_id, event_data); } @@ -119,7 +120,7 @@ static void eth_action_got_ip(void *handler_args, esp_event_base_t base, int32_t { ip_event_got_ip_t *ip_event = (ip_event_got_ip_t *)event_data; esp_eth_netif_glue_t *netif_glue = handler_args; - ESP_LOGD(TAG, "eth_action_got_ip: %p, %p, %d, %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data); + ESP_LOGD(TAG, "eth_action_got_ip: %p, %p, %" PRIi32 ", %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data); if (netif_glue->base.netif == ip_event->esp_netif) { esp_netif_action_got_ip(ip_event->esp_netif, base, event_id, event_data); } diff --git a/components/esp_eth/src/esp_eth_phy_ip101.c b/components/esp_eth/src/esp_eth_phy_ip101.c index a32a3bffb6..c9a187d690 100644 --- a/components/esp_eth/src/esp_eth_phy_ip101.c +++ b/components/esp_eth/src/esp_eth_phy_ip101.c @@ -6,6 +6,8 @@ #include #include #include +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" #include "esp_log.h" #include "esp_check.h" #include "freertos/FreeRTOS.h" diff --git a/components/esp_eth/src/esp_eth_phy_ksz80xx.c b/components/esp_eth/src/esp_eth_phy_ksz80xx.c index 2102acdf88..aec0e70b80 100644 --- a/components/esp_eth/src/esp_eth_phy_ksz80xx.c +++ b/components/esp_eth/src/esp_eth_phy_ksz80xx.c @@ -1,11 +1,12 @@ /* - * SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ #include #include #include +#include #include "esp_log.h" #include "esp_check.h" #include "esp_eth_phy_802_3.h" @@ -74,7 +75,7 @@ static esp_err_t ksz80xx_update_link_duplex_speed(phy_ksz80xx_t * ksz80xx) /* when link up, read negotiation result */ if (link == ETH_LINK_UP) { uint32_t reg_value = 0; - ESP_GOTO_ON_ERROR(eth->phy_reg_read(eth, addr, ksz80xx->op_mode_reg, ®_value), err, TAG, "read %#04x failed", ksz80xx->op_mode_reg); + ESP_GOTO_ON_ERROR(eth->phy_reg_read(eth, addr, ksz80xx->op_mode_reg, ®_value), err, TAG, "read %#04" PRIx32 " failed", ksz80xx->op_mode_reg); uint8_t op_mode = (reg_value >> ksz80xx->op_mode_offset) & 0x07; switch (op_mode) { case 1: //10Base-T half-duplex @@ -170,7 +171,7 @@ static esp_err_t ksz80xx_init(esp_eth_phy_t *phy) break; } } - ESP_GOTO_ON_FALSE(supported_model_name != NULL && ksz80xx_init_model(ksz80xx), ESP_FAIL, err, TAG, "unsupported model number: %#04x", ksz80xx->model_number); + ESP_GOTO_ON_FALSE(supported_model_name != NULL && ksz80xx_init_model(ksz80xx), ESP_FAIL, err, TAG, "unsupported model number: %#04" PRIx8, ksz80xx->model_number); ESP_LOGI(TAG, "auto detected phy KSZ80%s", supported_model_name); return ESP_OK; err: diff --git a/components/esp_eth/src/esp_eth_phy_ksz8851snl.c b/components/esp_eth/src/esp_eth_phy_ksz8851snl.c index 982c1c9b24..d520000bd6 100644 --- a/components/esp_eth/src/esp_eth_phy_ksz8851snl.c +++ b/components/esp_eth/src/esp_eth_phy_ksz8851snl.c @@ -242,7 +242,7 @@ static esp_err_t phy_ksz8851_set_addr(esp_eth_phy_t *phy, uint32_t addr) { phy_ksz8851snl_t *ksz8851 = __containerof(phy, phy_ksz8851snl_t, parent); ksz8851->addr = addr; - ESP_LOGD(TAG, "setting PHY addr to %u", addr); + ESP_LOGD(TAG, "setting PHY addr to %" PRIu32, addr); return ESP_OK; }