Merge "[BugFix][API-1284]fix ap change mode 2.4g to 5g ap error" into GSW3.0-No-Connman
diff --git a/framework/lynq-ril-service/src/cc.cpp b/framework/lynq-ril-service/src/cc.cpp
index 4040df3..f6cc262 100755
--- a/framework/lynq-ril-service/src/cc.cpp
+++ b/framework/lynq-ril-service/src/cc.cpp
@@ -1325,28 +1325,28 @@
         system("echo 0x30 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x31 0x80 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x32 0x85 > /sys/kernel/debug/regmap/0-0018/registers");
-        system("echo 0x33 0x9f > /sys/kernel/debug/regmap/0-0018/registers");
+        system("echo 0x33 0x00 > /sys/kernel/debug/regmap/0-0018/registers"); //dongyu@2023.9.18 Disables CODEC lineout output by default
         system("echo 0x34 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x35 0x80 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x36 0x82 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x37 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x38 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x39 0x82 > /sys/kernel/debug/regmap/0-0018/registers");
-        system("echo 0x3a 0x9f > /sys/kernel/debug/regmap/0-0018/registers");
+        system("echo 0x3a 0x00 > /sys/kernel/debug/regmap/0-0018/registers"); //dongyu@2023.9.18 Disables CODEC lineout output by default
         system("echo 0x3b 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x3c 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x3d 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x3e 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x3f 0x80 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x40 0xaf > /sys/kernel/debug/regmap/0-0018/registers");
-        system("echo 0x41 0x0d > /sys/kernel/debug/regmap/0-0018/registers");
+        system("echo 0x41 0x00 > /sys/kernel/debug/regmap/0-0018/registers"); //dongyu@2023.9.18 Disables CODEC lineout output by default
         system("echo 0x42 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x43 0x80 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x44 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x45 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x46 0x02 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x47 0xaf > /sys/kernel/debug/regmap/0-0018/registers");
-        system("echo 0x48 0x0d > /sys/kernel/debug/regmap/0-0018/registers");
+        system("echo 0x48 0x00 > /sys/kernel/debug/regmap/0-0018/registers"); //dongyu@2023.9.18 Disables CODEC lineout output by default
         system("echo 0x49 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x4a 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x4b 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
diff --git a/framework/lynq-sdk-ready/src/makefile b/framework/lynq-sdk-ready/src/makefile
index c1638ae..1030e02 100755
--- a/framework/lynq-sdk-ready/src/makefile
+++ b/framework/lynq-sdk-ready/src/makefile
@@ -3,6 +3,7 @@
 
 LOCAL_CFLAGS := -Wall \
                 -g -Os \
+		-std=gnu++14 \
                 -flto \
                 -DRIL_SHLIB \
                 -DATCI_PARSE \
diff --git a/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp b/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp
index 24ffcb4..9d5726a 100755
--- a/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp
+++ b/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp
@@ -252,7 +252,7 @@
     return ;

 }

 

-

+/*

 void *check(void * arg)

 {

 

@@ -361,6 +361,7 @@
     }

 

 }

+*/

 

 void *check_uci(void * arg)

 {

@@ -489,11 +490,13 @@
         return;

     }

     sleep(20);

