更新LYNQ_NW接口输出格式，优化test部分的代码格式对齐问题
Change-Id: Idcae41e8d92ee9f378d006095d275fed6c168917
diff --git a/mbtk/lynq_lib/src/lynq_network.c b/mbtk/lynq_lib/src/lynq_network.c
index f629271..6ea8325 100755
--- a/mbtk/lynq_lib/src/lynq_network.c
+++ b/mbtk/lynq_lib/src/lynq_network.c
@@ -189,13 +189,13 @@
lynq_nw_info_handle = mbtk_info_handle_get();
if(lynq_nw_info_handle)
{
- printf("creat lynq_nw_info_handle is success\n");
+ LOGI("creat lynq_nw_info_handle is success");
*ph_nw = lynq_nw_info_handle->client_fd;
g_nw_val = lynq_nw_info_handle->client_fd;
}
else
{
- printf("creat lynq_nw_info_handle is fail\n");
+ LOGE("creat lynq_nw_info_handle is fail");
return -1;
}
}
@@ -208,7 +208,7 @@
//UNUSED(h_nw);
if (h_nw != g_nw_val || g_nw_val == -1)
{
- printf("handle NULL\n");
+ LOGE("handle NULL");
return -1;
}
@@ -218,7 +218,7 @@
}
else
{
- printf("deinit lynq_nw_info_handle is fail\n");
+ LOGE("deinit lynq_nw_info_handle is fail");
return -1;
}
@@ -231,19 +231,19 @@
//UNUSED(pt_info);
if (h_nw != g_nw_val || g_nw_val == -1)
{
- printf("handle NULL\n");
+ LOGE("handle NULL");
return -1;
}
if(lynq_nw_info_handle == NULL)
{
- printf("lynq_nw_info_handle == NULL.\n");
+ LOGE("lynq_nw_info_handle == NULL.");
return -1;
}
if(pt_info == NULL)
{
- printf("pt_info == NULL.\n");
+ LOGE("pt_info == NULL.");
return -1;
}
@@ -255,7 +255,7 @@
//printf("tmp_mode = [%llu]",tmp_mode);
band.net_pref = lynq_net_pre_change(FALSE, pt_info->preferred_nw_mode);
- printf("band.net_pref = [%d]\n",band.net_pref);
+ LOGI("band.net_pref = [%d] ",band.net_pref);
if(band.net_pref == 0xFF)
{
@@ -277,19 +277,19 @@
//UNUSED(pt_info);
if (h_nw != g_nw_val || g_nw_val == -1)
{
- printf("handle NULL\n");
+ LOGE("handle NULL");
return -1;
}
if(lynq_nw_info_handle == NULL)
{
- printf("lynq_nw_info_handle == NULL.\n");
+ LOGE("lynq_nw_info_handle == NULL.");
return -1;
}
if(pt_info == NULL)
{
- printf("pt_info == NULL.\n");
+ LOGE("pt_info == NULL.");
return -1;
}
@@ -341,19 +341,19 @@
//UNUSED(pt_info);
if (h_nw != g_nw_val || g_nw_val == -1)
{
- printf("handle NULL\n");
+ LOGE("handle NULL");
return -1;
}
if(lynq_nw_info_handle == NULL)
{
- printf("lynq_nw_info_handle == NULL.\n");
+ LOGE("lynq_nw_info_handle == NULL.");
return -1;
}
if(pt_info == NULL)
{
- printf("pt_info == NULL.\n");
+ LOGE("pt_info == NULL.");
return -1;
}
@@ -483,19 +483,19 @@
//UNUSED(pt_info);
if (h_nw != g_nw_val || g_nw_val == -1)
{
- printf("handle NULL\n");
+ LOGE("handle NULL");
return -1;
}
if(lynq_nw_info_handle == NULL)
{
- printf("lynq_nw_info_handle == NULL.\n");
+ LOGE("lynq_nw_info_handle == NULL.");
return -1;
}
if(pt_info == NULL)
{
- printf("pt_info == NULL.\n");
+ LOGE("pt_info == NULL.");
return -1;
}
@@ -548,13 +548,13 @@
if (h_nw != g_nw_val || g_nw_val == -1)
{
- printf("handle NULL\n");
+ LOGE("handle NULL");
return -1;
}
if(lynq_nw_info_handle == NULL)
{
- printf("lynq_nw_info_handle == NULL.\n");
+ LOGE("lynq_nw_info_handle == NULL.");
return -1;
}
@@ -572,13 +572,13 @@
//UNUSED(pt_info);
if (h_nw != g_nw_val || g_nw_val == -1)
{
- printf("handle NULL\n");
+ LOGE("handle NULL");
return -1;
}
if (pt_info == NULL)
{
- printf("QSER_NW_OOS_CONFIG_INFO_T NULL\n");
+ LOGE("QSER_NW_OOS_CONFIG_INFO_T NULL");
return -1;
}
@@ -598,7 +598,7 @@
//输入多少配置多少，可以缺省使用默认值
if (pt_info->u.full_band_scan_info.t_min < 0 || pt_info->u.full_band_scan_info.t_step < 0 || pt_info->u.full_band_scan_info.t_max < 0)
{
- printf("qser_nw_set_oos_config set time < 0 \n");
+ LOGE("qser_nw_set_oos_config set time < 0 ");
return -1;
}
else if ((pt_info->u.full_band_scan_info.t_min > 0 && pt_info->u.full_band_scan_info.t_min <= 255) && pt_info->u.full_band_scan_info.t_step == 0 && pt_info->u.full_band_scan_info.t_max == 0)
@@ -631,25 +631,25 @@
}
else
{
- printf("qser_nw_set_oos_config set Format err\n");
+ LOGE("qser_nw_set_oos_config set Format err");
return -1;
}
int err = mbtk_oos_set(lynq_nw_info_handle, &oos_info);
if (err != 0)
{
- printf("qser_nw_set_oos_config mbtk_oos_set err \n");
+ LOGE("qser_nw_set_oos_config mbtk_oos_set err");
return -1;
}
}
else if (tmp_type == QSER_NW_OOS_CFG_TYPE_FAST_SCAN)
{
- printf("Not currently supported\n");
+ LOGE("Not currently supported");
return -1;
}
else
{
- printf("type is error\n");
+ LOGE("type is error");
return -1;
}
@@ -662,7 +662,7 @@
//UNUSED(pt_info);
if (h_nw != g_nw_val || g_nw_val == -1)
{
- printf("handle NULL\n");
+ LOGE("handle NULL");
return -1;
}
@@ -675,7 +675,7 @@
int err = mbtk_oos_get(lynq_nw_info_handle, &oos_info);
if (err != 0)
{
- printf("qser_nw_get_oos_config mbtk_oos_get err \n");
+ LOGE("qser_nw_get_oos_config mbtk_oos_get err ");
return -1;
}
/*
@@ -701,7 +701,7 @@
if (pt_info == NULL)
{
- printf("qser_nw_get_oos_config pt_info is null \n");
+ LOGE("qser_nw_get_oos_config pt_info is null ");
return -1;
}
@@ -717,13 +717,13 @@
if (h_nw != g_nw_val || g_nw_val == -1)
{
- printf("handle NULL\n");
+ LOGE("handle NULL");
return -1;
}
if(lynq_nw_info_handle == NULL)
{
- printf("lynq_nw_info_handle == NULL.\n");
+ LOGE("lynq_nw_info_handle == NULL.");
return -1;
}
@@ -736,7 +736,7 @@
*/
if (rf_mode != 4 && rf_mode != 0 && rf_mode != 1)
{
- printf("mode is error!\n");
+ LOGE("mode is error!");
return -1;
}
@@ -752,7 +752,7 @@
}
else
{
- printf("qser_nw_set_rf_mode is success\n");
+ LOGI("qser_nw_set_rf_mode is success\n");
}
return 0;
@@ -767,13 +767,13 @@
if (h_nw != g_nw_val || g_nw_val == -1)
{
- printf("handle NULL\n");
+ LOGE("handle NULL");
return -1;
}
if(lynq_nw_info_handle == NULL)
{
- printf("lynq_nw_info_handle == NULL.\n");
+ LOGE("lynq_nw_info_handle == NULL.");
return -1;
}
@@ -787,7 +787,7 @@
}
else
{
- printf("qser_nw_get_rf_mode is success\n");
+ LOGI("qser_nw_get_rf_mode is success\n");
*rf_mode = tmp_rf;
}
diff --git a/mbtk/test/asr1806/lynq_nw_test.c b/mbtk/test/asr1806/lynq_nw_test.c
index 56056c6..82cd6d8 100755
--- a/mbtk/test/asr1806/lynq_nw_test.c
+++ b/mbtk/test/asr1806/lynq_nw_test.c
@@ -77,90 +77,93 @@
return 0;
case 1:
qser_nw_client_init(&handle);
- printf("test>>: handle = %d\n",handle);
break;
case 2:
qser_nw_add_rx_msg_handler(handle, nw_event_ind_handler, NULL);
break;
case 3:
{
- //漫游开关现在不支持，所以就不用配置
- printf("please input \n"
- "\t1:GSM \n"
- "\t2:WCDMA \n"
- "\t4:CDMA \n"
- "\t8:EVDO \n"
- "\t16:LTE \n"
- "\t32:TDSCDMA \n"
- );
- memset(operator,0x00, sizeof(operator));
- fgets(operator, sizeof(operator), stdin);
- fflush(stdin);
- opt = atoi(operator);
- QSER_NW_CONFIG_INFO_T t_info;
- switch(opt)
- {
- case 1:
- t_info.preferred_nw_mode = QSER_NW_MODE_GSM;//2G CMCC/CU
- break;
- case 2:
- t_info.preferred_nw_mode = QSER_NW_MODE_WCDMA;//3G CU
- break;
- case 4:
- t_info.preferred_nw_mode = QSER_NW_MODE_CDMA;//3G CT
- break;
- case 8:
- t_info.preferred_nw_mode = QSER_NW_MODE_EVDO;//3G CT
- break;
- case 16:
- t_info.preferred_nw_mode = QSER_NW_MODE_LTE;//4G 全网通
- break;
- case 32:
- t_info.preferred_nw_mode = QSER_NW_MODE_TDSCDMA;//3G CMCC
- break;
- default:
- t_info.preferred_nw_mode = QSER_NW_MODE_LTE;//4G
- break;
+ //漫游开关现在不支持，所以就不用配置
+ printf("please input \n"
+ "\t1:GSM \n"
+ "\t2:WCDMA \n"
+ "\t4:CDMA \n"
+ "\t8:EVDO \n"
+ "\t16:LTE \n"
+ "\t32:TDSCDMA \n"
+ );
+ memset(operator,0x00, sizeof(operator));
+ fgets(operator, sizeof(operator)-1, stdin);
+ fflush(stdin);
+ opt = atoi(operator);
+ QSER_NW_CONFIG_INFO_T t_info;
+ switch(opt)
+ {
+ case 1:
+ t_info.preferred_nw_mode = QSER_NW_MODE_GSM;//2G
+ break;
+ case 2:
+ t_info.preferred_nw_mode = QSER_NW_MODE_WCDMA;//3G
+ break;
+ case 4:
+ t_info.preferred_nw_mode = QSER_NW_MODE_CDMA;//3G
+ break;
+ case 8:
+ t_info.preferred_nw_mode = QSER_NW_MODE_EVDO;//3G
+ break;
+ case 16:
+ t_info.preferred_nw_mode = QSER_NW_MODE_LTE;//4G
+ break;
+ case 32:
+ t_info.preferred_nw_mode = QSER_NW_MODE_TDSCDMA;//3G
+ break;
+ default:
+ t_info.preferred_nw_mode = QSER_NW_MODE_LTE;//4G
+ break;
+ }
+ qser_nw_set_config(handle, &t_info);
}
- //t_info.preferred_nw_mode = QSER_NW_MODE_LTE;
- qser_nw_set_config(handle, &t_info);
break;
- }
case 4:
{
- QSER_NW_OPERATOR_NAME_INFO_T t_info;
- int err = qser_nw_get_operator_name(handle, &t_info);
- if(err) {
- printf("Error : %d\n", err);
- } else {
- printf("Operator : %s, %s, %s, %s\n", t_info.long_eons, t_info.short_eons, t_info.mcc, t_info.mnc);
+ QSER_NW_OPERATOR_NAME_INFO_T t_info;
+ int err = qser_nw_get_operator_name(handle, &t_info);
+ if(err)
+ {
+ printf("Error : %d\n", err);
+ } else
+ {
+ printf("Operator : %s, %s, %s, %s\n", t_info.long_eons, t_info.short_eons, t_info.mcc, t_info.mnc);
+ }
}
break;
- }
case 5:
{
- QSER_NW_REG_STATUS_INFO_T reg;
- int err = qser_nw_get_reg_status(handle, ®);
- if(err) {
- printf("Error : %d\n", err);
- } else {
- if(reg.voice_registration_details_3gpp_valid)
- {
- printf("voice_registration_details_3gpp: \ntech_domain=%d, radio_tech=%d, mcc=%s, mnc=%s, roaming=%d, forbidden=%d, cid=0x%X, lac=%d, psc=%d, tac=%d\n",
- reg.voice_registration_details_3gpp.tech_domain,
- reg.voice_registration_details_3gpp.radio_tech,
- reg.voice_registration_details_3gpp.mcc,
- reg.voice_registration_details_3gpp.mnc,
- reg.voice_registration_details_3gpp.roaming,
- reg.voice_registration_details_3gpp.forbidden,
- reg.voice_registration_details_3gpp.cid,
- reg.voice_registration_details_3gpp.lac,
- reg.voice_registration_details_3gpp.psc,
- reg.voice_registration_details_3gpp.tac);
- }
- if(reg.data_registration_details_3gpp_valid)
- {
- printf("data_registration_details_3gpp: \ntech_domain=%d, radio_tech=%d, mcc=%s, mnc=%s, roaming=%d, forbidden=%d, cid=0x%X, lac=%d, psc=%d, tac=%d\n",
+ QSER_NW_REG_STATUS_INFO_T reg;
+ int err = qser_nw_get_reg_status(handle, ®);
+ if(err)
+ {
+ printf("Error : %d\n", err);
+ }
+ else
+ {
+ if(reg.voice_registration_details_3gpp_valid)
+ {
+ printf("voice_registration_details_3gpp: tech_domain=%d, radio_tech=%d, mcc=%s, mnc=%s, roaming=%d, forbidden=%d, cid=0x%X, lac=%d, psc=%d, tac=%d\n",
+ reg.voice_registration_details_3gpp.tech_domain,
+ reg.voice_registration_details_3gpp.radio_tech,
+ reg.voice_registration_details_3gpp.mcc,
+ reg.voice_registration_details_3gpp.mnc,
+ reg.voice_registration_details_3gpp.roaming,
+ reg.voice_registration_details_3gpp.forbidden,
+ reg.voice_registration_details_3gpp.cid,
+ reg.voice_registration_details_3gpp.lac,
+ reg.voice_registration_details_3gpp.psc,
+ reg.voice_registration_details_3gpp.tac);
+ }
+ if(reg.data_registration_details_3gpp_valid)
+ {
+ printf("data_registration_details_3gpp: tech_domain=%d, radio_tech=%d, mcc=%s, mnc=%s, roaming=%d, forbidden=%d, cid=0x%X, lac=%d, psc=%d, tac=%d\n",
reg.data_registration_details_3gpp.tech_domain,
reg.data_registration_details_3gpp.radio_tech,
reg.data_registration_details_3gpp.mcc,
@@ -171,84 +174,83 @@
reg.data_registration_details_3gpp.lac,
reg.data_registration_details_3gpp.psc,
reg.data_registration_details_3gpp.tac);
- }
- //printf("Data Reg: radio_tech = %d, lac = %x, cid = %x\n", reg.data_registration_details_3gpp.radio_tech, reg.data_registration_details_3gpp.lac, reg.data_registration_details_3gpp.cid);
- //printf("Voice Reg: radio_tech = %d, lac = %x, cid = %x\n", reg.voice_registration_details_3gpp.radio_tech, reg.voice_registration_details_3gpp.lac, reg.voice_registration_details_3gpp.cid);
+ }
+ //printf("Data Reg: radio_tech = %d, lac = %x, cid = %x\n", reg.data_registration_details_3gpp.radio_tech, reg.data_registration_details_3gpp.lac, reg.data_registration_details_3gpp.cid);
+ //printf("Voice Reg: radio_tech = %d, lac = %x, cid = %x\n", reg.voice_registration_details_3gpp.radio_tech, reg.voice_registration_details_3gpp.lac, reg.voice_registration_details_3gpp.cid);
+ }
}
break;
- }
case 6:
{
- QSER_NW_SIGNAL_STRENGTH_INFO_T sig;
- int err = qser_nw_get_signal_strength(handle, &sig);
- if(err) {
- printf("Error : %d\n", err);
- } else {
- if (sig.gsm_sig_info_valid == TRUE)
- printf("Signal GSM: rssi = %d\n", sig.gsm_sig_info.rssi);
- else if (sig.lte_sig_info_valid == TRUE)
- printf("Signal LTE: rssi = %d, rsrp = %d, rsrq = %d, snr = %d\n", sig.lte_sig_info.rssi , sig.lte_sig_info.rsrp, sig.lte_sig_info.rsrq, sig.lte_sig_info.snr);
- else if (sig.wcdma_sig_info_valid == TRUE)
- printf("Signal UTRAN: rssi = %d, ecio = %d\n", sig.wcdma_sig_info.rssi , sig.wcdma_sig_info.ecio);
+ QSER_NW_SIGNAL_STRENGTH_INFO_T sig;
+ int err = qser_nw_get_signal_strength(handle, &sig);
+ if(err)
+ {
+ printf("Error : %d\n", err);
+ }
else
- printf("Signal type not supported \n");
+ {
+ if (sig.gsm_sig_info_valid == TRUE)
+ printf("Signal GSM: rssi = %d\n", sig.gsm_sig_info.rssi);
+ else if (sig.lte_sig_info_valid == TRUE)
+ printf("Signal LTE: rssi = %d, rsrp = %d, rsrq = %d, snr = %d\n", sig.lte_sig_info.rssi , sig.lte_sig_info.rsrp, sig.lte_sig_info.rsrq, sig.lte_sig_info.snr);
+ else if (sig.wcdma_sig_info_valid == TRUE)
+ printf("Signal UTRAN: rssi = %d, ecio = %d\n", sig.wcdma_sig_info.rssi , sig.wcdma_sig_info.ecio);
+ else
+ printf("Signal type not supported \n");
+ }
}
break;
- }
case 7:
{
- QSER_NW_OOS_CONFIG_INFO_T pt_info_s;
- memset(&pt_info_s, 0x00, sizeof(QSER_NW_OOS_CONFIG_INFO_T));
- /*取值范围0-255,设置时间自定义
- phase 1 5次 次数无法更改，这五次都是以10秒为一次的间隔搜网
- phase 2 5次 次数无法更改，这五次都是以15秒为一次的间隔搜网
- phase 3 不限制次数的秒数设置，第三阶段不限制次数以20秒为一次的间隔搜网
- 如果要关闭OOS配置，则把min step max 全部配置为0即可
- */
- pt_info_s.type = QSER_NW_OOS_CFG_TYPE_FULL_BAND_SCAN;//平台提供自定义配置搜网时间间隔
- {
- pt_info_s.u.full_band_scan_info.t_min = 10;//phase 1
- pt_info_s.u.full_band_scan_info.t_step = 15;//phase 2
- pt_info_s.u.full_band_scan_info.t_num = 0;//可以不配置，并没有使用
- pt_info_s.u.full_band_scan_info.t_max = 20;//phase 3
+ QSER_NW_OOS_CONFIG_INFO_T pt_info_s;
+ memset(&pt_info_s, 0x00, sizeof(QSER_NW_OOS_CONFIG_INFO_T));
+ /*取值范围0-255,设置时间自定义
+ phase 1 5次 次数无法更改，这五次都是以10秒为一次的间隔搜网
+ phase 2 5次 次数无法更改，这五次都是以15秒为一次的间隔搜网
+ phase 3 不限制次数的秒数设置，第三阶段不限制次数以20秒为一次的间隔搜网
+ 如果要关闭OOS配置，则把min step max 全部配置为0即可
+ */
+ pt_info_s.type = QSER_NW_OOS_CFG_TYPE_FULL_BAND_SCAN;//平台提供自定义配置搜网时间间隔
+ {
+ pt_info_s.u.full_band_scan_info.t_min = 10;//phase 1
+ pt_info_s.u.full_band_scan_info.t_step = 15;//phase 2
+ pt_info_s.u.full_band_scan_info.t_num = 0;//可以不配置，并没有使用
+ pt_info_s.u.full_band_scan_info.t_max = 20;//phase 3
+ }
+ printf("set OOS %d %d %d \n",pt_info_s.u.full_band_scan_info.t_min, pt_info_s.u.full_band_scan_info.t_step, pt_info_s.u.full_band_scan_info.t_max);
+ //pt_info_s.type = QSER_NW_OOS_CFG_TYPE_FAST_SCAN;平台本身有历史频点优先处理的逻辑（无接口不需要我们进行处理）
+ qser_nw_set_oos_config(handle, &pt_info_s);
}
- printf("set OOS %d %d %d \n",pt_info_s.u.full_band_scan_info.t_min, pt_info_s.u.full_band_scan_info.t_step, pt_info_s.u.full_band_scan_info.t_max);
- //pt_info_s.type = QSER_NW_OOS_CFG_TYPE_FAST_SCAN;平台本身有历史频点优先处理的逻辑（无接口不需要我们进行处理）
- qser_nw_set_oos_config(handle, &pt_info_s);
break;
- }
case 8:
{
- QSER_NW_OOS_CONFIG_INFO_T pt_info_g;
- qser_nw_get_oos_config(handle, &pt_info_g);
- if (pt_info_g.type == QSER_NW_OOS_CFG_TYPE_FULL_BAND_SCAN)
- printf("TYPE: %d min: %d setp: %d max: %d\n", pt_info_g.type, pt_info_g.u.full_band_scan_info.t_min, pt_info_g.u.full_band_scan_info.t_step, pt_info_g.u.full_band_scan_info.t_max);
- /*
- else if (pt_info.type == QSER_NW_OOS_CFG_TYPE_FAST_SCAN)
- printf("TYPE: %d enable: %d time_interval: %d\n", pt_info.type, pt_info.u.fast_can_info.enable, pt_info.u.fast_can_info.enable, pt_info.u.fast_can_info.time_interval);
- */
- else
- printf("type not supported \n");
- break;
+ QSER_NW_OOS_CONFIG_INFO_T pt_info_g;
+ qser_nw_get_oos_config(handle, &pt_info_g);
+ if (pt_info_g.type == QSER_NW_OOS_CFG_TYPE_FULL_BAND_SCAN)
+ printf("TYPE: %d min: %d setp: %d max: %d\n", pt_info_g.type, pt_info_g.u.full_band_scan_info.t_min, pt_info_g.u.full_band_scan_info.t_step, pt_info_g.u.full_band_scan_info.t_max);
+ else
+ printf("type not supported \n");
}
+ break;
case 9:
{
- printf("please input 0 or 1 or 4: \n");
- memset(operator,0x00, sizeof(operator));
- fgets(operator, sizeof(operator), stdin);
- fflush(stdin);
- opt = atoi(operator);
- printf("opt: [%d]\n",opt);
- qser_nw_set_rf_mode(handle, opt);
- break;
+ printf("please input 0 or 1 or 4: \n");
+ memset(operator,0x00, sizeof(operator));
+ fgets(operator, sizeof(operator)-1, stdin);
+ fflush(stdin);
+ opt = atoi(operator);
+ printf("rf_mode: [%d]\n",opt);
+ qser_nw_set_rf_mode(handle, opt);
}
+ break;
case 10:
{
- int rf_t;
- qser_nw_get_rf_mode(handle, &rf_t);
- printf(">>>rf_mode = [%d]\n",rf_t);
- break;
+ int rf_t;
+ qser_nw_get_rf_mode(handle, &rf_t);
+ printf(">>>rf_mode = [%d]\n",rf_t);
}
+ break;
case 11:
qser_nw_client_deinit(handle);
break;