[Feature][T108][task-view-1499][ril]Modify return value GSW_HAL_FAIL to GSW_HAL_NORMAL_FAIL
Only Configure: No
Affected branch: GSW_V1453
Affected module: ril
Is it affected on IC: only ASR
Self-test: yes
Doc Update: no
Change-Id: I3d166729537a1a4863f797dc9a1d11e9cbfdddee
diff --git a/mbtk/libgsw_lib/gsw_data.c b/mbtk/libgsw_lib/gsw_data.c
index c60077f..20df239 100755
--- a/mbtk/libgsw_lib/gsw_data.c
+++ b/mbtk/libgsw_lib/gsw_data.c
@@ -226,7 +226,6 @@
//define
-#define GSW_HAL_FAIL GSW_HAL_NORMAL_FAIL
#define lib_mbtk_path "/lib/libmbtk_lib.so"
pthread_mutex_t data_mutex = PTHREAD_MUTEX_INITIALIZER;
static int data_call_lock = 0;
@@ -243,7 +242,7 @@
if((*linkState) == NULL)
{
LOGE("malloc Wan_State_ind_s fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
memset((*linkState), 0x00, sizeof(Wan_State_ind_s));
@@ -288,7 +287,7 @@
if ((*linkState) == NULL)
{
LOGE("(*linkState) is null\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
free((*linkState)->type);
@@ -330,82 +329,82 @@
dlHandle_mbtk = dlopen(lib_mbtk_path, RTLD_NOW);
if (dlHandle_mbtk == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_log_init = (void (*)(char *path, char *tag))dlsym(dlHandle_mbtk, "mbtk_log_init");
if (mbtk_log_init == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_log = (void (*)(int level, const char *format, ...))dlsym(dlHandle_mbtk, "mbtk_log");
if (mbtk_log == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_info_handle_get = (mbtk_info_handle_t* (*)(void))dlsym(dlHandle_mbtk, "mbtk_info_handle_get");
if (mbtk_info_handle_get == NULL)
{
LOGE("mbtk_info_handle_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_info_handle_free = (int (*)(mbtk_info_handle_t** handle))dlsym(dlHandle_mbtk, "mbtk_info_handle_free");
if (mbtk_info_handle_free == NULL)
{
LOGE("mbtk_info_handle_free dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_pdp_state_change_cb_reg = (int (*)(mbtk_info_handle_t* handle, mbtk_info_callback_func cb))dlsym(dlHandle_mbtk, "mbtk_pdp_state_change_cb_reg");
if (mbtk_pdp_state_change_cb_reg == NULL)
{
LOGE("mbtk_pdp_state_change_cb_reg dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_qser_apn_set = (int (*)(mbtk_info_handle_t* handle, mbtk_qser_apn_info_s *apninfo, unsigned char *cid))dlsym(dlHandle_mbtk, "mbtk_qser_apn_set");
if (mbtk_qser_apn_set == NULL)
{
LOGE("mbtk_qser_apn_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_data_call_start = (int (*)(mbtk_info_handle_t* handle, int cid, int auto_conn_interval, bool boot_conn, int timeout))dlsym(dlHandle_mbtk, "mbtk_data_call_start");
if (mbtk_data_call_start == NULL)
{
LOGE("mbtk_data_call_start dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_data_call_stop = (int (*)(mbtk_info_handle_t* handle, int cid, int timeout))dlsym(dlHandle_mbtk, "mbtk_data_call_stop");
if (mbtk_data_call_stop == NULL)
{
LOGE("mbtk_data_call_stop dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_data_call_state_get = (int (*)(mbtk_info_handle_t* handle, int cid, mbtk_ipv4_info_t *ipv4, mbtk_ipv6_info_t *ipv6))dlsym(dlHandle_mbtk, "mbtk_data_call_state_get");
if (mbtk_data_call_state_get == NULL)
{
LOGE("mbtk_data_call_state_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_apn_set = (int (*)(mbtk_info_handle_t* handle, int cid, mbtk_ip_type_enum ip_type, const void* apn_name, const void *user_name, const void *user_pass, const void *auth))dlsym(dlHandle_mbtk, "mbtk_apn_set");
if (mbtk_apn_set == NULL)
{
LOGE("mbtk_apn_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ipv6_2_str = (int (*)(const void *ipv6, void *ipv6_str))dlsym(dlHandle_mbtk, "ipv6_2_str");
if (ipv6_2_str == NULL)
{
LOGE("ipv6_2_str dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -454,7 +453,7 @@
if(linkState==NULL)
{
LOGE("linkState is NULL\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
//parse ipv4_addr,gw,dns,sdns
@@ -647,32 +646,32 @@
ret = mbtk_data_api_import();
if (ret != 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(data_init_flag != 0 && data_info_handle != NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if (ret != GSW_HAL_SUCCESS)
{
LOGE("mbtk_data_api_import fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
data_info_handle = (mbtk_info_handle_t*)mbtk_info_handle_get();
if (data_info_handle == NULL)
{
LOGE("mbtk_info_handle_get fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_pdp_state_change_cb_reg((mbtk_info_handle_t*)data_info_handle, data_call_state_change_cb);
if (ret != 0)
{
LOGE("mbtk_pdp_state_change_cb_reg fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
gsw_data_call_evt_cb = evt_cb;
@@ -692,14 +691,14 @@
int ret;
if(data_init_flag == 0 && data_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_info_handle_free((mbtk_info_handle_t**)&data_info_handle);
if (ret != 0)
{
LOGE("mbtk_info_handle_free fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
data_init_flag = 0;
@@ -717,13 +716,13 @@
{
if(data_init_flag == 0 && data_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(LinkInf == NULL)
{
LOGE("apn info is null\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int ret = 0;
@@ -749,7 +748,7 @@
else
{
LOGE("pdp_type(protocol) error\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
//auth type
@@ -760,7 +759,7 @@
if(ret != 0)
{
LOGE("mbtk_apn_set fail.");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -781,13 +780,13 @@
int ret = -1;
if(data_init_flag == 0 && data_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(LinkInf == NULL)
{
LOGE("apn info is null\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
data_call_lock = 1;
@@ -796,7 +795,7 @@
if(ret != 0)
{
LOGE("mbtk_data_call_start fail,\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
uint8_t cid_temp = (uint8_t)(linkid + 202);
@@ -820,13 +819,13 @@
int ret = -1;
if(data_init_flag == 0 && data_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(LinkInf == NULL)
{
LOGE("apn info is null\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
data_call_lock = 1;
ret = mbtk_data_call_stop((mbtk_info_handle_t*)data_info_handle, linkid + 2, 15);
@@ -834,7 +833,7 @@
if(ret != 0)
{
LOGE("mbtk_data_call_stop fail,ret = %d\n",ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
uint8_t cid_temp = (uint8_t)(linkid + 102);
@@ -874,7 +873,7 @@
if(fp == NULL)
{
LOGE("popen fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
//read line by line
@@ -915,7 +914,7 @@
if(data_pkt == NULL)
{
LOGE("data_pkt is null\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else