Skip to content

Commit df4d920

Browse files
committed
IDF release/v5.1 ed32d7a267
1 parent 7825e7d commit df4d920

File tree

333 files changed

+430
-342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

333 files changed

+430
-342
lines changed

esp32/bin/bootloader_dio_40m.elf

0 Bytes
Binary file not shown.

esp32/bin/bootloader_dio_80m.elf

0 Bytes
Binary file not shown.

esp32/bin/bootloader_dout_40m.elf

0 Bytes
Binary file not shown.

esp32/bin/bootloader_dout_80m.elf

0 Bytes
Binary file not shown.

esp32/bin/bootloader_qio_40m.elf

0 Bytes
Binary file not shown.

esp32/bin/bootloader_qio_80m.elf

0 Bytes
Binary file not shown.

esp32/bin/bootloader_qout_40m.elf

0 Bytes
Binary file not shown.

esp32/bin/bootloader_qout_80m.elf

0 Bytes
Binary file not shown.

esp32/dio_qspi/include/sdkconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,5 +1081,5 @@
10811081
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
10821082
#define CONFIG_WPA_MBEDTLS_CRYPTO CONFIG_ESP_WIFI_MBEDTLS_CRYPTO
10831083
#define CONFIG_WPA_MBEDTLS_TLS_CLIENT CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
1084-
#define CONFIG_ARDUINO_IDF_COMMIT "6cfc6f53be"
1084+
#define CONFIG_ARDUINO_IDF_COMMIT "ed32d7a267"
10851085
#define CONFIG_ARDUINO_IDF_BRANCH "release/v5.1"

esp32/dio_qspi/libspi_flash.a

0 Bytes
Binary file not shown.

esp32/dout_qspi/include/sdkconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,5 +1081,5 @@
10811081
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
10821082
#define CONFIG_WPA_MBEDTLS_CRYPTO CONFIG_ESP_WIFI_MBEDTLS_CRYPTO
10831083
#define CONFIG_WPA_MBEDTLS_TLS_CLIENT CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
1084-
#define CONFIG_ARDUINO_IDF_COMMIT "6cfc6f53be"
1084+
#define CONFIG_ARDUINO_IDF_COMMIT "ed32d7a267"
10851085
#define CONFIG_ARDUINO_IDF_BRANCH "release/v5.1"

esp32/dout_qspi/libspi_flash.a

0 Bytes
Binary file not shown.

esp32/flags/cpp_flags

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-mlongcalls -Wno-frame-address -ffunction-sections -fdata-sections -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-sign-compare -Wno-enum-conversion -gdwarf-4 -ggdb -freorder-blocks -Wwrite-strings -fstack-protector -fstrict-volatile-bitfields -fno-jump-tables -fno-tree-switch-conversion -std=gnu++20 -fexceptions -fno-rtti
1+
-mlongcalls -Wno-frame-address -ffunction-sections -fdata-sections -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-sign-compare -Wno-enum-conversion -gdwarf-4 -ggdb -freorder-blocks -Wwrite-strings -fstack-protector -fstrict-volatile-bitfields -fno-jump-tables -fno-tree-switch-conversion -std=gnu++2b -fexceptions -fno-rtti

esp32/flags/defines

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-DESP_PLATFORM -DIDF_VER=\"v5.1-dev-4784-g6cfc6f53be\" -DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\" -DSOC_MMU_PAGE_SIZE=CONFIG_MMU_PAGE_SIZE -DUNITY_INCLUDE_CONFIG_H -D_GNU_SOURCE -D_POSIX_READER_WRITER_LOCKS -DconfigENABLE_FREERTOS_DEBUG_OCDAWARE=1
1+
-DESP_PLATFORM -DIDF_VER=\"v5.1-dev-4870-ged32d7a267\" -DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\" -DSOC_MMU_PAGE_SIZE=CONFIG_MMU_PAGE_SIZE -DUNITY_INCLUDE_CONFIG_H -D_GNU_SOURCE -D_POSIX_READER_WRITER_LOCKS -DconfigENABLE_FREERTOS_DEBUG_OCDAWARE=1

