diff --git a/components/esp_eth/include/esp_eth_netif_glue.h b/components/esp_eth/include/esp_eth_netif_glue.h index 3025b848a0..60e6bcf531 100644 --- a/components/esp_eth/include/esp_eth_netif_glue.h +++ b/components/esp_eth/include/esp_eth_netif_glue.h @@ -5,7 +5,7 @@ */ #pragma once -#include "esp_eth.h" +#include "esp_eth_driver.h" #ifdef __cplusplus extern "C" { diff --git a/components/esp_eth/src/esp_eth.c b/components/esp_eth/src/esp_eth.c index 54734bd45a..a3662453e9 100644 --- a/components/esp_eth/src/esp_eth.c +++ b/components/esp_eth/src/esp_eth.c @@ -8,7 +8,7 @@ #include #include "esp_log.h" #include "esp_check.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "esp_event.h" #include "esp_heap_caps.h" #include "esp_timer.h" diff --git a/components/esp_eth/src/esp_eth_mac_dm9051.c b/components/esp_eth/src/esp_eth_mac_dm9051.c index 2c2fa4b4a5..6fa25d4517 100644 --- a/components/esp_eth/src/esp_eth_mac_dm9051.c +++ b/components/esp_eth/src/esp_eth_mac_dm9051.c @@ -12,7 +12,7 @@ #include "esp_attr.h" #include "esp_log.h" #include "esp_check.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "esp_timer.h" #include "esp_system.h" #include "esp_intr_alloc.h" diff --git a/components/esp_eth/src/esp_eth_mac_esp.c b/components/esp_eth/src/esp_eth_mac_esp.c index 5140e0420b..ef2587381a 100644 --- a/components/esp_eth/src/esp_eth_mac_esp.c +++ b/components/esp_eth/src/esp_eth_mac_esp.c @@ -12,7 +12,7 @@ #include "esp_attr.h" #include "esp_log.h" #include "esp_check.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "esp_pm.h" #include "esp_mac.h" #include "esp_heap_caps.h" diff --git a/components/esp_eth/src/esp_eth_mac_ksz8851snl.c b/components/esp_eth/src/esp_eth_mac_ksz8851snl.c index a7ebc7861f..4990d758ee 100644 --- a/components/esp_eth/src/esp_eth_mac_ksz8851snl.c +++ b/components/esp_eth/src/esp_eth_mac_ksz8851snl.c @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: MIT * - * SPDX-FileContributor: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileContributor: 2021-2022 Espressif Systems (Shanghai) CO LTD */ #include @@ -15,7 +15,7 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "freertos/semphr.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "ksz8851.h" diff --git a/components/esp_eth/src/esp_eth_mac_openeth.c b/components/esp_eth/src/esp_eth_mac_openeth.c index f72d89181c..a42571c219 100644 --- a/components/esp_eth/src/esp_eth_mac_openeth.c +++ b/components/esp_eth/src/esp_eth_mac_openeth.c @@ -19,7 +19,7 @@ #include #include "esp_log.h" #include "esp_check.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "esp_intr_alloc.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" diff --git a/components/esp_eth/src/esp_eth_mac_w5500.c b/components/esp_eth/src/esp_eth_mac_w5500.c index bb35652988..9917e03669 100644 --- a/components/esp_eth/src/esp_eth_mac_w5500.c +++ b/components/esp_eth/src/esp_eth_mac_w5500.c @@ -1,16 +1,8 @@ -// Copyright 2020 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include #include @@ -19,7 +11,7 @@ #include "esp_attr.h" #include "esp_log.h" #include "esp_check.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "esp_system.h" #include "esp_intr_alloc.h" #include "esp_heap_caps.h" diff --git a/components/esp_eth/src/esp_eth_netif_glue.c b/components/esp_eth/src/esp_eth_netif_glue.c index cfb0adf72d..5f71325a33 100644 --- a/components/esp_eth/src/esp_eth_netif_glue.c +++ b/components/esp_eth/src/esp_eth_netif_glue.c @@ -5,7 +5,7 @@ */ #include #include "esp_netif.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "esp_eth_netif_glue.h" #include "esp_event.h" #include "esp_log.h" diff --git a/components/esp_eth/src/esp_eth_phy.c b/components/esp_eth/src/esp_eth_phy.c index 6fae9ae79c..05b09eb17a 100644 --- a/components/esp_eth/src/esp_eth_phy.c +++ b/components/esp_eth/src/esp_eth_phy.c @@ -1,20 +1,12 @@ -// Copyright 2019 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include #include "esp_log.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "eth_phy_regs_struct.h" static const char *TAG = "esp_eth.phy"; diff --git a/components/esp_eth/src/esp_eth_phy_dm9051.c b/components/esp_eth/src/esp_eth_phy_dm9051.c index ec5fa2d8b7..5d30d65520 100644 --- a/components/esp_eth/src/esp_eth_phy_dm9051.c +++ b/components/esp_eth/src/esp_eth_phy_dm9051.c @@ -8,7 +8,7 @@ #include #include "esp_log.h" #include "esp_check.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "eth_phy_regs_struct.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" diff --git a/components/esp_eth/src/esp_eth_phy_dp83848.c b/components/esp_eth/src/esp_eth_phy_dp83848.c index adbb16b587..c6b5a05076 100644 --- a/components/esp_eth/src/esp_eth_phy_dp83848.c +++ b/components/esp_eth/src/esp_eth_phy_dp83848.c @@ -8,7 +8,7 @@ #include #include "esp_log.h" #include "esp_check.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "eth_phy_regs_struct.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" diff --git a/components/esp_eth/src/esp_eth_phy_ip101.c b/components/esp_eth/src/esp_eth_phy_ip101.c index 18949d7029..a17bbb915d 100644 --- a/components/esp_eth/src/esp_eth_phy_ip101.c +++ b/components/esp_eth/src/esp_eth_phy_ip101.c @@ -8,7 +8,7 @@ #include #include "esp_log.h" #include "esp_check.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "eth_phy_regs_struct.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" diff --git a/components/esp_eth/src/esp_eth_phy_ksz80xx.c b/components/esp_eth/src/esp_eth_phy_ksz80xx.c index 2ea90c08e6..c2329d23b2 100644 --- a/components/esp_eth/src/esp_eth_phy_ksz80xx.c +++ b/components/esp_eth/src/esp_eth_phy_ksz80xx.c @@ -8,7 +8,7 @@ #include #include "esp_log.h" #include "esp_check.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "eth_phy_regs_struct.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" diff --git a/components/esp_eth/src/esp_eth_phy_ksz8851snl.c b/components/esp_eth/src/esp_eth_phy_ksz8851snl.c index 8beaee2a7c..066a6c7db9 100644 --- a/components/esp_eth/src/esp_eth_phy_ksz8851snl.c +++ b/components/esp_eth/src/esp_eth_phy_ksz8851snl.c @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: MIT * - * SPDX-FileContributor: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileContributor: 2021-2022 Espressif Systems (Shanghai) CO LTD */ #include #include "esp_check.h" @@ -13,7 +13,7 @@ #include "esp_rom_gpio.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "ksz8851.h" diff --git a/components/esp_eth/src/esp_eth_phy_lan87xx.c b/components/esp_eth/src/esp_eth_phy_lan87xx.c index 6f44cd1a92..3396e924be 100644 --- a/components/esp_eth/src/esp_eth_phy_lan87xx.c +++ b/components/esp_eth/src/esp_eth_phy_lan87xx.c @@ -8,7 +8,7 @@ #include #include "esp_log.h" #include "esp_check.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "eth_phy_regs_struct.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" diff --git a/components/esp_eth/src/esp_eth_phy_rtl8201.c b/components/esp_eth/src/esp_eth_phy_rtl8201.c index 892fb38acb..b0a1f2493d 100644 --- a/components/esp_eth/src/esp_eth_phy_rtl8201.c +++ b/components/esp_eth/src/esp_eth_phy_rtl8201.c @@ -9,7 +9,7 @@ #include #include "esp_log.h" #include "esp_check.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "eth_phy_regs_struct.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" diff --git a/components/esp_eth/src/esp_eth_phy_w5500.c b/components/esp_eth/src/esp_eth_phy_w5500.c index c571ccdda0..f298fdb1d4 100644 --- a/components/esp_eth/src/esp_eth_phy_w5500.c +++ b/components/esp_eth/src/esp_eth_phy_w5500.c @@ -8,7 +8,7 @@ #include #include "esp_log.h" #include "esp_check.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "driver/gpio.h" diff --git a/components/esp_netif/vfs_l2tap/esp_vfs_l2tap.c b/components/esp_netif/vfs_l2tap/esp_vfs_l2tap.c index 45af6099a3..3a814b791d 100644 --- a/components/esp_netif/vfs_l2tap/esp_vfs_l2tap.c +++ b/components/esp_netif/vfs_l2tap/esp_vfs_l2tap.c @@ -19,7 +19,7 @@ #include "esp_log.h" #include "esp_check.h" #include "esp_netif.h" -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "freertos/FreeRTOS.h" #include "freertos/semphr.h" diff --git a/components/lwip/port/esp32/netif/ethernetif.c b/components/lwip/port/esp32/netif/ethernetif.c index 147499b4d5..f8c4a1f652 100644 --- a/components/lwip/port/esp32/netif/ethernetif.c +++ b/components/lwip/port/esp32/netif/ethernetif.c @@ -48,7 +48,7 @@ #include #include -#include "esp_eth.h" +#include "esp_eth_driver.h" #include "esp_netif.h" #include "esp_netif_net_stack.h" #include "esp_compiler.h" diff --git a/examples/network/simple_sniffer/main/cmd_sniffer.h b/examples/network/simple_sniffer/main/cmd_sniffer.h index ae0563efc1..8972d0dca3 100644 --- a/examples/network/simple_sniffer/main/cmd_sniffer.h +++ b/examples/network/simple_sniffer/main/cmd_sniffer.h @@ -8,7 +8,7 @@ */ #pragma once -#include "esp_eth.h" +#include "esp_eth_driver.h" #ifdef __cplusplus extern "C" { diff --git a/tools/ci/check_copyright_config.yaml b/tools/ci/check_copyright_config.yaml index bff6dd197c..1c34b84bf0 100644 --- a/tools/ci/check_copyright_config.yaml +++ b/tools/ci/check_copyright_config.yaml @@ -81,6 +81,13 @@ freertos_component: - Apache-2.0 #Files added to the freertos added by us - MIT #FreeRTOS sources and port files +ethernet_component: + include: + - 'components/esp_eth/**' + allowed_licenses: + - Apache-2.0 + - MIT # To allow contributed drivers + systemview: include: - 'components/app_trace/sys_view' diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index 4dfd30df98..b14700539e 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -419,8 +419,6 @@ components/esp32/include/rom/tjpgd.h components/esp32/include/rom/uart.h components/esp_eth/include/eth_phy_regs_struct.h components/esp_eth/src/dm9051.h -components/esp_eth/src/esp_eth_mac_w5500.c -components/esp_eth/src/esp_eth_phy.c components/esp_eth/src/ksz8851.h components/esp_eth/src/openeth.h components/esp_eth/src/w5500.h