+    /*

     ret = pthread_create(&thid_1, NULL, check, NULL);

     if(ret != 0){

         RLOGD("pthread_create error!!!");

         return;

     }

+    */

 

     ret = pthread_create(&thid_2,NULL,check_uci,NULL);

     if(ret != 0){

diff --git a/lib/liblynq-fota/rock_ua/rock_ua.c b/lib/liblynq-fota/rock_ua/rock_ua.c
index 64aa8e9..0822d13 100755
--- a/lib/liblynq-fota/rock_ua/rock_ua.c
+++ b/lib/liblynq-fota/rock_ua/rock_ua.c
@@ -184,6 +184,9 @@
 #define MD5_RETRY_TIME 3
 #define MD5_VERFY_ERROR 5
 #define MD5_READ_BUFFER_LEN 4*1024
+#define FOTA_FIRST 0
+#define RECOVER_FIRST 1
+int fota_interrupt = 1;
 //xf.li@20230822 add for ab rollback end
 
 
@@ -1488,7 +1491,7 @@
     for(; ret > 0 && retry > 0; retry--)
     {   
         //erase nand-target start
-        if((access(FILE_UPDATE_FLAG, F_OK)) == 0)
+        if(fota_interrupt == FOTA_FIRST && (access(FILE_UPDATE_FLAG, F_OK)) == 0)
         {
             RLOGD("+[UA]: fota runing\n");
             return -1;
@@ -1522,7 +1525,7 @@
         acquire_wake_lock(PARTIAL_WAKE_LOCK, "ab_recover");//lock
         while(( size = mtk_device_wrap_read(fd_source,delta_data,ROCK_DEFAULT_BLOCK_SIZE))>0)
         {
-            if((access(FILE_UPDATE_FLAG, F_OK)) == 0)
+            if(fota_interrupt == FOTA_FIRST && (access(FILE_UPDATE_FLAG, F_OK)) == 0)
             {
                 RLOGD("+[UA]: fota runing\n");
                 ret = -1;
@@ -1599,8 +1602,16 @@
     current_slot = module->getCurrentSlot(module);
     is_successful = module->isSlotMarkedSuccessful(module, current_slot);
     RLOGD("+[UA]: Booting slot = %d, : isSlotMarkedSuccessful= %d\n",current_slot,is_successful);
+    fota_interrupt = RECOVER_FIRST;
     if(current_slot==SLOT_B)
     {
+        ret = backup_nand_copyto_nand(DEV_SPM_B,DEV_SPM_A);
+        if(ret != 0)
+        {
+            RLOGD("+[UA]: backup spm_a fail\n");
+            return 1;
+        }
+        fota_interrupt = FOTA_FIRST;
         ret = backup_nand_copyto_nand(DEV_SYSTEM_B,DEV_SYSTEM_A);
         if(ret != 0)
         {
@@ -1625,12 +1636,6 @@
             RLOGD("+[UA]: backup md1img_a fail\n");
             return 1;
         }
-        ret = backup_nand_copyto_nand(DEV_SPM_B,DEV_SPM_A);
-        if(ret != 0)
-        {
-            RLOGD("+[UA]: backup spm_a fail\n");
-            return 1;
-        }
         ret = backup_nand_copyto_nand(DEV_VBMETA_B,DEV_VBMETA_A);
         if(ret != 0)
         {
@@ -1652,6 +1657,13 @@
     }
     else
     {
+        ret = backup_nand_copyto_nand(DEV_SPM_A,DEV_SPM_B);
+        if(ret != 0)
+        {
+            RLOGD("+[UA]: backup spm_a fail\n");
+            return 1;
+        }
+        fota_interrupt = FOTA_FIRST;
         ret = backup_nand_copyto_nand(DEV_SYSTEM_A,DEV_SYSTEM_B);
         if(ret != 0)
         {
@@ -1677,12 +1689,6 @@
             RLOGD("+[UA]: backup md1img_b fail\n");
             return 1;
         }
-        ret = backup_nand_copyto_nand(DEV_SPM_A,DEV_SPM_B);
-        if(ret != 0)
-        {
-            RLOGD("+[UA]: backup spm_a fail\n");
-            return 1;
-        }
         ret = backup_nand_copyto_nand(DEV_VBMETA_A,DEV_VBMETA_B);
         if(ret != 0)
         {
diff --git a/lib/liblynq-media/liblynq-media/media_control.c b/lib/liblynq-media/liblynq-media/media_control.c
index d1ff41a..1c40d8e 100755
--- a/lib/liblynq-media/liblynq-media/media_control.c
+++ b/lib/liblynq-media/liblynq-media/media_control.c
@@ -41,7 +41,6 @@
   GstState gst_cur_state;

 } MEDIA_PARAM_T;

 

-

 static gboolean

   bus_call (GstBus * bus, GstMessage * msg, gpointer datas)

   {

@@ -322,28 +321,28 @@
         system("echo 0x30 0x00 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x31 0x80 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x32 0x85 > /sys/kernel/debug/regmap/0-0018/registers");

-        system("echo 0x33 0x9f > /sys/kernel/debug/regmap/0-0018/registers");

+        system("echo 0x33 0x00 > /sys/kernel/debug/regmap/0-0018/registers"); //dongyu@2023.9.18 Disables CODEC lineout output by default

         system("echo 0x34 0x00 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x35 0x80 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x36 0x82 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x37 0x00 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x38 0x00 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x39 0x82 > /sys/kernel/debug/regmap/0-0018/registers");

-        system("echo 0x3a 0x9f > /sys/kernel/debug/regmap/0-0018/registers");

+        system("echo 0x3a 0x00 > /sys/kernel/debug/regmap/0-0018/registers"); //dongyu@2023.9.18 Disables CODEC lineout output by default

         system("echo 0x3b 0x00 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x3c 0x00 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x3d 0x00 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x3e 0x00 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x3f 0x80 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x40 0xaf > /sys/kernel/debug/regmap/0-0018/registers");

-        system("echo 0x41 0x0d > /sys/kernel/debug/regmap/0-0018/registers");

+        system("echo 0x41 0x00 > /sys/kernel/debug/regmap/0-0018/registers"); //dongyu@2023.9.18 Disables CODEC lineout output by default

         system("echo 0x42 0x00 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x43 0x80 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x44 0x00 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x45 0x00 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x46 0x02 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x47 0xaf > /sys/kernel/debug/regmap/0-0018/registers");

-        system("echo 0x48 0x0d > /sys/kernel/debug/regmap/0-0018/registers");

+        system("echo 0x48 0x00 > /sys/kernel/debug/regmap/0-0018/registers"); //dongyu@2023.9.18 Disables CODEC lineout output by default

         system("echo 0x49 0x00 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x4a 0x00 > /sys/kernel/debug/regmap/0-0018/registers");

         system("echo 0x4b 0x00 > /sys/kernel/debug/regmap/0-0018/registers");

diff --git a/lib/liblynq-rtp/src/lynq_rtp.c b/lib/liblynq-rtp/src/lynq_rtp.c
index c6688c5..088d3ee 100755
--- a/lib/liblynq-rtp/src/lynq_rtp.c
+++ b/lib/liblynq-rtp/src/lynq_rtp.c
@@ -201,28 +201,28 @@
         system("echo 0x30 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x31 0x80 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x32 0x85 > /sys/kernel/debug/regmap/0-0018/registers");
-        system("echo 0x33 0x9f > /sys/kernel/debug/regmap/0-0018/registers");
+        system("echo 0x33 0x00 > /sys/kernel/debug/regmap/0-0018/registers"); //dongyu@2023.9.18 Disables CODEC lineout output by default
         system("echo 0x34 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x35 0x80 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x36 0x82 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x37 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x38 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x39 0x82 > /sys/kernel/debug/regmap/0-0018/registers");
-        system("echo 0x3a 0x9f > /sys/kernel/debug/regmap/0-0018/registers");
+        system("echo 0x3a 0x00 > /sys/kernel/debug/regmap/0-0018/registers"); //dongyu@2023.9.18 Disables CODEC lineout output by default
         system("echo 0x3b 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x3c 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x3d 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x3e 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x3f 0x80 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x40 0xaf > /sys/kernel/debug/regmap/0-0018/registers");
-        system("echo 0x41 0x0d > /sys/kernel/debug/regmap/0-0018/registers");
+        system("echo 0x41 0x00 > /sys/kernel/debug/regmap/0-0018/registers"); //dongyu@2023.9.18 Disables CODEC lineout output by default
         system("echo 0x42 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x43 0x80 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x44 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x45 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x46 0x02 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x47 0xaf > /sys/kernel/debug/regmap/0-0018/registers");
-        system("echo 0x48 0x0d > /sys/kernel/debug/regmap/0-0018/registers");
+        system("echo 0x48 0x00 > /sys/kernel/debug/regmap/0-0018/registers"); //dongyu@2023.9.18 Disables CODEC lineout output by default
         system("echo 0x49 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x4a 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
         system("echo 0x4b 0x00 > /sys/kernel/debug/regmap/0-0018/registers");
@@ -380,4 +380,4 @@
         strcpy(file_address,lynq_rtp_server_info.address);
     }
     return 0;
-}
\ No newline at end of file
+}