diff --git a/components/esp_coex/esp32h2/esp_coex_adapter.c b/components/esp_coex/esp32h2/esp_coex_adapter.c index 6cdfdd9bd9..936f8f2ce8 100644 --- a/components/esp_coex/esp32h2/esp_coex_adapter.c +++ b/components/esp_coex/esp32h2/esp_coex_adapter.c @@ -21,7 +21,7 @@ #include "soc/rtc.h" #include "esp_private/esp_clk.h" #include "private/esp_coexist_adapter.h" -#include "esp32c6/rom/ets_sys.h" +#include "esp32h2/rom/ets_sys.h" #define TAG "esp_coex_adapter" diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt index 9a97104f9a..44cb92c966 100644 --- a/components/esp_rom/CMakeLists.txt +++ b/components/esp_rom/CMakeLists.txt @@ -3,7 +3,8 @@ idf_build_get_property(target IDF_TARGET) set(target_folder "${target}") set(include_dirs "include" - "include/${target_folder}" + "${target_folder}/include" + "${target_folder}/include/${target_folder}" "${target_folder}") set(private_required_comp "") @@ -17,9 +18,6 @@ if(target STREQUAL "linux") "${target}/esp_rom_md5.c" "${target}/esp_rom_efuse.c") else() - if(CONFIG_IDF_TARGET_ESP32C5) - list(APPEND include_dirs "include/${target_folder}/..") - endif() list(APPEND sources "patches/esp_rom_crc.c" "patches/esp_rom_uart.c" "patches/esp_rom_spiflash.c" diff --git a/components/esp_rom/include/esp32/rom/aes.h b/components/esp_rom/esp32/include/esp32/rom/aes.h similarity index 58% rename from components/esp_rom/include/esp32/rom/aes.h rename to components/esp_rom/esp32/include/esp32/rom/aes.h index bbe13d22e4..a517a350a8 100644 --- a/components/esp_rom/include/esp32/rom/aes.h +++ b/components/esp_rom/esp32/include/esp32/rom/aes.h @@ -5,19 +5,11 @@ use the wrapper functions in esp32/aes.h instead. */ -// 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 _ROM_AES_H_ #define _ROM_AES_H_ diff --git a/components/esp_rom/include/esp32/rom/bigint.h b/components/esp_rom/esp32/include/esp32/rom/bigint.h similarity index 67% rename from components/esp_rom/include/esp32/rom/bigint.h rename to components/esp_rom/esp32/include/esp32/rom/bigint.h index 97ad72202a..16ed4dc1c2 100644 --- a/components/esp_rom/include/esp32/rom/bigint.h +++ b/components/esp_rom/esp32/include/esp32/rom/bigint.h @@ -5,19 +5,11 @@ use the wrapper functions in hwcrypto/mpi.h instead. */ -// 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 _ROM_BIGINT_H_ #define _ROM_BIGINT_H_ diff --git a/components/esp_rom/include/esp32/rom/cache.h b/components/esp_rom/esp32/include/esp32/rom/cache.h similarity index 100% rename from components/esp_rom/include/esp32/rom/cache.h rename to components/esp_rom/esp32/include/esp32/rom/cache.h diff --git a/components/esp_rom/include/esp32/rom/crc.h b/components/esp_rom/esp32/include/esp32/rom/crc.h similarity index 87% rename from components/esp_rom/include/esp32/rom/crc.h rename to components/esp_rom/esp32/include/esp32/rom/crc.h index a570361176..16c0e0ed3e 100644 --- a/components/esp_rom/include/esp32/rom/crc.h +++ b/components/esp_rom/esp32/include/esp32/rom/crc.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 ROM_CRC_H #define ROM_CRC_H diff --git a/components/esp_rom/include/esp32/rom/efuse.h b/components/esp_rom/esp32/include/esp32/rom/efuse.h similarity index 100% rename from components/esp_rom/include/esp32/rom/efuse.h rename to components/esp_rom/esp32/include/esp32/rom/efuse.h diff --git a/components/esp_rom/include/esp32/rom/ets_sys.h b/components/esp_rom/esp32/include/esp32/rom/ets_sys.h similarity index 97% rename from components/esp_rom/include/esp32/rom/ets_sys.h rename to components/esp_rom/esp32/include/esp32/rom/ets_sys.h index 549db8ffc6..eb73b89795 100644 --- a/components/esp_rom/include/esp32/rom/ets_sys.h +++ b/components/esp_rom/esp32/include/esp32/rom/ets_sys.h @@ -64,11 +64,11 @@ struct ETSEventTag { ETSParam par; /**< Event parameter, sometimes without usage, then will be set as 0*/ }; -typedef void (*ETSTask)(ETSEvent *e); /**< Type of the Task processer*/ +typedef void (*ETSTask)(ETSEvent *e); /**< Type of the Task processor*/ typedef void (* ets_idle_cb_t)(void *arg); /**< Type of the system idle callback*/ /** - * @brief Start the Espressif Task Scheduler, which is an infinit loop. Please do not add code after it. + * @brief Start the Espressif Task Scheduler, which is an infinite loop. Please do not add code after it. * * @param none * @@ -88,9 +88,9 @@ void ets_run(void); void ets_set_idle_cb(ets_idle_cb_t func, void *arg); /** - * @brief Init a task with processer, priority, queue to receive Event, queue length. + * @brief Init a task with processor, priority, queue to receive Event, queue length. * - * @param ETSTask task : The task processer. + * @param ETSTask task : The task processor. * * @param uint8_t prio : Task priority, 0-31, bigger num with high priority, one priority with one task. * @@ -128,7 +128,7 @@ ETS_STATUS ets_post(uint8_t prio, ETSSignal sig, ETSParam par); * @{ */ -extern const char *const exc_cause_table[40]; ///**< excption cause that defined by the core.*/ +extern const char *const exc_cause_table[40]; ///**< exception cause that defined by the core.*/ /** * @brief Set Pro cpu Entry code, code can be called in PRO CPU when booting is not completed. @@ -230,7 +230,7 @@ int ets_printf(const char *fmt, ...); void ets_write_char_uart(char c); /** - * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need ouput. + * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need output. * To install putc1, which is defaulted installed as ets_write_char_uart in none silent boot mode, as NULL in silent mode. * * @param void (*)(char) p: Output function to install. @@ -240,7 +240,7 @@ void ets_write_char_uart(char c); void ets_install_putc1(void (*p)(char c)); /** - * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need ouput. + * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need output. * To install putc2, which is defaulted installed as NULL. * * @param void (*)(char) p: Output function to install. @@ -283,7 +283,7 @@ typedef void ETSTimerFunc(void *timer_arg);/**< timer handler*/ typedef struct _ETSTIMER_ { struct _ETSTIMER_ *timer_next; /**< timer linker*/ - uint32_t timer_expire; /**< abstruct time when timer expire*/ + uint32_t timer_expire; /**< abstract time when timer expire*/ uint32_t timer_period; /**< timer period, 0 means timer is not periodic repeated*/ ETSTimerFunc *timer_func; /**< timer handler*/ void *timer_arg; /**< timer handler argument*/ diff --git a/components/esp_rom/include/esp32/rom/gpio.h b/components/esp_rom/esp32/include/esp32/rom/gpio.h similarity index 97% rename from components/esp_rom/include/esp32/rom/gpio.h rename to components/esp_rom/esp32/include/esp32/rom/gpio.h index 62df27f02c..6a6b458718 100644 --- a/components/esp_rom/include/esp32/rom/gpio.h +++ b/components/esp_rom/esp32/include/esp32/rom/gpio.h @@ -62,7 +62,7 @@ typedef enum { * * @param uint32_t enable_mask : the gpios that need be changed. * - * @param uint32_t disable_mask : the gpios that need diable output. + * @param uint32_t disable_mask : the gpios that need disable output. * * @return None */ @@ -79,7 +79,7 @@ void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mas * * @param uint32_t enable_mask : the gpios that need be changed. * - * @param uint32_t disable_mask : the gpios that need diable output. + * @param uint32_t disable_mask : the gpios that need disable output. * * @return None */ diff --git a/components/esp_rom/include/esp32/rom/libc_stubs.h b/components/esp_rom/esp32/include/esp32/rom/libc_stubs.h similarity index 100% rename from components/esp_rom/include/esp32/rom/libc_stubs.h rename to components/esp_rom/esp32/include/esp32/rom/libc_stubs.h diff --git a/components/esp_rom/include/esp32/rom/lldesc.h b/components/esp_rom/esp32/include/esp32/rom/lldesc.h similarity index 100% rename from components/esp_rom/include/esp32/rom/lldesc.h rename to components/esp_rom/esp32/include/esp32/rom/lldesc.h diff --git a/components/esp_rom/include/esp32/rom/md5_hash.h b/components/esp_rom/esp32/include/esp32/rom/md5_hash.h similarity index 100% rename from components/esp_rom/include/esp32/rom/md5_hash.h rename to components/esp_rom/esp32/include/esp32/rom/md5_hash.h diff --git a/components/esp_rom/include/esp32/rom/rsa_pss.h b/components/esp_rom/esp32/include/esp32/rom/rsa_pss.h similarity index 100% rename from components/esp_rom/include/esp32/rom/rsa_pss.h rename to components/esp_rom/esp32/include/esp32/rom/rsa_pss.h diff --git a/components/esp_rom/include/esp32/rom/rtc.h b/components/esp_rom/esp32/include/esp32/rom/rtc.h similarity index 99% rename from components/esp_rom/include/esp32/rom/rtc.h rename to components/esp_rom/esp32/include/esp32/rom/rtc.h index 101b4bf56b..a39b2f267a 100644 --- a/components/esp_rom/include/esp32/rom/rtc.h +++ b/components/esp_rom/esp32/include/esp32/rom/rtc.h @@ -85,7 +85,7 @@ typedef enum { TGWDT_CPU_RESET = 11, /**<11, Time Group reset CPU*/ SW_CPU_RESET = 12, /**<12, Software reset CPU*/ RTCWDT_CPU_RESET = 13, /**<13, RTC Watch dog Reset CPU*/ - EXT_CPU_RESET = 14, /**<14, for APP CPU, reseted by PRO CPU*/ + EXT_CPU_RESET = 14, /**<14, for APP CPU, reset by PRO CPU*/ RTCWDT_BROWN_OUT_RESET = 15, /**<15, Reset when the vdd voltage is not stable*/ RTCWDT_RTC_RESET = 16 /**<16, RTC Watch dog reset digital core and rtc module*/ } RESET_REASON; diff --git a/components/esp_rom/include/esp32/rom/secure_boot.h b/components/esp_rom/esp32/include/esp32/rom/secure_boot.h similarity index 100% rename from components/esp_rom/include/esp32/rom/secure_boot.h rename to components/esp_rom/esp32/include/esp32/rom/secure_boot.h diff --git a/components/esp_rom/include/esp32/rom/sha.h b/components/esp_rom/esp32/include/esp32/rom/sha.h similarity index 62% rename from components/esp_rom/include/esp32/rom/sha.h rename to components/esp_rom/esp32/include/esp32/rom/sha.h index f43c19d16a..39d0578592 100644 --- a/components/esp_rom/include/esp32/rom/sha.h +++ b/components/esp_rom/esp32/include/esp32/rom/sha.h @@ -6,19 +6,11 @@ esp_sha_lock_memory_block() functions in esp32/sha.h to ensure exclusive access. */ -// 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 _ROM_SHA_H_ #define _ROM_SHA_H_ diff --git a/components/esp_rom/include/esp32/rom/spi_flash.h b/components/esp_rom/esp32/include/esp32/rom/spi_flash.h similarity index 100% rename from components/esp_rom/include/esp32/rom/spi_flash.h rename to components/esp_rom/esp32/include/esp32/rom/spi_flash.h diff --git a/components/esp_rom/esp32/include/esp32/rom/tbconsole.h b/components/esp_rom/esp32/include/esp32/rom/tbconsole.h new file mode 100644 index 0000000000..cece0a83a4 --- /dev/null +++ b/components/esp_rom/esp32/include/esp32/rom/tbconsole.h @@ -0,0 +1,19 @@ +/* + * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ +#ifndef _ROM_TBCONSOLE_H_ +#define _ROM_TBCONSOLE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +void start_tb_console(void); + +#ifdef __cplusplus +} +#endif + +#endif /* _ROM_TBCONSOLE_H_ */ diff --git a/components/esp_rom/include/esp32/rom/tjpgd.h b/components/esp_rom/esp32/include/esp32/rom/tjpgd.h similarity index 94% rename from components/esp_rom/include/esp32/rom/tjpgd.h rename to components/esp_rom/esp32/include/esp32/rom/tjpgd.h index 3c110a1302..0a44ebe2fb 100644 --- a/components/esp_rom/include/esp32/rom/tjpgd.h +++ b/components/esp_rom/esp32/include/esp32/rom/tjpgd.h @@ -71,7 +71,7 @@ struct JDEC { BYTE msx, msy; /* MCU size in unit of block (width, height) */ BYTE qtid[3]; /* Quantization table ID of each component */ SHORT dcv[3]; /* Previous DC element of each component */ - WORD nrst; /* Restart inverval */ + WORD nrst; /* Restart interval */ UINT width, height; /* Size of the input image (pixel) */ BYTE* huffbits[2][2]; /* Huffman bit distribution tables [id][dcac] */ WORD* huffcode[2][2]; /* Huffman code word tables [id][dcac] */ @@ -80,9 +80,9 @@ struct JDEC { void* workbuf; /* Working buffer for IDCT and RGB output */ BYTE* mcubuf; /* Working buffer for the MCU */ void* pool; /* Pointer to available memory pool */ - UINT sz_pool; /* Size of momory pool (bytes available) */ + UINT sz_pool; /* Size of memory pool (bytes available) */ UINT (*infunc)(JDEC*, BYTE*, UINT);/* Pointer to jpeg stream input function */ - void* device; /* Pointer to I/O device identifiler for the session */ + void* device; /* Pointer to I/O device identifier for the session */ }; diff --git a/components/esp_rom/include/esp32/rom/uart.h b/components/esp_rom/esp32/include/esp32/rom/uart.h similarity index 100% rename from components/esp_rom/include/esp32/rom/uart.h rename to components/esp_rom/esp32/include/esp32/rom/uart.h diff --git a/components/esp_rom/include/esp32c2/rom/apb_backup_dma.h b/components/esp_rom/esp32c2/include/esp32c2/rom/apb_backup_dma.h similarity index 100% rename from components/esp_rom/include/esp32c2/rom/apb_backup_dma.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/apb_backup_dma.h diff --git a/components/esp_rom/include/esp32c2/rom/cache.h b/components/esp_rom/esp32c2/include/esp32c2/rom/cache.h similarity index 99% rename from components/esp_rom/include/esp32c2/rom/cache.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/cache.h index 51e38469be..39d6bbf9f7 100644 --- a/components/esp_rom/include/esp32c2/rom/cache.h +++ b/components/esp_rom/esp32c2/include/esp32c2/rom/cache.h @@ -445,7 +445,7 @@ void Cache_Travel_Tag_Memory(struct cache_mode * mode, uint32_t filter_addr, voi * * @param struct cache_mode * mode : the cache to calculate the virtual address and the cache mode. * - * @param uint32_t tag : the tag part fo a tag item, 12-14 bits. + * @param uint32_t tag : the tag part of a tag item, 12-14 bits. * * @param uint32_t addr_offset : the virtual address offset of the cache ways. * diff --git a/components/esp_rom/include/esp32c2/rom/crc.h b/components/esp_rom/esp32c2/include/esp32c2/rom/crc.h similarity index 100% rename from components/esp_rom/include/esp32c2/rom/crc.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/crc.h diff --git a/components/esp_rom/include/esp32c2/rom/ecdsa.h b/components/esp_rom/esp32c2/include/esp32c2/rom/ecdsa.h similarity index 100% rename from components/esp_rom/include/esp32c2/rom/ecdsa.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/ecdsa.h diff --git a/components/esp_rom/include/esp32c2/rom/efuse.h b/components/esp_rom/esp32c2/include/esp32c2/rom/efuse.h similarity index 98% rename from components/esp_rom/include/esp32c2/rom/efuse.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/efuse.h index d4f5f8f390..bb838a6753 100644 --- a/components/esp_rom/include/esp32c2/rom/efuse.h +++ b/components/esp_rom/esp32c2/include/esp32c2/rom/efuse.h @@ -39,7 +39,7 @@ typedef enum { } ets_efuse_block_t; /** - * @brief set timing accroding the apb clock, so no read error or write error happens. + * @brief set timing according the apb clock, so no read error or write error happens. * * @param clock: apb clock in HZ, only accept 5M(in FPGA), 10M(in FPGA), 20M, 40M, 80M. * @@ -162,7 +162,7 @@ bool ets_efuse_download_modes_disabled(void); * - 0 for uart force print. * - 1 for uart print when GPIO8 is low when digital reset. * 2 for uart print when GPIO8 is high when digital reset. - * 3 for uart force slient + * 3 for uart force silent */ uint32_t ets_efuse_get_uart_print_control(void); diff --git a/components/esp_rom/include/esp32c2/rom/esp_flash.h b/components/esp_rom/esp32c2/include/esp32c2/rom/esp_flash.h similarity index 100% rename from components/esp_rom/include/esp32c2/rom/esp_flash.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/esp_flash.h diff --git a/components/esp_rom/include/esp32c2/rom/ets_sys.h b/components/esp_rom/esp32c2/include/esp32c2/rom/ets_sys.h similarity index 100% rename from components/esp_rom/include/esp32c2/rom/ets_sys.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/ets_sys.h diff --git a/components/esp_rom/include/esp32c2/rom/gpio.h b/components/esp_rom/esp32c2/include/esp32c2/rom/gpio.h similarity index 98% rename from components/esp_rom/include/esp32c2/rom/gpio.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/gpio.h index 1c4a803d14..6cd67cf964 100644 --- a/components/esp_rom/include/esp32c2/rom/gpio.h +++ b/components/esp_rom/esp32c2/include/esp32c2/rom/gpio.h @@ -57,7 +57,7 @@ typedef enum { * * @param uint32_t enable_mask : the gpios that need be changed. * - * @param uint32_t disable_mask : the gpios that need diable output. + * @param uint32_t disable_mask : the gpios that need disable output. * * @return None */ diff --git a/components/esp_rom/include/esp32c2/rom/libc_stubs.h b/components/esp_rom/esp32c2/include/esp32c2/rom/libc_stubs.h similarity index 100% rename from components/esp_rom/include/esp32c2/rom/libc_stubs.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/libc_stubs.h diff --git a/components/esp_rom/include/esp32c2/rom/lldesc.h b/components/esp_rom/esp32c2/include/esp32c2/rom/lldesc.h similarity index 100% rename from components/esp_rom/include/esp32c2/rom/lldesc.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/lldesc.h diff --git a/components/esp_rom/include/esp32c2/rom/rom_layout.h b/components/esp_rom/esp32c2/include/esp32c2/rom/rom_layout.h similarity index 100% rename from components/esp_rom/include/esp32c2/rom/rom_layout.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/rom_layout.h diff --git a/components/esp_rom/include/esp32c2/rom/rtc.h b/components/esp_rom/esp32c2/include/esp32c2/rom/rtc.h similarity index 100% rename from components/esp_rom/include/esp32c2/rom/rtc.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/rtc.h diff --git a/components/esp_rom/include/esp32c2/rom/secure_boot.h b/components/esp_rom/esp32c2/include/esp32c2/rom/secure_boot.h similarity index 100% rename from components/esp_rom/include/esp32c2/rom/secure_boot.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/secure_boot.h diff --git a/components/esp_rom/include/esp32c2/rom/sha.h b/components/esp_rom/esp32c2/include/esp32c2/rom/sha.h similarity index 100% rename from components/esp_rom/include/esp32c2/rom/sha.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/sha.h diff --git a/components/esp_rom/include/esp32c2/rom/spi_flash.h b/components/esp_rom/esp32c2/include/esp32c2/rom/spi_flash.h similarity index 99% rename from components/esp_rom/include/esp32c2/rom/spi_flash.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/spi_flash.h index 4c03ad36e2..f61a9e8d0b 100644 --- a/components/esp_rom/include/esp32c2/rom/spi_flash.h +++ b/components/esp_rom/esp32c2/include/esp32c2/rom/spi_flash.h @@ -434,7 +434,7 @@ void esp_rom_spiflash_fix_dummylen(uint8_t spi, uint8_t freqdiv); * * @param uint8_t *drvs: drvs[0]-bit[3:0] for cpiclk, bit[7:4] for spiq, drvs[1]-bit[3:0] for spid, drvs[1]-bit[7:4] for spid * drvs[2]-bit[3:0] for spihd, drvs[2]-bit[7:4] for spiwp. - * Values usually read from falsh by rom code, function usually callde by rom code. + * Values usually read from flash by rom code, function usually called by rom code. * if value with bit(3) set, the value is valid, bit[2:0] is the real value. * * @return None diff --git a/components/esp_rom/include/esp32c2/rom/uart.h b/components/esp_rom/esp32c2/include/esp32c2/rom/uart.h similarity index 98% rename from components/esp_rom/include/esp32c2/rom/uart.h rename to components/esp_rom/esp32c2/include/esp32c2/rom/uart.h index 454e0d83a1..818e291fd3 100644 --- a/components/esp_rom/include/esp32c2/rom/uart.h +++ b/components/esp_rom/esp32c2/include/esp32c2/rom/uart.h @@ -28,7 +28,7 @@ extern "C" { #define RX_BUFF_SIZE 0x400 #define TX_BUFF_SIZE 100 -//uart int enalbe register ctrl bits +//uart int enable register ctrl bits #define UART_RCV_INTEN BIT0 #define UART_TRX_INTEN BIT1 #define UART_LINE_STATUS_INTEN BIT2 @@ -263,7 +263,7 @@ char uart_rx_one_char_block(void); * * @param uint8_t *pString : the pointer to store the string. * - * @param uint8_t MaxStrlen : the max string length, incude '\0'. + * @param uint8_t MaxStrlen : the max string length, include '\0'. * * @return OK. */ diff --git a/components/esp_rom/include/esp32c3/rom/aes.h b/components/esp_rom/esp32c3/include/esp32c3/rom/aes.h similarity index 100% rename from components/esp_rom/include/esp32c3/rom/aes.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/aes.h diff --git a/components/esp_rom/include/esp32c3/rom/apb_backup_dma.h b/components/esp_rom/esp32c3/include/esp32c3/rom/apb_backup_dma.h similarity index 100% rename from components/esp_rom/include/esp32c3/rom/apb_backup_dma.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/apb_backup_dma.h diff --git a/components/esp_rom/include/esp32c3/rom/bigint.h b/components/esp_rom/esp32c3/include/esp32c3/rom/bigint.h similarity index 54% rename from components/esp_rom/include/esp32c3/rom/bigint.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/bigint.h index b63172ea7f..fbcfd46d81 100644 --- a/components/esp_rom/include/esp32c3/rom/bigint.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/bigint.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 + */ #ifndef _ROM_BIGINT_H_ #define _ROM_BIGINT_H_ diff --git a/components/esp_rom/include/esp32c3/rom/cache.h b/components/esp_rom/esp32c3/include/esp32c3/rom/cache.h similarity index 99% rename from components/esp_rom/include/esp32c3/rom/cache.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/cache.h index 148f47427f..2711cc3764 100644 --- a/components/esp_rom/include/esp32c3/rom/cache.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/cache.h @@ -605,7 +605,7 @@ void Cache_Travel_Tag_Memory(struct cache_mode * mode, uint32_t filter_addr, voi * * @param struct cache_mode * mode : the cache to calculate the virtual address and the cache mode. * - * @param uint32_t tag : the tag part fo a tag item, 12-14 bits. + * @param uint32_t tag : the tag part of a tag item, 12-14 bits. * * @param uint32_t addr_offset : the virtual address offset of the cache ways. * diff --git a/components/esp_rom/include/esp32c3/rom/crc.h b/components/esp_rom/esp32c3/include/esp32c3/rom/crc.h similarity index 81% rename from components/esp_rom/include/esp32c3/rom/crc.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/crc.h index e683f4fd41..549db7158c 100644 --- a/components/esp_rom/include/esp32c3/rom/crc.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/crc.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 + */ #ifndef ROM_CRC_H #define ROM_CRC_H diff --git a/components/esp_rom/include/esp32c3/rom/digital_signature.h b/components/esp_rom/esp32c3/include/esp32c3/rom/digital_signature.h similarity index 89% rename from components/esp_rom/include/esp32c3/rom/digital_signature.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/digital_signature.h index 54c01681d4..0d8778101e 100644 --- a/components/esp_rom/include/esp32c3/rom/digital_signature.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/digital_signature.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/esp_rom/include/esp32c3/rom/efuse.h b/components/esp_rom/esp32c3/include/esp32c3/rom/efuse.h similarity index 99% rename from components/esp_rom/include/esp32c3/rom/efuse.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/efuse.h index 912af40d96..cf2767b7d5 100644 --- a/components/esp_rom/include/esp32c3/rom/efuse.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/efuse.h @@ -55,7 +55,7 @@ typedef enum { } ets_efuse_block_t; /** - * @brief set timing accroding the apb clock, so no read error or write error happens. + * @brief set timing according the apb clock, so no read error or write error happens. * * @param clock: apb clock in HZ, only accept 5M(in FPGA), 10M(in FPGA), 20M, 40M, 80M. * @@ -208,7 +208,7 @@ bool ets_efuse_legacy_spi_boot_mode_disabled(void); * - 0 for uart force print. * - 1 for uart print when GPIO8 is low when digital reset. * 2 for uart print when GPIO8 is high when digital reset. - * 3 for uart force slient + * 3 for uart force silent */ uint32_t ets_efuse_get_uart_print_control(void); diff --git a/components/esp_rom/include/esp32c3/rom/esp_flash.h b/components/esp_rom/esp32c3/include/esp32c3/rom/esp_flash.h similarity index 64% rename from components/esp_rom/include/esp32c3/rom/esp_flash.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/esp_flash.h index 40e5872c09..3b1c97b2e8 100644 --- a/components/esp_rom/include/esp32c3/rom/esp_flash.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/esp_flash.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/esp_rom/include/esp32c3/rom/ets_sys.h b/components/esp_rom/esp32c3/include/esp32c3/rom/ets_sys.h similarity index 97% rename from components/esp_rom/include/esp32c3/rom/ets_sys.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/ets_sys.h index 06b3b47d8c..96ade75932 100644 --- a/components/esp_rom/include/esp32c3/rom/ets_sys.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/ets_sys.h @@ -61,7 +61,7 @@ struct ETSEventTag { ETSParam par; /**< Event parameter, sometimes without usage, then will be set as 0*/ }; -typedef void (*ETSTask)(ETSEvent *e); /**< Type of the Task processer*/ +typedef void (*ETSTask)(ETSEvent *e); /**< Type of the Task processor*/ typedef void (* ets_idle_cb_t)(void *arg); /**< Type of the system idle callback*/ @@ -80,7 +80,7 @@ typedef void (* ets_idle_cb_t)(void *arg); /**< Type of the system idle callbac * @{ */ -extern const char *const exc_cause_table[40]; ///**< excption cause that defined by the core.*/ +extern const char *const exc_cause_table[40]; ///**< exception cause that defined by the core.*/ /** * @brief Set Pro cpu Entry code, code can be called in PRO CPU when booting is not completed. @@ -125,7 +125,7 @@ int ets_printf(const char *fmt, ...); uint8_t ets_get_printf_channel(void); /** - * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need ouput. + * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need output. * To install putc1, which is defaulted installed as ets_write_char_uart in none silent boot mode, as NULL in silent mode. * * @param void (*)(char) p: Output function to install. @@ -135,7 +135,7 @@ uint8_t ets_get_printf_channel(void); void ets_install_putc1(void (*p)(char c)); /** - * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need ouput. + * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need output. * To install putc2, which is defaulted installed as NULL. * * @param void (*)(char) p: Output function to install. @@ -178,7 +178,7 @@ typedef void ETSTimerFunc(void *timer_arg);/**< timer handler*/ typedef struct _ETSTIMER_ { struct _ETSTIMER_ *timer_next; /**< timer linker*/ - uint32_t timer_expire; /**< abstruct time when timer expire*/ + uint32_t timer_expire; /**< abstract time when timer expire*/ uint32_t timer_period; /**< timer period, 0 means timer is not periodic repeated*/ ETSTimerFunc *timer_func; /**< timer handler*/ void *timer_arg; /**< timer handler argument*/ diff --git a/components/esp_rom/include/esp32c3/rom/gpio.h b/components/esp_rom/esp32c3/include/esp32c3/rom/gpio.h similarity index 98% rename from components/esp_rom/include/esp32c3/rom/gpio.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/gpio.h index 39c2564f3b..8bbb1ce8eb 100644 --- a/components/esp_rom/include/esp32c3/rom/gpio.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/gpio.h @@ -57,7 +57,7 @@ typedef enum { * * @param uint32_t enable_mask : the gpios that need be changed. * - * @param uint32_t disable_mask : the gpios that need diable output. + * @param uint32_t disable_mask : the gpios that need disable output. * * @return None */ diff --git a/components/esp_rom/include/esp32s2/rom/hmac.h b/components/esp_rom/esp32c3/include/esp32c3/rom/hmac.h similarity index 71% rename from components/esp_rom/include/esp32s2/rom/hmac.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/hmac.h index f5f82d5b23..7ec5dfc3c2 100644 --- a/components/esp_rom/include/esp32s2/rom/hmac.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/hmac.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: 2020-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifndef _ROM_HMAC_H_ #define _ROM_HMAC_H_ diff --git a/components/esp_rom/include/esp32c3/rom/libc_stubs.h b/components/esp_rom/esp32c3/include/esp32c3/rom/libc_stubs.h similarity index 100% rename from components/esp_rom/include/esp32c3/rom/libc_stubs.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/libc_stubs.h diff --git a/components/esp_rom/include/esp32c3/rom/lldesc.h b/components/esp_rom/esp32c3/include/esp32c3/rom/lldesc.h similarity index 100% rename from components/esp_rom/include/esp32c3/rom/lldesc.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/lldesc.h diff --git a/components/esp_rom/include/esp32c3/rom/md5_hash.h b/components/esp_rom/esp32c3/include/esp32c3/rom/md5_hash.h similarity index 100% rename from components/esp_rom/include/esp32c3/rom/md5_hash.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/md5_hash.h diff --git a/components/esp_rom/include/esp32c3/rom/rom_layout.h b/components/esp_rom/esp32c3/include/esp32c3/rom/rom_layout.h similarity index 100% rename from components/esp_rom/include/esp32c3/rom/rom_layout.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/rom_layout.h diff --git a/components/esp_rom/include/esp32c3/rom/rsa_pss.h b/components/esp_rom/esp32c3/include/esp32c3/rom/rsa_pss.h similarity index 54% rename from components/esp_rom/include/esp32c3/rom/rsa_pss.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/rsa_pss.h index 4a838071e7..90bf9de64f 100644 --- a/components/esp_rom/include/esp32c3/rom/rsa_pss.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/rsa_pss.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 + */ #ifndef _ROM_RSA_PSS_H_ #define _ROM_RSA_PSS_H_ diff --git a/components/esp_rom/include/esp32c3/rom/rtc.h b/components/esp_rom/esp32c3/include/esp32c3/rom/rtc.h similarity index 100% rename from components/esp_rom/include/esp32c3/rom/rtc.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/rtc.h diff --git a/components/esp_rom/include/esp32c3/rom/secure_boot.h b/components/esp_rom/esp32c3/include/esp32c3/rom/secure_boot.h similarity index 100% rename from components/esp_rom/include/esp32c3/rom/secure_boot.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/secure_boot.h diff --git a/components/esp_rom/include/esp32c3/rom/sha.h b/components/esp_rom/esp32c3/include/esp32c3/rom/sha.h similarity index 65% rename from components/esp_rom/include/esp32c3/rom/sha.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/sha.h index 54b1b21676..1ed5555e84 100644 --- a/components/esp_rom/include/esp32c3/rom/sha.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/sha.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 + */ #ifndef _ROM_SHA_H_ #define _ROM_SHA_H_ diff --git a/components/esp_rom/include/esp32c3/rom/spi_flash.h b/components/esp_rom/esp32c3/include/esp32c3/rom/spi_flash.h similarity index 99% rename from components/esp_rom/include/esp32c3/rom/spi_flash.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/spi_flash.h index 5862ee724b..1fe10d3395 100644 --- a/components/esp_rom/include/esp32c3/rom/spi_flash.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/spi_flash.h @@ -428,7 +428,7 @@ void esp_rom_spiflash_fix_dummylen(uint8_t spi, uint8_t freqdiv); * * @param uint8_t *drvs: drvs[0]-bit[3:0] for cpiclk, bit[7:4] for spiq, drvs[1]-bit[3:0] for spid, drvs[1]-bit[7:4] for spid * drvs[2]-bit[3:0] for spihd, drvs[2]-bit[7:4] for spiwp. - * Values usually read from falsh by rom code, function usually callde by rom code. + * Values usually read from flash by rom code, function usually called by rom code. * if value with bit(3) set, the value is valid, bit[2:0] is the real value. * * @return None diff --git a/components/esp_rom/include/esp32c3/rom/tjpgd.h b/components/esp_rom/esp32c3/include/esp32c3/rom/tjpgd.h similarity index 94% rename from components/esp_rom/include/esp32c3/rom/tjpgd.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/tjpgd.h index 80d346a1cb..56e17c62ac 100644 --- a/components/esp_rom/include/esp32c3/rom/tjpgd.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/tjpgd.h @@ -71,7 +71,7 @@ struct JDEC { BYTE msx, msy; /* MCU size in unit of block (width, height) */ BYTE qtid[3]; /* Quantization table ID of each component */ SHORT dcv[3]; /* Previous DC element of each component */ - WORD nrst; /* Restart inverval */ + WORD nrst; /* Restart interval */ UINT width, height; /* Size of the input image (pixel) */ BYTE *huffbits[2][2]; /* Huffman bit distribution tables [id][dcac] */ WORD *huffcode[2][2]; /* Huffman code word tables [id][dcac] */ @@ -80,9 +80,9 @@ struct JDEC { void *workbuf; /* Working buffer for IDCT and RGB output */ BYTE *mcubuf; /* Working buffer for the MCU */ void *pool; /* Pointer to available memory pool */ - UINT sz_pool; /* Size of momory pool (bytes available) */ + UINT sz_pool; /* Size of memory pool (bytes available) */ UINT (*infunc)(JDEC *, BYTE *, UINT); /* Pointer to jpeg stream input function */ - void *device; /* Pointer to I/O device identifiler for the session */ + void *device; /* Pointer to I/O device identifier for the session */ }; diff --git a/components/esp_rom/include/esp32c3/rom/uart.h b/components/esp_rom/esp32c3/include/esp32c3/rom/uart.h similarity index 98% rename from components/esp_rom/include/esp32c3/rom/uart.h rename to components/esp_rom/esp32c3/include/esp32c3/rom/uart.h index a4fbd52077..fcbe425fc1 100644 --- a/components/esp_rom/include/esp32c3/rom/uart.h +++ b/components/esp_rom/esp32c3/include/esp32c3/rom/uart.h @@ -28,7 +28,7 @@ extern "C" { #define RX_BUFF_SIZE 0x400 #define TX_BUFF_SIZE 100 -//uart int enalbe register ctrl bits +//uart int enable register ctrl bits #define UART_RCV_INTEN BIT0 #define UART_TRX_INTEN BIT1 #define UART_LINE_STATUS_INTEN BIT2 @@ -253,7 +253,7 @@ char uart_rx_one_char_block(void); * * @param uint8_t *pString : the pointer to store the string. * - * @param uint8_t MaxStrlen : the max string length, incude '\0'. + * @param uint8_t MaxStrlen : the max string length, include '\0'. * * @return OK. */ diff --git a/components/esp_rom/include/esp32c5/rom/aes.h b/components/esp_rom/esp32c5/include/esp32c5/rom/aes.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/aes.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/aes.h diff --git a/components/esp_rom/include/esp32c5/rom/bigint.h b/components/esp_rom/esp32c5/include/esp32c5/rom/bigint.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/bigint.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/bigint.h diff --git a/components/esp_rom/include/esp32c5/rom/cache.h b/components/esp_rom/esp32c5/include/esp32c5/rom/cache.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/cache.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/cache.h diff --git a/components/esp_rom/include/esp32c5/rom/crc.h b/components/esp_rom/esp32c5/include/esp32c5/rom/crc.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/crc.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/crc.h diff --git a/components/esp_rom/include/esp32c5/rom/digital_signature.h b/components/esp_rom/esp32c5/include/esp32c5/rom/digital_signature.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/digital_signature.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/digital_signature.h diff --git a/components/esp_rom/include/esp32c5/rom/ecdsa.h b/components/esp_rom/esp32c5/include/esp32c5/rom/ecdsa.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/ecdsa.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/ecdsa.h diff --git a/components/esp_rom/include/esp32c5/rom/efuse.h b/components/esp_rom/esp32c5/include/esp32c5/rom/efuse.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/efuse.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/efuse.h diff --git a/components/esp_rom/include/esp32c5/rom/esp_flash.h b/components/esp_rom/esp32c5/include/esp32c5/rom/esp_flash.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/esp_flash.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/esp_flash.h diff --git a/components/esp_rom/include/esp32c5/rom/ets_sys.h b/components/esp_rom/esp32c5/include/esp32c5/rom/ets_sys.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/ets_sys.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/ets_sys.h diff --git a/components/esp_rom/include/esp32c5/rom/gpio.h b/components/esp_rom/esp32c5/include/esp32c5/rom/gpio.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/gpio.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/gpio.h diff --git a/components/esp_rom/include/esp32c5/rom/hmac.h b/components/esp_rom/esp32c5/include/esp32c5/rom/hmac.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/hmac.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/hmac.h diff --git a/components/esp_rom/include/esp32c5/rom/libc_stubs.h b/components/esp_rom/esp32c5/include/esp32c5/rom/libc_stubs.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/libc_stubs.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/libc_stubs.h diff --git a/components/esp_rom/include/esp32c5/rom/lldesc.h b/components/esp_rom/esp32c5/include/esp32c5/rom/lldesc.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/lldesc.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/lldesc.h diff --git a/components/esp_rom/include/esp32c5/rom/md5_hash.h b/components/esp_rom/esp32c5/include/esp32c5/rom/md5_hash.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/md5_hash.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/md5_hash.h diff --git a/components/esp_rom/include/esp32c5/rom/opi_flash.h b/components/esp_rom/esp32c5/include/esp32c5/rom/opi_flash.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/opi_flash.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/opi_flash.h diff --git a/components/esp_rom/include/esp32c5/rom/rom_layout.h b/components/esp_rom/esp32c5/include/esp32c5/rom/rom_layout.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/rom_layout.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/rom_layout.h diff --git a/components/esp_rom/include/esp32c5/rom/rsa_pss.h b/components/esp_rom/esp32c5/include/esp32c5/rom/rsa_pss.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/rsa_pss.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/rsa_pss.h diff --git a/components/esp_rom/include/esp32c5/rom/rtc.h b/components/esp_rom/esp32c5/include/esp32c5/rom/rtc.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/rtc.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/rtc.h diff --git a/components/esp_rom/include/esp32c5/rom/secure_boot.h b/components/esp_rom/esp32c5/include/esp32c5/rom/secure_boot.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/secure_boot.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/secure_boot.h diff --git a/components/esp_rom/include/esp32c5/rom/sha.h b/components/esp_rom/esp32c5/include/esp32c5/rom/sha.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/sha.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/sha.h diff --git a/components/esp_rom/include/esp32c5/rom/spi_flash.h b/components/esp_rom/esp32c5/include/esp32c5/rom/spi_flash.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/spi_flash.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/spi_flash.h diff --git a/components/esp_rom/include/esp32c5/rom/tjpgd.h b/components/esp_rom/esp32c5/include/esp32c5/rom/tjpgd.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/tjpgd.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/tjpgd.h diff --git a/components/esp_rom/include/esp32c5/rom/uart.h b/components/esp_rom/esp32c5/include/esp32c5/rom/uart.h similarity index 100% rename from components/esp_rom/include/esp32c5/rom/uart.h rename to components/esp_rom/esp32c5/include/esp32c5/rom/uart.h diff --git a/components/esp_rom/include/esp32c6/rom/aes.h b/components/esp_rom/esp32c6/include/esp32c6/rom/aes.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/aes.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/aes.h diff --git a/components/esp_rom/include/esp32c6/rom/bigint.h b/components/esp_rom/esp32c6/include/esp32c6/rom/bigint.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/bigint.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/bigint.h diff --git a/components/esp_rom/include/esp32c6/rom/cache.h b/components/esp_rom/esp32c6/include/esp32c6/rom/cache.h similarity index 99% rename from components/esp_rom/include/esp32c6/rom/cache.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/cache.h index dfa657e865..7e0eaa67e7 100644 --- a/components/esp_rom/include/esp32c6/rom/cache.h +++ b/components/esp_rom/esp32c6/include/esp32c6/rom/cache.h @@ -561,7 +561,7 @@ void Cache_Travel_Tag_Memory(struct cache_mode * mode, uint32_t filter_addr, voi * * @param struct cache_mode * mode : the cache to calculate the virtual address and the cache mode. * - * @param uint32_t tag : the tag part fo a tag item, 12-14 bits. + * @param uint32_t tag : the tag part of a tag item, 12-14 bits. * * @param uint32_t addr_offset : the virtual address offset of the cache ways. * diff --git a/components/esp_rom/include/esp32c6/rom/crc.h b/components/esp_rom/esp32c6/include/esp32c6/rom/crc.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/crc.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/crc.h diff --git a/components/esp_rom/include/esp32c6/rom/digital_signature.h b/components/esp_rom/esp32c6/include/esp32c6/rom/digital_signature.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/digital_signature.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/digital_signature.h diff --git a/components/esp_rom/include/esp32c6/rom/ecdsa.h b/components/esp_rom/esp32c6/include/esp32c6/rom/ecdsa.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/ecdsa.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/ecdsa.h diff --git a/components/esp_rom/include/esp32c6/rom/efuse.h b/components/esp_rom/esp32c6/include/esp32c6/rom/efuse.h similarity index 99% rename from components/esp_rom/include/esp32c6/rom/efuse.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/efuse.h index 6cd9f4b377..5854c3eb8a 100644 --- a/components/esp_rom/include/esp32c6/rom/efuse.h +++ b/components/esp_rom/esp32c6/include/esp32c6/rom/efuse.h @@ -169,7 +169,7 @@ bool ets_efuse_download_modes_disabled(void); * - 0 for uart force print. * - 1 for uart print when GPIO8 is low when digital reset. * 2 for uart print when GPIO8 is high when digital reset. - * 3 for uart force slient + * 3 for uart force silent */ uint32_t ets_efuse_get_uart_print_control(void); diff --git a/components/esp_rom/include/esp32c6/rom/esp_flash.h b/components/esp_rom/esp32c6/include/esp32c6/rom/esp_flash.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/esp_flash.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/esp_flash.h diff --git a/components/esp_rom/include/esp32c6/rom/ets_sys.h b/components/esp_rom/esp32c6/include/esp32c6/rom/ets_sys.h similarity index 97% rename from components/esp_rom/include/esp32c6/rom/ets_sys.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/ets_sys.h index 7c04af3a54..d4b0989650 100644 --- a/components/esp_rom/include/esp32c6/rom/ets_sys.h +++ b/components/esp_rom/esp32c6/include/esp32c6/rom/ets_sys.h @@ -61,7 +61,7 @@ struct ETSEventTag { ETSParam par; /**< Event parameter, sometimes without usage, then will be set as 0*/ }; -typedef void (*ETSTask)(ETSEvent *e); /**< Type of the Task processer*/ +typedef void (*ETSTask)(ETSEvent *e); /**< Type of the Task processor*/ typedef void (* ets_idle_cb_t)(void *arg); /**< Type of the system idle callback*/ @@ -80,7 +80,7 @@ typedef void (* ets_idle_cb_t)(void *arg); /**< Type of the system idle callbac * @{ */ -extern const char *const exc_cause_table[40]; ///**< excption cause that defined by the core.*/ +extern const char *const exc_cause_table[40]; ///**< exception cause that defined by the core.*/ /** * @brief Set Pro cpu Entry code, code can be called in PRO CPU when booting is not completed. @@ -135,7 +135,7 @@ uint8_t ets_get_printf_channel(void); void ets_write_char_uart(char c); /** - * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need ouput. + * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need output. * To install putc1, which is defaulted installed as ets_write_char_uart in none silent boot mode, as NULL in silent mode. * * @param void (*)(char) p: Output function to install. @@ -145,7 +145,7 @@ void ets_write_char_uart(char c); void ets_install_putc1(void (*p)(char c)); /** - * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need ouput. + * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need output. * To install putc2, which is defaulted installed as NULL. * * @param void (*)(char) p: Output function to install. @@ -188,7 +188,7 @@ typedef void ETSTimerFunc(void *timer_arg);/**< timer handler*/ typedef struct _ETSTIMER_ { struct _ETSTIMER_ *timer_next; /**< timer linker*/ - uint32_t timer_expire; /**< abstruct time when timer expire*/ + uint32_t timer_expire; /**< abstract time when timer expire*/ uint32_t timer_period; /**< timer period, 0 means timer is not periodic repeated*/ ETSTimerFunc *timer_func; /**< timer handler*/ void *timer_arg; /**< timer handler argument*/ diff --git a/components/esp_rom/include/esp32c6/rom/gpio.h b/components/esp_rom/esp32c6/include/esp32c6/rom/gpio.h similarity index 98% rename from components/esp_rom/include/esp32c6/rom/gpio.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/gpio.h index b022c438ba..6ac6dc21da 100644 --- a/components/esp_rom/include/esp32c6/rom/gpio.h +++ b/components/esp_rom/esp32c6/include/esp32c6/rom/gpio.h @@ -57,7 +57,7 @@ typedef enum { * * @param uint32_t enable_mask : the gpios that need be changed. * - * @param uint32_t disable_mask : the gpios that need diable output. + * @param uint32_t disable_mask : the gpios that need disable output. * * @return None */ diff --git a/components/esp_rom/include/esp32c6/rom/hmac.h b/components/esp_rom/esp32c6/include/esp32c6/rom/hmac.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/hmac.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/hmac.h diff --git a/components/esp_rom/include/esp32c6/rom/libc_stubs.h b/components/esp_rom/esp32c6/include/esp32c6/rom/libc_stubs.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/libc_stubs.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/libc_stubs.h diff --git a/components/esp_rom/include/esp32c6/rom/lldesc.h b/components/esp_rom/esp32c6/include/esp32c6/rom/lldesc.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/lldesc.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/lldesc.h diff --git a/components/esp_rom/include/esp32c6/rom/md5_hash.h b/components/esp_rom/esp32c6/include/esp32c6/rom/md5_hash.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/md5_hash.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/md5_hash.h diff --git a/components/esp_rom/include/esp32c6/rom/rom_layout.h b/components/esp_rom/esp32c6/include/esp32c6/rom/rom_layout.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/rom_layout.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/rom_layout.h diff --git a/components/esp_rom/include/esp32c6/rom/rsa_pss.h b/components/esp_rom/esp32c6/include/esp32c6/rom/rsa_pss.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/rsa_pss.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/rsa_pss.h diff --git a/components/esp_rom/include/esp32c6/rom/rtc.h b/components/esp_rom/esp32c6/include/esp32c6/rom/rtc.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/rtc.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/rtc.h diff --git a/components/esp_rom/include/esp32c6/rom/secure_boot.h b/components/esp_rom/esp32c6/include/esp32c6/rom/secure_boot.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/secure_boot.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/secure_boot.h diff --git a/components/esp_rom/include/esp32c6/rom/sha.h b/components/esp_rom/esp32c6/include/esp32c6/rom/sha.h similarity index 100% rename from components/esp_rom/include/esp32c6/rom/sha.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/sha.h diff --git a/components/esp_rom/include/esp32h2/rom/spi_flash.h b/components/esp_rom/esp32c6/include/esp32c6/rom/spi_flash.h similarity index 99% rename from components/esp_rom/include/esp32h2/rom/spi_flash.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/spi_flash.h index 2d782dee4f..70816780e6 100644 --- a/components/esp_rom/include/esp32h2/rom/spi_flash.h +++ b/components/esp_rom/esp32c6/include/esp32c6/rom/spi_flash.h @@ -421,7 +421,7 @@ void esp_rom_spiflash_fix_dummylen(uint8_t spi, uint8_t freqdiv); * * @param uint8_t *drvs: drvs[0]-bit[3:0] for cpiclk, bit[7:4] for spiq, drvs[1]-bit[3:0] for spid, drvs[1]-bit[7:4] for spid * drvs[2]-bit[3:0] for spihd, drvs[2]-bit[7:4] for spiwp. - * Values usually read from falsh by rom code, function usually callde by rom code. + * Values usually read from flash by rom code, function usually called by rom code. * if value with bit(3) set, the value is valid, bit[2:0] is the real value. * * @return None diff --git a/components/esp_rom/include/esp32c6/rom/tjpgd.h b/components/esp_rom/esp32c6/include/esp32c6/rom/tjpgd.h similarity index 94% rename from components/esp_rom/include/esp32c6/rom/tjpgd.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/tjpgd.h index 3050f865c9..6a4d645b11 100644 --- a/components/esp_rom/include/esp32c6/rom/tjpgd.h +++ b/components/esp_rom/esp32c6/include/esp32c6/rom/tjpgd.h @@ -76,7 +76,7 @@ struct JDEC { BYTE msx, msy; /* MCU size in unit of block (width, height) */ BYTE qtid[3]; /* Quantization table ID of each component */ SHORT dcv[3]; /* Previous DC element of each component */ - WORD nrst; /* Restart inverval */ + WORD nrst; /* Restart interval */ UINT width, height; /* Size of the input image (pixel) */ BYTE *huffbits[2][2]; /* Huffman bit distribution tables [id][dcac] */ WORD *huffcode[2][2]; /* Huffman code word tables [id][dcac] */ @@ -85,9 +85,9 @@ struct JDEC { void *workbuf; /* Working buffer for IDCT and RGB output */ BYTE *mcubuf; /* Working buffer for the MCU */ void *pool; /* Pointer to available memory pool */ - UINT sz_pool; /* Size of momory pool (bytes available) */ + UINT sz_pool; /* Size of memory pool (bytes available) */ UINT (*infunc)(JDEC *, BYTE *, UINT); /* Pointer to jpeg stream input function */ - void *device; /* Pointer to I/O device identifiler for the session */ + void *device; /* Pointer to I/O device identifier for the session */ }; diff --git a/components/esp_rom/include/esp32c6/rom/uart.h b/components/esp_rom/esp32c6/include/esp32c6/rom/uart.h similarity index 97% rename from components/esp_rom/include/esp32c6/rom/uart.h rename to components/esp_rom/esp32c6/include/esp32c6/rom/uart.h index 9045c42f6f..c21c091440 100644 --- a/components/esp_rom/include/esp32c6/rom/uart.h +++ b/components/esp_rom/esp32c6/include/esp32c6/rom/uart.h @@ -28,7 +28,7 @@ extern "C" { #define RX_BUFF_SIZE 0x400 #define TX_BUFF_SIZE 100 -//uart int enalbe register ctrl bits +//uart int enable register ctrl bits #define UART_RCV_INTEN BIT0 #define UART_TRX_INTEN BIT1 #define UART_LINE_STATUS_INTEN BIT2 @@ -263,14 +263,14 @@ char uart_rx_one_char_block(void); * * @param uint8_t *pString : the pointer to store the string. * - * @param uint8_t MaxStrlen : the max string length, incude '\0'. + * @param uint8_t MaxStrlen : the max string length, include '\0'. * * @return OK. */ ETS_STATUS UartRxString(uint8_t *pString, uint8_t MaxStrlen); /** - * @brief Process uart recevied information in the interrupt handler. + * @brief Process uart received information in the interrupt handler. * Please do not call this function in SDK. * * @param void *para : the message receive buffer. diff --git a/components/esp_rom/include/esp32c61/rom/bigint.h b/components/esp_rom/esp32c61/include/esp32c61/rom/bigint.h similarity index 100% rename from components/esp_rom/include/esp32c61/rom/bigint.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/bigint.h diff --git a/components/esp_rom/include/esp32c61/rom/cache.h b/components/esp_rom/esp32c61/include/esp32c61/rom/cache.h similarity index 100% rename from components/esp_rom/include/esp32c61/rom/cache.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/cache.h diff --git a/components/esp_rom/include/esp32c61/rom/crc.h b/components/esp_rom/esp32c61/include/esp32c61/rom/crc.h similarity index 100% rename from components/esp_rom/include/esp32c61/rom/crc.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/crc.h diff --git a/components/esp_rom/include/esp32c61/rom/ecdsa.h b/components/esp_rom/esp32c61/include/esp32c61/rom/ecdsa.h similarity index 100% rename from components/esp_rom/include/esp32c61/rom/ecdsa.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/ecdsa.h diff --git a/components/esp_rom/include/esp32c61/rom/efuse.h b/components/esp_rom/esp32c61/include/esp32c61/rom/efuse.h similarity index 99% rename from components/esp_rom/include/esp32c61/rom/efuse.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/efuse.h index 2c95712579..be4bdf9c79 100644 --- a/components/esp_rom/include/esp32c61/rom/efuse.h +++ b/components/esp_rom/esp32c61/include/esp32c61/rom/efuse.h @@ -169,7 +169,7 @@ bool ets_efuse_download_modes_disabled(void); * - 0 for uart force print. * - 1 for uart print when GPIO8 is low when digital reset. * 2 for uart print when GPIO8 is high when digital reset. - * 3 for uart force slient + * 3 for uart force silent */ uint32_t ets_efuse_get_uart_print_control(void); diff --git a/components/esp_rom/include/esp32c61/rom/esp_flash.h b/components/esp_rom/esp32c61/include/esp32c61/rom/esp_flash.h similarity index 100% rename from components/esp_rom/include/esp32c61/rom/esp_flash.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/esp_flash.h diff --git a/components/esp_rom/include/esp32c61/rom/ets_sys.h b/components/esp_rom/esp32c61/include/esp32c61/rom/ets_sys.h similarity index 97% rename from components/esp_rom/include/esp32c61/rom/ets_sys.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/ets_sys.h index 516a694fcd..7160a95d80 100644 --- a/components/esp_rom/include/esp32c61/rom/ets_sys.h +++ b/components/esp_rom/esp32c61/include/esp32c61/rom/ets_sys.h @@ -61,7 +61,7 @@ struct ETSEventTag { ETSParam par; /**< Event parameter, sometimes without usage, then will be set as 0*/ }; -typedef void (*ETSTask)(ETSEvent *e); /**< Type of the Task processer*/ +typedef void (*ETSTask)(ETSEvent *e); /**< Type of the Task processor*/ typedef void (* ets_idle_cb_t)(void *arg); /**< Type of the system idle callback*/ @@ -80,7 +80,7 @@ typedef void (* ets_idle_cb_t)(void *arg); /**< Type of the system idle callbac * @{ */ -extern const char *const exc_cause_table[40]; ///**< excption cause that defined by the core.*/ +extern const char *const exc_cause_table[40]; ///**< exception cause that defined by the core.*/ /** * @brief Set Pro cpu Entry code, code can be called in PRO CPU when booting is not completed. @@ -135,7 +135,7 @@ uint8_t ets_get_printf_channel(void); void ets_write_char_uart(char c); /** - * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need ouput. + * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need output. * To install putc1, which is defaulted installed as ets_write_char_uart in none silent boot mode, as NULL in silent mode. * * @param void (*)(char) p: Output function to install. @@ -145,7 +145,7 @@ void ets_write_char_uart(char c); void ets_install_putc1(void (*p)(char c)); /** - * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need ouput. + * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need output. * To install putc2, which is defaulted installed as NULL. * * @param void (*)(char) p: Output function to install. @@ -188,7 +188,7 @@ typedef void ETSTimerFunc(void *timer_arg);/**< timer handler*/ typedef struct _ETSTIMER_ { struct _ETSTIMER_ *timer_next; /**< timer linker*/ - uint32_t timer_expire; /**< abstruct time when timer expire*/ + uint32_t timer_expire; /**< abstract time when timer expire*/ uint32_t timer_period; /**< timer period, 0 means timer is not periodic repeated*/ ETSTimerFunc *timer_func; /**< timer handler*/ void *timer_arg; /**< timer handler argument*/ diff --git a/components/esp_rom/include/esp32c61/rom/gpio.h b/components/esp_rom/esp32c61/include/esp32c61/rom/gpio.h similarity index 100% rename from components/esp_rom/include/esp32c61/rom/gpio.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/gpio.h diff --git a/components/esp_rom/include/esp32c61/rom/libc_stubs.h b/components/esp_rom/esp32c61/include/esp32c61/rom/libc_stubs.h similarity index 100% rename from components/esp_rom/include/esp32c61/rom/libc_stubs.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/libc_stubs.h diff --git a/components/esp_rom/include/esp32c61/rom/lldesc.h b/components/esp_rom/esp32c61/include/esp32c61/rom/lldesc.h similarity index 100% rename from components/esp_rom/include/esp32c61/rom/lldesc.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/lldesc.h diff --git a/components/esp_rom/include/esp32c61/rom/md5_hash.h b/components/esp_rom/esp32c61/include/esp32c61/rom/md5_hash.h similarity index 100% rename from components/esp_rom/include/esp32c61/rom/md5_hash.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/md5_hash.h diff --git a/components/esp_rom/include/esp32c61/rom/opi_flash.h b/components/esp_rom/esp32c61/include/esp32c61/rom/opi_flash.h similarity index 98% rename from components/esp_rom/include/esp32c61/rom/opi_flash.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/opi_flash.h index e3412d1962..8a5236801c 100644 --- a/components/esp_rom/include/esp32c61/rom/opi_flash.h +++ b/components/esp_rom/esp32c61/include/esp32c61/rom/opi_flash.h @@ -55,8 +55,8 @@ typedef struct { uint32_t addrBitLen; /*!< Address byte length*/ uint32_t *txData; /*!< Point to send data buffer*/ uint32_t txDataBitLen; /*!< Send data byte length.*/ - uint32_t *rxData; /*!< Point to recevie data buffer*/ - uint32_t rxDataBitLen; /*!< Recevie Data byte length.*/ + uint32_t *rxData; /*!< Point to receive data buffer*/ + uint32_t rxDataBitLen; /*!< Receive Data byte length.*/ uint32_t dummyBitLen; } esp_rom_spi_cmd_t; diff --git a/components/esp_rom/include/esp32c61/rom/rom_layout.h b/components/esp_rom/esp32c61/include/esp32c61/rom/rom_layout.h similarity index 100% rename from components/esp_rom/include/esp32c61/rom/rom_layout.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/rom_layout.h diff --git a/components/esp_rom/include/esp32c61/rom/rtc.h b/components/esp_rom/esp32c61/include/esp32c61/rom/rtc.h similarity index 100% rename from components/esp_rom/include/esp32c61/rom/rtc.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/rtc.h diff --git a/components/esp_rom/include/esp32c61/rom/secure_boot.h b/components/esp_rom/esp32c61/include/esp32c61/rom/secure_boot.h similarity index 100% rename from components/esp_rom/include/esp32c61/rom/secure_boot.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/secure_boot.h diff --git a/components/esp_rom/include/esp32c61/rom/sha.h b/components/esp_rom/esp32c61/include/esp32c61/rom/sha.h similarity index 100% rename from components/esp_rom/include/esp32c61/rom/sha.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/sha.h diff --git a/components/esp_rom/include/esp32c61/rom/spi_flash.h b/components/esp_rom/esp32c61/include/esp32c61/rom/spi_flash.h similarity index 99% rename from components/esp_rom/include/esp32c61/rom/spi_flash.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/spi_flash.h index b3bcc37409..0b6e0afb6d 100644 --- a/components/esp_rom/include/esp32c61/rom/spi_flash.h +++ b/components/esp_rom/esp32c61/include/esp32c61/rom/spi_flash.h @@ -421,7 +421,7 @@ void esp_rom_spiflash_fix_dummylen(uint8_t spi, uint8_t freqdiv); * * @param uint8_t *drvs: drvs[0]-bit[3:0] for cpiclk, bit[7:4] for spiq, drvs[1]-bit[3:0] for spid, drvs[1]-bit[7:4] for spid * drvs[2]-bit[3:0] for spihd, drvs[2]-bit[7:4] for spiwp. - * Values usually read from falsh by rom code, function usually callde by rom code. + * Values usually read from flash by rom code, function usually called by rom code. * if value with bit(3) set, the value is valid, bit[2:0] is the real value. * * @return None diff --git a/components/esp_rom/include/esp32c61/rom/tjpgd.h b/components/esp_rom/esp32c61/include/esp32c61/rom/tjpgd.h similarity index 94% rename from components/esp_rom/include/esp32c61/rom/tjpgd.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/tjpgd.h index b993c2f532..b494e70bbe 100644 --- a/components/esp_rom/include/esp32c61/rom/tjpgd.h +++ b/components/esp_rom/esp32c61/include/esp32c61/rom/tjpgd.h @@ -76,7 +76,7 @@ struct JDEC { BYTE msx, msy; /* MCU size in unit of block (width, height) */ BYTE qtid[3]; /* Quantization table ID of each component */ SHORT dcv[3]; /* Previous DC element of each component */ - WORD nrst; /* Restart inverval */ + WORD nrst; /* Restart interval */ UINT width, height; /* Size of the input image (pixel) */ BYTE *huffbits[2][2]; /* Huffman bit distribution tables [id][dcac] */ WORD *huffcode[2][2]; /* Huffman code word tables [id][dcac] */ @@ -85,9 +85,9 @@ struct JDEC { void *workbuf; /* Working buffer for IDCT and RGB output */ BYTE *mcubuf; /* Working buffer for the MCU */ void *pool; /* Pointer to available memory pool */ - UINT sz_pool; /* Size of momory pool (bytes available) */ + UINT sz_pool; /* Size of memory pool (bytes available) */ UINT (*infunc)(JDEC *, BYTE *, UINT); /* Pointer to jpeg stream input function */ - void *device; /* Pointer to I/O device identifiler for the session */ + void *device; /* Pointer to I/O device identifier for the session */ }; diff --git a/components/esp_rom/include/esp32c61/rom/uart.h b/components/esp_rom/esp32c61/include/esp32c61/rom/uart.h similarity index 97% rename from components/esp_rom/include/esp32c61/rom/uart.h rename to components/esp_rom/esp32c61/include/esp32c61/rom/uart.h index 57e3cf6618..dba76699ea 100644 --- a/components/esp_rom/include/esp32c61/rom/uart.h +++ b/components/esp_rom/esp32c61/include/esp32c61/rom/uart.h @@ -28,7 +28,7 @@ extern "C" { #define RX_BUFF_SIZE 0x400 #define TX_BUFF_SIZE 100 -//uart int enalbe register ctrl bits +//uart int enable register ctrl bits #define UART_RCV_INTEN BIT0 #define UART_TRX_INTEN BIT1 #define UART_LINE_STATUS_INTEN BIT2 @@ -263,14 +263,14 @@ char uart_rx_one_char_block(void); * * @param uint8_t *pString : the pointer to store the string. * - * @param uint8_t MaxStrlen : the max string length, incude '\0'. + * @param uint8_t MaxStrlen : the max string length, include '\0'. * * @return OK. */ ETS_STATUS UartRxString(uint8_t *pString, uint8_t MaxStrlen); /** - * @brief Process uart recevied information in the interrupt handler. + * @brief Process uart received information in the interrupt handler. * Please do not call this function in SDK. * * @param void *para : the message receive buffer. diff --git a/components/esp_rom/include/esp32h2/rom/aes.h b/components/esp_rom/esp32h2/include/esp32h2/rom/aes.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/aes.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/aes.h diff --git a/components/esp_rom/include/esp32h2/rom/bigint.h b/components/esp_rom/esp32h2/include/esp32h2/rom/bigint.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/bigint.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/bigint.h diff --git a/components/esp_rom/include/esp32h2/rom/cache.h b/components/esp_rom/esp32h2/include/esp32h2/rom/cache.h similarity index 99% rename from components/esp_rom/include/esp32h2/rom/cache.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/cache.h index 37a8201b17..4559177976 100644 --- a/components/esp_rom/include/esp32h2/rom/cache.h +++ b/components/esp_rom/esp32h2/include/esp32h2/rom/cache.h @@ -564,7 +564,7 @@ void Cache_Travel_Tag_Memory(struct cache_mode * mode, uint32_t filter_addr, voi * * @param struct cache_mode * mode : the cache to calculate the virtual address and the cache mode. * - * @param uint32_t tag : the tag part fo a tag item, 12-14 bits. + * @param uint32_t tag : the tag part of a tag item, 12-14 bits. * * @param uint32_t addr_offset : the virtual address offset of the cache ways. * diff --git a/components/esp_rom/include/esp32h2/rom/crc.h b/components/esp_rom/esp32h2/include/esp32h2/rom/crc.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/crc.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/crc.h diff --git a/components/esp_rom/include/esp32h2/rom/digital_signature.h b/components/esp_rom/esp32h2/include/esp32h2/rom/digital_signature.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/digital_signature.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/digital_signature.h diff --git a/components/esp_rom/include/esp32h2/rom/ecdsa.h b/components/esp_rom/esp32h2/include/esp32h2/rom/ecdsa.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/ecdsa.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/ecdsa.h diff --git a/components/esp_rom/include/esp32h2/rom/efuse.h b/components/esp_rom/esp32h2/include/esp32h2/rom/efuse.h similarity index 99% rename from components/esp_rom/include/esp32h2/rom/efuse.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/efuse.h index dc612dff4b..fbd1721211 100644 --- a/components/esp_rom/include/esp32h2/rom/efuse.h +++ b/components/esp_rom/esp32h2/include/esp32h2/rom/efuse.h @@ -170,7 +170,7 @@ bool ets_efuse_download_modes_disabled(void); * - 0 for uart force print. * - 1 for uart print when GPIO8 is low when digital reset. * 2 for uart print when GPIO8 is high when digital reset. - * 3 for uart force slient + * 3 for uart force silent */ uint32_t ets_efuse_get_uart_print_control(void); diff --git a/components/esp_rom/include/esp32h2/rom/esp_flash.h b/components/esp_rom/esp32h2/include/esp32h2/rom/esp_flash.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/esp_flash.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/esp_flash.h diff --git a/components/esp_rom/include/esp32h2/rom/ets_sys.h b/components/esp_rom/esp32h2/include/esp32h2/rom/ets_sys.h similarity index 97% rename from components/esp_rom/include/esp32h2/rom/ets_sys.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/ets_sys.h index b9247bc3bd..0b19741d5d 100644 --- a/components/esp_rom/include/esp32h2/rom/ets_sys.h +++ b/components/esp_rom/esp32h2/include/esp32h2/rom/ets_sys.h @@ -61,7 +61,7 @@ struct ETSEventTag { ETSParam par; /**< Event parameter, sometimes without usage, then will be set as 0*/ }; -typedef void (*ETSTask)(ETSEvent *e); /**< Type of the Task processer*/ +typedef void (*ETSTask)(ETSEvent *e); /**< Type of the Task processor*/ typedef void (* ets_idle_cb_t)(void *arg); /**< Type of the system idle callback*/ @@ -80,7 +80,7 @@ typedef void (* ets_idle_cb_t)(void *arg); /**< Type of the system idle callbac * @{ */ -extern const char *const exc_cause_table[40]; ///**< excption cause that defined by the core.*/ +extern const char *const exc_cause_table[40]; ///**< exception cause that defined by the core.*/ /** * @brief Set Pro cpu Entry code, code can be called in PRO CPU when booting is not completed. @@ -135,7 +135,7 @@ uint8_t ets_get_printf_channel(void); void ets_write_char_uart(char c); /** - * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need ouput. + * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need output. * To install putc1, which is defaulted installed as ets_write_char_uart in none silent boot mode, as NULL in silent mode. * * @param void (*)(char) p: Output function to install. @@ -145,7 +145,7 @@ void ets_write_char_uart(char c); void ets_install_putc1(void (*p)(char c)); /** - * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need ouput. + * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need output. * To install putc2, which is defaulted installed as NULL. * * @param void (*)(char) p: Output function to install. @@ -188,7 +188,7 @@ typedef void ETSTimerFunc(void *timer_arg);/**< timer handler*/ typedef struct _ETSTIMER_ { struct _ETSTIMER_ *timer_next; /**< timer linker*/ - uint32_t timer_expire; /**< abstruct time when timer expire*/ + uint32_t timer_expire; /**< abstract time when timer expire*/ uint32_t timer_period; /**< timer period, 0 means timer is not periodic repeated*/ ETSTimerFunc *timer_func; /**< timer handler*/ void *timer_arg; /**< timer handler argument*/ diff --git a/components/esp_rom/include/esp32h2/rom/gpio.h b/components/esp_rom/esp32h2/include/esp32h2/rom/gpio.h similarity index 98% rename from components/esp_rom/include/esp32h2/rom/gpio.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/gpio.h index 67fb476f5c..5829765c60 100644 --- a/components/esp_rom/include/esp32h2/rom/gpio.h +++ b/components/esp_rom/esp32h2/include/esp32h2/rom/gpio.h @@ -57,7 +57,7 @@ typedef enum { * * @param uint32_t enable_mask : the gpios that need be changed. * - * @param uint32_t disable_mask : the gpios that need diable output. + * @param uint32_t disable_mask : the gpios that need disable output. * * @return None */ diff --git a/components/esp_rom/include/esp32h2/rom/hmac.h b/components/esp_rom/esp32h2/include/esp32h2/rom/hmac.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/hmac.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/hmac.h diff --git a/components/esp_rom/include/esp32h2/rom/libc_stubs.h b/components/esp_rom/esp32h2/include/esp32h2/rom/libc_stubs.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/libc_stubs.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/libc_stubs.h diff --git a/components/esp_rom/include/esp32h2/rom/lldesc.h b/components/esp_rom/esp32h2/include/esp32h2/rom/lldesc.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/lldesc.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/lldesc.h diff --git a/components/esp_rom/include/esp32h2/rom/md5_hash.h b/components/esp_rom/esp32h2/include/esp32h2/rom/md5_hash.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/md5_hash.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/md5_hash.h diff --git a/components/esp_rom/include/esp32h2/rom/rom_layout.h b/components/esp_rom/esp32h2/include/esp32h2/rom/rom_layout.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/rom_layout.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/rom_layout.h diff --git a/components/esp_rom/include/esp32h2/rom/rsa_pss.h b/components/esp_rom/esp32h2/include/esp32h2/rom/rsa_pss.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/rsa_pss.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/rsa_pss.h diff --git a/components/esp_rom/include/esp32h2/rom/rtc.h b/components/esp_rom/esp32h2/include/esp32h2/rom/rtc.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/rtc.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/rtc.h diff --git a/components/esp_rom/include/esp32h2/rom/secure_boot.h b/components/esp_rom/esp32h2/include/esp32h2/rom/secure_boot.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/secure_boot.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/secure_boot.h diff --git a/components/esp_rom/include/esp32h2/rom/sha.h b/components/esp_rom/esp32h2/include/esp32h2/rom/sha.h similarity index 100% rename from components/esp_rom/include/esp32h2/rom/sha.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/sha.h diff --git a/components/esp_rom/include/esp32c6/rom/spi_flash.h b/components/esp_rom/esp32h2/include/esp32h2/rom/spi_flash.h similarity index 99% rename from components/esp_rom/include/esp32c6/rom/spi_flash.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/spi_flash.h index 2d782dee4f..70816780e6 100644 --- a/components/esp_rom/include/esp32c6/rom/spi_flash.h +++ b/components/esp_rom/esp32h2/include/esp32h2/rom/spi_flash.h @@ -421,7 +421,7 @@ void esp_rom_spiflash_fix_dummylen(uint8_t spi, uint8_t freqdiv); * * @param uint8_t *drvs: drvs[0]-bit[3:0] for cpiclk, bit[7:4] for spiq, drvs[1]-bit[3:0] for spid, drvs[1]-bit[7:4] for spid * drvs[2]-bit[3:0] for spihd, drvs[2]-bit[7:4] for spiwp. - * Values usually read from falsh by rom code, function usually callde by rom code. + * Values usually read from flash by rom code, function usually called by rom code. * if value with bit(3) set, the value is valid, bit[2:0] is the real value. * * @return None diff --git a/components/esp_rom/include/esp32h2/rom/uart.h b/components/esp_rom/esp32h2/include/esp32h2/rom/uart.h similarity index 97% rename from components/esp_rom/include/esp32h2/rom/uart.h rename to components/esp_rom/esp32h2/include/esp32h2/rom/uart.h index 9045c42f6f..c21c091440 100644 --- a/components/esp_rom/include/esp32h2/rom/uart.h +++ b/components/esp_rom/esp32h2/include/esp32h2/rom/uart.h @@ -28,7 +28,7 @@ extern "C" { #define RX_BUFF_SIZE 0x400 #define TX_BUFF_SIZE 100 -//uart int enalbe register ctrl bits +//uart int enable register ctrl bits #define UART_RCV_INTEN BIT0 #define UART_TRX_INTEN BIT1 #define UART_LINE_STATUS_INTEN BIT2 @@ -263,14 +263,14 @@ char uart_rx_one_char_block(void); * * @param uint8_t *pString : the pointer to store the string. * - * @param uint8_t MaxStrlen : the max string length, incude '\0'. + * @param uint8_t MaxStrlen : the max string length, include '\0'. * * @return OK. */ ETS_STATUS UartRxString(uint8_t *pString, uint8_t MaxStrlen); /** - * @brief Process uart recevied information in the interrupt handler. + * @brief Process uart received information in the interrupt handler. * Please do not call this function in SDK. * * @param void *para : the message receive buffer. diff --git a/components/esp_rom/include/esp32p4/rom/aes.h b/components/esp_rom/esp32p4/include/esp32p4/rom/aes.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/aes.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/aes.h diff --git a/components/esp_rom/include/esp32p4/rom/bigint.h b/components/esp_rom/esp32p4/include/esp32p4/rom/bigint.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/bigint.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/bigint.h diff --git a/components/esp_rom/include/esp32p4/rom/cache.h b/components/esp_rom/esp32p4/include/esp32p4/rom/cache.h similarity index 99% rename from components/esp_rom/include/esp32p4/rom/cache.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/cache.h index 95f4a4db05..49b084b3ab 100644 --- a/components/esp_rom/include/esp32p4/rom/cache.h +++ b/components/esp_rom/esp32p4/include/esp32p4/rom/cache.h @@ -507,7 +507,7 @@ void ROM_Direct_Boot_Cache_Init(void); * * @param None * - * @return 0 if mmu map is sucessfully, others if not. + * @return 0 if mmu map is successfully, others if not. */ int ROM_Direct_Boot_MMU_Init(void); @@ -1517,7 +1517,7 @@ void Cache_Freeze_L2_Cache_Disable(void); void Cache_Travel_Tag_Memory(struct cache_mode *mode, uint32_t filter_addr, void (*process)(struct tag_group_info *, int res[]), int res[]); /** - * @brief Travel tag memory to run a call back function using 2rd tag api. + * @brief Travel tag memory to run a call back function using 2nd tag api. * ICache and DCache are suspend when doing this. * The callback will get the parameter tag_group_info, which will include a group of tag memory addresses and cache memory addresses. * Please do not call this function in your SDK application. @@ -1539,7 +1539,7 @@ void Cache_Travel_Tag_Memory2(struct cache_mode *mode, uint32_t filter_addr, voi * * @param struct cache_mode * mode : the cache to calculate the virtual address and the cache mode. * - * @param uint32_t tag : the tag part fo a tag item, 12-14 bits. + * @param uint32_t tag : the tag part of a tag item, 12-14 bits. * * @param uint32_t addr_offset : the virtual address offset of the cache ways. * diff --git a/components/esp_rom/include/esp32p4/rom/crc.h b/components/esp_rom/esp32p4/include/esp32p4/rom/crc.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/crc.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/crc.h diff --git a/components/esp_rom/include/esp32p4/rom/digital_signature.h b/components/esp_rom/esp32p4/include/esp32p4/rom/digital_signature.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/digital_signature.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/digital_signature.h diff --git a/components/esp_rom/include/esp32p4/rom/ecdsa.h b/components/esp_rom/esp32p4/include/esp32p4/rom/ecdsa.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/ecdsa.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/ecdsa.h diff --git a/components/esp_rom/include/esp32p4/rom/efuse.h b/components/esp_rom/esp32p4/include/esp32p4/rom/efuse.h similarity index 99% rename from components/esp_rom/include/esp32p4/rom/efuse.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/efuse.h index 60b7726d11..60d8498dd0 100644 --- a/components/esp_rom/include/esp32p4/rom/efuse.h +++ b/components/esp_rom/esp32p4/include/esp32p4/rom/efuse.h @@ -58,7 +58,7 @@ typedef enum { } ets_efuse_block_t; /** - * @brief set timing accroding the apb clock, so no read error or write error happens. + * @brief set timing according the apb clock, so no read error or write error happens. * * @param clock: apb clock in HZ, only accept 5M(in FPGA), 10M(in FPGA), 20M, 40M, 80M. * @@ -226,7 +226,7 @@ bool ets_efuse_legacy_spi_boot_mode_disabled(void); * - 0 for uart force print. * - 1 for uart print when GPIO8 is low when digital reset. * 2 for uart print when GPIO8 is high when digital reset. - * 3 for uart force slient + * 3 for uart force silent */ uint32_t ets_efuse_get_uart_print_control(void); diff --git a/components/esp_rom/include/esp32p4/rom/esp_flash.h b/components/esp_rom/esp32p4/include/esp32p4/rom/esp_flash.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/esp_flash.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/esp_flash.h diff --git a/components/esp_rom/include/esp32p4/rom/ets_sys.h b/components/esp_rom/esp32p4/include/esp32p4/rom/ets_sys.h similarity index 96% rename from components/esp_rom/include/esp32p4/rom/ets_sys.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/ets_sys.h index 5ee1383cb1..95d8b092fc 100644 --- a/components/esp_rom/include/esp32p4/rom/ets_sys.h +++ b/components/esp_rom/esp32p4/include/esp32p4/rom/ets_sys.h @@ -58,11 +58,11 @@ struct ETSEventTag { ETSParam par; /**< Event parameter, sometimes without usage, then will be set as 0*/ }; -typedef void (*ETSTask)(ETSEvent *e); /**< Type of the Task processer*/ +typedef void (*ETSTask)(ETSEvent *e); /**< Type of the Task processor*/ typedef void (* ets_idle_cb_t)(void *arg); /**< Type of the system idle callback*/ /** - * @brief Start the Espressif Task Scheduler, which is an infinit loop. Please do not add code after it. + * @brief Start the Espressif Task Scheduler, which is an infinite loop. Please do not add code after it. * * @param none * @@ -82,9 +82,9 @@ void ets_run(void); void ets_set_idle_cb(ets_idle_cb_t func, void *arg); /** - * @brief Init a task with processer, priority, queue to receive Event, queue length. + * @brief Init a task with processor, priority, queue to receive Event, queue length. * - * @param ETSTask task : The task processer. + * @param ETSTask task : The task processor. * * @param uint8_t prio : Task priority, 0-31, bigger num with high priority, one priority with one task. * @@ -122,7 +122,7 @@ ETS_STATUS ets_post(uint8_t prio, ETSSignal sig, ETSParam par); * @{ */ -extern const char *const exc_cause_table[40]; ///**< excption cause that defined by the core.*/ +extern const char *const exc_cause_table[40]; ///**< exception cause that defined by the core.*/ /** * @brief Set Pro cpu Entry code, code can be called in PRO CPU when booting is not completed. @@ -179,7 +179,7 @@ uint8_t ets_get_printf_channel(void); void ets_write_char_uart(char c); /** - * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need ouput. + * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need output. * To install putc1, which is defaulted installed as ets_write_char_uart in none silent boot mode, as NULL in silent mode. * * @param void (*)(char) p: Output function to install. @@ -189,7 +189,7 @@ void ets_write_char_uart(char c); void ets_install_putc1(void (*p)(char c)); /** - * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need ouput. + * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need output. * To install putc2, which is defaulted installed as NULL. * * @param void (*)(char) p: Output function to install. @@ -232,7 +232,7 @@ typedef void ETSTimerFunc(void *timer_arg);/**< timer handler*/ typedef struct _ETSTIMER_ { struct _ETSTIMER_ *timer_next; /**< timer linker*/ - uint32_t timer_expire; /**< abstruct time when timer expire*/ + uint32_t timer_expire; /**< abstract time when timer expire*/ uint32_t timer_period; /**< timer period, 0 means timer is not periodic repeated*/ ETSTimerFunc *timer_func; /**< timer handler*/ void *timer_arg; /**< timer handler argument*/ diff --git a/components/esp_rom/include/esp32p4/rom/gpio.h b/components/esp_rom/esp32p4/include/esp32p4/rom/gpio.h similarity index 98% rename from components/esp_rom/include/esp32p4/rom/gpio.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/gpio.h index 214eaff048..e59383319b 100644 --- a/components/esp_rom/include/esp32p4/rom/gpio.h +++ b/components/esp_rom/esp32p4/include/esp32p4/rom/gpio.h @@ -78,7 +78,7 @@ void gpio_init(void); * * @param uint32_t enable_mask : the gpios that need be changed. * - * @param uint32_t disable_mask : the gpios that need diable output. + * @param uint32_t disable_mask : the gpios that need disable output. * * @return None */ @@ -95,7 +95,7 @@ void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mas * * @param uint32_t enable_mask : the gpios that need be changed. * - * @param uint32_t disable_mask : the gpios that need diable output. + * @param uint32_t disable_mask : the gpios that need disable output. * * @return None */ diff --git a/components/esp_rom/include/esp32p4/rom/hmac.h b/components/esp_rom/esp32p4/include/esp32p4/rom/hmac.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/hmac.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/hmac.h diff --git a/components/esp_rom/include/esp32p4/rom/key_mgr.h b/components/esp_rom/esp32p4/include/esp32p4/rom/key_mgr.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/key_mgr.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/key_mgr.h diff --git a/components/esp_rom/include/esp32p4/rom/km.h b/components/esp_rom/esp32p4/include/esp32p4/rom/km.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/km.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/km.h diff --git a/components/esp_rom/include/esp32p4/rom/libc_stubs.h b/components/esp_rom/esp32p4/include/esp32p4/rom/libc_stubs.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/libc_stubs.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/libc_stubs.h diff --git a/components/esp_rom/include/esp32p4/rom/lldesc.h b/components/esp_rom/esp32p4/include/esp32p4/rom/lldesc.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/lldesc.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/lldesc.h diff --git a/components/esp_rom/include/esp32p4/rom/md5_hash.h b/components/esp_rom/esp32p4/include/esp32p4/rom/md5_hash.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/md5_hash.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/md5_hash.h diff --git a/components/esp_rom/include/esp32p4/rom/opi_flash.h b/components/esp_rom/esp32p4/include/esp32p4/rom/opi_flash.h similarity index 98% rename from components/esp_rom/include/esp32p4/rom/opi_flash.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/opi_flash.h index 9eff17f2ef..3184c98e3a 100644 --- a/components/esp_rom/include/esp32p4/rom/opi_flash.h +++ b/components/esp_rom/esp32p4/include/esp32p4/rom/opi_flash.h @@ -57,8 +57,8 @@ typedef struct { uint32_t addrBitLen; /*!< Address byte length*/ uint32_t *txData; /*!< Point to send data buffer*/ uint32_t txDataBitLen; /*!< Send data byte length.*/ - uint32_t *rxData; /*!< Point to recevie data buffer*/ - uint32_t rxDataBitLen; /*!< Recevie Data byte length.*/ + uint32_t *rxData; /*!< Point to receive data buffer*/ + uint32_t rxDataBitLen; /*!< Receive Data byte length.*/ uint32_t dummyBitLen; } esp_rom_spi_cmd_t; diff --git a/components/esp_rom/include/esp32p4/rom/rom_layout.h b/components/esp_rom/esp32p4/include/esp32p4/rom/rom_layout.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/rom_layout.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/rom_layout.h diff --git a/components/esp_rom/include/esp32p4/rom/rsa_pss.h b/components/esp_rom/esp32p4/include/esp32p4/rom/rsa_pss.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/rsa_pss.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/rsa_pss.h diff --git a/components/esp_rom/include/esp32p4/rom/rtc.h b/components/esp_rom/esp32p4/include/esp32p4/rom/rtc.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/rtc.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/rtc.h diff --git a/components/esp_rom/include/esp32p4/rom/secure_boot.h b/components/esp_rom/esp32p4/include/esp32p4/rom/secure_boot.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/secure_boot.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/secure_boot.h diff --git a/components/esp_rom/include/esp32p4/rom/sha.h b/components/esp_rom/esp32p4/include/esp32p4/rom/sha.h similarity index 100% rename from components/esp_rom/include/esp32p4/rom/sha.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/sha.h diff --git a/components/esp_rom/include/esp32p4/rom/spi_flash.h b/components/esp_rom/esp32p4/include/esp32p4/rom/spi_flash.h similarity index 99% rename from components/esp_rom/include/esp32p4/rom/spi_flash.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/spi_flash.h index 761fc46bc7..72e5f90cfd 100644 --- a/components/esp_rom/include/esp32p4/rom/spi_flash.h +++ b/components/esp_rom/esp32p4/include/esp32p4/rom/spi_flash.h @@ -459,7 +459,7 @@ void esp_rom_spiflash_fix_dummylen(uint8_t spi, uint8_t freqdiv); * * @param uint8_t *drvs: drvs[0]-bit[3:0] for cpiclk, bit[7:4] for spiq, drvs[1]-bit[3:0] for spid, drvs[1]-bit[7:4] for spid * drvs[2]-bit[3:0] for spihd, drvs[2]-bit[7:4] for spiwp. - * Values usually read from falsh by rom code, function usually callde by rom code. + * Values usually read from flash by rom code, function usually called by rom code. * if value with bit(3) set, the value is valid, bit[2:0] is the real value. * * @return None diff --git a/components/esp_rom/include/esp32p4/rom/uart.h b/components/esp_rom/esp32p4/include/esp32p4/rom/uart.h similarity index 98% rename from components/esp_rom/include/esp32p4/rom/uart.h rename to components/esp_rom/esp32p4/include/esp32p4/rom/uart.h index 60258dceb6..b3a399356c 100644 --- a/components/esp_rom/include/esp32p4/rom/uart.h +++ b/components/esp_rom/esp32p4/include/esp32p4/rom/uart.h @@ -28,7 +28,7 @@ extern "C" { #define RX_BUFF_SIZE 0x400 #define TX_BUFF_SIZE 100 -//uart int enalbe register ctrl bits +//uart int enable register ctrl bits #define UART_RCV_INTEN BIT0 #define UART_TRX_INTEN BIT1 #define UART_LINE_STATUS_INTEN BIT2 @@ -286,14 +286,14 @@ char uart_rx_one_char_block(void); * * @param uint8_t *pString : the pointer to store the string. * - * @param uint8_t MaxStrlen : the max string length, incude '\0'. + * @param uint8_t MaxStrlen : the max string length, include '\0'. * * @return OK. */ STATUS UartRxString(uint8_t *pString, uint8_t MaxStrlen); /** - * @brief Process uart recevied information in the interrupt handler. + * @brief Process uart received information in the interrupt handler. * Please do not call this function in SDK. * * @param void *para : the message receive buffer. diff --git a/components/esp_rom/include/esp32s2/rom/aes.h b/components/esp_rom/esp32s2/include/esp32s2/rom/aes.h similarity index 59% rename from components/esp_rom/include/esp32s2/rom/aes.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/aes.h index 9350e2511e..50497c252e 100644 --- a/components/esp_rom/include/esp32s2/rom/aes.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/aes.h @@ -5,19 +5,11 @@ use the wrapper functions in hwcrypto/aes.h instead. */ -// 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 + */ #pragma once diff --git a/components/esp_rom/include/esp32s2/rom/bigint.h b/components/esp_rom/esp32s2/include/esp32s2/rom/bigint.h similarity index 59% rename from components/esp_rom/include/esp32s2/rom/bigint.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/bigint.h index eee19d46bb..418a41de36 100644 --- a/components/esp_rom/include/esp32s2/rom/bigint.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/bigint.h @@ -5,19 +5,11 @@ use the wrapper functions in hwcrypto/mpi.h instead. */ -// 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 _ROM_BIGINT_H_ #define _ROM_BIGINT_H_ diff --git a/components/esp_rom/include/esp32s2/rom/cache.h b/components/esp_rom/esp32s2/include/esp32s2/rom/cache.h similarity index 99% rename from components/esp_rom/include/esp32s2/rom/cache.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/cache.h index cdfa143a7d..7ee63be904 100644 --- a/components/esp_rom/include/esp32s2/rom/cache.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/cache.h @@ -90,7 +90,7 @@ struct tag_item { uint32_t fifo_cnt:3; /*!< fifo cnt, 0 ~ 3 for 4 ways cache, 0 ~ 7 for 8 ways cache */ uint32_t lock:1; /*!< the cache line is locked or not */ uint32_t attr:3; /*!< the attribute of the external memory physical address */ - uint32_t access:1; /*!< software accessable, used by hardware */ + uint32_t access:1; /*!< software accessible, used by hardware */ uint32_t reserved:8; }; @@ -884,7 +884,7 @@ void Cache_Travel_Tag_Memory(struct cache_mode * mode, uint32_t filter_addr, voi * * @param struct cache_mode * mode : the cache to calculate the virtual address and the cache mode. * - * @param uint32_t tag : the tag part fo a tag item, 12-14 bits. + * @param uint32_t tag : the tag part of a tag item, 12-14 bits. * * @param uint32_t addr_offset : the virtual address offset of the cache ways. * diff --git a/components/esp_rom/include/esp32s2/rom/crc.h b/components/esp_rom/esp32s2/include/esp32s2/rom/crc.h similarity index 72% rename from components/esp_rom/include/esp32s2/rom/crc.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/crc.h index 0d13979576..344a43f1b5 100644 --- a/components/esp_rom/include/esp32s2/rom/crc.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/crc.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 ROM_CRC_H #define ROM_CRC_H diff --git a/components/esp_rom/include/esp32s2/rom/digital_signature.h b/components/esp_rom/esp32s2/include/esp32s2/rom/digital_signature.h similarity index 89% rename from components/esp_rom/include/esp32s2/rom/digital_signature.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/digital_signature.h index 9f23a5d6b8..8590b9c8be 100644 --- a/components/esp_rom/include/esp32s2/rom/digital_signature.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/digital_signature.h @@ -1,19 +1,11 @@ /* ROM functions for hardware Digital Signature peripheral verification */ -// 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-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once diff --git a/components/esp_rom/include/esp32s2/rom/efuse.h b/components/esp_rom/esp32s2/include/esp32s2/rom/efuse.h similarity index 99% rename from components/esp_rom/include/esp32s2/rom/efuse.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/efuse.h index 6f4e8812b3..290a5567ba 100644 --- a/components/esp_rom/include/esp32s2/rom/efuse.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/efuse.h @@ -56,7 +56,7 @@ typedef enum { } ets_efuse_block_t; /** - * @brief set timing accroding the apb clock, so no read error or write error happens. + * @brief set timing according the apb clock, so no read error or write error happens. * * @param clock: apb clock in HZ, only accept 20M, 40M, 80M. * @@ -224,7 +224,7 @@ bool ets_efuse_legacy_spi_boot_mode_disabled(void); * - 0 for uart force print. * - 1 for uart print when GPIO46 is low when digital reset. * 2 for uart print when GPIO46 is high when digital reset. - * 3 for uart force slient + * 3 for uart force silent */ uint32_t ets_efuse_get_uart_print_control(void); diff --git a/components/esp_rom/include/esp32s2/rom/ets_sys.h b/components/esp_rom/esp32s2/include/esp32s2/rom/ets_sys.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/ets_sys.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/ets_sys.h diff --git a/components/esp_rom/include/esp32s2/rom/gpio.h b/components/esp_rom/esp32s2/include/esp32s2/rom/gpio.h similarity index 97% rename from components/esp_rom/include/esp32s2/rom/gpio.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/gpio.h index 991b20352d..84e0af1adb 100644 --- a/components/esp_rom/include/esp32s2/rom/gpio.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/gpio.h @@ -62,7 +62,7 @@ typedef enum { * * @param uint32_t enable_mask : the gpios that need be changed. * - * @param uint32_t disable_mask : the gpios that need diable output. + * @param uint32_t disable_mask : the gpios that need disable output. * * @return None */ @@ -79,7 +79,7 @@ void gpio_output_set(uint32_t set_mask, uint32_t clear_mask, uint32_t enable_mas * * @param uint32_t enable_mask : the gpios that need be changed. * - * @param uint32_t disable_mask : the gpios that need diable output. + * @param uint32_t disable_mask : the gpios that need disable output. * * @return None */ diff --git a/components/esp_rom/include/esp32c3/rom/hmac.h b/components/esp_rom/esp32s2/include/esp32s2/rom/hmac.h similarity index 71% rename from components/esp_rom/include/esp32c3/rom/hmac.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/hmac.h index 223fe884a3..09e8b1effd 100644 --- a/components/esp_rom/include/esp32c3/rom/hmac.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/hmac.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: 2018-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifndef _ROM_HMAC_H_ #define _ROM_HMAC_H_ diff --git a/components/esp_rom/include/esp32s2/rom/libc_stubs.h b/components/esp_rom/esp32s2/include/esp32s2/rom/libc_stubs.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/libc_stubs.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/libc_stubs.h diff --git a/components/esp_rom/include/esp32s2/rom/lldesc.h b/components/esp_rom/esp32s2/include/esp32s2/rom/lldesc.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/lldesc.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/lldesc.h diff --git a/components/esp_rom/include/esp32s2/rom/md5_hash.h b/components/esp_rom/esp32s2/include/esp32s2/rom/md5_hash.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/md5_hash.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/md5_hash.h diff --git a/components/esp_rom/include/esp32s2/rom/opi_flash.h b/components/esp_rom/esp32s2/include/esp32s2/rom/opi_flash.h similarity index 98% rename from components/esp_rom/include/esp32s2/rom/opi_flash.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/opi_flash.h index c7e789b020..371db2185d 100644 --- a/components/esp_rom/include/esp32s2/rom/opi_flash.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/opi_flash.h @@ -21,8 +21,8 @@ typedef struct { uint32_t addrBitLen; /*!< Address byte length*/ uint32_t *txData; /*!< Point to send data buffer*/ uint32_t txDataBitLen; /*!< Send data byte length.*/ - uint32_t *rxData; /*!< Point to recevie data buffer*/ - uint32_t rxDataBitLen; /*!< Recevie Data byte length.*/ + uint32_t *rxData; /*!< Point to receive data buffer*/ + uint32_t rxDataBitLen; /*!< Receive Data byte length.*/ uint32_t dummyBitLen; } esp_rom_spi_cmd_t; diff --git a/components/esp_rom/include/esp32s2/rom/rsa_pss.h b/components/esp_rom/esp32s2/include/esp32s2/rom/rsa_pss.h similarity index 53% rename from components/esp_rom/include/esp32s2/rom/rsa_pss.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/rsa_pss.h index bfbaeb6a41..5ec11a0e24 100644 --- a/components/esp_rom/include/esp32s2/rom/rsa_pss.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/rsa_pss.h @@ -1,22 +1,15 @@ -// Copyright 2015-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: 2015-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifndef _ROM_RSA_PSS_H_ #define _ROM_RSA_PSS_H_ #include #include +#include #ifdef __cplusplus extern "C" { diff --git a/components/esp_rom/include/esp32s2/rom/rtc.h b/components/esp_rom/esp32s2/include/esp32s2/rom/rtc.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/rtc.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/rtc.h diff --git a/components/esp_rom/include/esp32s2/rom/secure_boot.h b/components/esp_rom/esp32s2/include/esp32s2/rom/secure_boot.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/secure_boot.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/secure_boot.h diff --git a/components/esp_rom/include/esp32s2/rom/sha.h b/components/esp_rom/esp32s2/include/esp32s2/rom/sha.h similarity index 70% rename from components/esp_rom/include/esp32s2/rom/sha.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/sha.h index f04e9aec50..ad3e4dd650 100644 --- a/components/esp_rom/include/esp32s2/rom/sha.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/sha.h @@ -6,19 +6,11 @@ esp_sha_lock_memory_block() functions in hwcrypto/sha.h to ensure exclusive access. */ -// 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 _ROM_SHA_H_ #define _ROM_SHA_H_ diff --git a/components/esp_rom/include/esp32s2/rom/spi_flash.h b/components/esp_rom/esp32s2/include/esp32s2/rom/spi_flash.h similarity index 99% rename from components/esp_rom/include/esp32s2/rom/spi_flash.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/spi_flash.h index b496bc1b99..6711e81aa0 100644 --- a/components/esp_rom/include/esp32s2/rom/spi_flash.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/spi_flash.h @@ -416,7 +416,7 @@ void esp_rom_spiflash_fix_dummylen(uint8_t spi, uint8_t freqdiv); * * @param uint8_t *drvs: drvs[0]-bit[3:0] for cpiclk, bit[7:4] for spiq, drvs[1]-bit[3:0] for spid, drvs[1]-bit[7:4] for spid * drvs[2]-bit[3:0] for spihd, drvs[2]-bit[7:4] for spiwp. - * Values usually read from falsh by rom code, function usually callde by rom code. + * Values usually read from flash by rom code, function usually called by rom code. * if value with bit(3) set, the value is valid, bit[2:0] is the real value. * * @return None diff --git a/components/esp_rom/include/esp32s2/rom/uart.h b/components/esp_rom/esp32s2/include/esp32s2/rom/uart.h similarity index 98% rename from components/esp_rom/include/esp32s2/rom/uart.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/uart.h index 491d2c28fb..a3ebc5f235 100644 --- a/components/esp_rom/include/esp32s2/rom/uart.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/uart.h @@ -28,7 +28,7 @@ extern "C" { #define RX_BUFF_SIZE 0x400 #define TX_BUFF_SIZE 100 -//uart int enalbe register ctrl bits +//uart int enable register ctrl bits #define UART_RCV_INTEN BIT0 #define UART_TRX_INTEN BIT1 #define UART_LINE_STATUS_INTEN BIT2 @@ -301,14 +301,14 @@ char uart_rx_one_char_block(void); * * @param uint8_t *pString : the pointer to store the string. * - * @param uint8_t MaxStrlen : the max string length, incude '\0'. + * @param uint8_t MaxStrlen : the max string length, include '\0'. * * @return OK. */ ETS_STATUS UartRxString(uint8_t *pString, uint8_t MaxStrlen); /** - * @brief Process uart recevied information in the interrupt handler. + * @brief Process uart received information in the interrupt handler. * Please do not call this function in SDK. * * @param void *para : the message receive buffer. diff --git a/components/esp_rom/include/esp32s2/rom/usb/cdc_acm.h b/components/esp_rom/esp32s2/include/esp32s2/rom/usb/cdc_acm.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/usb/cdc_acm.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/usb/cdc_acm.h diff --git a/components/esp_rom/include/esp32s2/rom/usb/chip_usb_dw_wrapper.h b/components/esp_rom/esp32s2/include/esp32s2/rom/usb/chip_usb_dw_wrapper.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/usb/chip_usb_dw_wrapper.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/usb/chip_usb_dw_wrapper.h diff --git a/components/esp_rom/include/esp32s2/rom/usb/cpio.h b/components/esp_rom/esp32s2/include/esp32s2/rom/usb/cpio.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/usb/cpio.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/usb/cpio.h diff --git a/components/esp_rom/include/esp32s2/rom/usb/usb_cdc.h b/components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_cdc.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/usb/usb_cdc.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_cdc.h diff --git a/components/esp_rom/include/esp32s2/rom/usb/usb_common.h b/components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_common.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/usb/usb_common.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_common.h diff --git a/components/esp_rom/include/esp32s2/rom/usb/usb_dc.h b/components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_dc.h similarity index 99% rename from components/esp_rom/include/esp32s2/rom/usb/usb_dc.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_dc.h index 5587cc22ba..0d25f50fc1 100644 --- a/components/esp_rom/include/esp32s2/rom/usb/usb_dc.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_dc.h @@ -365,7 +365,7 @@ int usb_dc_ep_read_continue(uint8_t ep); * @param[in] ep Endpoint address corresponding to the one * listed in the device configuration table * - * @return enpoint max packet size (mps) + * @return endpoint max packet size (mps) */ int usb_dc_ep_mps(uint8_t ep); @@ -384,7 +384,7 @@ void usb_dc_check_poll_for_interrupts(void); * * This takes the USB peripheral offline in such a way that it seems 'just busy' to the * host. This way, the chip can reboot (e.g. into bootloader mode) and pick up the USB - * configuration again, without the conenction to the host being interrupted. + * configuration again, without the connection to the host being interrupted. * * @note Actual persistence is depending on USBDC_PERSIST_ENA being set in flags, as this * is also used to e.g. reboot into DFU mode. diff --git a/components/esp_rom/include/esp32s2/rom/usb/usb_descriptor.h b/components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_descriptor.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/usb/usb_descriptor.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_descriptor.h diff --git a/components/esp_rom/include/esp32s3/rom/usb/usb_device.h b/components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_device.h similarity index 99% rename from components/esp_rom/include/esp32s3/rom/usb/usb_device.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_device.h index 87dbcda15b..bd9739fa52 100644 --- a/components/esp_rom/include/esp32s3/rom/usb/usb_device.h +++ b/components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_device.h @@ -248,7 +248,7 @@ int usb_read(uint8_t ep, uint8_t *data, uint32_t max_data_len, * @brief set STALL condition on the specified endpoint * * This function is called by USB device class handler code to set stall - * conditionin on endpoint. + * condition on endpoint. * * @param[in] ep Endpoint address corresponding to the one listed in * the device configuration table @@ -262,7 +262,7 @@ int usb_ep_set_stall(uint8_t ep); * @brief clears STALL condition on the specified endpoint * * This function is called by USB device class handler code to clear stall - * conditionin on endpoint. + * condition on endpoint. * * @param[in] ep Endpoint address corresponding to the one listed in * the device configuration table diff --git a/components/esp_rom/include/esp32s2/rom/usb/usb_dfu.h b/components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_dfu.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/usb/usb_dfu.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_dfu.h diff --git a/components/esp_rom/include/esp32s2/rom/usb/usb_os_glue.h b/components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_os_glue.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/usb/usb_os_glue.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_os_glue.h diff --git a/components/esp_rom/include/esp32s2/rom/usb/usb_persist.h b/components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_persist.h similarity index 100% rename from components/esp_rom/include/esp32s2/rom/usb/usb_persist.h rename to components/esp_rom/esp32s2/include/esp32s2/rom/usb/usb_persist.h diff --git a/components/esp_rom/include/esp32s3/rom/aes.h b/components/esp_rom/esp32s3/include/esp32s3/rom/aes.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/aes.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/aes.h diff --git a/components/esp_rom/include/esp32s3/rom/apb_backup_dma.h b/components/esp_rom/esp32s3/include/esp32s3/rom/apb_backup_dma.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/apb_backup_dma.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/apb_backup_dma.h diff --git a/components/esp_rom/include/esp32s3/rom/bigint.h b/components/esp_rom/esp32s3/include/esp32s3/rom/bigint.h similarity index 51% rename from components/esp_rom/include/esp32s3/rom/bigint.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/bigint.h index 2ab022d87d..49d4a2a931 100644 --- a/components/esp_rom/include/esp32s3/rom/bigint.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/bigint.h @@ -1,16 +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 + */ #pragma once diff --git a/components/esp_rom/include/esp32s3/rom/cache.h b/components/esp_rom/esp32s3/include/esp32s3/rom/cache.h similarity index 99% rename from components/esp_rom/include/esp32s3/rom/cache.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/cache.h index e0be832c56..1a90324a05 100644 --- a/components/esp_rom/include/esp32s3/rom/cache.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/cache.h @@ -160,7 +160,7 @@ struct tag_group_info { uint32_t vaddr_offset; /*!< virtual address offset of the cache ways */ uint32_t tag_addr[MAX_CACHE_WAYS]; /*!< tag memory address, only [0~mode.ways-1] is valid to use */ uint32_t cache_memory_offset[MAX_CACHE_WAYS]; /*!< cache memory address, only [0~mode.ways-1] is valid to use */ - uint8_t use_legacy; /*!< 1 for using legacy tag api, 0 for using 2rd tag api */ + uint8_t use_legacy; /*!< 1 for using legacy tag api, 0 for using 2nd tag api */ }; struct lock_config { @@ -1096,7 +1096,7 @@ void Cache_Travel_Tag_Memory2(struct cache_mode * mode, uint32_t filter_addr, vo * * @param struct cache_mode * mode : the cache to calculate the virtual address and the cache mode. * - * @param uint32_t tag : the tag part fo a tag item, 12-14 bits. + * @param uint32_t tag : the tag part of a tag item, 12-14 bits. * * @param uint32_t addr_offset : the virtual address offset of the cache ways. * diff --git a/components/esp_rom/include/esp32s3/rom/crc.h b/components/esp_rom/esp32s3/include/esp32s3/rom/crc.h similarity index 81% rename from components/esp_rom/include/esp32s3/rom/crc.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/crc.h index e47a2ff580..431b8d6efb 100644 --- a/components/esp_rom/include/esp32s3/rom/crc.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/crc.h @@ -1,16 +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 + */ #pragma once diff --git a/components/esp_rom/include/esp32s3/rom/digital_signature.h b/components/esp_rom/esp32s3/include/esp32s3/rom/digital_signature.h similarity index 88% rename from components/esp_rom/include/esp32s3/rom/digital_signature.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/digital_signature.h index 36e71e7c4f..e05b0a3712 100644 --- a/components/esp_rom/include/esp32s3/rom/digital_signature.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/digital_signature.h @@ -1,16 +1,8 @@ -// Copyright 2019-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: 2019-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once diff --git a/components/esp_rom/include/esp32s3/rom/efuse.h b/components/esp_rom/esp32s3/include/esp32s3/rom/efuse.h similarity index 99% rename from components/esp_rom/include/esp32s3/rom/efuse.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/efuse.h index c34ca57de1..a2aac78c9d 100644 --- a/components/esp_rom/include/esp32s3/rom/efuse.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/efuse.h @@ -56,7 +56,7 @@ typedef enum { } ets_efuse_block_t; /** - * @brief set timing accroding the apb clock, so no read error or write error happens. + * @brief set timing according the apb clock, so no read error or write error happens. * * @param clock: apb clock in HZ, only accept 5M(in FPGA), 10M(in FPGA), 20M, 40M, 80M. * @@ -209,7 +209,7 @@ bool ets_efuse_legacy_spi_boot_mode_disabled(void); * - 0 for uart force print. * - 1 for uart print when GPIO46 is low when digital reset. * 2 for uart print when GPIO46 is high when digital reset. - * 3 for uart force slient + * 3 for uart force silent */ uint32_t ets_efuse_get_uart_print_control(void); diff --git a/components/esp_rom/include/esp32s3/rom/ets_sys.h b/components/esp_rom/esp32s3/include/esp32s3/rom/ets_sys.h similarity index 98% rename from components/esp_rom/include/esp32s3/rom/ets_sys.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/ets_sys.h index 83c93b2eb6..7bc91572f2 100644 --- a/components/esp_rom/include/esp32s3/rom/ets_sys.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/ets_sys.h @@ -61,7 +61,7 @@ struct ETSEventTag { ETSParam par; /**< Event parameter, sometimes without usage, then will be set as 0*/ }; -typedef void (*ETSTask)(ETSEvent *e); /**< Type of the Task processer*/ +typedef void (*ETSTask)(ETSEvent *e); /**< Type of the Task processor*/ typedef void (* ets_idle_cb_t)(void *arg); /**< Type of the system idle callback*/ @@ -80,7 +80,7 @@ typedef void (* ets_idle_cb_t)(void *arg); /**< Type of the system idle callbac * @{ */ -extern const char *const exc_cause_table[40]; ///**< excption cause that defined by the core.*/ +extern const char *const exc_cause_table[40]; ///**< exception cause that defined by the core.*/ /** * @brief Set Pro cpu Entry code, code can be called in PRO CPU when booting is not completed. @@ -145,7 +145,7 @@ uint8_t ets_get_printf_channel(void); void ets_write_char_uart(char c); /** - * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need ouput. + * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need output. * To install putc1, which is defaulted installed as ets_write_char_uart in none silent boot mode, as NULL in silent mode. * * @param void (*)(char) p: Output function to install. @@ -155,7 +155,7 @@ void ets_write_char_uart(char c); void ets_install_putc1(void (*p)(char c)); /** - * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need ouput. + * @brief Ets_printf have two output functions： putc1 and putc2, both of which will be called if need output. * To install putc2, which is defaulted installed as NULL. * * @param void (*)(char) p: Output function to install. @@ -198,7 +198,7 @@ typedef void ETSTimerFunc(void *timer_arg);/**< timer handler*/ typedef struct _ETSTIMER_ { struct _ETSTIMER_ *timer_next; /**< timer linker*/ - uint32_t timer_expire; /**< abstruct time when timer expire*/ + uint32_t timer_expire; /**< abstract time when timer expire*/ uint32_t timer_period; /**< timer period, 0 means timer is not periodic repeated*/ ETSTimerFunc *timer_func; /**< timer handler*/ void *timer_arg; /**< timer handler argument*/ diff --git a/components/esp_rom/include/esp32s3/rom/gpio.h b/components/esp_rom/esp32s3/include/esp32s3/rom/gpio.h similarity index 98% rename from components/esp_rom/include/esp32s3/rom/gpio.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/gpio.h index 13b9c9a60b..8958b03578 100644 --- a/components/esp_rom/include/esp32s3/rom/gpio.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/gpio.h @@ -57,7 +57,7 @@ typedef enum { * * @param uint32_t enable_mask : the gpios that need be changed. * - * @param uint32_t disable_mask : the gpios that need diable output. + * @param uint32_t disable_mask : the gpios that need disable output. * * @return None */ diff --git a/components/esp_rom/include/esp32s3/rom/hmac.h b/components/esp_rom/esp32s3/include/esp32s3/rom/hmac.h similarity index 70% rename from components/esp_rom/include/esp32s3/rom/hmac.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/hmac.h index ac7ddf358e..2c65b0fc85 100644 --- a/components/esp_rom/include/esp32s3/rom/hmac.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/hmac.h @@ -1,16 +1,8 @@ -// Copyright 2018-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: 2018-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once diff --git a/components/esp_rom/include/esp32s3/rom/libc_stubs.h b/components/esp_rom/esp32s3/include/esp32s3/rom/libc_stubs.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/libc_stubs.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/libc_stubs.h diff --git a/components/esp_rom/include/esp32s3/rom/lldesc.h b/components/esp_rom/esp32s3/include/esp32s3/rom/lldesc.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/lldesc.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/lldesc.h diff --git a/components/esp_rom/include/esp32s3/rom/md5_hash.h b/components/esp_rom/esp32s3/include/esp32s3/rom/md5_hash.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/md5_hash.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/md5_hash.h diff --git a/components/esp_rom/include/esp32s3/rom/opi_flash.h b/components/esp_rom/esp32s3/include/esp32s3/rom/opi_flash.h similarity index 98% rename from components/esp_rom/include/esp32s3/rom/opi_flash.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/opi_flash.h index 8976e7b53e..3f5d840549 100644 --- a/components/esp_rom/include/esp32s3/rom/opi_flash.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/opi_flash.h @@ -55,8 +55,8 @@ typedef struct { uint32_t addrBitLen; /*!< Address byte length*/ uint32_t *txData; /*!< Point to send data buffer*/ uint32_t txDataBitLen; /*!< Send data byte length.*/ - uint32_t *rxData; /*!< Point to recevie data buffer*/ - uint32_t rxDataBitLen; /*!< Recevie Data byte length.*/ + uint32_t *rxData; /*!< Point to receive data buffer*/ + uint32_t rxDataBitLen; /*!< Receive Data byte length.*/ uint32_t dummyBitLen; } esp_rom_spi_cmd_t; diff --git a/components/esp_rom/include/esp32s3/rom/rom_layout.h b/components/esp_rom/esp32s3/include/esp32s3/rom/rom_layout.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/rom_layout.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/rom_layout.h diff --git a/components/esp_rom/include/esp32s3/rom/rsa_pss.h b/components/esp_rom/esp32s3/include/esp32s3/rom/rsa_pss.h similarity index 53% rename from components/esp_rom/include/esp32s3/rom/rsa_pss.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/rsa_pss.h index 71ae589226..23cb049891 100644 --- a/components/esp_rom/include/esp32s3/rom/rsa_pss.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/rsa_pss.h @@ -1,16 +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 + */ #pragma once diff --git a/components/esp_rom/include/esp32s3/rom/rtc.h b/components/esp_rom/esp32s3/include/esp32s3/rom/rtc.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/rtc.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/rtc.h diff --git a/components/esp_rom/include/esp32s3/rom/secure_boot.h b/components/esp_rom/esp32s3/include/esp32s3/rom/secure_boot.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/secure_boot.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/secure_boot.h diff --git a/components/esp_rom/include/esp32s3/rom/sha.h b/components/esp_rom/esp32s3/include/esp32s3/rom/sha.h similarity index 65% rename from components/esp_rom/include/esp32s3/rom/sha.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/sha.h index 4d8fe90195..64a26c6905 100644 --- a/components/esp_rom/include/esp32s3/rom/sha.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/sha.h @@ -1,16 +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 + */ #pragma once #include diff --git a/components/esp_rom/include/esp32s3/rom/spi_flash.h b/components/esp_rom/esp32s3/include/esp32s3/rom/spi_flash.h similarity index 99% rename from components/esp_rom/include/esp32s3/rom/spi_flash.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/spi_flash.h index 069fc7dbf3..519f89eec6 100644 --- a/components/esp_rom/include/esp32s3/rom/spi_flash.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/spi_flash.h @@ -465,7 +465,7 @@ void esp_rom_spiflash_fix_dummylen(uint8_t spi, uint8_t freqdiv); * * @param uint8_t *drvs: drvs[0]-bit[3:0] for cpiclk, bit[7:4] for spiq, drvs[1]-bit[3:0] for spid, drvs[1]-bit[7:4] for spid * drvs[2]-bit[3:0] for spihd, drvs[2]-bit[7:4] for spiwp. - * Values usually read from falsh by rom code, function usually callde by rom code. + * Values usually read from flash by rom code, function usually called by rom code. * if value with bit(3) set, the value is valid, bit[2:0] is the real value. * * @return None diff --git a/components/esp_rom/include/esp32s3/rom/tjpgd.h b/components/esp_rom/esp32s3/include/esp32s3/rom/tjpgd.h similarity index 94% rename from components/esp_rom/include/esp32s3/rom/tjpgd.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/tjpgd.h index 40340dea58..9d832b4232 100644 --- a/components/esp_rom/include/esp32s3/rom/tjpgd.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/tjpgd.h @@ -71,7 +71,7 @@ struct JDEC { BYTE msx, msy; /* MCU size in unit of block (width, height) */ BYTE qtid[3]; /* Quantization table ID of each component */ SHORT dcv[3]; /* Previous DC element of each component */ - WORD nrst; /* Restart inverval */ + WORD nrst; /* Restart interval */ UINT width, height; /* Size of the input image (pixel) */ BYTE *huffbits[2][2]; /* Huffman bit distribution tables [id][dcac] */ WORD *huffcode[2][2]; /* Huffman code word tables [id][dcac] */ @@ -80,9 +80,9 @@ struct JDEC { void *workbuf; /* Working buffer for IDCT and RGB output */ BYTE *mcubuf; /* Working buffer for the MCU */ void *pool; /* Pointer to available memory pool */ - UINT sz_pool; /* Size of momory pool (bytes available) */ + UINT sz_pool; /* Size of memory pool (bytes available) */ UINT (*infunc)(JDEC *, BYTE *, UINT); /* Pointer to jpeg stream input function */ - void *device; /* Pointer to I/O device identifiler for the session */ + void *device; /* Pointer to I/O device identifier for the session */ }; /* TJpgDec API functions */ diff --git a/components/esp_rom/include/esp32s3/rom/uart.h b/components/esp_rom/esp32s3/include/esp32s3/rom/uart.h similarity index 98% rename from components/esp_rom/include/esp32s3/rom/uart.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/uart.h index 864563f788..b427f32262 100644 --- a/components/esp_rom/include/esp32s3/rom/uart.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/uart.h @@ -26,7 +26,7 @@ extern "C" { #define RX_BUFF_SIZE 0x400 #define TX_BUFF_SIZE 100 -//uart int enalbe register ctrl bits +//uart int enable register ctrl bits #define UART_RCV_INTEN BIT0 #define UART_TRX_INTEN BIT1 #define UART_LINE_STATUS_INTEN BIT2 @@ -261,7 +261,7 @@ char uart_rx_one_char_block(void); * * @param uint8_t *pString : the pointer to store the string. * - * @param uint8_t MaxStrlen : the max string length, incude '\0'. + * @param uint8_t MaxStrlen : the max string length, include '\0'. * * @return OK. */ diff --git a/components/esp_rom/include/esp32s3/rom/usb/cdc_acm.h b/components/esp_rom/esp32s3/include/esp32s3/rom/usb/cdc_acm.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/usb/cdc_acm.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/usb/cdc_acm.h diff --git a/components/esp_rom/include/esp32s3/rom/usb/chip_usb_dw_wrapper.h b/components/esp_rom/esp32s3/include/esp32s3/rom/usb/chip_usb_dw_wrapper.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/usb/chip_usb_dw_wrapper.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/usb/chip_usb_dw_wrapper.h diff --git a/components/esp_rom/include/esp32s3/rom/usb/cpio.h b/components/esp_rom/esp32s3/include/esp32s3/rom/usb/cpio.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/usb/cpio.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/usb/cpio.h diff --git a/components/esp_rom/include/esp32s3/rom/usb/usb_cdc.h b/components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_cdc.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/usb/usb_cdc.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_cdc.h diff --git a/components/esp_rom/include/esp32s3/rom/usb/usb_common.h b/components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_common.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/usb/usb_common.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_common.h diff --git a/components/esp_rom/include/esp32s3/rom/usb/usb_dc.h b/components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_dc.h similarity index 99% rename from components/esp_rom/include/esp32s3/rom/usb/usb_dc.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_dc.h index 725362fa19..8640c70580 100644 --- a/components/esp_rom/include/esp32s3/rom/usb/usb_dc.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_dc.h @@ -365,7 +365,7 @@ int usb_dc_ep_read_continue(uint8_t ep); * @param[in] ep Endpoint address corresponding to the one * listed in the device configuration table * - * @return enpoint max packet size (mps) + * @return endpoint max packet size (mps) */ int usb_dc_ep_mps(uint8_t ep); @@ -384,7 +384,7 @@ void usb_dc_check_poll_for_interrupts(void); * * This takes the USB peripheral offline in such a way that it seems 'just busy' to the * host. This way, the chip can reboot (e.g. into bootloader mode) and pick up the USB - * configuration again, without the conenction to the host being interrupted. + * configuration again, without the connection to the host being interrupted. * * @note Actual persistence is depending on USBDC_PERSIST_ENA being set in flags, as this * is also used to e.g. reboot into DFU mode. diff --git a/components/esp_rom/include/esp32s3/rom/usb/usb_descriptor.h b/components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_descriptor.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/usb/usb_descriptor.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_descriptor.h diff --git a/components/esp_rom/include/esp32s2/rom/usb/usb_device.h b/components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_device.h similarity index 99% rename from components/esp_rom/include/esp32s2/rom/usb/usb_device.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_device.h index 87dbcda15b..bd9739fa52 100644 --- a/components/esp_rom/include/esp32s2/rom/usb/usb_device.h +++ b/components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_device.h @@ -248,7 +248,7 @@ int usb_read(uint8_t ep, uint8_t *data, uint32_t max_data_len, * @brief set STALL condition on the specified endpoint * * This function is called by USB device class handler code to set stall - * conditionin on endpoint. + * condition on endpoint. * * @param[in] ep Endpoint address corresponding to the one listed in * the device configuration table @@ -262,7 +262,7 @@ int usb_ep_set_stall(uint8_t ep); * @brief clears STALL condition on the specified endpoint * * This function is called by USB device class handler code to clear stall - * conditionin on endpoint. + * condition on endpoint. * * @param[in] ep Endpoint address corresponding to the one listed in * the device configuration table diff --git a/components/esp_rom/include/esp32s3/rom/usb/usb_dfu.h b/components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_dfu.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/usb/usb_dfu.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_dfu.h diff --git a/components/esp_rom/include/esp32s3/rom/usb/usb_os_glue.h b/components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_os_glue.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/usb/usb_os_glue.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_os_glue.h diff --git a/components/esp_rom/include/esp32s3/rom/usb/usb_persist.h b/components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_persist.h similarity index 100% rename from components/esp_rom/include/esp32s3/rom/usb/usb_persist.h rename to components/esp_rom/esp32s3/include/esp32s3/rom/usb/usb_persist.h diff --git a/components/esp_rom/include/esp32/rom/miniz.h b/components/esp_rom/include/esp32/rom/miniz.h deleted file mode 100644 index f0baecabdc..0000000000 --- a/components/esp_rom/include/esp32/rom/miniz.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#warning "{target}/rom/miniz.h is deprecated, please use (#include "miniz.h") instead" -#include "../../miniz.h" diff --git a/components/esp_rom/include/esp32/rom/tbconsole.h b/components/esp_rom/include/esp32/rom/tbconsole.h deleted file mode 100644 index d6ca069cc7..0000000000 --- a/components/esp_rom/include/esp32/rom/tbconsole.h +++ /dev/null @@ -1,27 +0,0 @@ -// 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. -#ifndef _ROM_TBCONSOLE_H_ -#define _ROM_TBCONSOLE_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -void start_tb_console(void); - -#ifdef __cplusplus -} -#endif - -#endif /* _ROM_TBCONSOLE_H_ */ diff --git a/components/esp_rom/include/esp32c2/rom/miniz.h b/components/esp_rom/include/esp32c2/rom/miniz.h deleted file mode 100644 index f0baecabdc..0000000000 --- a/components/esp_rom/include/esp32c2/rom/miniz.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#warning "{target}/rom/miniz.h is deprecated, please use (#include "miniz.h") instead" -#include "../../miniz.h" diff --git a/components/esp_rom/include/esp32c3/rom/miniz.h b/components/esp_rom/include/esp32c3/rom/miniz.h deleted file mode 100644 index f0baecabdc..0000000000 --- a/components/esp_rom/include/esp32c3/rom/miniz.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#warning "{target}/rom/miniz.h is deprecated, please use (#include "miniz.h") instead" -#include "../../miniz.h" diff --git a/components/esp_rom/include/esp32c5/rom/miniz.h b/components/esp_rom/include/esp32c5/rom/miniz.h deleted file mode 100644 index 357e60a9c1..0000000000 --- a/components/esp_rom/include/esp32c5/rom/miniz.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#warning "{target}/rom/miniz.h is deprecated, please use (#include "miniz.h") instead" -#include "../../miniz.h" diff --git a/components/esp_rom/include/esp32c6/rom/miniz.h b/components/esp_rom/include/esp32c6/rom/miniz.h deleted file mode 100644 index f0baecabdc..0000000000 --- a/components/esp_rom/include/esp32c6/rom/miniz.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#warning "{target}/rom/miniz.h is deprecated, please use (#include "miniz.h") instead" -#include "../../miniz.h" diff --git a/components/esp_rom/include/esp32c61/rom/miniz.h b/components/esp_rom/include/esp32c61/rom/miniz.h deleted file mode 100644 index 357e60a9c1..0000000000 --- a/components/esp_rom/include/esp32c61/rom/miniz.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#warning "{target}/rom/miniz.h is deprecated, please use (#include "miniz.h") instead" -#include "../../miniz.h" diff --git a/components/esp_rom/include/esp32s2/rom/miniz.h b/components/esp_rom/include/esp32s2/rom/miniz.h deleted file mode 100644 index f0baecabdc..0000000000 --- a/components/esp_rom/include/esp32s2/rom/miniz.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#warning "{target}/rom/miniz.h is deprecated, please use (#include "miniz.h") instead" -#include "../../miniz.h" diff --git a/components/esp_rom/include/esp32s3/rom/miniz.h b/components/esp_rom/include/esp32s3/rom/miniz.h deleted file mode 100644 index f0baecabdc..0000000000 --- a/components/esp_rom/include/esp32s3/rom/miniz.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#warning "{target}/rom/miniz.h is deprecated, please use (#include "miniz.h") instead" -#include "../../miniz.h" diff --git a/components/esp_rom/include/linux/soc/reset_reasons.h b/components/esp_rom/include/linux/soc/reset_reasons.h deleted file mode 100644 index 7cc86ffddf..0000000000 --- a/components/esp_rom/include/linux/soc/reset_reasons.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2021 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. - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @brief Dummy to satisfy the requirement for this type on Linux targets. - * Look at other reset_reasons.h files in IDF. - */ -typedef enum { - RESET_REASON_CHIP_POWER_ON = 0x01, // Power on reset -} soc_reset_reason_t; - -#ifdef __cplusplus -} -#endif diff --git a/components/esp_rom/include/linux/rom/efuse.h b/components/esp_rom/linux/include/linux/rom/efuse.h similarity index 100% rename from components/esp_rom/include/linux/rom/efuse.h rename to components/esp_rom/linux/include/linux/rom/efuse.h diff --git a/components/esp_rom/include/linux/rom/ets_sys.h b/components/esp_rom/linux/include/linux/rom/ets_sys.h similarity index 100% rename from components/esp_rom/include/linux/rom/ets_sys.h rename to components/esp_rom/linux/include/linux/rom/ets_sys.h diff --git a/components/esp_rom/linux/include/linux/soc/reset_reasons.h b/components/esp_rom/linux/include/linux/soc/reset_reasons.h new file mode 100644 index 0000000000..f5bd2c1534 --- /dev/null +++ b/components/esp_rom/linux/include/linux/soc/reset_reasons.h @@ -0,0 +1,23 @@ +/* + * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief Dummy to satisfy the requirement for this type on Linux targets. + * Look at other reset_reasons.h files in IDF. + */ +typedef enum { + RESET_REASON_CHIP_POWER_ON = 0x01, // Power on reset +} soc_reset_reason_t; + +#ifdef __cplusplus +} +#endif diff --git a/components/nvs_flash/test_nvs_host/Makefile b/components/nvs_flash/test_nvs_host/Makefile index 7e8659aebf..e1849a6cb9 100644 --- a/components/nvs_flash/test_nvs_host/Makefile +++ b/components/nvs_flash/test_nvs_host/Makefile @@ -34,7 +34,7 @@ else COMPILER := gcc endif -CPPFLAGS += -I../private_include -I../include -I../src -I../../heap/include -I../../esp_rom/include -I../../esp_rom/include/linux -I../../log/include -I./ -I../../esp_common/include -I../../esp32/include -I ../../mbedtls/mbedtls/include -I ../../spi_flash/include -I ../../esp_partition/include -I ../../hal/include -I ../../xtensa/include -I ../../soc/linux/include -I ../../../tools/catch -fprofile-arcs -ftest-coverage -g2 -ggdb +CPPFLAGS += -I../private_include -I../include -I../src -I../../heap/include -I../../esp_rom/include -I../../esp_rom/include/linux -I../../esp_rom/linux/include/linux -I../../log/include -I./ -I../../esp_common/include -I../../esp32/include -I ../../mbedtls/mbedtls/include -I ../../spi_flash/include -I ../../esp_partition/include -I ../../hal/include -I ../../xtensa/include -I ../../soc/linux/include -I ../../../tools/catch -fprofile-arcs -ftest-coverage -g2 -ggdb CFLAGS += -fprofile-arcs -ftest-coverage -DLINUX_TARGET -DLINUX_HOST_LEGACY_TEST CXXFLAGS += -std=c++11 -Wall -Werror -DLINUX_TARGET -DLINUX_HOST_LEGACY_TEST LDFLAGS += -lstdc++ -Wall -fprofile-arcs -ftest-coverage diff --git a/docs/en/migration-guides/release-5.x/5.4/system.rst b/docs/en/migration-guides/release-5.x/5.4/system.rst index df98248613..ae7414bf5d 100644 --- a/docs/en/migration-guides/release-5.x/5.4/system.rst +++ b/docs/en/migration-guides/release-5.x/5.4/system.rst @@ -8,3 +8,10 @@ Log - `esp_log_buffer_hex` is deprecated, use `ESP_LOG_BUFFER_HEX` instead. - `esp_log_buffer_char` is deprecated, use `ESP_LOG_BUFFER_CHAR` instead. + +ESP rom +--- + +- All target-specific header files has been moved from `components/esp_rom/include/{target}/` to `/esp_rom/{target}/include/{target}/`, and `components/esp_rom/CMakeLists.txt` has been modified accordingly. If you encounter an error indicating a missing header file, such as ``fatal error: esp32s3/rom/efuse.h: No such file or directory``, try removing the leading relative path from the header file include statement. In your current and future development, when including any header files from the components/esp_rom folder, directly include the header file name without the target-specific relative folder path. +- All target-specific `rom/miniz.h` files are removed because they are deprecated. + diff --git a/tools/ci/check_copyright_config.yaml b/tools/ci/check_copyright_config.yaml index 0e505ee603..9850f85dd9 100644 --- a/tools/ci/check_copyright_config.yaml +++ b/tools/ci/check_copyright_config.yaml @@ -143,7 +143,7 @@ argtable3: md5_hash: include: - - 'components/esp_rom/include/**/rom/md5_hash.h' + - 'components/esp_rom/*/include/**/rom/md5_hash.h' allowed_licenses: - BSD-3-Clause - Apache-2.0 @@ -182,7 +182,7 @@ tinyusb: # with files licensed under a mix of Apache and BSD-3-Clause licenses. esp_rom_usb: include: - - 'components/esp_rom/include/*/rom/usb/' + - 'components/esp_rom/*/include/*/rom/usb/' allowed_licenses: - Apache-2.0 - BSD-3-Clause diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index 713934c48f..b45b0680a9 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -410,6 +410,7 @@ components/esp_hid/private/bt_hidh.h 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_rom/esp32/include/esp32/rom/tjpgd.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 @@ -421,6 +422,7 @@ components/esp_rom/esp32/ld/esp32.rom.newlib-nano.ld components/esp_rom/esp32/ld/esp32.rom.newlib-time.ld components/esp_rom/esp32/ld/esp32.rom.redefined.ld components/esp_rom/esp32/ld/esp32.rom.syscalls.ld +components/esp_rom/esp32c3/include/esp32c3/rom/tjpgd.h components/esp_rom/esp32c3/ld/esp32c3.rom.api.ld components/esp_rom/esp32c3/ld/esp32c3.rom.eco3.ld components/esp_rom/esp32c3/ld/esp32c3.rom.ld @@ -428,50 +430,22 @@ components/esp_rom/esp32c3/ld/esp32c3.rom.libgcc.ld components/esp_rom/esp32c3/ld/esp32c3.rom.newlib-nano.ld components/esp_rom/esp32c3/ld/esp32c3.rom.newlib.ld components/esp_rom/esp32c3/ld/esp32c3.rom.version.ld +components/esp_rom/esp32s2/include/esp32s2/rom/opi_flash.h components/esp_rom/esp32s2/ld/esp32s2.rom.api.ld components/esp_rom/esp32s2/ld/esp32s2.rom.ld components/esp_rom/esp32s2/ld/esp32s2.rom.libgcc.ld components/esp_rom/esp32s2/ld/esp32s2.rom.newlib-data.ld components/esp_rom/esp32s2/ld/esp32s2.rom.newlib-funcs.ld components/esp_rom/esp32s2/ld/esp32s2.rom.newlib-nano.ld +components/esp_rom/esp32s3/include/esp32s3/rom/opi_flash.h +components/esp_rom/esp32s3/include/esp32s3/rom/tjpgd.h components/esp_rom/esp32s3/ld/esp32s3.rom.api.ld components/esp_rom/esp32s3/ld/esp32s3.rom.ld components/esp_rom/esp32s3/ld/esp32s3.rom.libgcc.ld components/esp_rom/esp32s3/ld/esp32s3.rom.newlib-nano.ld components/esp_rom/esp32s3/ld/esp32s3.rom.newlib.ld components/esp_rom/esp32s3/ld/esp32s3.rom.version.ld -components/esp_rom/include/esp32/rom/aes.h -components/esp_rom/include/esp32/rom/bigint.h -components/esp_rom/include/esp32/rom/crc.h -components/esp_rom/include/esp32/rom/sha.h -components/esp_rom/include/esp32/rom/tbconsole.h -components/esp_rom/include/esp32/rom/tjpgd.h -components/esp_rom/include/esp32c3/rom/bigint.h -components/esp_rom/include/esp32c3/rom/crc.h -components/esp_rom/include/esp32c3/rom/digital_signature.h -components/esp_rom/include/esp32c3/rom/esp_flash.h -components/esp_rom/include/esp32c3/rom/hmac.h -components/esp_rom/include/esp32c3/rom/rsa_pss.h -components/esp_rom/include/esp32c3/rom/sha.h -components/esp_rom/include/esp32c3/rom/tjpgd.h -components/esp_rom/include/esp32s2/rom/aes.h -components/esp_rom/include/esp32s2/rom/bigint.h -components/esp_rom/include/esp32s2/rom/crc.h -components/esp_rom/include/esp32s2/rom/digital_signature.h -components/esp_rom/include/esp32s2/rom/hmac.h -components/esp_rom/include/esp32s2/rom/opi_flash.h -components/esp_rom/include/esp32s2/rom/rsa_pss.h -components/esp_rom/include/esp32s2/rom/sha.h -components/esp_rom/include/esp32s3/rom/bigint.h -components/esp_rom/include/esp32s3/rom/crc.h -components/esp_rom/include/esp32s3/rom/digital_signature.h -components/esp_rom/include/esp32s3/rom/hmac.h -components/esp_rom/include/esp32s3/rom/opi_flash.h -components/esp_rom/include/esp32s3/rom/rsa_pss.h -components/esp_rom/include/esp32s3/rom/sha.h -components/esp_rom/include/esp32s3/rom/tjpgd.h components/esp_rom/include/esp_rom_crc.h -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 diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt index eef90d868b..faa9bc92d8 100644 --- a/tools/ci/check_public_headers_exceptions.txt +++ b/tools/ci/check_public_headers_exceptions.txt @@ -16,7 +16,6 @@ components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/ components/log/include/esp_log_internal.h -components/esp_rom/include/esp32s2/rom/rsa_pss.h # LWIP: sockets.h uses #include_next<>, which doesn't work correctly with the checker @@ -85,23 +84,23 @@ components/esp_coex/include/private/esp_coexist_adapter.h components/esp_coex/include/esp_coex_i154.h ### To be fixed: headers that rely on implicit inclusion # -components/esp_rom/include/esp32/rom/rtc.h -components/esp_rom/include/esp32c3/rom/rtc.h -components/esp_rom/include/esp32s2/rom/rtc.h -components/esp_rom/include/esp32s3/rom/rtc.h -components/esp_rom/include/esp32c2/rom/rtc.h -components/esp_rom/include/esp32c5/rom/rtc.h -components/esp_rom/include/esp32c6/rom/rtc.h -components/esp_rom/include/esp32h2/rom/rtc.h -components/esp_rom/include/esp32p4/rom/rtc.h -components/esp_rom/include/esp32c61/rom/rtc.h -components/esp_rom/include/esp32/rom/sha.h -components/esp_rom/include/esp32/rom/secure_boot.h -components/esp_rom/include/esp32c3/rom/spi_flash.h -components/esp_rom/include/esp32s2/rom/spi_flash.h -components/esp_rom/include/esp32s2/rom/cache.h -components/esp_rom/include/esp32s2/rom/secure_boot.h -components/esp_rom/include/esp32s2/rom/opi_flash.h +components/esp_rom/esp32/include/esp32/rom/rtc.h +components/esp_rom/esp32c3/include/esp32c3/rom/rtc.h +components/esp_rom/esp32s2/include/esp32s2/rom/rtc.h +components/esp_rom/esp32s3/include/esp32s3/rom/rtc.h +components/esp_rom/esp32c2/include/esp32c2/rom/rtc.h +components/esp_rom/esp32c5/include/esp32c5/rom/rtc.h +components/esp_rom/esp32c6/include/esp32c6/rom/rtc.h +components/esp_rom/esp32h2/include/esp32h2/rom/rtc.h +components/esp_rom/esp32p4/include/esp32p4/rom/rtc.h +components/esp_rom/esp32c61/include/esp32c61/rom/rtc.h +components/esp_rom/esp32/include/esp32/rom/sha.h +components/esp_rom/esp32/include/esp32/rom/secure_boot.h +components/esp_rom/esp32c3/include/esp32c3/rom/spi_flash.h +components/esp_rom/esp32s2/include/esp32s2/rom/spi_flash.h +components/esp_rom/esp32s2/include/esp32s2/rom/cache.h +components/esp_rom/esp32s2/include/esp32s2/rom/secure_boot.h +components/esp_rom/esp32s2/include/esp32s2/rom/opi_flash.h components/esp_ringbuf/include/freertos/ringbuf.h components/esp_netif/include/esp_netif_defaults.h components/esp_netif/include/esp_netif_net_stack.h @@ -124,8 +123,8 @@ components/spi_flash/include/esp_private/spi_flash_os.h ### To be fixed: files which don't compile for esp32s2 target: components/esp_psram/include/esp32/himem.h -components/esp_rom/include/esp32/rom/ets_sys.h -components/esp_rom/include/esp32/rom/uart.h +components/esp_rom/esp32/include/esp32/rom/ets_sys.h +components/esp_rom/esp32/include/esp32/rom/uart.h ### To be fixed: files which don't compile for esp32s3 target: