application文件夹下brandy文件夹1201patch合并提交

diff --git a/code/sdk/application/brandy/brandy_standard/thread_init.c b/code/sdk/application/brandy/brandy_standard/thread_init.c
index d51d612..ae358e7 100644 (file)
--- a/code/sdk/application/brandy/brandy_standard/thread_init.c
+++ b/code/sdk/application/brandy/brandy_standard/thread_init.c
@@ -25,6 +25,7 @@
 #include "pm_control.h"
 #include "dfx_system_init.h"
 #include "cpu_load.h"
+#include "soc_mmc.h"
 
 #ifdef SUPPORT_AT_CMD
 #include "at_cmd_api.h"
@@ -86,6 +87,10 @@
 #include "lwip/tcpip.h"
 #endif
 
+#ifdef SUPPORT_UART_AGENT_DEMO
+#include "app_uart_agent_demo.h"
+#endif
+
 #define EMMC_BASE_ADDR              0x52062000
 
 #define TASK_COMMON_APP_DELAY_MS    5000
@@ -113,7 +118,7 @@
 #define APP_MAIN_STACK_SIZE         0xC00
 #define SAVE_FILE_STACK_SIZE        0xC00
 #define AUTO_OTA_STACK_SIZE         0xC00
-#define LWIP_MAIN_STACK_SIZE        0xF00
+#define LWIP_MAIN_STACK_SIZE        0xC00
 
 #define TIME_MAX                64
 #define USEC_TO_MILLI           1000
@@ -141,10 +146,10 @@ void save_file_main(void);
 static uint32_t g_app_delay_ms = TASK_COMMON_APP_DELAY_MS;
 app_task_definition_t g_app_tasks[] = {
     { { "app", 0, NULL, 0, NULL, APP_MAIN_STACK_SIZE, TASK_PRIORITY_APP, 0, 0 },
-      (osThreadFunc_t)app_main, NULL, NULL, USE_EXTEND_MEM },
+      (osThreadFunc_t)app_main, NULL, NULL, USE_DTCM_MEM },
 #if SUPPORT_LWIP
     { { "lwip", 0, NULL, 0, NULL, LWIP_MAIN_STACK_SIZE, TASK_PRIORITY_BRANDY_APP, 0, 0 },
-      (osThreadFunc_t)lwip_main, NULL, NULL, USE_EXTEND_MEM },
+      (osThreadFunc_t)lwip_main, NULL, NULL, USE_DTCM_MEM },
 #endif
 #if (USE_COMPRESS_LOG_INSTEAD_OF_SDT_LOG == NO)
     { { "log", 0, NULL, 0, NULL, (0xC00), TASK_PRIORITY_LOG, 0, 0 },
@@ -153,9 +158,9 @@ app_task_definition_t g_app_tasks[] = {
     { { "bt_sdk", 0, NULL, 0, NULL, BTH_SDK_STACK_SIZE, TASK_PRIORITY_SDK, 0, 0 },
       (osThreadFunc_t)bt_acore_task_main, NULL, NULL, USE_DTCM_MEM },
 #ifdef SUPPORT_AT_CMD
-    { { "at_cmd", 0, NULL, 0, NULL, 0x1C00, TASK_PRIORITY_APP, 0, 0 },
+    { { "at_cmd", 0, NULL, 0, NULL, 0xC00, TASK_PRIORITY_APP, 0, 0 },
       (osThreadFunc_t)at_cmd_task_process_handler, NULL,
-      (CreateQueueFunction_t)at_cmd_task_queue_init, USE_EXTEND_MEM },
+      (CreateQueueFunction_t)at_cmd_task_queue_init, USE_DTCM_MEM },
 #endif
 #if defined(SUPPORT_AT_GRAPHIC)
     { { "at_graphic", 0, NULL, 0, NULL, AT_GRAPHIC_STACK_SIZE, TASK_PRIORITY_APP, 0, 0 },
@@ -170,17 +175,17 @@ app_task_definition_t g_app_tasks[] = {
 #ifdef SUPPORT_AT_AUDIO
     { { "at_audio", 0, NULL, 0, NULL, AT_AUDIO_STACK_SIZE, TASK_PRIORITY_APP, 0, 0 },
       (osThreadFunc_t)audio_at_task_process_handler, NULL,
-      (CreateQueueFunction_t)audio_at_task_queue_init, USE_EXTEND_MEM },
+      (CreateQueueFunction_t)audio_at_task_queue_init, USE_DTCM_MEM },
 #endif
 #ifdef SUPPORT_AT_BT_MANAGER
     { { "at_bt_manager", 0, NULL, 0, NULL, AT_BT_MANAGER_STACK_SIZE, TASK_PRIORITY_APP, 0, 0 },
       (osThreadFunc_t)bt_manager_task_process_handler, NULL,
-      (CreateQueueFunction_t)bt_manager_at_task_queue_init, USE_EXTEND_MEM },
+      (CreateQueueFunction_t)bt_manager_at_task_queue_init, USE_DTCM_MEM },
 #endif
 #ifdef SUPPORT_AT_MEDIA
     { { "at_media", 0, NULL, 0, NULL, AT_MEDIA_STACK_SIZE, TASK_PRIORITY_APP, 0, 0 },
       (osThreadFunc_t)media_at_task_process_handler, NULL,
-      (CreateQueueFunction_t)media_at_task_queue_init, USE_EXTEND_MEM },
+      (CreateQueueFunction_t)media_at_task_queue_init, USE_DTCM_MEM },
 #endif
 #ifdef HSO_SUPPORT
     { { "dfx_msg", 0, NULL, 0, NULL, DFX_MSG_STACK_SIZE, TASK_PRIORITY_DFX_MSG, 0, 0 },
@@ -199,10 +204,14 @@ app_task_definition_t g_app_tasks[] = {
       (CreateQueueFunction_t)power_display_task_init, USE_DTCM_MEM },
 #endif
     { { "save_file", 0, NULL, 0, NULL, SAVE_FILE_STACK_SIZE, TASK_PRIORITY_SAVE_FILE, 0, 0 },
-      (osThreadFunc_t)save_file_main, NULL, NULL, USE_EXTEND_MEM },
+      (osThreadFunc_t)save_file_main, NULL, NULL, USE_DTCM_MEM },
 #ifdef SUPPORT_AUTO_OTA
     { { "auto_ota", 0, NULL, 0, NULL, AUTO_OTA_STACK_SIZE, TASK_PRIORITY_AUTO_OTA, 0, 0 },
-      (osThreadFunc_t)auto_ota_task_main, NULL, NULL, USE_EXTEND_MEM },
+      (osThreadFunc_t)auto_ota_task_main, NULL, NULL, USE_DTCM_MEM },
+#endif
+#ifdef SUPPORT_UART_AGENT_DEMO
+    { { "uart_agent_app", 0, NULL, 0, NULL, UART_AGENT_APP_STACK_SIZE, TASK_PRIORITY_TRANSMIT, 0, 0 },
+        (osThreadFunc_t)app_uart_agent_task_thread, NULL, NULL, USE_DTCM_MEM },
 #endif
 };
 
@@ -368,6 +377,7 @@ static void app_main(const void *unused)
 #ifndef XTS_SUPPORT
         PRINT("app_main run start."NEWLINE);
         print_system_sleep_info();
+        mmc_sdhci_clock_info();
         oml_pf_log_print0(LOG_BCORE_PLT_DRIVER_REBOOT, LOG_NUM_DRIVER_LPC, LOG_LEVEL_INFO, "App run ok.");
 #endif
     }

diff --git a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
index 275be3d..ad4b871 100644 (file)
--- a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
+++ b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
@@ -173,8 +173,11 @@ static void sample_gfx_init(void)
 #else\r
     ztw523_host_init_sample();\r
 #endif\r
-#endif\r
-    uapi_lcd_init();\r
+    ext_errno ret = uapi_lcd_init();\r
+    if (ret != EXT_ERR_SUCCESS) {\r
+        PRINT("lcd init fail, ret = %x \r\n", ret);\r
+        return;\r
+    }\r
     uapi_vau_module_init();\r
     uapi_dpu_module_init();\r
 #ifdef SUPPORT_GPU_JPEG\r