esp32/include/console/esp_console.h

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ typedef struct {
6565
.max_cmdline_length = 0, \
6666
}
6767

68+
#if CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
6869
/**
6970
* @brief Parameters for console device: UART
7071
*
@@ -76,7 +77,7 @@ typedef struct {
7677
int rx_gpio_num; //!< GPIO number for RX path, -1 means using default one
7778
} esp_console_dev_uart_config_t;
7879

79-
#ifdef CONFIG_ESP_CONSOLE_UART_CUSTOM
80+
#if CONFIG_ESP_CONSOLE_UART_CUSTOM
8081
#define ESP_CONSOLE_DEV_UART_CONFIG_DEFAULT() \
8182
{ \
8283
.channel = CONFIG_ESP_CONSOLE_UART_NUM, \
@@ -92,8 +93,10 @@ typedef struct {
9293
.tx_gpio_num = -1, \
9394
.rx_gpio_num = -1, \
9495
}
95-
#endif
96+
#endif // CONFIG_ESP_CONSOLE_UART_CUSTOM
97+
#endif // CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
9698

99+
#if CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
97100
/**
98101
* @brief Parameters for console device: USB CDC
99102
*
@@ -104,11 +107,10 @@ typedef struct {
104107

105108
} esp_console_dev_usb_cdc_config_t;
106109

107-
#define ESP_CONSOLE_DEV_CDC_CONFIG_DEFAULT() \
108-
{ \
109-
}
110+
#define ESP_CONSOLE_DEV_CDC_CONFIG_DEFAULT() {}
111+
#endif // CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
110112

111-
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
113+
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
112114
/**
113115
* @brief Parameters for console device: USB-SERIAL-JTAG
114116
*
@@ -120,8 +122,7 @@ typedef struct {
120122
} esp_console_dev_usb_serial_jtag_config_t;
121123

122124
#define ESP_CONSOLE_DEV_USB_SERIAL_JTAG_CONFIG_DEFAULT() {}
123-
124-
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
125+
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
125126

126127
/**
127128
* @brief initialize console module
@@ -304,6 +305,7 @@ struct esp_console_repl_s {
304305
esp_err_t (*del)(esp_console_repl_t *repl);
305306
};
306307

308+
#if CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
307309
/**
308310
* @brief Establish a console REPL environment over UART driver
309311
*
@@ -326,7 +328,9 @@ struct esp_console_repl_s {
326328
* - ESP_FAIL Parameter error
327329
*/
328330
esp_err_t esp_console_new_repl_uart(const esp_console_dev_uart_config_t *dev_config, const esp_console_repl_config_t *repl_config, esp_console_repl_t **ret_repl);
331+
#endif // CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
329332

333+
#if CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
330334
/**
331335
* @brief Establish a console REPL environment over USB CDC
332336
*
@@ -347,8 +351,9 @@ esp_err_t esp_console_new_repl_uart(const esp_console_dev_uart_config_t *dev_con
347351
* - ESP_FAIL Parameter error
348352
*/
349353
esp_err_t esp_console_new_repl_usb_cdc(const esp_console_dev_usb_cdc_config_t *dev_config, const esp_console_repl_config_t *repl_config, esp_console_repl_t **ret_repl);
354+
#endif // CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
350355

351-
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
356+
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
352357
/**
353358
* @brief Establish a console REPL (Read-eval-print loop) environment over USB-SERIAL-JTAG
354359
*
@@ -369,7 +374,7 @@ esp_err_t esp_console_new_repl_usb_cdc(const esp_console_dev_usb_cdc_config_t *d
369374
* - ESP_FAIL Parameter error
370375
*/
371376
esp_err_t esp_console_new_repl_usb_serial_jtag(const esp_console_dev_usb_serial_jtag_config_t *dev_config, const esp_console_repl_config_t *repl_config, esp_console_repl_t **ret_repl);
372-
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
377+
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
373378

