diff --git a/components/esp_event/esp_event_private.c b/components/esp_event/esp_event_private.c index 42214d2677..612f37e1ae 100644 --- a/components/esp_event/esp_event_private.c +++ b/components/esp_event/esp_event_private.c @@ -1,16 +1,8 @@ -// Copyright 2018 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: 2018-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include "esp_event_private.h" #include "esp_event_internal.h" diff --git a/components/esp_event/include/esp_event_loop.h b/components/esp_event/include/esp_event_loop.h index 14ab627e51..bda2866eb0 100644 --- a/components/esp_event/include/esp_event_loop.h +++ b/components/esp_event/include/esp_event_loop.h @@ -1,3 +1,11 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + #pragma once + #warning "esp_event_loop.h is deprecated, please include esp_event.h instead" + #include "esp_event.h" diff --git a/components/esp_event/private_include/esp_event_internal.h b/components/esp_event/private_include/esp_event_internal.h index dd403f6d7c..caa0f1614b 100644 --- a/components/esp_event/private_include/esp_event_internal.h +++ b/components/esp_event/private_include/esp_event_internal.h @@ -1,16 +1,8 @@ -// Copyright 2018 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: 2018-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifndef ESP_EVENT_INTERNAL_H_ #define ESP_EVENT_INTERNAL_H_ diff --git a/components/esp_event/private_include/esp_event_private.h b/components/esp_event/private_include/esp_event_private.h index 64ccf133c5..b93f837355 100644 --- a/components/esp_event/private_include/esp_event_private.h +++ b/components/esp_event/private_include/esp_event_private.h @@ -1,16 +1,8 @@ -// Copyright 2018 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: 2018-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifndef ESP_EVENT_PRIVATE_H_ #define ESP_EVENT_PRIVATE_H_ diff --git a/components/esp_pm/include/esp_private/pm_trace.h b/components/esp_pm/include/esp_private/pm_trace.h index e6cb7b9233..983febec1a 100644 --- a/components/esp_pm/include/esp_private/pm_trace.h +++ b/components/esp_pm/include/esp_private/pm_trace.h @@ -1,16 +1,8 @@ -// Copyright 2016-2017 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: 2016-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once diff --git a/components/esp_system/include/esp_expression_with_stack.h b/components/esp_system/include/esp_expression_with_stack.h index 456e5db16b..11a5ecc8a6 100644 --- a/components/esp_system/include/esp_expression_with_stack.h +++ b/components/esp_system/include/esp_expression_with_stack.h @@ -1,16 +1,8 @@ -// Copyright 2015-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: 2015-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once #include diff --git a/components/esp_system/include/esp_freertos_hooks.h b/components/esp_system/include/esp_freertos_hooks.h index 290d580b1d..8c15e57b1b 100644 --- a/components/esp_system/include/esp_freertos_hooks.h +++ b/components/esp_system/include/esp_freertos_hooks.h @@ -1,16 +1,8 @@ -// Copyright 2015-2016 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: 2015-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifndef __ESP_FREERTOS_HOOKS_H__ #define __ESP_FREERTOS_HOOKS_H__ @@ -130,5 +122,4 @@ void esp_deregister_freertos_tick_hook(esp_freertos_tick_cb_t old_tick_cb); } #endif - -#endif +#endif // __ESP_FREERTOS_HOOKS_H__ diff --git a/components/esp_system/include/esp_private/dbg_stubs.h b/components/esp_system/include/esp_private/dbg_stubs.h index ead23447bc..9e371fc39a 100644 --- a/components/esp_system/include/esp_private/dbg_stubs.h +++ b/components/esp_system/include/esp_private/dbg_stubs.h @@ -1,16 +1,9 @@ -// Copyright 2017 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 +/* + * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ -// 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. #ifndef ESP_DBG_STUBS_H_ #define ESP_DBG_STUBS_H_ @@ -73,4 +66,4 @@ esp_err_t esp_dbg_stub_entry_get(esp_dbg_stub_id_t id, uint32_t *entry); } #endif -#endif //ESP_DBG_STUBS_H_ +#endif // ESP_DBG_STUBS_H_ diff --git a/components/esp_system/port/soc/esp32c3/apb_backup_dma.c b/components/esp_system/port/soc/esp32c3/apb_backup_dma.c index 24b0ad0e04..8e544ba62d 100644 --- a/components/esp_system/port/soc/esp32c3/apb_backup_dma.c +++ b/components/esp_system/port/soc/esp32c3/apb_backup_dma.c @@ -1,17 +1,8 @@ - -// Copyright 2015-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: 2015-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include "soc/soc_caps.h" @@ -45,4 +36,4 @@ void esp_apb_backup_dma_lock_init(void) { ets_apb_backup_init_lock_func(apb_backup_dma_lock, apb_backup_dma_unlock); } -#endif +#endif // SOC_APB_BACKUP_DMA diff --git a/components/esp_system/test_eh_frame_parser/esp_private/panic_internal.h b/components/esp_system/test_eh_frame_parser/esp_private/panic_internal.h index d4aa6873ec..e6c2baa280 100644 --- a/components/esp_system/test_eh_frame_parser/esp_private/panic_internal.h +++ b/components/esp_system/test_eh_frame_parser/esp_private/panic_internal.h @@ -1,17 +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-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include diff --git a/components/esp_system/test_eh_frame_parser/linker.ld b/components/esp_system/test_eh_frame_parser/linker.ld index f562209141..a8d7be8de6 100644 --- a/components/esp_system/test_eh_frame_parser/linker.ld +++ b/components/esp_system/test_eh_frame_parser/linker.ld @@ -1,17 +1,7 @@ -/** - * Copyright 2020 Espressif Systems (Shanghai) PTE LTD +/* + * SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO 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-License-Identifier: Apache-2.0 */ SECTIONS diff --git a/components/heap/test_multi_heap_host/main.cpp b/components/heap/test_multi_heap_host/main.cpp index 0c7c351f43..f1d2676c06 100644 --- a/components/heap/test_multi_heap_host/main.cpp +++ b/components/heap/test_multi_heap_host/main.cpp @@ -1,2 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + #define CATCH_CONFIG_MAIN #include "catch.hpp" diff --git a/components/heap/test_multi_heap_host/test_multi_heap.cpp b/components/heap/test_multi_heap_host/test_multi_heap.cpp index a892681c7f..36ebfb4f52 100644 --- a/components/heap/test_multi_heap_host/test_multi_heap.cpp +++ b/components/heap/test_multi_heap_host/test_multi_heap.cpp @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + #include "catch.hpp" #include "multi_heap.h" diff --git a/components/linux/include/sys/queue.h b/components/linux/include/sys/queue.h index 34f5a6caa4..25e1be2f53 100644 --- a/components/linux/include/sys/queue.h +++ b/components/linux/include/sys/queue.h @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + #if __has_include() /* On Linux, try using sys/queue.h provided by libbsd-dev */ #include diff --git a/components/log/esp_log_private.h b/components/log/esp_log_private.h index 68b6c852b0..9d838e4a86 100644 --- a/components/log/esp_log_private.h +++ b/components/log/esp_log_private.h @@ -1,6 +1,21 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + #pragma once + #include +#ifdef __cplusplus +extern "C" { +#endif + void esp_log_impl_lock(void); bool esp_log_impl_lock_timeout(void); void esp_log_impl_unlock(void); + +#ifdef __cplusplus +} +#endif diff --git a/components/log/log_linux.c b/components/log/log_linux.c index b6d42a9f30..ddcafca005 100644 --- a/components/log/log_linux.c +++ b/components/log/log_linux.c @@ -1,16 +1,8 @@ -// Copyright 2010-2021 Espressif Systems (Shanghai) CO 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: 2010-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include diff --git a/components/riscv/include/riscv/instruction_decode.h b/components/riscv/include/riscv/instruction_decode.h index 5625680f82..0795bccc03 100644 --- a/components/riscv/include/riscv/instruction_decode.h +++ b/components/riscv/include/riscv/instruction_decode.h @@ -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-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once diff --git a/components/riscv/instruction_decode.c b/components/riscv/instruction_decode.c index 89abccbbbb..a7e86c4f83 100644 --- a/components/riscv/instruction_decode.c +++ b/components/riscv/instruction_decode.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-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include "riscv/instruction_decode.h" diff --git a/components/unity/include/priv/setjmp.h b/components/unity/include/priv/setjmp.h index c467cbd94a..888d50a912 100644 --- a/components/unity/include/priv/setjmp.h +++ b/components/unity/include/priv/setjmp.h @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + #include_next #include "esp_debug_helpers.h" diff --git a/components/unity/include/unity_config.h b/components/unity/include/unity_config.h index 0d75508f91..3ba6b47b2d 100644 --- a/components/unity/include/unity_config.h +++ b/components/unity/include/unity_config.h @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + #ifndef UNITY_CONFIG_H #define UNITY_CONFIG_H diff --git a/components/unity/include/unity_fixture_extras.h b/components/unity/include/unity_fixture_extras.h index c6ad8ba46d..6c4bd7d38a 100644 --- a/components/unity/include/unity_fixture_extras.h +++ b/components/unity/include/unity_fixture_extras.h @@ -1,16 +1,8 @@ -// Copyright 2016-2021 Espressif Systems (Shanghai) Co. 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: 2016-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ /* IDF-specific additions to "Unity Fixture". * This file doesn't need to be included directly, it gets included into unity.h diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index 8a7c4c2f2b..624c5f877e 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -399,12 +399,8 @@ components/bt/host/bluedroid/stack/smp/smp_utils.c components/console/linenoise/linenoise.c components/console/linenoise/linenoise.h components/esp_eth/src/ksz8851.h -components/esp_event/esp_event_private.c components/esp_event/host_test/esp_event_unit_test/main/esp_event_test.cpp components/esp_event/host_test/fixtures.hpp -components/esp_event/include/esp_event_loop.h -components/esp_event/private_include/esp_event_internal.h -components/esp_event/private_include/esp_event_private.h components/esp_hid/include/esp_hid_common.h components/esp_hid/include/esp_hidd.h components/esp_hid/include/esp_hidd_gatts.h @@ -419,7 +415,6 @@ components/esp_local_ctrl/src/esp_local_ctrl_handler.c components/esp_local_ctrl/src/esp_local_ctrl_priv.h components/esp_local_ctrl/src/esp_local_ctrl_transport_ble.c components/esp_phy/test/test_phy_rtc.c -components/esp_pm/include/esp_private/pm_trace.h components/esp_rom/esp32/ld/esp32.rom.api.ld components/esp_rom/esp32/ld/esp32.rom.eco3.ld components/esp_rom/esp32/ld/esp32.rom.ld @@ -488,12 +483,6 @@ components/esp_rom/include/linux/soc/reset_reasons.h components/esp_rom/linux/esp_rom_crc.c components/esp_rom/linux/esp_rom_md5.c components/esp_rom/patches/esp_rom_crc.c -components/esp_system/include/esp_expression_with_stack.h -components/esp_system/include/esp_freertos_hooks.h -components/esp_system/include/esp_private/dbg_stubs.h -components/esp_system/port/soc/esp32c3/apb_backup_dma.c -components/esp_system/test_eh_frame_parser/esp_private/panic_internal.h -components/esp_system/test_eh_frame_parser/linker.ld components/esp_system/ubsan.c components/esp_wifi/include/esp_private/esp_wifi_types_private.h components/esp_wifi/include/esp_private/wifi_types.h @@ -540,13 +529,8 @@ components/freertos/FreeRTOS-Kernel-SMP/timers.c components/hal/include/hal/dac_types.h components/hal/spi_slave_hal.c components/hal/spi_slave_hal_iram.c -components/heap/test_multi_heap_host/main.cpp -components/heap/test_multi_heap_host/test_multi_heap.cpp components/idf_test/include/idf_performance.h -components/linux/include/sys/queue.h -components/log/esp_log_private.h components/log/host_test/log_test/main/log_test.cpp -components/log/log_linux.c components/lwip/apps/ping/ping.c components/lwip/include/apps/dhcpserver/dhcpserver_options.h components/lwip/include/apps/esp_ping.h @@ -591,8 +575,6 @@ components/protocomm/include/transports/protocomm_console.h components/protocomm/include/transports/protocomm_httpd.h components/riscv/include/riscv/csr.h components/riscv/include/riscv/encoding.h -components/riscv/include/riscv/instruction_decode.h -components/riscv/instruction_decode.c components/sdmmc/sdmmc_common.c components/sdmmc/sdmmc_common.h components/sdmmc/sdmmc_init.c @@ -793,9 +775,6 @@ components/spi_flash/spi_flash_chip_boya.c components/spi_flash/spi_flash_chip_issi.c components/spi_flash/spi_flash_chip_mxic.c components/tcp_transport/include/esp_transport_ws.h -components/unity/include/priv/setjmp.h -components/unity/include/unity_config.h -components/unity/include/unity_fixture_extras.h components/vfs/include/esp_vfs_common.h components/vfs/include/esp_vfs_eventfd.h components/wifi_provisioning/include/wifi_provisioning/scheme_ble.h