From: luozheng <1732036298@qq.com> Date: Wed, 23 Jul 2025 06:55:24 +0000 (+0800) Subject: middleware文件夹下utils文件夹合并提交 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~230 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=6de6a954149a36a1cde763896a18542bcdd1686c;p=mirrors%2FFD230.git middleware文件夹下utils文件夹合并提交 --- diff --git a/code/sdk/middleware/utils/common_headers/debug_print.h b/code/sdk/middleware/utils/common_headers/debug_print.h index 13c5f367e..74bb49cac 100644 --- a/code/sdk/middleware/utils/common_headers/debug_print.h +++ b/code/sdk/middleware/utils/common_headers/debug_print.h @@ -19,6 +19,10 @@ #include "stdio.h" #endif +#ifdef __cplusplus +extern "C" { +#endif + #if !defined(_WIN32) #ifndef NEWLINE #define NEWLINE "\r\n" @@ -101,6 +105,11 @@ void test_suite_uart_sendf(const char *str, ...); #else // _WIN32 -#define PRINT(fmt, arg...) printf("", "", fmt, ##arg) +#define PRINT(fmt, arg...) printf(fmt, ##arg) #endif // _WIN32 + +#ifdef __cplusplus +} +#endif + #endif diff --git a/code/sdk/middleware/utils/common_headers/native/td_type.h b/code/sdk/middleware/utils/common_headers/native/td_type.h index a9f5d0bc3..47b22c875 100644 --- a/code/sdk/middleware/utils/common_headers/native/td_type.h +++ b/code/sdk/middleware/utils/common_headers/native/td_type.h @@ -8,7 +8,7 @@ #ifdef __KERNEL__ #include -#elif (defined(__LITEOS__) || defined(TD_SUPPORT_STDLIB) || defined(CONFIG_CGRA_CORE)) +#elif (defined(__LITEOS__) || defined(TD_SUPPORT_STDLIB) || defined(CONFIG_CGRA_CORE)) || defined(_WIN32) #include #endif @@ -61,7 +61,7 @@ typedef long long td_mem_handle_t; typedef unsigned int td_fr32; // 分数,分子高16bit,分母低16bit #if ((!defined(_LINUX_TYPES_H)) && (!defined(_STDINT_H)) && (!defined(CONFIG_CGRA_CORE)) \ - &&(!defined(__DEFINED_uintptr_t))) + &&(!defined(__DEFINED_uintptr_t)) &&(!defined(_WIN32))) typedef unsigned int uintptr_t; #define __DEFINED_uintptr_t #endif diff --git a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_dst.c b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_dst.c index 9070ee6a8..1a4ec414a 100644 --- a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_dst.c +++ b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_dst.c @@ -14,6 +14,9 @@ #include "uapi_crc.h" #include "errcode.h" #include "transmit_resume.h" +#ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE +#include "bluetooth/BluetoothChangeBle.h" +#endif #ifdef CONFIG_DFX_SUPPORT_PARTITION #if (CONFIG_DFX_SUPPORT_PARTITION == DFX_YES) #include "partition.h" @@ -114,6 +117,9 @@ static void transmit_dst_item_init_info(transmit_item_t *item, uint16_t transmit transmit_item_init_local_type(item, TRANSMIT_LOCAL_TYPE_SAVE_FILE); transmit_item_init_write_handler(item, file_write_data, (uintptr_t)item); transmit_item_init_remote_type(item, transmit_type); +#ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE + ChangeBleConnectToMax(); +#endif if (re_trans) { #if (CONFIG_DFX_SUPPORT_CONTINUOUSLY_TRANSMIT == DFX_YES) transmit_get_progress(transmit_type, &offset); diff --git a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_item.c b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_item.c index d5418bdd3..a92a75394 100644 --- a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_item.c +++ b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_item.c @@ -21,6 +21,9 @@ #include "transmit.h" #include "diag_msg.h" #include "diag_dfx.h" +#ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE +#include "bluetooth/BluetoothChangeBle.h" +#endif #define TRANSMIT_ITEM_CNT 3 #define TRANSMIT_TIMER_PERIOD 1000 @@ -326,6 +329,9 @@ void transmit_item_deinit(transmit_item_t *item) } item->used = false; +#ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE + ChangeBleConnectToDefault(); +#endif } void transmit_item_disable(transmit_item_t *item, transmit_disable_reason_t reason) diff --git a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_src.c b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_src.c index 16f2d1a73..0975efbbb 100644 --- a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_src.c +++ b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_src.c @@ -19,6 +19,9 @@ #include "securec.h" #include "zdiag_adapt_layer.h" #include "errcode.h" +#ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE +#include "bluetooth/BluetoothChangeBle.h" +#endif STATIC uint32_t transmit_data_read(transmit_item_t *item, uint32_t offset, uint8_t *buf, uint32_t size) { @@ -147,7 +150,9 @@ STATIC void transmit_src_item_init_info(transmit_item_t *item, uint16_t transmit transmit_item_init_local_start(item, false); transmit_item_init_local_src(item, true); transmit_item_init_remote_type(item, transmit_type); - +#ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE + ChangeBleConnectToMax(); +#endif switch (transmit_type) { case TRANSMIT_TYPE_READ_FILE: case TRANSMIT_TYPE_DUMP: diff --git a/code/sdk/middleware/utils/dfx/panic/private/panic.c b/code/sdk/middleware/utils/dfx/panic/private/panic.c index d49011660..afcd1500e 100644 --- a/code/sdk/middleware/utils/dfx/panic/private/panic.c +++ b/code/sdk/middleware/utils/dfx/panic/private/panic.c @@ -246,7 +246,7 @@ void panic_deal(panic_id_t origin, uint32_t code, uint32_t caller) #if !defined(BUILD_APPLICATION_SSB) && !defined(BUILD_RECOVERY_IMAGE) if (origin == PANIC_BT_STS_ABNORMAL) { uapi_self_heal_timer_enable(); - uapi_sys_shipmode(0); + uapi_sys_shipmode_no_calibration(); uapi_tcxo_delay_ms(SELF_HEAL_WAIT_TIME); } #endif diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-cli/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-cli/libx_vfs_private.a index 33a2d799b..b2ef79ea7 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-cli/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-cli/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-ser/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-ser/libx_vfs_private.a index 8f40ca66b..6233af2b3 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-ser/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-auto-ota-ser/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-r/libx_vfs_private.a index 23120b6c6..ef8c37d47 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js/libx_vfs_private.a index 319a37815..1c08fcb6b 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-native-js/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target1-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target1-r/libx_vfs_private.a index bb57d22ae..65e622b8b 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target1-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target1-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target1/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target1/libx_vfs_private.a index e52a1e68b..c42993ae1 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target1/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target1/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target3-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target3-r/libx_vfs_private.a index 24b0b2f8e..4f46e17e1 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target3-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target3-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target3/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target3/libx_vfs_private.a index 0e5855e02..998355721 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target3/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target3/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target4-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target4-r/libx_vfs_private.a index 97f4e64f5..651752069 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target4-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target4-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target4/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target4/libx_vfs_private.a index 09bfd6041..cd04a364e 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target4/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target4/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target5-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target5-r/libx_vfs_private.a index c2ee0d61f..11e2d9809 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target5-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target5-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-target5/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-target5/libx_vfs_private.a index 48096293a..8bdeccc04 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-target5/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-target5/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-xts-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-xts-r/libx_vfs_private.a index b466e66f4..a01bd7550 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-xts-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-xts-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-xts/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-xts/libx_vfs_private.a index e80292fca..08319d332 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-xts/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-xts/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/testsuite-brandy-sdk/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/testsuite-brandy-sdk/libx_vfs_private.a index a276ed70e..23386925a 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/testsuite-brandy-sdk/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/testsuite-brandy-sdk/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-cli/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-cli/libfs_yaffs2.a index 46d1ef55b..f6822a1e5 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-cli/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-cli/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-ser/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-ser/libfs_yaffs2.a index 3e07c7c96..13bf834be 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-ser/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-auto-ota-ser/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-r/libfs_yaffs2.a index 3a01352d5..00beb36cd 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js/libfs_yaffs2.a index b9ee51284..50e244ad8 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target1-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target1-r/libfs_yaffs2.a index 7a071efa8..c9000683b 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target1-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target1-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target1/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target1/libfs_yaffs2.a index e554b69b7..1cf1ddc13 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target1/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target1/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target3-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target3-r/libfs_yaffs2.a index 46e3f75e5..395874ab2 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target3-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target3-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target3/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target3/libfs_yaffs2.a index 82c739041..51c19216d 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target3/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target3/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target4-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target4-r/libfs_yaffs2.a index 9c9873469..70e8eb423 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target4-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target4-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target4/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target4/libfs_yaffs2.a index 1c923b402..862959c8b 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target4/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target4/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target5-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target5-r/libfs_yaffs2.a index 64071738b..1c5314480 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target5-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target5-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-target5/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-target5/libfs_yaffs2.a index 16ee62462..58dec4a61 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-target5/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-target5/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-xts-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-xts-r/libfs_yaffs2.a index 3813b9e20..89122dac6 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-xts-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-xts-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-xts/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-xts/libfs_yaffs2.a index a6315c34f..faf814eff 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-xts/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-xts/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/testsuite-brandy-sdk/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/testsuite-brandy-sdk/libfs_yaffs2.a index 81b00d7d8..a64241e56 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/testsuite-brandy-sdk/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/testsuite-brandy-sdk/libfs_yaffs2.a differ