374379
/**
375380
* @brief Start REPL environment

esp32/include/driver/mcpwm/include/driver/mcpwm_gen.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ esp_err_t mcpwm_del_generator(mcpwm_gen_handle_t gen);
5959
* @note The force level will be applied to the generator immediately, regardless any other events that would change the generator's behaviour.
6060
* @note If the `hold_on` is true, the force level will retain forever, until user removes the force level by setting the force level to `-1`.
6161
* @note If the `hold_on` is false, the force level can be overridden by the next event action.
62+
* @note The force level set by this function can be inverted by GPIO matrix or dead-time module. So the level set here doesn't equal to the final output level.
6263
*
6364
* @param[in] gen MCPWM generator handle, allocated by `mcpwm_new_generator()`
6465
* @param[in] level GPIO level to be applied to MCPWM generator, specially, -1 means to remove the force level

esp32/include/driver/spi/include/driver/spi_master.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,18 @@ void spi_get_timing(bool gpio_is_used, int input_delay_ns, int eff_clk, int *dum
391391
*/
392392
int spi_get_freq_limit(bool gpio_is_used, int input_delay_ns);
393393

394+
/**
395+
* @brief Get max length (in bytes) of one transaction
396+
*
397+
* @param host_id SPI peripheral
398+
* @param[out] max_bytes Max length of one transaction, in bytes
399+
*
400+
* @return
401+
* - ESP_OK: On success
402+
* - ESP_ERR_INVALID_ARG: Invalid argument
403+
*/
404+
esp_err_t spi_bus_get_max_transaction_len(spi_host_device_t host_id, size_t *max_bytes);
405+
394406
#ifdef __cplusplus
395407
}
396408
#endif

esp32/include/esp_common/include/esp_err.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ const char *esp_err_to_name(esp_err_t code);
7676
const char *esp_err_to_name_r(esp_err_t code, char *buf, size_t buflen);
7777

7878
/** @cond */
79-
void _esp_error_check_failed(esp_err_t rc, const char *file, int line, const char *function, const char *expression) __attribute__((noreturn));
79+
void _esp_error_check_failed(esp_err_t rc, const char *file, int line, const char *function, const char *expression) __attribute__((__noreturn__));
8080

8181
/** @cond */
8282
void _esp_error_check_failed_without_abort(esp_err_t rc, const char *file, int line, const char *function, const char *expression);

