[Feature][T108][system][task-view-1692]Merged gsw hal code
Only Configure: No
Affected branch: GSW_V1453
Affected module: libgsw
Is it affected on IC: only ASR
Self-test: yes
Doc Update: no
Change-Id: I7fb669b6afc6e2f92a1e86ec8543498eb73120b4
diff --git a/mbtk/libgsw_lib/gsw_nw_interface.c b/mbtk/libgsw_lib/gsw_nw_interface.c
index b613a1a..90da70b 100755
--- a/mbtk/libgsw_lib/gsw_nw_interface.c
+++ b/mbtk/libgsw_lib/gsw_nw_interface.c
@@ -1,8 +1,9 @@
-#include "gsw_nw_interface.h"
+#include <stdbool.h>
#include <dlfcn.h>
#include <time.h>
#include <pthread.h>
#include <cutils/properties.h>
+#include "gsw_nw_interface.h"
#define SIG_TIMER 5
#define MODEM_TIMER 5
@@ -135,7 +136,6 @@
uint32 value15;
} __attribute__((packed)) mbtk_cell_info_t;
-
typedef struct
{
uint8 net_pref; // mbtk_net_pref_enum
@@ -1266,24 +1266,24 @@
}
/*
-typedef enum{
- MBTK_READY_INIT = -1,
- MBTK_READY_SUCCESS,
- MBTK_READY_MODEM_FAIL,
- MBTK_READY_RESPONSE_FAIL,
- MBTK_READY_SOCKET_FAIL,
- MBTK_READY_RIL_FAIL
+typedef enum{
+ MBTK_READY_INIT = -1,
+ MBTK_READY_SUCCESS,
+ MBTK_READY_MODEM_FAIL,
+ MBTK_READY_RESPONSE_FAIL,
+ MBTK_READY_SOCKET_FAIL,
+ MBTK_READY_RIL_FAIL
}mbtk_ready_status_type;
-typedef enum gsw_hal_nw_mode_state_type
-{
- GSW_MODEM_STATE_UNKNOWN = 0,
- GSW_MODEM_STATE_ONLINE,
- GSW_MODEM_STATE_OFFLINE,
- GSW_SDK_STATE_SERVICE_DOWN,
- GSW_SDK_STATE_SERVICE_UP,// service down->up 需要routectl 重启
- GSW_SDK_STATE_GPS_DOWN,
- GSW_SDK_STATE_GPS_UP,
+typedef enum gsw_hal_nw_mode_state_type
+{
+ GSW_MODEM_STATE_UNKNOWN = 0,
+ GSW_MODEM_STATE_ONLINE,
+ GSW_MODEM_STATE_OFFLINE,
+ GSW_SDK_STATE_SERVICE_DOWN,
+ GSW_SDK_STATE_SERVICE_UP,// service down->up 需要routectl 重启
+ GSW_SDK_STATE_GPS_DOWN,
+ GSW_SDK_STATE_GPS_UP,
} gsw_mode_state_e;
*/
@@ -1455,7 +1455,6 @@
}
-
static void gsw_reject_callback(GSW_NW_RADIO_ACCESS_TECH_E rat, GSW_SERVICE_DOMAIN_E domain, int cause)
{
LOGE("gsw_reject_callback start,rat = %d,domain = %d,cause = %d\n",rat,domain,cause);
@@ -1845,14 +1844,14 @@
{
LOGD("not find mcc");
strcpy(serving_info->operator_name, "unknown");
- sprintf(serving_info->reg_plmn, "%d", net.plmn);
+ sprintf(serving_info->reg_plmn, "%u", net.plmn);
}
else
{
LOGD("find mcc\n");
strcpy(serving_info->operator_name, lynq_operator_mcc_mnc[i].lynq_operator_l);
- sprintf(serving_info->reg_plmn, "%d", net.plmn);
+ sprintf(serving_info->reg_plmn, "%u", net.plmn);
}
LOGE("operator_name = %s\n", serving_info->operator_name);
@@ -1888,9 +1887,9 @@
LOGE("is lte\n");
//LOGE("LTE : tac=%x, PCI=%x, dlEuarfcn=%x, ulEuarfcn=%x, band=%x\n", cell->value1, cell->value2, cell->value3, cell->value4, cell->value5);
LOGE("LTE : tac=%d, PCI=%d, dlEuarfcn=%d, ulEuarfcn=%d, band=%d\n", cell->value1, cell->value2, cell->value3, cell->value4, cell->value5);
- snprintf(serving_info->tac,sizeof(serving_info->tac),"%d",cell->value1);
+ snprintf(serving_info->tac,sizeof(serving_info->tac),"%u",cell->value1);
strcpy(serving_info->lac,"");
- snprintf(serving_info->cell_id,sizeof(serving_info->cell_id),"%d",cell->value10);
+ snprintf(serving_info->cell_id,sizeof(serving_info->cell_id),"%u",cell->value10);
break;
}
@@ -1898,18 +1897,18 @@
{
LOGE("is gsm\n");
LOGE("GSM : lac=%d, ci=%d, arfcn=%d, bsic=%d\n", cell->value1, cell->value2, cell->value3, cell->value4);
- sprintf(serving_info->lac,"%d",cell->value1);
+ sprintf(serving_info->lac,"%u",cell->value1);
memset(serving_info->tac,0,sizeof(serving_info->tac));
- sprintf(serving_info->cell_id,"%d",cell->value2);
+ sprintf(serving_info->cell_id,"%u",cell->value2);
break;
}
case MBTK_CELL_TYPE_UMTS:
{
LOGE("is wcdma\n");
LOGE("UMTS : lac=%d, ci=%d, arfcn=%d\n", cell->value1, cell->value2, cell->value3);
- sprintf(serving_info->lac,"%d",cell->value1);
+ sprintf(serving_info->lac,"%u",cell->value1);
memset(serving_info->tac,0,sizeof(serving_info->tac));
- sprintf(serving_info->cell_id,"%d",cell->value2);
+ sprintf(serving_info->cell_id,"%u",cell->value2);
break;
}
@@ -1937,7 +1936,7 @@
* @retval 0: success
* @retval other: fail
*/
-int gsw_get_netype(int *netype)
+int gsw_get_netype(int32_t *netype)
{
int ret = -1;
@@ -2015,7 +2014,7 @@
* @retval 0: success
* @retval other: fail
*/
-int gsw_set_opmode(int op_mode)
+int gsw_set_opmode(int32_t op_mode)
{
mbtk_modem_info_t info;
int rf_mode = -1;
@@ -2068,7 +2067,7 @@
* @retval 0: success
* @retval other: fail
*/
-int gsw_get_mode_preference(int *mode_pref)
+int gsw_get_mode_preference(int32_t *mode_pref)
{
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
@@ -2105,7 +2104,7 @@
* @retval 0: success
* @retval other: fail
*/
-int gsw_set_mode_preference(int mode_pref)
+int gsw_set_mode_preference(int32_t mode_pref)
{
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
@@ -2142,14 +2141,14 @@
* @retval 0: success
* @retval other: fail
*/
-int gsw_get_sig_info(int *csq_value)
+int gsw_get_sig_info(int32_t *csq_value)
{
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
return GSW_HAL_NORMAL_FAIL;
}
- mbtk_signal_info_t signal;
+ mbtk_signal_info_t signal = {0};
int ret = mbtk_net_signal_get(nw_info_handle, &signal);
if(ret != 0)
{
@@ -2242,7 +2241,7 @@
* @retval csq
* @retval other: fail
*/
-int gsw_sigInfo_to_csq(int netType, int sigValue)
+int gsw_sigInfo_to_csq(int32_t netType, int32_t sigValue)
{
if (nw_init_flag == 0 || nw_info_handle == NULL)
{
@@ -2281,7 +2280,7 @@
{
char OperatorFN[128];
char OperatorSH[128];
- char temp[12] = {0};
+ char temp[12];
mbtk_net_info_t net;
if (nw_init_flag == 0 || nw_info_handle == NULL)
@@ -2310,14 +2309,14 @@
strcpy(OperatorFN, lynq_operator_mcc_mnc[i].lynq_operator_l);
strcpy(OperatorSH, lynq_operator_mcc_mnc[i].lynq_operator_s);
- memset(temp,0,12);
- memset(nw_operator_name_infos->mcc,0,4);
- sprintf(temp, "%d", (lynq_operator_mcc_mnc[i].lynq_mcc_mnc)/100);
+ memset(temp,0,sizeof(temp));
+ memset(nw_operator_name_infos->mcc,0,sizeof(nw_operator_name_infos->mcc));
+ sprintf(temp, "%u", (lynq_operator_mcc_mnc[i].lynq_mcc_mnc)/100);
strncpy(nw_operator_name_infos->mcc, temp, strlen(temp));
- memset(temp,0,12);
- memset(nw_operator_name_infos->mnc,0,4);
- sprintf(temp, "%d", (lynq_operator_mcc_mnc[i].lynq_mcc_mnc)%100);
+ memset(temp,0,sizeof(temp));
+ memset(nw_operator_name_infos->mnc,0,sizeof(nw_operator_name_infos->mnc));
+ sprintf(temp, "%u", (lynq_operator_mcc_mnc[i].lynq_mcc_mnc)%100);
strncpy(nw_operator_name_infos->mnc, temp, strlen(temp));
}
@@ -2371,7 +2370,7 @@
case 0:
{
LOGD("GSM : lac=%d, ci=%d, arfcn=%d, bsic=%d\n", cell->value1, cell->value2, cell->value3, cell->value4);
- char gsm_temp[12];
+ char gsm_temp[12] = {0};
cell_info->rat = GSW_NETWORK_RADIO_GSM;
@@ -2400,7 +2399,7 @@
case 1:
{
LOGD("UMTS : lac=%d, ci=%d, arfcn=%d\n", cell->value1, cell->value2, cell->value3);
- char wcdma_temp[12];
+ char wcdma_temp[12] = {0};
cell_info->rat = GSW_NETWORK_RADIO_UMTS;
@@ -2429,8 +2428,9 @@
case 2:
{
LOGE("LTE : tac=%d, PCI=%d, dlEuarfcn=%d, ulEuarfcn=%d, band=%d\n", cell->value1, cell->value2, cell->value3, cell->value4, cell->value5);
+
+ char lte_temp[12] = {0};
- char lte_temp[12];
cell_info->rat = GSW_NETWORK_RADIO_LTE;
cell_info->mcc_valid = 1;
@@ -2517,7 +2517,6 @@
char lte_temp[12] = {0};
cell_info->ext_info[neibor_count].rat = GSW_NETWORK_RADIO_LTE;
-
cell_info->ext_info[neibor_count].pci = cell->value1;
cell_info->ext_info[neibor_count].pci_valid = 1;
@@ -2538,6 +2537,8 @@
snprintf(lte_temp, sizeof(lte_temp) ,"%X", cell->value6);
strncpy(cell_info->ext_info[neibor_count].mcc, lte_temp, sizeof(cell_info->ext_info[neibor_count].mcc));
+ cell_info->ext_info[neibor_count].cell_id = cell->value5;
+ cell_info->ext_info[neibor_count].cell_id_valid = 1;
snprintf(lte_temp, sizeof(lte_temp) ,"%X", cell->value7);
strncpy(cell_info->ext_info[neibor_count].mnc, lte_temp, sizeof(cell_info->ext_info[neibor_count].mnc));
@@ -2997,3 +2998,32 @@
}
+int gsw_get_apn_reserved_id(const char *apn)
+{
+ return 0;
+}
+
+int gsw_set_apn_reserved_id(int reserved_id, const char *apn)
+{
+ return 0;
+}
+
+int gsw_data_call_clear_session(int linkid, Link_Info_s *LinkInf)
+{
+ return 0;
+}
+
+void *gsw_onUnsolicited(void *arg)
+{
+ return 0;
+}
+
+int gsw_sdk_init(void)
+{
+ return 0;
+}
+
+int gsw_get_modem_state_exp(void)
+{
+ return 0;
+}