优化demo代码解决NW部分参数处理错误
Change-Id: I4db3c717b535160ff7dc12bc9723d0d03ef303e8
diff --git a/mbtk/test/liblynq_lib_t106/lynq-qser-network-demo.cpp b/mbtk/test/liblynq_lib_t106/lynq-qser-network-demo.cpp
index 585b3aa..ca0874a 100755
--- a/mbtk/test/liblynq_lib_t106/lynq-qser-network-demo.cpp
+++ b/mbtk/test/liblynq_lib_t106/lynq-qser-network-demo.cpp
@@ -12,6 +12,10 @@
#define LOG_TAG "QSER_NETWORK_DEMO"
#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+
void *handle_network;
int (*qser_nw_client_init_p)(nw_client_handle_type * h_nw);
@@ -345,7 +349,7 @@
case 0://"qser_nw_client_init"
{
- ret = qser_nw_client_init_p(&h_nw);
+ ret = qser_nw_client_init(&h_nw);
printf("qser_nw_client_init ret = %d\n", ret);
break;
}
@@ -358,14 +362,14 @@
scanf("%d", &mask);
t_info.preferred_nw_mode = mask;
- ret = qser_nw_set_config_p(h_nw, &t_info);
+ ret = qser_nw_set_config(h_nw, &t_info);
printf("qser_nw_set_config ret = %d\n", ret);
break;
}
case 2://"qser_nw_get_operator_name"
{
QSER_NW_OPERATOR_NAME_INFO_T t_info;
- ret = qser_nw_get_operator_name_p(h_nw, &t_info);
+ ret = qser_nw_get_operator_name(h_nw, &t_info);
printf("qser_nw_get_operator_name ret = %d, long_eons=%s, short_eons=%s, mcc=%s, mnc=%s\n", ret,
t_info.long_eons, t_info.short_eons, t_info.mcc, t_info.mnc);
break;
@@ -375,7 +379,7 @@
QSER_NW_REG_STATUS_INFO_T t_info;
memset(&t_info, 0, sizeof(QSER_NW_REG_STATUS_INFO_T));
- ret = qser_nw_get_reg_status_p(h_nw, &t_info);
+ ret = qser_nw_get_reg_status(h_nw, &t_info);
printf("qser_nw_get_reg_status ret = %d, detail info:\n", ret);
if(t_info.voice_registration_valid)
{
@@ -454,20 +458,20 @@
}
case 12://"qser_nw_client_deinit"
{
- ret = qser_nw_client_deinit_p(h_nw);
+ ret = qser_nw_client_deinit(h_nw);
printf("qser_nw_client_deinit ret = %d\n", ret);
break;
}
case 4 :
{
- ret = qser_nw_add_rx_msg_handler_p(h_nw, nw_event_ind_handler, NULL);
+ ret = qser_nw_add_rx_msg_handler(h_nw, nw_event_ind_handler, NULL);
printf("qser_nw_add_rx_msg_handler, ret=%d\n", ret);
break;
}
case 5 :
{
QSER_NW_SIGNAL_STRENGTH_INFO_T t_info;
- ret = qser_nw_get_signal_strength_p(h_nw, &t_info);
+ ret = qser_nw_get_signal_strength(h_nw, &t_info);
printf("qser_nw_get_signal_strength, ret=%d\n", ret);
if(ret==0)
{
@@ -510,7 +514,7 @@
printf("please input you want query oos config's type (0: fast network scan config; 1: full band network scan config ) : \n");
scanf("%d", &type);
t_info.type = type;
- ret = qser_nw_get_oos_config_p(h_nw, &t_info);
+ ret = qser_nw_get_oos_config(h_nw, &t_info);
printf("qser_nw_get_oos_config, ret=%d\n", ret);
if(ret==0)
{
@@ -554,7 +558,7 @@
scanf("%d", &(t_info.u.full_band_scan_info.t_num));
printf("please input t_max: \n");
scanf("%d", &(t_info.u.full_band_scan_info.t_max));
- ret = qser_nw_set_oos_config_p(h_nw, &t_info);
+ ret = qser_nw_set_oos_config(h_nw, &t_info);
printf("qser_nw_get_oos_config, ret=%d\n", ret);
}
else if(t_info.type==QSER_NW_OOS_CFG_TYPE_FAST_SCAN)
@@ -563,12 +567,12 @@
scanf("%d", &(t_info.u.fast_can_info.enable));
printf("please input time_interval: \n");
scanf("%d", &(t_info.u.fast_can_info.time_interval));
- ret = qser_nw_set_oos_config_p(h_nw, &t_info);
+ ret = qser_nw_set_oos_config(h_nw, &t_info);
printf("qser_nw_get_oos_config, ret=%d\n", ret);
}
else
{
- ret = qser_nw_set_oos_config_p(h_nw, &t_info);
+ ret = qser_nw_set_oos_config(h_nw, &t_info);
printf("qser_nw_get_oos_config, ret=%d\n", ret);
}
break;
@@ -576,7 +580,7 @@
case 9://"qser_nw_get_rf_mode"
{
E_QSER_NW_RF_MODE_TYPE_T rf_mode;
- ret = qser_nw_get_rf_mode_p(h_nw, &rf_mode);
+ ret = qser_nw_get_rf_mode(h_nw, &rf_mode);
printf("qser_nw_get_rf_mode ret = %d, rf mode=%d\n", ret, rf_mode);
break;
}
@@ -585,7 +589,7 @@
E_QSER_NW_RF_MODE_TYPE_T rf_mode;
printf("please input you want set rf mode (0: cfun 0; 1: cfun 1; 4: flight mode \n");
scanf("%d", &rf_mode);
- ret = qser_nw_set_rf_mode_p(h_nw, rf_mode);
+ ret = qser_nw_set_rf_mode(h_nw, rf_mode);
printf("qser_nw_set_rf_mode %d ret = %dn",rf_mode, ret);
break;
}
@@ -594,7 +598,7 @@
E_QSER_NW_IMS_MODE_TYPE_T ims_mode;
printf("please input you want set ims mode (0: off; 1: volte enable \n");
scanf("%d", &ims_mode);
- ret = qser_nw_set_ims_enable_p(h_nw, ims_mode);
+ ret = qser_nw_set_ims_enable(h_nw, ims_mode);
printf("qser_nw_set_ims_enable %d ret = %dn",ims_mode, ret);
break;
}
@@ -602,7 +606,7 @@
{
QSER_NW_IMS_REG_STATUS_INFO_T t_info;
memset(&t_info, 0, sizeof(QSER_NW_IMS_REG_STATUS_INFO_T));
- ret = qser_nw_get_ims_reg_status_p(h_nw, &t_info);
+ ret = qser_nw_get_ims_reg_status(h_nw, &t_info);
printf("qser_nw_get_ims_reg_status ret = %d, detail info:\n", ret);
if(ret == 0)
{
@@ -620,6 +624,9 @@
return 0;
}
+#ifdef __cplusplus
+}
+#endif