esp32/include/esp_common/include/esp_macros.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ extern "C" {
3232
* - MACRO_ARGS(__VA_ARGS__) if __VA_ARGS__ was not empty
3333
* - MACRO_NO_ARGS() if __VA_ARGS__ was empty
3434
*
35-
* @note In the future, we want to switch to C++20. We also want to become compatible with clang. Hence, we provide two
35+
* @note In the future, we want to become compatible with clang. Hence, we provide two
3636
* versions of the following macros which are using variadic arguments. One is using the GNU extension ##__VA_ARGS__.
3737
* The other is using the C++20 feature __VA_OPT__(,). This allows users to compile their code with standard C++20
3838
* enabled instead of the GNU extension. Below C++20, we haven't found any good alternative to using ##__VA_ARGS__.

esp32/include/esp_hw_support/include/esp_cpu.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#endif
2020
#include "esp_intr_alloc.h"
2121
#include "esp_err.h"
22+
#include "esp_attr.h"
2223

2324
#ifdef __cplusplus
2425
extern "C" {

esp32/include/esp_hw_support/include/esp_sleep.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ esp_err_t esp_sleep_pd_config(esp_sleep_pd_domain_t domain,
417417
*
418418
* This function does not return.
419419
*/
420-
void esp_deep_sleep_start(void) __attribute__((noreturn));
420+
void esp_deep_sleep_start(void) __attribute__((__noreturn__));
421421

422422
/**
423423
* @brief Enter light sleep with the configured wakeup options
@@ -455,7 +455,7 @@ esp_err_t esp_light_sleep_start(void);
455455
*
456456
* @param time_in_us deep-sleep time, unit: microsecond
457457
*/
458-
void esp_deep_sleep(uint64_t time_in_us) __attribute__((noreturn));
458+
void esp_deep_sleep(uint64_t time_in_us) __attribute__((__noreturn__));
459459

460460

461461
/**

esp32/include/esp_rom/include/esp32/rom/rtc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ static inline void rtc_suppress_rom_log(void)
217217
*
218218
* @return None
219219
*/
220-
void __attribute__((noreturn)) software_reset(void);
220+
void __attribute__((__noreturn__)) software_reset(void);
221221

222222
/**
223223
* @brief Software Reset digital core.

esp32/include/esp_rom/include/esp32c2/rom/libc_stubs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ struct syscall_stub_table
6969
void (*_retarget_lock_release_recursive)(_LOCK_T lock);
7070
int (*_printf_float)(struct _reent *data, void *pdata, FILE * fp, int (*pfunc) (struct _reent *, FILE *, const char *, size_t len), va_list * ap);
7171
int (*_scanf_float) (struct _reent *rptr, void *pdata, FILE *fp, va_list *ap);
72-
void (*__assert_func) (const char *file, int line, const char * func, const char *failedexpr) __attribute__((noreturn));
72+
void (*__assert_func) (const char *file, int line, const char * func, const char *failedexpr) __attribute__((__noreturn__));
7373
void (*__sinit) (struct _reent *r);
7474
void (*_cleanup_r) (struct _reent* r);
7575
};

esp32/include/esp_rom/include/esp32c3/rom/libc_stubs.h

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
/*
2+
* SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
146
#ifndef _ROM_LIBC_STUBS_H_
157
#define _ROM_LIBC_STUBS_H_
168

@@ -77,7 +69,7 @@ struct syscall_stub_table
7769
void (*_retarget_lock_release_recursive)(_LOCK_T lock);
7870
int (*_printf_float)(struct _reent *data, void *pdata, FILE * fp, int (*pfunc) (struct _reent *, FILE *, const char *, size_t len), va_list * ap);
7971
int (*_scanf_float) (struct _reent *rptr, void *pdata, FILE *fp, va_list *ap);
80-
void (*__assert_func) (const char *file, int line, const char * func, const char *failedexpr) __attribute__((noreturn));
72+
void (*__assert_func) (const char *file, int line, const char * func, const char *failedexpr) __attribute__((__noreturn__));
8173
void (*__sinit) (struct _reent *r);
8274
void (*_cleanup_r) (struct _reent* r);
8375
};

esp32/include/esp_rom/include/esp32c6/rom/libc_stubs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -68,7 +68,7 @@ struct syscall_stub_table {
6868
void (*_retarget_lock_release_recursive)(_LOCK_T lock);
6969
int (*_printf_float)(struct _reent *data, void *pdata, FILE *fp, int (*pfunc) (struct _reent *, FILE *, const char *, size_t len), va_list *ap);
7070
int (*_scanf_float) (struct _reent *rptr, void *pdata, FILE *fp, va_list *ap);
71-
void (*__assert_func) (const char *file, int line, const char *func, const char *failedexpr) __attribute__((noreturn));
71+
void (*__assert_func) (const char *file, int line, const char *func, const char *failedexpr) __attribute__((__noreturn__));
7272
void (*__sinit) (struct _reent *r);
7373
void (*_cleanup_r) (struct _reent *r);
7474
};

esp32/include/esp_rom/include/esp32h2/rom/libc_stubs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -69,7 +69,7 @@ struct syscall_stub_table
6969
void (*_retarget_lock_release_recursive)(_LOCK_T lock);
7070
int (*_printf_float)(struct _reent *data, void *pdata, FILE * fp, int (*pfunc) (struct _reent *, FILE *, const char *, size_t len), va_list * ap);
7171
int (*_scanf_float) (struct _reent *rptr, void *pdata, FILE *fp, va_list *ap);
72-
void (*__assert_func) (const char *file, int line, const char * func, const char *failedexpr) __attribute__((noreturn));
72+
void (*__assert_func) (const char *file, int line, const char * func, const char *failedexpr) __attribute__((__noreturn__));
7373
void (*__sinit) (struct _reent *r);
7474
void (*_cleanup_r) (struct _reent* r);
7575
};

esp32/include/esp_rom/include/esp32s3/rom/libc_stubs.h

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
/*
2+
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
146

157
#pragma once
168

@@ -78,7 +70,7 @@ struct syscall_stub_table
7870
void (*_retarget_lock_release_recursive)(_LOCK_T lock);
7971
int (*_printf_float)(struct _reent *data, void *pdata, FILE * fp, int (*pfunc) (struct _reent *, FILE *, const char *, size_t len), va_list * ap);
8072
int (*_scanf_float) (struct _reent *rptr, void *pdata, FILE *fp, va_list *ap);
81-
void (*__assert_func) (const char *file, int line, const char * func, const char *failedexpr) __attribute__((noreturn));
73+
void (*__assert_func) (const char *file, int line, const char * func, const char *failedexpr) __attribute__((__noreturn__));
8274
void (*__sinit) (struct _reent *r);
8375
void (*_cleanup_r) (struct _reent* r);
8476
};

esp32/include/esp_system/include/esp_private/panic_internal.h

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
/*
2+
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
146

157
#pragma once
168

@@ -76,7 +68,7 @@ void panic_print_hex(int h);
7668
#define panic_print_hex(h)
7769
#endif
7870

79-
void __attribute__((noreturn)) panic_abort(const char *details);
71+
void __attribute__((__noreturn__)) panic_abort(const char *details);
8072

8173
void panic_arch_fill_info(void *frame, panic_info_t *info);
8274

esp32/include/esp_system/include/esp_system.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ esp_err_t esp_unregister_shutdown_handler(shutdown_handler_t handle);
7272
* Peripherals (except for Wi-Fi, BT, UART0, SPI1, and legacy timers) are not reset.
7373
* This function does not return.
7474
*/
75-
void esp_restart(void) __attribute__ ((noreturn));
75+
void esp_restart(void) __attribute__ ((__noreturn__));
7676

7777
/**
7878
* @brief Get reason of last reset
@@ -112,7 +112,7 @@ uint32_t esp_get_minimum_free_heap_size( void );
112112
*
113113
* @param details Details that will be displayed during panic handling.
114114
*/
115-
void __attribute__((noreturn)) esp_system_abort(const char* details);
115+
void __attribute__((__noreturn__)) esp_system_abort(const char* details);
116116

117117
#ifdef __cplusplus
118118
}

esp32/include/hal/esp32/include/hal/i2c_ll.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ static inline void i2c_ll_set_slave_addr(i2c_dev_t *hw, uint16_t slave_addr, boo
275275
*
276276
* @return None
277277
*/
278+
__attribute__((always_inline))
278279
static inline void i2c_ll_write_cmd_reg(i2c_dev_t *hw, i2c_ll_hw_cmd_t cmd, int cmd_idx)
279280
{
280281
hw->command[cmd_idx].val = cmd.val;
@@ -454,6 +455,7 @@ static inline void i2c_ll_get_tout(i2c_dev_t *hw, int *timeout)
454455
*
455456
* @return None
456457
*/
458+
__attribute__((always_inline))
457459
static inline void i2c_ll_trans_start(i2c_dev_t *hw)
458460
{
459461
hw->ctr.trans_start = 1;
@@ -666,6 +668,7 @@ static inline void i2c_ll_slave_init(i2c_dev_t *hw)
666668
*
667669
* @return None
668670
*/
671+
__attribute__((always_inline))
669672
static inline void i2c_ll_update(i2c_dev_t *hw)
670673
{
671674
;// ESP32 do not support
@@ -861,6 +864,7 @@ static inline void i2c_ll_slave_disable_rx_it(i2c_dev_t *hw)
861864
*
862865
* @return None
863866
*/
867+
__attribute__((always_inline))
864868
static inline void i2c_ll_master_enable_tx_it(i2c_dev_t *hw)
865869
{
866870
hw->int_clr.val = UINT32_MAX;
@@ -874,6 +878,7 @@ static inline void i2c_ll_master_enable_tx_it(i2c_dev_t *hw)
874878
*
875879
* @return None
876880
*/
881+
__attribute__((always_inline))
877882
static inline void i2c_ll_master_enable_rx_it(i2c_dev_t *hw)
878883
{
879884
hw->int_clr.val = UINT32_MAX;

0 commit comments

Comments
 (0)