[Feature][T108][system][task-view-1692]Merged gsw hal code

Only Configure: No
Affected branch: GSW_V1453
Affected module: libgsw
Is it affected on IC: only ASR
Self-test: yes
Doc Update: no

Change-Id: I7fb669b6afc6e2f92a1e86ec8543498eb73120b4
diff --git a/mbtk/libgsw_lib/gsw_ota_ua_interface.c b/mbtk/libgsw_lib/gsw_ota_ua_interface.c
index 1279d7b..5261c0e 100755
--- a/mbtk/libgsw_lib/gsw_ota_ua_interface.c
+++ b/mbtk/libgsw_lib/gsw_ota_ua_interface.c
@@ -110,6 +110,7 @@
         } \
         fun_ptr_log(LOG_ERR_LEVEL, "%s#%s: "GSW_OTA"" fmt, ptr_1001 + 1, line_1001, ##args); \

     } while(0)

+    

 

 typedef enum

 {

@@ -144,8 +145,8 @@
     GSW_UPDATE_NONEEDCANCEL,       //取消升级失败

     GSW_UPDATE_NOGOING             //升级或分区同步正在进行,不可重复操作

 }gsw_update_exit_code_t;

-            

-            

+

+

 typedef struct

 {

     unsigned int percentage; //update progress0-100

@@ -236,7 +237,7 @@
 * @brief Start install modem software

 * @param  [in] char* file_path

 * @param  [out] NULL

-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL

+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL

 */

 int32_t gsw_update_modem_start_autobackup(char* file_path)

 {

@@ -425,7 +426,7 @@
 * @brief Start install modem software

 * @param  [in] char* file_path

 * @param  [out] NULL

-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL

+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL

 */

 int32_t gsw_update_modem_start_nobackup(char* file_path)

 {

@@ -438,7 +439,7 @@
 * @brief get current system

 * @param  [in] NULL

 * @param  [out] NULL

-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL

+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL

 */

 int32_t gsw_update_modem_get_system(void)

 {

@@ -476,7 +477,7 @@
 * @brief cancel update

 * @param  [in] NULL

 * @param  [out] NULL

-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL

+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL

 */

 int32_t gsw_update_modem_cancel(void)

 {

@@ -488,7 +489,7 @@
 * @brief get modem update info

 * @param  [in] NULL

 * @param  [out] gsw_update_info_s 

-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL

+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL

 */

 int32_t gsw_update_modem_get_info(gsw_update_info_s *update_info)

 {

@@ -548,7 +549,7 @@
 * @brief get modem system status

 * @param  [in] NULL

 * @param  [out] gsw_system_status_s 

-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL

+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL

 */

 int32_t gsw_update_modem_get_status(gsw_system_status_s *system_status)

 {

@@ -559,7 +560,7 @@
 * @brief A/B system sync

 * @param  [in] NULL

 * @param  [out] NULL 

-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL

+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL

 */

 int32_t gsw_update_modem_sync(void)

 {

@@ -571,9 +572,27 @@
 * @brief A/B system switch

 * @param  [in] NULL

 * @param  [out] NULL 

-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL

+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL

 */

 int32_t gsw_update_modem_switch(void)

 {

     return GSW_HAL_SUCCESS;

 }

+

+int32_t gsw_update_modem_process(void *bufdata)

+{

+    return gsw_update_modem_start_autobackup(UPDATE_MODEM_PACKAGE);

+}

+

+int32_t gsw_get_ab_system(gsw_system_type *type)

+{

+    int32_t ret = GSW_HAL_NORMAL_FAIL;

+

+    ret = gsw_update_modem_get_system();

+    if (GSW_HAL_NORMAL_FAIL != ret)

+    {

+        *type = (gsw_system_type)ret;

+    }

+

+    return ret;

+}