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 13c5f36..74bb49c 100644 (file)
--- 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"\r
 #endif\r
 \r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif\r
+\r
 #if !defined(_WIN32)\r
 #ifndef NEWLINE\r
 #define NEWLINE "\r\n"\r
@@ -101,6 +105,11 @@ void test_suite_uart_sendf(const char *str, ...);
 \r
 \r
 #else // _WIN32\r
-#define PRINT(fmt, arg...) printf("", "", fmt, ##arg)\r
+#define PRINT(fmt, arg...) printf(fmt, ##arg)\r
 #endif // _WIN32\r
+\r
+#ifdef __cplusplus\r
+}\r
+#endif\r
+\r
 #endif\r

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 a9f5d0b..47b22c8 100644 (file)
--- 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 @@
 \r
 #ifdef __KERNEL__\r
 #include <linux/types.h>\r
-#elif (defined(__LITEOS__) || defined(TD_SUPPORT_STDLIB) || defined(CONFIG_CGRA_CORE))\r
+#elif (defined(__LITEOS__) || defined(TD_SUPPORT_STDLIB) || defined(CONFIG_CGRA_CORE)) || defined(_WIN32)\r
 #include <stdint.h>\r
 #endif\r
 \r
@@ -61,7 +61,7 @@ typedef long long               td_mem_handle_t;
 typedef unsigned int            td_fr32; // 分数，分子高16bit，分母低16bit\r
 \r
 #if ((!defined(_LINUX_TYPES_H)) && (!defined(_STDINT_H)) && (!defined(CONFIG_CGRA_CORE)) \\r
-     &&(!defined(__DEFINED_uintptr_t)))\r
+     &&(!defined(__DEFINED_uintptr_t)) &&(!defined(_WIN32)))\r
 typedef unsigned int            uintptr_t;\r
 #define __DEFINED_uintptr_t\r
 #endif\r

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 9070ee6..1a4ec41 100644 (file)
--- 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"\r
 #include "errcode.h"\r
 #include "transmit_resume.h"\r
+#ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
+#include "bluetooth/BluetoothChangeBle.h"\r
+#endif\r
 #ifdef CONFIG_DFX_SUPPORT_PARTITION\r
 #if (CONFIG_DFX_SUPPORT_PARTITION == DFX_YES)\r
 #include "partition.h"\r
@@ -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);\r
     transmit_item_init_write_handler(item, file_write_data, (uintptr_t)item);\r
     transmit_item_init_remote_type(item, transmit_type);\r
+#ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
+    ChangeBleConnectToMax();\r
+#endif\r
     if (re_trans) {\r
 #if (CONFIG_DFX_SUPPORT_CONTINUOUSLY_TRANSMIT == DFX_YES)\r
         transmit_get_progress(transmit_type, &offset);\r

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 d5418bd..a92a753 100644 (file)
--- 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"\r
 #include "diag_msg.h"\r
 #include "diag_dfx.h"\r
+#ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
+#include "bluetooth/BluetoothChangeBle.h"\r
+#endif\r
 \r
 #define TRANSMIT_ITEM_CNT 3\r
 #define TRANSMIT_TIMER_PERIOD 1000\r
@@ -326,6 +329,9 @@ void transmit_item_deinit(transmit_item_t *item)
     }\r
 \r
     item->used = false;\r
+#ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
+    ChangeBleConnectToDefault();\r
+#endif\r
 }\r
 \r
 void transmit_item_disable(transmit_item_t *item, transmit_disable_reason_t reason)\r

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 16f2d1a..0975efb 100644 (file)
--- 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"\r
 #include "zdiag_adapt_layer.h"\r
 #include "errcode.h"\r
+#ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
+#include "bluetooth/BluetoothChangeBle.h"\r
+#endif\r
 \r
 STATIC uint32_t transmit_data_read(transmit_item_t *item, uint32_t offset, uint8_t *buf, uint32_t size)\r
 {\r
@@ -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);\r
     transmit_item_init_local_src(item, true);\r
     transmit_item_init_remote_type(item, transmit_type);\r
-\r
+#ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
+    ChangeBleConnectToMax();\r
+#endif\r
     switch (transmit_type) {\r
         case TRANSMIT_TYPE_READ_FILE:\r
         case TRANSMIT_TYPE_DUMP:\r

diff --git a/code/sdk/middleware/utils/dfx/panic/private/panic.c b/code/sdk/middleware/utils/dfx/panic/private/panic.c
index d490116..afcd150 100644 (file)
--- 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 33a2d79..b2ef79e 100644 (file)
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 8f40ca6..6233af2 100644 (file)
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 23120b6..ef8c37d 100644 (file)
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 319a378..1c08fcb 100644 (file)
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 bb57d22..65e622b 100644 (file)
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 e52a1e6..c42993a 100644 (file)
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 24b0b2f..4f46e17 100644 (file)
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 0e5855e..9983557 100644 (file)
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 97f4e64..6517520 100644 (file)
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 09bfd60..cd04a36 100644 (file)
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 c2ee0d6..11e2d98 100644 (file)
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 4809629..8bdeccc 100644 (file)
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 b466e66..a01bd75 100644 (file)
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 e80292f..08319d3 100644 (file)
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 a276ed7..2338692 100644 (file)
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 46d1ef5..f6822a1 100644 (file)
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 3e07c7c..13bf834 100644 (file)
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 3a01352..00beb36 100644 (file)
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 b9ee512..50e244a 100644 (file)
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 7a071ef..c900068 100644 (file)
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 e554b69..1cf1ddc 100644 (file)
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 46e3f75..395874a 100644 (file)
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 82c7390..51c1921 100644 (file)
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 9c98734..70e8eb4 100644 (file)
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 1c923b4..862959c 100644 (file)
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 6407173..1c53144 100644 (file)
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 16ee624..58dec4a 100644 (file)
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 3813b9e..89122da 100644 (file)
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 a6315c3..faf814e 100644 (file)
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 81b00d7..a64241e 100644 (file)
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