[Bugfix][T108-GSW][bug-view-1473] change gsw_reset_modem from sim module to nw module
Only Configure: No
Affected branch: unknown
Affected module: data
Is it affected on both ZXIC and ASR: only ASR
Self-test: yes
Doc Update: no
Change-Id: Id20dde78474bc49b3cfe02d85e2371b2203e203f
diff --git a/mbtk/test/libgsw_lib/gsw_nw_test.c b/mbtk/test/libgsw_lib/gsw_nw_test.c
index 9fc90b1..9cfb040 100755
--- a/mbtk/test/libgsw_lib/gsw_nw_test.c
+++ b/mbtk/test/libgsw_lib/gsw_nw_test.c
@@ -13,6 +13,8 @@
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#define GSW_IMEI_LENGTH 20+1
+
#ifndef FALSE
#define FALSE (0)
#endif
@@ -631,7 +633,8 @@
int (*gsw_get_cell_info)(GSW_NW_CELL_INFO *cell_info);
int (*gsw_oos_config_get)(GSW_NW_OOS_CONFIG_INFO_T *pt_info);
int (*gsw_oos_config_set)(GSW_NW_OOS_CONFIG_INFO_T *pt_info);
-
+int (*gsw_get_imei)(int32_t len, int8_t *imei);
+int (*gsw_reset_modem)(void);
static int gsw_nw_api_import()
{
@@ -779,6 +782,18 @@
return -1;
}
+ gsw_get_imei = (int(*)(int32_t len, int8_t *imei))dlsym(dlHandle_nw,"gsw_get_imei");
+ if (gsw_get_imei == NULL) {
+ printf("dlsym gsw_get_imei fail\n");
+ return GSW_HAL_FAIL;
+ }
+
+ gsw_reset_modem = (int(*)(void))dlsym(dlHandle_nw,"gsw_reset_modem");
+ if (gsw_reset_modem == NULL) {
+ printf("dlsym gsw_reset_modem fail\n");
+ return GSW_HAL_FAIL;
+ }
+
return 0;
}
@@ -867,6 +882,8 @@
printf(" 21 gsw_reg_rej_cause_callback\n");
printf(" 22 gsw_oos_config_get\n");
printf(" 23 gsw_oos_config_set\n");
+ printf(" 24 gsw_get_imei\n");
+ printf(" 25 gsw_reset modem\n");
printf("-------------------------------------------------------------------------\n");
}
@@ -1304,7 +1321,35 @@
break;
}
-
+
+ case 24:
+ {
+ char imei[GSW_IMEI_LENGTH] = {0};
+ ret = gsw_get_imei(GSW_IMEI_LENGTH, (int8_t *)imei);
+ if(ret == 0)
+ {
+ printf("gsw_get_imei success, imei = %s\n",imei);
+ }
+ else
+ {
+ printf("gsw_get_imei fail,ret = %d\n",ret);
+ }
+ break;
+ }
+ //reset modem
+ case 25:
+ {
+ ret = gsw_reset_modem();
+ if(ret == 0)
+ {
+ printf("gsw_reset_modem success\n");
+ }
+ else
+ {
+ printf("gsw_reset_modem fail,ret = %d\n",ret);
+ }
+ break;
+ }
default:
{
continue;
diff --git a/mbtk/test/libgsw_lib/gsw_sim_test.c b/mbtk/test/libgsw_lib/gsw_sim_test.c
index 6ba8288..b7dea00 100755
--- a/mbtk/test/libgsw_lib/gsw_sim_test.c
+++ b/mbtk/test/libgsw_lib/gsw_sim_test.c
@@ -96,11 +96,8 @@
int (*gsw_get_sim_iccid)(int32_t len, int8_t *iccid);
int (*gsw_get_sim_imsi)(int32_t len, int8_t *imsi);
int (*gsw_get_sim_msisdn)(int32_t len, int8_t *msisdn);
-int (*gsw_get_imei)(int32_t len, int8_t *imei);
int (*gsw_set_sim_power_down)(void);
int (*gsw_set_sim_power_up)(void);
-int (*gsw_reset_modem)(void);
-
#define lib_gsw_sim_path "/lib/libgsw_lib.so"
static void *dlHandle_sim = NULL;
@@ -148,13 +145,7 @@
if (gsw_get_sim_msisdn == NULL) {
printf("dlsym gsw_get_sim_msisdn fail\n");
return GSW_HAL_FAIL;
- }
-
- gsw_get_imei = (int(*)(int32_t len, int8_t *imei))dlsym(dlHandle_sim,"gsw_get_imei");
- if (gsw_get_imei == NULL) {
- printf("dlsym gsw_get_imei fail\n");
- return GSW_HAL_FAIL;
- }
+ }
gsw_set_sim_power_down = (int(*)(void))dlsym(dlHandle_sim,"gsw_set_sim_power_down");
if (gsw_set_sim_power_down == NULL) {
@@ -167,13 +158,7 @@
printf("dlsym gsw_set_sim_power_up fail\n");
return GSW_HAL_FAIL;
}
-
- gsw_reset_modem = (int(*)(void))dlsym(dlHandle_sim,"gsw_reset_modem");
- if (gsw_reset_modem == NULL) {
- printf("dlsym gsw_reset_modem fail\n");
- return GSW_HAL_FAIL;
- }
-
+
return GSW_HAL_SUCCESS;
}
@@ -198,7 +183,6 @@
printf("6.sim states\n");
printf("7.sim power_down\n");
printf("8.sim power_up\n");
- printf("9.reset modem\n");
printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>Enter cmd:");
char* temp = NULL;
@@ -340,23 +324,7 @@
printf("gsw_set_sim_power_up fail,ret = %d\n",ret);
}
break;
- }
-
- //reset modem
- case 9:
- {
- ret = gsw_reset_modem();
- if(ret == 0)
- {
- printf("gsw_reset_modem success\n");
- }
- else
- {
- printf("gsw_reset_modem fail,ret = %d\n",ret);
- }
- break;
- }
-
+ }
default :
{
printf("error cmd.\n");