[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
diff --git a/mbtk/libgsw_lib/gsw_nw.c b/mbtk/libgsw_lib/gsw_nw.c
index 18edcd9..9d5fda7 100755
--- a/mbtk/libgsw_lib/gsw_nw.c
+++ b/mbtk/libgsw_lib/gsw_nw.c
@@ -293,9 +293,6 @@
int t_max;
}GSW_NW_OOS_CONFIG_INFO_T;
-
-#define GSW_HAL_FAIL GSW_HAL_NORMAL_FAIL
-#define GSW_HAL_MEM_INVAILD GSW_HAL_ARG_INVALID
#define lib_mbtk_path "/lib/libmbtk_lib.so"
mbtk_info_handle_t* nw_info_handle = NULL;
@@ -466,145 +463,145 @@
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_net_sel_mode_get = (int (*)(mbtk_info_handle_t* handle, mbtk_net_info_t *net))dlsym(dlHandle_mbtk, "mbtk_net_sel_mode_get");
if (mbtk_net_sel_mode_get == NULL)
{
LOGE("mbtk_net_sel_mode_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_net_reg_get = (int (*)(mbtk_info_handle_t* handle, mbtk_net_reg_info_t *reg))dlsym(dlHandle_mbtk, "mbtk_net_reg_get");
if (mbtk_net_reg_get == NULL)
{
LOGE("mbtk_net_reg_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_get_modem_fun = (int (*)(mbtk_info_handle_t* handle, int* fun))dlsym(dlHandle_mbtk, "mbtk_get_modem_fun");
if (mbtk_get_modem_fun == NULL)
{
LOGE("mbtk_get_modem_fun dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_set_modem_fun = (int (*)(mbtk_info_handle_t* handle, mbtk_modem_info_t *info))dlsym(dlHandle_mbtk, "mbtk_set_modem_fun");
if (mbtk_set_modem_fun == NULL)
{
LOGE("mbtk_set_modem_fun dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_current_band_get = (int (*)(mbtk_info_handle_t* handle, mbtk_band_info_t *band))dlsym(dlHandle_mbtk, "mbtk_current_band_get");
if (mbtk_current_band_get == NULL)
{
LOGE("mbtk_current_band_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_current_band_set = (int (*)(mbtk_info_handle_t* handle, const mbtk_band_info_t *band))dlsym(dlHandle_mbtk, "mbtk_current_band_set");
if (mbtk_current_band_set == NULL)
{
LOGE("mbtk_current_band_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_net_signal_get = (int (*)(mbtk_info_handle_t* handle, mbtk_signal_info_t *signal))dlsym(dlHandle_mbtk, "mbtk_net_signal_get");
if (mbtk_net_signal_get == NULL)
{
LOGE("mbtk_net_signal_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_wakeup_state_set = (int (*)(mbtk_info_handle_t* handle, uint32 wakeup_state))dlsym(dlHandle_mbtk, "mbtk_wakeup_state_set");
if (mbtk_wakeup_state_set == NULL)
{
LOGE("mbtk_wakeup_state_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_cell_get = (int (*)(mbtk_info_handle_t* handle, mbtk_cell_type_enum *type, list_node_t **cell_list))dlsym(dlHandle_mbtk, "mbtk_cell_get");
if (mbtk_cell_get == NULL)
{
LOGE("mbtk_cell_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_signal_state_change_cb_reg = (int (*)(mbtk_info_handle_t* handle, mbtk_info_callback_func cb))dlsym(dlHandle_mbtk, "mbtk_signal_state_change_cb_reg");
if (mbtk_signal_state_change_cb_reg == NULL)
{
LOGE("mbtk_signal_state_change_cb_reg dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_net_state_change_cb_reg = (int (*)(mbtk_info_handle_t* handle, mbtk_info_callback_func cb))dlsym(dlHandle_mbtk, "mbtk_net_state_change_cb_reg");
if (mbtk_net_state_change_cb_reg == NULL)
{
LOGE("mbtk_net_state_change_cb_reg dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_fplmn_get = (int(*)(mbtk_info_handle_t *handle, void *fplmn))dlsym(dlHandle_mbtk, "mbtk_fplmn_get");
if (mbtk_fplmn_get == NULL)
{
LOGE("mbtk_fplmn_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_fplmn_set = (int(*)(mbtk_info_handle_t *handle, void *fplmn))dlsym(dlHandle_mbtk, "mbtk_fplmn_set");
if (mbtk_fplmn_set == NULL)
{
LOGE("mbtk_fplmn_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_radio_state_change_cb_reg = (int (*)(mbtk_info_handle_t* handle, mbtk_info_callback_func cb))dlsym(dlHandle_mbtk, "mbtk_radio_state_change_cb_reg");
if (mbtk_radio_state_change_cb_reg == NULL)
{
LOGE("mbtk_radio_state_change_cb_reg dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_oos_get = (int (*)(mbtk_info_handle_t* handle, mbtk_oos_info *oos))dlsym(dlHandle_mbtk, "mbtk_oos_get");
if (mbtk_oos_get == NULL)
{
LOGE("mbtk_oos_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_oos_set = (int (*)(mbtk_info_handle_t* handle, mbtk_oos_info *oos))dlsym(dlHandle_mbtk, "mbtk_oos_set");
if (mbtk_oos_set == NULL)
{
LOGE("mbtk_oos_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -1241,13 +1238,13 @@
{
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(handle_ptr == NULL)
{
LOGE("handle_ptr is NULL\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
serving_cb = handle_ptr;
@@ -1267,13 +1264,13 @@
{
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(handle_ptr == NULL)
{
LOGE("handle_ptr is NULL\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
sig_cb = handle_ptr;
@@ -1293,13 +1290,13 @@
{
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(handle_ptr == NULL)
{
LOGE("handle_ptr is NULL\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
reject_cb = handle_ptr;
@@ -1317,6 +1314,7 @@
int gsw_nw_sdk_init(int token)
{
int ret = -1;
+ pthread_t nw_info_thread;
if (nw_init_flag == 1 && nw_info_handle != NULL)
{
@@ -1327,7 +1325,7 @@
if (ret != 0)
{
LOGE("mbtk_nw_api_import fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
nw_info_handle = mbtk_info_handle_get();
@@ -1335,7 +1333,7 @@
if (nw_info_handle == NULL)
{
LOGE("mbtk_info_handle_get fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
char fplmn[256] = {0};
@@ -1343,7 +1341,7 @@
if(ret != 0)
{
LOGE("mbtk_fplmn_get failed : %d\n",ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
fplmn_max_length = (strlen(fplmn)/6);
LOGE("fplmn = %s, fplmn_max_length = %d\n",fplmn,fplmn_max_length);
@@ -1352,14 +1350,14 @@
if (ret != 0)
{
LOGE("mbtk_signal_state_change_cb_reg fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_net_state_change_cb_reg(nw_info_handle, gsw_serving_info_callback);
if (ret != 0)
{
LOGE("mbtk_net_state_change_cb_reg fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
nw_init_flag = 1;
@@ -1380,14 +1378,14 @@
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_info_handle_free(&nw_info_handle);
if(ret != GSW_HAL_SUCCESS)
{
LOGE("mbtk_info_handle_free fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
dlclose(dlHandle_mbtk);
@@ -1414,7 +1412,7 @@
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
LOGE("nw_sdk_deinit not init\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
LOGE("mbtk_net_reg_get start \n");
@@ -1425,7 +1423,7 @@
if(ret)
{
LOGE("mbtk_net_reg_get fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
LOGE("convert_cs_reg_state\n");
@@ -1547,7 +1545,7 @@
if(ret != 0 || cell_list == NULL)
{
LOGE("mbtk_cell_get fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
{
@@ -1620,7 +1618,7 @@
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
//regstate
@@ -1629,7 +1627,7 @@
if(ret)
{
LOGE("mbtk_net_reg_get fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(reg.data_state == MBTK_NET_REG_STATE_HOME || reg.data_state == MBTK_NET_REG_STATE_ROAMING)
@@ -1657,14 +1655,14 @@
int ret = -1;
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_get_modem_fun(nw_info_handle, &tmp_rf);
if (ret != 0)
{
LOGE("mbtk_get_modem_fun fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(tmp_rf == LYNQ_AIR_CFUN_MODE_OFF)
{
@@ -1700,7 +1698,7 @@
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(op_mode == GSW_OP_MODE_LPM)
@@ -1721,7 +1719,7 @@
if (rf_mode != LYNQ_AIR_PLANE_MODE_ON && rf_mode != LYNQ_AIR_PLANE_MODE_OFF && rf_mode != LYNQ_AIR_CFUN_MODE_OFF)
{
LOGE("Input mode is error!\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
info.fun = rf_mode;
@@ -1730,7 +1728,7 @@
if (ret != 0)
{
LOGE("gsw_set_opmode fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -1749,7 +1747,7 @@
{
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int ret = -1;
@@ -1760,7 +1758,7 @@
if(ret != 0)
{
LOGE("mbtk_current_band_get fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
*mode_pref = convert_gsw_net_config(band.net_pref);
@@ -1768,7 +1766,7 @@
if(*mode_pref <= 0)
{
LOGE("no support mode\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -1786,7 +1784,7 @@
{
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int ret = -1;
@@ -1800,14 +1798,14 @@
if(band.net_pref < 0)
{
LOGE("no support mode\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_current_band_set(nw_info_handle, &band);
if(ret != 0)
{
LOGE("mbtk_current_band_set fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -1825,7 +1823,7 @@
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_signal_info_t signal;
@@ -1834,7 +1832,7 @@
if(ret != 0)
{
LOGE("mbtk_net_signal_get fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
LOGD("signal.type=%d\n", signal.type);
@@ -1867,7 +1865,7 @@
default:
{
LOGD("[%s] unknown reg type.[%d]\n", __func__, signal.type);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
}
return GSW_HAL_SUCCESS;
@@ -1885,13 +1883,13 @@
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(mode != 0 && mode != 1)
{
LOGE("Input mode is error!\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(mode == 1)
@@ -1903,7 +1901,7 @@
if(ret != 0)
{
LOGE("mbtk_wakeup_state_set fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -1946,7 +1944,7 @@
default:
{
LOGE("parameter error\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
}
}
@@ -1966,7 +1964,7 @@
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(!mbtk_net_sel_mode_get(nw_info_handle, &net) && net.plmn > 0)
@@ -2012,7 +2010,7 @@
else
{
LOGE("mbtk_net_sel_mode_get fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -2032,7 +2030,7 @@
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
LOGE("nw_sdk_deinit not init\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
list_node_t* cell_list = NULL;
@@ -2244,7 +2242,7 @@
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int ret = -1;
@@ -2252,7 +2250,7 @@
if(handle_ptr == NULL)
{
LOGE("handle_ptr is NULL\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
modem_cb = handle_ptr;
@@ -2261,7 +2259,7 @@
if(ret != 0)
{
LOGE("mbtk_radio_state_change_cb_reg failed : %d\n", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -2279,7 +2277,7 @@
{
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int ret = -1;
@@ -2290,7 +2288,7 @@
if(ret != 0)
{
LOGE("mbtk_fplmn_get failed : %d\n",ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
update_fplmn_list(fplmn);
@@ -2320,13 +2318,13 @@
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(plmn_list->plmn_list_len >= fplmn_max_length)
{
LOGE("can't save all the plmn\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int i = 0;
@@ -2342,7 +2340,7 @@
if((fplmn_index + plmn_list->plmn_list_len) > fplmn_max_length)
{
LOGE("can't save all the plmn\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
@@ -2370,7 +2368,7 @@
if(ret != 0)
{
LOGE("mbtk_fplmn_set failed : %d\n",ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
LOGE("gsw_add_forbidden_networks exit\n");
@@ -2388,7 +2386,7 @@
LOGE("gsw_remove_forbidden_networks enter\n");
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int i = 0;
@@ -2420,7 +2418,7 @@
if(ret != 0)
{
LOGE("mbtk_fplmn_set failed : %d\n",ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
LOGE("gsw_remove_forbidden_networks exit\n");
@@ -2437,7 +2435,7 @@
{
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
char fplmn_str[FPLMN_STRING_LENGTH+1];
@@ -2449,7 +2447,7 @@
if(ret != 0)
{
LOGE("mbtk_fplmn_set failed : %d\n",ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -2465,13 +2463,13 @@
{
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(pt_info == NULL)
{
LOGE("pt_info is null\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int ret = -1;
@@ -2483,7 +2481,7 @@
if(ret != 0)
{
LOGE("mbtk_oos_get failed : %d\n",ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(oos_info.mode == 0)
@@ -2514,13 +2512,13 @@
{
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(pt_info == NULL)
{
LOGE("pt_info is null\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int ret = -1;
@@ -2530,7 +2528,7 @@
if (pt_info->t_min < 0 || pt_info->t_step < 0 || pt_info->t_max < 0)
{
LOGE("gsw_oos_config_set set time < 0 ");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else if ((pt_info->t_min > 0 && pt_info->t_min <= 255) && pt_info->t_step == 0 && pt_info->t_max == 0)
{
@@ -2557,14 +2555,14 @@
else
{
LOGE("gsw_oos_config_set set Format err");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_oos_set(nw_info_handle, &oos_info);
if(ret != 0)
{
LOGE("mbtk_oos_set failed : %d\n",ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
diff --git a/mbtk/libgsw_lib/gsw_sim.c b/mbtk/libgsw_lib/gsw_sim.c
index cd44304..e4c5966 100755
--- a/mbtk/libgsw_lib/gsw_sim.c
+++ b/mbtk/libgsw_lib/gsw_sim.c
@@ -74,8 +74,6 @@
//api
static mbtk_info_handle_t* (*mbtk_info_handle_get)(void);
-#define GSW_HAL_FAIL GSW_HAL_NORMAL_FAIL
-#define GSW_HAL_MEM_INVAILD GSW_HAL_ARG_INVALID
#define lib_mbtk_path "/lib/libmbtk_lib.so"
static int sim_init_flag = 0;
@@ -190,82 +188,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_imsi_get = (int (*)(mbtk_info_handle_t* handle, void *imsi))dlsym(dlHandle_mbtk, "mbtk_imsi_get");
if (mbtk_imsi_get == NULL)
{
LOGE("mbtk_imsi_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_iccid_get = (int (*)(mbtk_info_handle_t* handle, void *iccid))dlsym(dlHandle_mbtk, "mbtk_iccid_get");
if (mbtk_iccid_get == NULL)
{
LOGE("mbtk_iccid_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_phone_number_get = (int (*)(mbtk_info_handle_t* handle, void *phone_number))dlsym(dlHandle_mbtk, "mbtk_phone_number_get");
if (mbtk_phone_number_get == NULL)
{
LOGE("mbtk_phone_number_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_imei_get = (int (*)(mbtk_info_handle_t* handle, void *imei))dlsym(dlHandle_mbtk, "mbtk_imei_get");
if (mbtk_imei_get == NULL)
{
LOGE("mbtk_imei_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_sim_state_get = (int (*)(mbtk_info_handle_t* handle, mbtk_sim_state_enum *sim_state))dlsym(dlHandle_mbtk, "mbtk_sim_state_get");
if (mbtk_sim_state_get == NULL)
{
LOGE("mbtk_sim_state_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_set_modem_fun = (int (*)(mbtk_info_handle_t* handle, mbtk_modem_info_t *info))dlsym(dlHandle_mbtk, "mbtk_set_modem_fun");
if (mbtk_set_modem_fun == NULL)
{
LOGE("mbtk_set_modem_fun dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_sim_power_set = (int (*)(int power))dlsym(dlHandle_mbtk, "mbtk_sim_power_set");
if (mbtk_sim_power_set == NULL)
{
LOGE("mbtk_sim_power_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
LOGD("gsw_sim_api_import end\n");
@@ -280,7 +278,7 @@
*/
int gsw_sim_sdk_init(int32_t token)
{
- int ret = GSW_HAL_FAIL;
+ int ret = GSW_HAL_NORMAL_FAIL;
if(sim_init_flag == 1 && sim_info_handle != NULL)
{
@@ -294,7 +292,7 @@
{
LOGE("gsw_sim_import fail\n");
}
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_log_init("syslog", "MBTK_RIL");
@@ -303,7 +301,7 @@
if(sim_info_handle == NULL)
{
LOGE("mbtk_info_handle_get fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
sim_init_flag = 1;
@@ -324,14 +322,14 @@
if(sim_init_flag == 0 && sim_info_handle == NULL)
{
LOGE("sim sdk has been deinit\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_info_handle_free(&sim_info_handle);
if(ret != GSW_HAL_SUCCESS)
{
LOGE("mbtk_info_handle_free fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
sim_init_flag = 0;
@@ -357,7 +355,7 @@
if(sim_init_flag == 0 && sim_info_handle == NULL)
{
LOGE("sim sdk has been deinit\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_sim_state_enum sim = MBTK_SIM_ABSENT;
@@ -367,7 +365,7 @@
if(ret)
{
LOGE("[gsw_get_sim_status] mbtk_sim_state_get fail [err = %d].", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
@@ -428,26 +426,26 @@
if(sim_init_flag == 0 && sim_info_handle == NULL)
{
LOGE("sim sdk has been deinit\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(iccid == NULL)
{
LOGE("iccid is NULL.");
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
if(len < GSW_SIM_ICCID_LENGTH)
{
LOGE("iccid len is too short,len = %d\n", len);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_iccid_get(sim_info_handle, (void *)iccid);
if(ret != MBTK_ERR_OK)
{
LOGE("[gsw_sim] mbtk_iccid_get fail [err = %d].", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -467,26 +465,26 @@
if(sim_init_flag == 0 && sim_info_handle == NULL)
{
LOGE("sim sdk has been deinit\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(imsi == NULL)
{
LOGE("imsi is NULL.");
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
if(len < GSW_SIM_IMSI_LENGTH)
{
LOGE("imsi len is too short,len = %d\n", len);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_imsi_get(sim_info_handle, (void *)imsi);
if(ret != MBTK_ERR_OK)
{
LOGE("[gsw_sim] mbtk_imsi_get fail [err = %d].", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -506,26 +504,26 @@
if(sim_init_flag == 0 && sim_info_handle == NULL)
{
printf("sim sdk has been deinit\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(msisdn == NULL)
{
printf("msisdn is NULL.");
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
if(len < GSW_SIM_MSISDN_LENGTH)
{
printf("msisdn len is too short,len = %d\n", len);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_phone_number_get(sim_info_handle, (void *)msisdn);
if(ret != MBTK_ERR_OK)
{
LOGE("[gsw_sim] mbtk_phone_number_get fail [err = %d].", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -545,26 +543,26 @@
if(sim_init_flag == 0 && sim_info_handle == NULL)
{
LOGE("sim sdk has been deinit\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(imei == NULL)
{
LOGE("imei is NULL.");
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
if(len < GSW_SIM_MSISDN_LENGTH)
{
LOGE("imei len is too short,len = %d\n", len);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_imei_get(sim_info_handle, (void *)imei);
if(ret != MBTK_ERR_OK)
{
LOGE("[gsw_sim] mbtk_imei_get fail [err = %d].", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -583,14 +581,14 @@
if(sim_init_flag == 0 && sim_info_handle == NULL)
{
LOGE("sim sdk has been deinit\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_sim_power_set(0);
if(ret != MBTK_ERR_OK)
{
LOGE("[gsw_sim] mbtk_sim_power_set fail [err = %d].", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
}
@@ -609,14 +607,14 @@
if(sim_init_flag == 0 && sim_info_handle == NULL)
{
LOGE("sim sdk has been deinit\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_sim_power_set(1);
if(ret != MBTK_ERR_OK)
{
LOGE("[gsw_sim] mbtk_sim_power_set fail [err = %d].", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
}
@@ -635,7 +633,7 @@
if(sim_init_flag == 0 && sim_info_handle == NULL)
{
LOGE("sim sdk has been deinit\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_modem_info_t info;
@@ -646,7 +644,7 @@
if(ret)
{
LOGE("[gsw_sim] mbtk_set_modem_fun fail [err = %d].", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
sleep(1);
@@ -656,7 +654,7 @@
if(ret)
{
LOGE("[gsw_sim] mbtk_set_modem_fun fail [err = %d].", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
}
\ No newline at end of file
diff --git a/mbtk/libgsw_lib/gsw_sms.c b/mbtk/libgsw_lib/gsw_sms.c
index e33def8..bf27db3 100755
--- a/mbtk/libgsw_lib/gsw_sms.c
+++ b/mbtk/libgsw_lib/gsw_sms.c
@@ -114,9 +114,6 @@
#define lib_mbtk_path "/lib/libmbtk_lib.so"
#define lib_qser_sms_path "/lib/liblynq-qser-sms.so"
-#define GSW_HAL_FAIL GSW_HAL_NORMAL_FAIL
-#define GSW_HAL_MEM_INVAILD GSW_HAL_ARG_INVALID
-
static mbtk_info_handle_t* (*mbtk_info_handle_get)(void);
int (*mbtk_sms_state_change_cb_reg)(mbtk_info_handle_t* handle, mbtk_info_callback_func cb);
@@ -236,110 +233,110 @@
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_sms_state_change_cb_reg = (int (*)(mbtk_info_handle_t* handle, mbtk_info_callback_func cb))dlsym(dlHandle_mbtk, "mbtk_sms_state_change_cb_reg");
if (mbtk_sms_state_change_cb_reg == NULL)
{
LOGE("mbtk_sms_state_change_cb_reg 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;
}
PDUDecoding = (struct SMS_Struct (*)(const char *data))dlsym(dlHandle_mbtk, "PDUDecoding");
if (PDUDecoding == NULL)
{
LOGE("PDUDecoding dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
SCADecoding = (char *(*)(const char *data, int *EndIndex))dlsym(dlHandle_mbtk, "SCADecoding");
if (SCADecoding == NULL)
{
LOGE("SCADecoding dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
SCAEncoding = (char *(*)(char *SCA))dlsym(dlHandle_mbtk, "SCAEncoding");
if (SCAEncoding == NULL)
{
LOGE("SCAEncoding dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
PDUEncoding = (struct PDUS *(*)(char *SCA, char *DA, char *UDC, struct UDHS *udhs))dlsym(dlHandle_mbtk, "PDUEncoding");
if (PDUEncoding == NULL)
{
LOGE("PDUEncoding dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_sms_cmgf_set = (int (*)(mbtk_info_handle_t* handle, int mode))dlsym(dlHandle_mbtk, "mbtk_sms_cmgf_set");
if (mbtk_sms_cmgf_set == NULL)
{
LOGE("mbtk_sms_cmgf_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_sms_cmgs_set = (int (*)(mbtk_info_handle_t* handle, char * cmgs, char *resp))dlsym(dlHandle_mbtk, "mbtk_sms_cmgs_set");
if (mbtk_sms_cmgs_set == NULL)
{
LOGE("mbtk_sms_cmgs_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_sms_csca_set = (int (*)(mbtk_info_handle_t* handle, char * csca))dlsym(dlHandle_mbtk, "mbtk_sms_csca_set");
if (mbtk_sms_csca_set == NULL)
{
LOGE("mbtk_sms_csca_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_sms_csca_get = (int (*)(mbtk_info_handle_t* handle, char *buf))dlsym(dlHandle_mbtk, "mbtk_sms_csca_get");
if (mbtk_sms_csca_get == NULL)
{
LOGE("mbtk_sms_csca_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_sms_cnmi_set = (int (*)(mbtk_info_handle_t* handle))dlsym(dlHandle_mbtk, "mbtk_sms_cnmi_set");
if (mbtk_sms_cnmi_set == NULL)
{
LOGE("mbtk_sms_cnmi_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
smsPduEncode = (int (*)(const char *smsc, const char *da_num, const char *msg, int charset, char *smsc_pdu, char **pdu))dlsym(dlHandle_mbtk, "smsPduEncode");
if (smsPduEncode == NULL)
{
LOGE("smsPduEncode dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
@@ -347,14 +344,14 @@
if (smsPduDecode == NULL)
{
LOGE("smsPduDecode dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
_mdapi_sms_get_msg_num = (kal_int32 (*)(const char *msg, int charset, kal_int32 *msg_num, kal_int32 *msg_len))dlsym(dlHandle_mbtk,"_mdapi_sms_get_msg_num");
if (_mdapi_sms_get_msg_num == NULL)
{
LOGE("_mdapi_sms_get_msg_num dlsym fail");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -508,7 +505,7 @@
{
LOGE("[gsw_sms_sdk_init]mbtk_sms_import fail\n");
}
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_log_init("syslog", "MBTK_RIL");
@@ -518,14 +515,14 @@
{
LOGE("[gsw_sms_sdk_init] mbtk handle init fail\n");
dlclose(dlHandle_mbtk);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_sms_cnmi_set(sms_info_handle);
if(ret != 0)
{
LOGE("mbtk_sms_cnmi_set fail.[%d]\n", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_sms_state_change_cb_reg(sms_info_handle, gsw_sms_state_change_cb);
@@ -537,7 +534,7 @@
mbtk_info_handle_free(&sms_info_handle);
sms_info_handle = NULL;
}
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
LOGD("[gsw_sms_sdk_init]gsw_sms_sdk_init success\n");
@@ -570,7 +567,7 @@
if(ret != 0)
{
LOGE("[gsw_sms_sdk_deinit]mbtk_info_handle_free fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
sms_info_handle = NULL;
}
@@ -603,19 +600,19 @@
if(init_flag == 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(phone_num == NULL || msg == NULL)
{
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
if(strlen((char *)msg) > GSW_SMS_RECV_CONT_MAX || strlen((char *)msg) == 0 || strlen((char *)phone_num) == 0)
{
LOGE("strlen(telephony_num):%d", strlen((char *)phone_num));
LOGE("strlen(msg):%d", strlen((char *)msg));
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
int err = -1;
@@ -647,7 +644,7 @@
if(status == MDAPI_RET_ERROR)
{
LOGE("get message number failed\n");
- //return GSW_HAL_FAIL;
+ //return GSW_HAL_NORMAL_FAIL;
}
else
{
@@ -656,7 +653,7 @@
if(pdu == NULL)
{
LOGE("%s, %s, %d, allocate memory for pdu failed\n", __FILE__, __FUNCTION__, __LINE__);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
@@ -674,7 +671,7 @@
free(pdu);
pdu = NULL;
LOGE("%s, %s, %d, allocate memory for pdu[%d] failed\n", __FILE__, __FUNCTION__, __LINE__,index);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
{
@@ -724,7 +721,7 @@
}
free(pdu);
pdu = NULL;
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
{
@@ -741,7 +738,7 @@
}
free(pdu);
pdu = NULL;
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
{
@@ -778,20 +775,20 @@
if(init_flag == 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(smsc == NULL || len <= 0)
{
LOGE("smsc is null or len = %d\n",len);
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
ret = mbtk_sms_csca_get(sms_info_handle, smsc_temp);
if(smsc_temp[0] == '\0')
{
LOGE("gsw_get_smsc_address Error : %d\n", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
@@ -806,7 +803,7 @@
if(substr_t == NULL)
{
LOGE("malloc substr_t fail\n");
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
strncpy(substr_t, p1 + 1, len_t);
substr_t[len_t] = '\0';
@@ -822,7 +819,7 @@
else
{
LOGE("String inside double quotes not found\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
}
@@ -842,13 +839,13 @@
if(init_flag == 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(smsc == NULL || strlen((char *)smsc) == 0)
{
LOGE("smsc is null or empty\n");
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
ret = mbtk_sms_csca_set(sms_info_handle, (char *)smsc);
@@ -860,7 +857,7 @@
else
{
LOGE("set smsc fail,ret = %d\n", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;