[Feature][ZXW-41] merged 0601 version
Change-Id: I667af6bb09d65581d455b73f8984c160b2c67ad8
diff --git a/ap/lib/libvsim/ght_vsim_api.h b/ap/lib/libvsim/ght_vsim_api.h
index b381421..5fd8568 100755
--- a/ap/lib/libvsim/ght_vsim_api.h
+++ b/ap/lib/libvsim/ght_vsim_api.h
@@ -48,10 +48,8 @@
typedef enum {
E_NW_STATUS_SRV_NONE = 0,
- E_NW_STATUS_CURRENT_SERVING = 1,
- E_NW_STATUS_SRV_LIMITED = 2,
- E_NW_STATUS_SRV_AVAILABLE = 3,
- E_NW_STATUS_SRV_FORBIDDEN = 4,
+ E_NW_STATUS_SRV_LIMITED = 1,
+ E_NW_STATUS_SRV_AVAILABLE = 2,
}e_nw_srv_status_t;
@@ -59,6 +57,7 @@
{
uint32_t tac;
uint32_t cell_id;
+ uint32_t roamingFlag; ///< 1:roaming,0:non roaming
}lte_scell_info_t;
typedef struct
@@ -83,15 +82,14 @@
uint32_t tac;
uint32_t cell_id;
uint16_t bandwidth;
- int16_t rxlev;
+ uint16_t pcid;//int16_t rxlev;
uint32_t arfcn;
- uint16_t pcid;
}base_cell_info_t;//Hex format
typedef struct
{
- uint8_t roamingFlag; ///< 1:roaming,0:non roaming
+ uint16_t roamingFlag; ///< 1:roaming,0:non roaming
int16_t rsrp;
int16_t rsrq;
uint16_t SINR;
@@ -227,6 +225,7 @@
E_RF_RESOURCE_CALLBACK_EVENT = 0x00, /**< ÉäƵ×ÊÔ´Çл». */
E_NW_ATTACH_COMMPLETE_EVENT = 0x32, /**< ×¢ÍøÍê³É. */
E_DATA_PDN_ACT_SUCC_EVENT = 0x64, /**< PDN¼¤»îÍê³É ,ind_dataÖÐЯ´øZGIPDNS:µØÖ·ÐÅÏ¢ */
+ E_GET_CELLINFO_BY_SIMID_EVENT = 0x65, /**< ɨÍøÍê³É. */
}E_MODEM_EVENT_ID;
typedef enum
@@ -470,7 +469,7 @@
**
***********************************************************/
-extern int32_t fibo_get_CellInfo_by_simid(CellInfo_t *pcellinfo, uint8_t nSimID);
+extern int32_t fibo_get_CellInfo_by_simid(uint8_t nSimID);
/**********************************************************
** Function Name: fibo_get_NetInfo_by_simid