Regenerate all (#474)

* Regenerate all * Update toolchain used * Include `libprintf.a`
esp-rs · Aug 30, 2024 · cb78993 · cb78993
1 parent 2862fb2
commit cb78993
Show file tree

Hide file tree

Showing 106 changed files with 8,117 additions and 3,222 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,6 @@
 [workspace]
 members = ["esp-wifi-sys", "xtask"]
+exclude = ["printf"]
 resolver = "2"
 
 [profile.release]

diff --git a/esp-wifi-sys/build.rs b/esp-wifi-sys/build.rs
@@ -95,6 +95,7 @@ fn copy_libraries(out: &PathBuf) -> Result<()> {
     copy_file(out, "libs/esp32/libsmartconfig.a", "libsmartconfig.a")?;
     copy_file(out, "libs/esp32/libwapi.a", "libwapi.a")?;
     copy_file(out, "libs/esp32/libwpa_supplicant.a", "libwpa_supplicant.a")?;
+    copy_file(out, "libs/esp32/libprintf.a", "libprintf.a")?;
 
     println!("cargo:rustc-link-lib={}", "btdm_app");
     println!("cargo:rustc-link-lib={}", "coexist");
@@ -108,6 +109,7 @@ fn copy_libraries(out: &PathBuf) -> Result<()> {
     println!("cargo:rustc-link-lib={}", "smartconfig");
     println!("cargo:rustc-link-lib={}", "wapi");
     println!("cargo:rustc-link-lib={}", "wpa_supplicant");
+    println!("cargo:rustc-link-lib={}", "printf");
 
     Ok(())
 }
@@ -128,6 +130,7 @@ fn copy_libraries(out: &PathBuf) -> Result<()> {
         "libs/esp32c2/libwpa_supplicant.a",
         "libwpa_supplicant.a",
     )?;
+    copy_file(out, "libs/esp32c2/libprintf.a", "libprintf.a")?;
 
     println!("cargo:rustc-link-lib={}", "ble_app");
     println!("cargo:rustc-link-lib={}", "btbb");
@@ -139,6 +142,7 @@ fn copy_libraries(out: &PathBuf) -> Result<()> {
     println!("cargo:rustc-link-lib={}", "pp");
     println!("cargo:rustc-link-lib={}", "smartconfig");
     println!("cargo:rustc-link-lib={}", "wpa_supplicant");
+    println!("cargo:rustc-link-lib={}", "printf");
 
     Ok(())
 }
@@ -161,6 +165,7 @@ fn copy_libraries(out: &PathBuf) -> Result<()> {
         "libs/esp32c3/libwpa_supplicant.a",
         "libwpa_supplicant.a",
     )?;
+    copy_file(out, "libs/esp32c3/libprintf.a", "libprintf.a")?;
 
     println!("cargo:rustc-link-lib={}", "btbb");
     println!("cargo:rustc-link-lib={}", "btdm_app");
@@ -174,6 +179,7 @@ fn copy_libraries(out: &PathBuf) -> Result<()> {
     println!("cargo:rustc-link-lib={}", "smartconfig");
     println!("cargo:rustc-link-lib={}", "wapi");
     println!("cargo:rustc-link-lib={}", "wpa_supplicant");
+    println!("cargo:rustc-link-lib={}", "printf");
 
     Ok(())
 }
@@ -196,6 +202,7 @@ fn copy_libraries(out: &PathBuf) -> Result<()> {
         "libs/esp32c6/libwpa_supplicant.a",
         "libwpa_supplicant.a",
     )?;
+    copy_file(out, "libs/esp32c6/libprintf.a", "libprintf.a")?;
 
     println!("cargo:rustc-link-lib={}", "ble_app");
     println!("cargo:rustc-link-lib={}", "btbb");
@@ -209,6 +216,7 @@ fn copy_libraries(out: &PathBuf) -> Result<()> {
     println!("cargo:rustc-link-lib={}", "smartconfig");
     println!("cargo:rustc-link-lib={}", "wapi");
     println!("cargo:rustc-link-lib={}", "wpa_supplicant");
+    println!("cargo:rustc-link-lib={}", "printf");
 
     Ok(())
 }
@@ -219,17 +227,13 @@ fn copy_libraries(out: &PathBuf) -> Result<()> {
     copy_file(out, "libs/esp32h2/libbtbb.a", "libbtbb.a")?;
     copy_file(out, "libs/esp32h2/libcoexist.a", "libcoexist.a")?;
     copy_file(out, "libs/esp32h2/libphy.a", "libphy.a")?;
-    copy_file(
-        out,
-        "libs/esp32h2/libwpa_supplicant.a",
-        "libwpa_supplicant.a",
-    )?;
+    copy_file(out, "libs/esp32h2/libprintf.a", "libprintf.a")?;
 
     println!("cargo:rustc-link-lib={}", "ble_app");
     println!("cargo:rustc-link-lib={}", "btbb");
     println!("cargo:rustc-link-lib={}", "coexist");
     println!("cargo:rustc-link-lib={}", "phy");
-    println!("cargo:rustc-link-lib={}", "wpa_supplicant");
+    println!("cargo:rustc-link-lib={}", "printf");
 
     Ok(())
 }
@@ -251,6 +255,7 @@ fn copy_libraries(out: &PathBuf) -> Result<()> {
         "libs/esp32s2/libwpa_supplicant.a",
         "libwpa_supplicant.a",
     )?;
+    copy_file(out, "libs/esp32s2/libprintf.a", "libprintf.a")?;
 
     println!("cargo:rustc-link-lib={}", "coexist");
     println!("cargo:rustc-link-lib={}", "core");
@@ -262,6 +267,7 @@ fn copy_libraries(out: &PathBuf) -> Result<()> {
     println!("cargo:rustc-link-lib={}", "smartconfig");
     println!("cargo:rustc-link-lib={}", "wapi");
     println!("cargo:rustc-link-lib={}", "wpa_supplicant");
+    println!("cargo:rustc-link-lib={}", "printf");
 
     Ok(())
 }
@@ -285,6 +291,7 @@ fn copy_libraries(out: &PathBuf) -> Result<()> {
         "libs/esp32s3/libwpa_supplicant.a",
         "libwpa_supplicant.a",
     )?;
+    copy_file(out, "libs/esp32s3/libprintf.a", "libprintf.a")?;
 
     println!("cargo:rustc-link-lib={}", "btbb");
     println!("cargo:rustc-link-lib={}", "btdm_app");
@@ -298,6 +305,7 @@ fn copy_libraries(out: &PathBuf) -> Result<()> {
     println!("cargo:rustc-link-lib={}", "smartconfig");
     println!("cargo:rustc-link-lib={}", "wapi");
     println!("cargo:rustc-link-lib={}", "wpa_supplicant");
+    println!("cargo:rustc-link-lib={}", "printf");
 
     Ok(())
 }
diff --git a/esp-wifi-sys/headers/btbb.h b/esp-wifi-sys/headers/btbb.h
@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Set btbb enable for BT/ieee802154
+ * @param[in] print_version enable btbb version print.
+ * @return NULL
+ */
+void bt_bb_v2_init_cmplx(int print_version);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/esp-wifi-sys/headers/esp32/esp_bt.h b/esp-wifi-sys/headers/esp32/esp_bt.h
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 #include "esp_err.h"
 #include "sdkconfig.h"
+
 #include "esp_assert.h"
 
 #ifdef __cplusplus

diff --git a/esp-wifi-sys/headers/esp32/sdkconfig.h b/esp-wifi-sys/headers/esp32/sdkconfig.h
@@ -223,6 +223,7 @@
 #define CONFIG_APP_BUILD_GENERATE_BINARIES 1
 #define CONFIG_APP_BUILD_BOOTLOADER 1
 #define CONFIG_APP_BUILD_USE_FLASH_SECTIONS 1
+#define CONFIG_APP_REPRODUCIBLE_BUILD 1
 #define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x1000
 #define CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE 1
 #define CONFIG_BOOTLOADER_LOG_LEVEL_INFO 1
@@ -261,9 +262,10 @@
 #define CONFIG_PARTITION_TABLE_OFFSET 0x8000
 #define CONFIG_PARTITION_TABLE_MD5 1
 #define CONFIG_COMPILER_OPTIMIZATION_SIZE 1
-#define CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE 1
+#define CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT 1
 #define CONFIG_COMPILER_FLOAT_LIB_FROM_GCCLIB 1
-#define CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL 2
+#define CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL 1
+#define CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT 1
 #define CONFIG_COMPILER_HIDE_PATHS_MACROS 1
 #define CONFIG_COMPILER_STACK_CHECK_MODE_NONE 1
 #define CONFIG_APPTRACE_DEST_NONE 1
@@ -434,6 +436,7 @@
 #define CONFIG_ESP_PHY_CALIBRATION_MODE 0
 #define CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160 1
 #define CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ 160
+#define CONFIG_ESP32_TRACEMEM_RESERVE_DRAM 0x0
 #define CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT 1
 #define CONFIG_ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS 0
 #define CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE 32
@@ -492,13 +495,9 @@
 #define CONFIG_ESP_WIFI_MGMT_SBUF_NUM 32
 #define CONFIG_ESP_WIFI_IRAM_OPT 1
 #define CONFIG_ESP_WIFI_RX_IRAM_OPT 1
-#define CONFIG_ESP_WIFI_ENABLE_WPA3_SAE 1
-#define CONFIG_ESP_WIFI_ENABLE_SAE_PK 1
-#define CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT 1
 #define CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE 1
 #define CONFIG_ESP_WIFI_SOFTAP_SUPPORT 1
 #define CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM 7
-#define CONFIG_ESP_WIFI_MBEDTLS_CRYPTO 1
 #define CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT 1
 #define CONFIG_ESP_COREDUMP_ENABLE_TO_NONE 1
 #define CONFIG_FATFS_VOLUME_COUNT 2
@@ -532,7 +531,7 @@
 #define CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION 1
 #define CONFIG_FREERTOS_DEBUG_OCDAWARE 1
 #define CONFIG_HAL_ASSERTION_EQUALS_SYSTEM 1
-#define CONFIG_HAL_DEFAULT_ASSERTION_LEVEL 2
+#define CONFIG_HAL_DEFAULT_ASSERTION_LEVEL 1
 #define CONFIG_HAL_SPI_MASTER_FUNC_IN_IRAM 1
 #define CONFIG_HAL_SPI_SLAVE_FUNC_IN_IRAM 1
 #define CONFIG_HEAP_POISONING_DISABLED 1
@@ -618,7 +617,6 @@
 #define CONFIG_MBEDTLS_CERTIFICATE_BUNDLE 1
 #define CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL 1
 #define CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS 200
-#define CONFIG_MBEDTLS_CMAC_C 1
 #define CONFIG_MBEDTLS_HARDWARE_AES 1
 #define CONFIG_MBEDTLS_HARDWARE_MPI 1
 #define CONFIG_MBEDTLS_HARDWARE_SHA 1
@@ -685,6 +683,7 @@
 #define CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_2 1
 #define CONFIG_PTHREAD_TASK_PRIO_DEFAULT 5
 #define CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT 3072
+#define CONFIG_PTHREAD_STACK_MIN 768
 #define CONFIG_PTHREAD_DEFAULT_CORE_NO_AFFINITY 1
 #define CONFIG_PTHREAD_TASK_CORE_DEFAULT -1
 #define CONFIG_PTHREAD_TASK_NAME_DEFAULT "pthread"
@@ -797,12 +796,14 @@
 #define CONFIG_ESP32_DEBUG_OCDAWARE CONFIG_ESP_DEBUG_OCDAWARE
 #define CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY CONFIG_ESP_SLEEP_WAIT_FLASH_READY_EXTRA_DELAY
 #define CONFIG_ESP32_DEFAULT_CPU_FREQ_160 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160
+#define CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ
 #define CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY CONFIG_PTHREAD_DEFAULT_CORE_NO_AFFINITY
 #define CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE CONFIG_ESP_COREDUMP_ENABLE_TO_NONE
 #define CONFIG_ESP32_PANIC_PRINT_REBOOT CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT
 #define CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE
 #define CONFIG_ESP32_PHY_MAX_TX_POWER CONFIG_ESP_PHY_MAX_TX_POWER
 #define CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER CONFIG_ESP_PHY_MAX_WIFI_TX_POWER
+#define CONFIG_ESP32_PTHREAD_STACK_MIN CONFIG_PTHREAD_STACK_MIN
 #define CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT CONFIG_PTHREAD_TASK_CORE_DEFAULT
 #define CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT CONFIG_PTHREAD_TASK_NAME_DEFAULT
 #define CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT CONFIG_PTHREAD_TASK_PRIO_DEFAULT
@@ -818,7 +819,6 @@
 #define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER
 #define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM
 #define CONFIG_ESP32_WIFI_ENABLED CONFIG_ESP_WIFI_ENABLED
-#define CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE CONFIG_ESP_WIFI_ENABLE_WPA3_SAE
 #define CONFIG_ESP32_WIFI_IRAM_OPT CONFIG_ESP_WIFI_IRAM_OPT
 #define CONFIG_ESP32_WIFI_MGMT_SBUF_NUM CONFIG_ESP_WIFI_MGMT_SBUF_NUM
 #define CONFIG_ESP32_WIFI_NVS_ENABLED CONFIG_ESP_WIFI_NVS_ENABLED
@@ -864,7 +864,7 @@
 #define CONFIG_MCA_TRACE_LEVEL_WARNING CONFIG_BT_LOG_MCA_TRACE_LEVEL_WARNING
 #define CONFIG_MONITOR_BAUD CONFIG_ESPTOOLPY_MONITOR_BAUD
 #define CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES
-#define CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE
+#define CONFIG_OPTIMIZATION_ASSERTIONS_SILENT CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT
 #define CONFIG_OPTIMIZATION_ASSERTION_LEVEL CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL
 #define CONFIG_OPTIMIZATION_LEVEL_RELEASE CONFIG_COMPILER_OPTIMIZATION_SIZE
 #define CONFIG_OSI_INITIAL_TRACE_LEVEL CONFIG_BT_LOG_OSI_TRACE_LEVEL
@@ -910,5 +910,5 @@
 #define CONFIG_TIMER_TASK_PRIORITY CONFIG_FREERTOS_TIMER_TASK_PRIORITY
 #define CONFIG_TIMER_TASK_STACK_DEPTH CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH
 #define CONFIG_TIMER_TASK_STACK_SIZE CONFIG_ESP_TIMER_TASK_STACK_SIZE
+#define CONFIG_TRACEMEM_RESERVE_DRAM CONFIG_ESP32_TRACEMEM_RESERVE_DRAM
 #define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
-#define CONFIG_WPA_MBEDTLS_CRYPTO CONFIG_ESP_WIFI_MBEDTLS_CRYPTO
diff --git a/esp-wifi-sys/headers/esp32c2/esp_bt.h b/esp-wifi-sys/headers/esp32c2/esp_bt.h
@@ -12,7 +12,9 @@
 #include "esp_err.h"
 #include "sdkconfig.h"
 
+
 #include "nimble/nimble_npl.h"
+//#include "../../../../controller/esp32c2/esp_bt_cfg.h"
 #include "hal/efuse_hal.h"
 
 #ifdef CONFIG_BT_LE_HCI_INTERFACE_USE_UART

diff --git a/esp-wifi-sys/headers/esp32c2/esp_bt_cfg.h b/esp-wifi-sys/headers/esp32c2/esp_bt_cfg.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -32,15 +32,19 @@ extern "C" {
     #define DEFAULT_BT_LE_MAX_PERIODIC_ADVERTISER_LIST MYNEWT_VAL(BLE_MAX_PERIODIC_ADVERTISER_LIST)
     #define DEFAULT_BT_LE_MAX_PERIODIC_SYNCS MYNEWT_VAL(BLE_MAX_PERIODIC_SYNCS)
     #define DEFAULT_BT_LE_MAX_CONNECTIONS MYNEWT_VAL(BLE_MAX_CONNECTIONS)
-    #define DEFAULT_BT_LE_ACL_BUF_SIZE MYNEWT_VAL(BLE_ACL_BUF_SIZE)
-    #define DEFAULT_BT_LE_ACL_BUF_COUNT MYNEWT_VAL(BLE_ACL_BUF_COUNT)
-    #define DEFAULT_BT_LE_HCI_EVT_BUF_SIZE MYNEWT_VAL(BLE_HCI_EVT_BUF_SIZE)
+    #define DEFAULT_BT_LE_ACL_BUF_SIZE MYNEWT_VAL(BLE_TRANSPORT_ACL_SIZE)
+    #define DEFAULT_BT_LE_ACL_BUF_COUNT MYNEWT_VAL(BLE_TRANSPORT_ACL_FROM_LL_COUNT)
+    #define DEFAULT_BT_LE_HCI_EVT_BUF_SIZE MYNEWT_VAL(BLE_TRANSPORT_EVT_SIZE)
     #define DEFAULT_BT_LE_EXT_ADV_MAX_SIZE MYNEWT_VAL(BLE_EXT_ADV_MAX_SIZE)
     #define DEFAULT_BT_LE_MAX_EXT_ADV_INSTANCES MYNEWT_VAL(BLE_MULTI_ADV_INSTANCES)
     #define DEFAULT_BT_NIMBLE_WHITELIST_SIZE MYNEWT_VAL(BLE_LL_WHITELIST_SIZE)
-    #define DEFAULT_BT_LE_HCI_EVT_HI_BUF_COUNT MYNEWT_VAL(BLE_HCI_EVT_HI_BUF_COUNT)
-    #define DEFAULT_BT_LE_HCI_EVT_LO_BUF_COUNT MYNEWT_VAL(BLE_HCI_EVT_LO_BUF_COUNT)
-    #define DEFAULT_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EFF
+    #define DEFAULT_BT_LE_HCI_EVT_HI_BUF_COUNT MYNEWT_VAL(BLE_TRANSPORT_EVT_COUNT)
+    #define DEFAULT_BT_LE_HCI_EVT_LO_BUF_COUNT MYNEWT_VAL(BLE_TRANSPORT_EVT_DISCARDABLE_COUNT)
+    #if defined(CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT)
+    #define DEFAULT_BT_LE_50_FEATURE_SUPPORT (1)
+    #else
+    #define DEFAULT_BT_LE_50_FEATURE_SUPPORT (0)
+    #endif
 
 #else
 
@@ -115,12 +119,15 @@ extern "C" {
     #else
         #define DEFAULT_BT_LE_HCI_EVT_LO_BUF_COUNT (8)
     #endif
-
-    #define DEFAULT_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF CONFIG_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF
+    #if defined(CONFIG_BT_LE_50_FEATURE_SUPPORT)
+        #define DEFAULT_BT_LE_50_FEATURE_SUPPORT (1)
+    #else
+        #define DEFAULT_BT_LE_50_FEATURE_SUPPORT (0)
+    #endif
 
 #endif
 
-
+#define DEFAULT_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF CONFIG_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF
 
 #ifdef CONFIG_BT_LE_HCI_INTERFACE_USE_UART
 #define HCI_UART_EN CONFIG_BT_LE_HCI_INTERFACE_USE_UART