[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_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