[Feature][T108][task-view-1499][ril]Modify return value GSW_HAL_FAIL to GSW_HAL_NORMAL_FAIL and rename file name
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: Icc373f650a429298d4fcf34677d87ac674ae796e
diff --git a/mbtk/libgsw_lib/gsw_data.c b/mbtk/libgsw_lib/gsw_data_interface.c
similarity index 100%
rename from mbtk/libgsw_lib/gsw_data.c
rename to mbtk/libgsw_lib/gsw_data_interface.c
diff --git a/mbtk/libgsw_lib/gsw_nw.c b/mbtk/libgsw_lib/gsw_nw_interface.c
similarity index 100%
rename from mbtk/libgsw_lib/gsw_nw.c
rename to mbtk/libgsw_lib/gsw_nw_interface.c
diff --git a/mbtk/libgsw_lib/gsw_sim.c b/mbtk/libgsw_lib/gsw_sim_interface.c
similarity index 100%
rename from mbtk/libgsw_lib/gsw_sim.c
rename to mbtk/libgsw_lib/gsw_sim_interface.c
diff --git a/mbtk/libgsw_lib/gsw_sms.c b/mbtk/libgsw_lib/gsw_sms_interface.c
similarity index 100%
rename from mbtk/libgsw_lib/gsw_sms.c
rename to mbtk/libgsw_lib/gsw_sms_interface.c
diff --git a/mbtk/libgsw_lib/gsw_voice.c b/mbtk/libgsw_lib/gsw_voice_interface.c
similarity index 92%
rename from mbtk/libgsw_lib/gsw_voice.c
rename to mbtk/libgsw_lib/gsw_voice_interface.c
index 454c722..1063c79 100755
--- a/mbtk/libgsw_lib/gsw_voice.c
+++ b/mbtk/libgsw_lib/gsw_voice_interface.c
@@ -1,6 +1,9 @@
#include "gsw_voice_interface.h"
#include <dlfcn.h>
#include <pthread.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
// mbtk includes
@@ -311,56 +314,56 @@
if (mbtk_rtp_init == NULL)
{
LOGE("mbtk_rtp_init dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_deinit = (int (*)(void))dlsym(dlHandle_mbtk, "mbtk_rtp_deinit");
if (mbtk_rtp_deinit == NULL)
{
LOGE("mbtk_rtp_deinit dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_enable = (int (*)(bool enable))dlsym(dlHandle_mbtk, "mbtk_rtp_enable");
if (mbtk_rtp_enable == NULL)
{
LOGE("mbtk_rtp_enable dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_remote_ip_set = (int (*)(const char *ipv4))dlsym(dlHandle_mbtk, "mbtk_rtp_remote_ip_set");
if (mbtk_rtp_remote_ip_set == NULL)
{
LOGE("mbtk_rtp_remote_ip_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_server_port_set = (int (*)(int port))dlsym(dlHandle_mbtk, "mbtk_rtp_server_port_set");
if (mbtk_rtp_server_port_set == NULL)
{
LOGE("mbtk_rtp_server_port_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_client_port_set = (int (*)(int port))dlsym(dlHandle_mbtk, "mbtk_rtp_client_port_set");
if (mbtk_rtp_client_port_set == NULL)
{
LOGE("mbtk_rtp_client_port_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_sample_rate_set = (int (*)(int sample_rate))dlsym(dlHandle_mbtk, "mbtk_rtp_sample_rate_set");
if (mbtk_rtp_sample_rate_set == NULL)
{
LOGE("mbtk_rtp_sample_rate_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_channel_set = (int (*)(int channel))dlsym(dlHandle_mbtk, "mbtk_rtp_channel_set");
if (mbtk_rtp_channel_set == NULL)
{
LOGE("mbtk_rtp_channel_set dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -373,68 +376,68 @@
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_call_state_change_cb_reg = (int (*)(mbtk_info_handle_t* handle, mbtk_info_callback_func cb))dlsym(dlHandle_mbtk, "mbtk_call_state_change_cb_reg");
if(mbtk_call_state_change_cb_reg == NULL)
{
LOGE("mbtk_call_state_change_cb_reg dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_call_start = (int (*)(mbtk_info_handle_t* handle, char* phone_number))dlsym(dlHandle_mbtk, "mbtk_call_start");
if(mbtk_call_start == NULL)
{
LOGE("mbtk_call_start dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_call_answer = (int (*)(mbtk_info_handle_t* handle))dlsym(dlHandle_mbtk, "mbtk_call_answer");
if(mbtk_call_answer == NULL)
{
LOGE("mbtk_call_answer dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_call_hang = (int (*)(mbtk_info_handle_t* handle))dlsym(dlHandle_mbtk, "mbtk_call_hang");
if(mbtk_call_hang == NULL)
{
LOGE("mbtk_call_hang dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_a_call_hang = (int (*)(mbtk_info_handle_t* handle, int phone_id))dlsym(dlHandle_mbtk, "mbtk_a_call_hang");
if(mbtk_a_call_hang == NULL)
{
LOGE("mbtk_a_call_hang dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_call_reg_get = (int (*)(mbtk_info_handle_t* handle, mbtk_call_info_t *reg))dlsym(dlHandle_mbtk, "mbtk_call_reg_get");
if(mbtk_call_reg_get == NULL)
{
LOGE("mbtk_call_reg_get dlsym fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return mbtk_rtp_api_import();
@@ -556,7 +559,7 @@
* @brief init voice sdk,and register the status indicated callback function
* @param [in] CallStateInd ind: status indicated callback function
* @param [out] None
-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL
+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL
*/
int32_t gsw_voice_sdk_init(CallStateInd ind)
{
@@ -570,7 +573,7 @@
if(ind == NULL)
{
LOGE("parameter is null\n");
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
ret = mbtk_call_api_import();
@@ -580,7 +583,7 @@
{
LOGE("[gsw_voice_sdk_init]mbtk_call_api_import fail\n");
}
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_log_init("syslog", "MBTK_RIL");
@@ -589,7 +592,7 @@
if(ret < 0)
{
LOGE("mbtk_call_api_import fail,ret = %d\n",ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
ret=mbtk_rtp_init();
@@ -597,7 +600,7 @@
if(ret!=0)
{
LOGE("[gsw_voice_sdk_init]mbtk_rtp_init fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(call_info_handle == NULL)
@@ -612,7 +615,7 @@
{
LOGE("mbtk_call_state_change_cb_reg fail,ret = %d\n",ret);
(void) mbtk_rtp_deinit();
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
{
@@ -628,7 +631,7 @@
{
(void) mbtk_rtp_deinit();
LOGE("create gsw_voice_sdk_init fail\n");
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
}
@@ -639,7 +642,7 @@
* @brief set speaker_volume
* @param [in] int32_t volumeļ¼1(Min)-7(Max)
* @param [out] None
-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL
+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL
*/
int32_t gsw_voice_set_speaker_volume(int32_t volume)
{
@@ -699,7 +702,7 @@
if(volume < 1 || volume > 7)
{
LOGE("Error volume : %d", volume);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
{
@@ -742,7 +745,7 @@
else
{
LOGE("Error : %d", err);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -752,13 +755,13 @@
* @brief start a voice call
* @param [in] char *callNumber
* @param [out] CallHandle *handle
-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL
+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL
*/
int32_t gsw_voice_normal_voice_start(CallHandle *handle, const char *callNumber)
{
if(gsw_voice_init_flag == 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
mbtk_call_info_t reg = {0};
@@ -768,13 +771,13 @@
if(handle == NULL)
{
LOGE("handle is null\n");
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
if(callNumber == NULL)
{
LOGE("callNumber is null\n");
- return GSW_HAL_MEM_INVAILD;
+ return GSW_HAL_ARG_INVALID;
}
@@ -783,7 +786,7 @@
if(ret != 0)
{
LOGE("mbtk_call_start fail,ret = %d\n",ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
//get call id
@@ -801,13 +804,13 @@
* @brief answer a voice call
* @param [in] CallHandle handle
* @param [out] None
-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL
+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL
*/
int32_t gsw_voice_answer(CallHandle handle)
{
if(gsw_voice_init_flag == 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int ret = -1;
@@ -818,7 +821,7 @@
if(ret != 0)
{
LOGE("mbtk_call_answer fail,ret = %d\n", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
{
@@ -833,13 +836,13 @@
* @brief hangup a voice call
* @param [in] CallHandle handle
* @param [out] None
-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL
+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL
*/
int32_t gsw_voice_hangup(CallHandle handle)
{
if(gsw_voice_init_flag == 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int ret = -1;
@@ -849,7 +852,7 @@
if(ret != 0)
{
LOGE("mbtk_a_call_hang fail,ret = %d\n", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
{
@@ -863,13 +866,13 @@
* @brief set auto answer mode
* @param [in] int32_t mode:0-1, 0:NO(close auto answer), 1:YES(auto answer)
* @param [out] None
-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL
+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL
*/
int32_t gsw_voice_set_auto_answer_mode(int32_t mode)
{
if(gsw_voice_init_flag == 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
if(mode == 1)
@@ -880,7 +883,7 @@
if(ret != 0)
{
LOGE("mbtk_call_answer fail,ret = %d\n", ret);
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
else
{
@@ -895,7 +898,7 @@
{
if(gsw_voice_init_flag == 0 || call_info_handle == NULL)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int reason = gsw_global_end_reason;
@@ -910,19 +913,19 @@
* @brief set audio mode
* @param [in] AudioMode audioMode
* @param [out] None
-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL
+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL
*/
int32_t gsw_voice_set_audio_mode(AudioMode audioMode)
{
if(gsw_voice_init_flag == 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int ret=mbtk_rtp_enable(audioMode);
if(ret !=0 )
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
}
@@ -932,19 +935,19 @@
* @param [in] char *ip :ip address
* @param [in] int32_t len: length
* @param [out] None
-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL
+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL
*/
int32_t gsw_voice_set_remote_rtp_ip(const char *ip, int32_t len)
{
if(gsw_voice_init_flag == 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int ret=mbtk_rtp_remote_ip_set(ip);
if(ret !=0 )
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
}
@@ -954,13 +957,13 @@
* @param [in] RTPMode rtpMode: rtp mode
* @param [in] int32_t port:rtp port
* @param [out] None
-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL
+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL
*/
int32_t gsw_voice_set_rtp_port(RTPMode rtpMode, int32_t port)
{
if(gsw_voice_init_flag == 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int ret;
@@ -974,7 +977,7 @@
}
if(ret !=0 )
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
}
@@ -985,13 +988,13 @@
* @param [in] int32_t channel:channel
* @param [in] int32_t latency:latency
* @param [out] None
-* @retval GSW_HAL_SUCCESS\GSW_HAL_FAIL
+* @retval GSW_HAL_SUCCESS\GSW_HAL_NORMAL_FAIL
*/
int32_t gsw_voice_set_rtp_param(int32_t clockRate, int32_t channel, int32_t latency)
{
if(gsw_voice_init_flag == 0)
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
int ret=mbtk_rtp_channel_set(channel);
@@ -1001,7 +1004,7 @@
}
if(ret !=0 )
{
- return GSW_HAL_FAIL;
+ return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
}