[Feature][ZXW-130]merge P50U02 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I4f29ec5bb7c59385f23738d2b7ca84e67c100f69
diff --git a/cp/ps/driver/inc/misc/NvParam_tsc.h b/cp/ps/driver/inc/misc/NvParam_tsc.h
old mode 100644
new mode 100755
index 93a0197..f3a40d6
--- a/cp/ps/driver/inc/misc/NvParam_tsc.h
+++ b/cp/ps/driver/inc/misc/NvParam_tsc.h
@@ -65,7 +65,8 @@
UINT8 Dfs_En; /*ps ²àDFS¿ØÖÆ¿ª¹Ø£¬0xB2±íʾps ²àDFS¿ØÖÆ´ò¿ª,ÆäËûÖµ²»¿ª*/
UINT8 TansmitPower_En; /* modem²à½µ·¢É书ÂÊ¿ØÖÆ¿ª¹Ø, 0xB2±íʾmodem²à½µ·¢É书ÂÊ¿ØÖÆ´ò¿ª,ÆäËûÖµ²»¿ª*/
UINT8 User_En; /*Óû§²ßÂÔ¿ØÖÆ¿ª¹Ø0xB2±íʾ¿ª,ÆäËûÖµ²»¿ª*/
- UINT8 reserved2[3];
+ UINT8 AdcRFd_En; /*VEHICLE_DC ÊÇ·ñ²ÉÓÃAdcRFd»ñÈ¡DBBζÈ×öοأ¬ 0xB2±íʾ²ÉÓÃ,ÆäËûÖµ²»ÓÃ*/
+ UINT8 reserved2[2];
}T_SYS_NV_TSC_CONFIG;
/******************************************************
diff --git a/cp/ps/driver/inc/misc/drvs_voiceprocess.h b/cp/ps/driver/inc/misc/drvs_voiceprocess.h
index db2104e..a5ab9f4 100755
--- a/cp/ps/driver/inc/misc/drvs_voiceprocess.h
+++ b/cp/ps/driver/inc/misc/drvs_voiceprocess.h
@@ -247,6 +247,7 @@
SINT32 muteCount;//22 mute_count
BOOL vpLoopBkRunning;//23
BOOL rxMuteEn; //24
+ BOOL firstRegZCATFlag; //25
} T_zDrvVoice_GbVar; //T_zDrvVoice_GbVar
typedef struct
diff --git a/cp/ps/driver/src/chipsets/src/audio_base/audio_config/audioRef_cfg.c b/cp/ps/driver/src/chipsets/src/audio_base/audio_config/audioRef_cfg.c
index 480c4cf..1c21e8b 100755
--- a/cp/ps/driver/src/chipsets/src/audio_base/audio_config/audioRef_cfg.c
+++ b/cp/ps/driver/src/chipsets/src/audio_base/audio_config/audioRef_cfg.c
@@ -332,6 +332,8 @@
//extern T_ZDrvI2S_Cfg s_vpFmI2sCfg ;//TEST FOR i2s
extern T_ZDrvTdm_Cfg s_vpTdmNbCfg ;//TEST FOR tdm
extern T_ZDrvTdm_Cfg s_vpTdmWbCfg ;//TEST FOR tdm
+extern T_ZDrvTdm_Cfg s_vpTdmWbCfg_codec ;//TEST FOR codec tdm
+
static T_ZDrvCodec_Handle gCodecHandle = 0;//xiu
@@ -588,8 +590,7 @@
aud_dsp_dai_configuration_type *p_dspPcmCfg = NULL;
aud_dsp_dai_configuration_type *p_dspI2sCfg = NULL;
-
- zDrvRamlog_PRINTF(RAMLOG_MOD_AUDIO, " zDrvVoiceConfig_Init audio nv addr=0x%x!\n", OS_FLASH_VOICE_DRV_RW_NONFAC_BASE_ADDR);
+ zDrvRamlog_PRINTF(RAMLOG_MOD_AUDIO, " zDrvVoiceConfig_Init audio nv addr=0x%x!\n", OS_FLASH_VOICE_DRV_RW_NONFAC_BASE_ADDR);
//ret = zDrvNand_Read(OS_FLASH_VOICE_DRV_RW_NONFAC_BASE_ADDR, sizeof(audionvflag), ((UINT8 *)(&audionvflag)));
ret = zOss_NvItemRead(OS_FLASH_VOICE_DRV_RW_NONFAC_BASE_ADDR, ((UINT8 *)(&audionvflag)), sizeof(audionvflag));
@@ -660,7 +661,8 @@
}
else
{
- zDrvVp_SetExtAudioCfg(&s_vpExtI2sNbCfg,&s_vpExtI2sWbCfg,&s_vpTdmNbCfg,&s_vpTdmWbCfg);
+ zDrvVp_SetExtAudioCfg(&s_vpExtI2sNbCfg,&s_vpExtI2sWbCfg,&s_vpTdmNbCfg,&s_vpTdmWbCfg_codec);
+ //zDrvVp_SetExtAudioCfg(&s_vpExtI2sNbCfg,&s_vpExtI2sWbCfg,&s_vpTdmNbCfg,&s_vpTdmWbCfg);
}
/*klocwork 3 INVARIANT_CONDITION.UNREACH delete if*/
/*if (ret != DRV_SUCCESS)
@@ -707,13 +709,35 @@
return DRV_ERROR;
}
#endif
- zCatAgt_Audio_Reg(10,VP_INOUT_BAK_BUFFER_SIZE,(UINT32)vpInOutBuffer.p_voiceRxInBuffer);
- zCatAgt_Audio_Reg(12,VP_INOUT_BAK_BUFFER_SIZE,(UINT32)vpInOutBuffer.p_voiceTxInBuffer);
- zCatAgt_Audio_Reg(13,VP_INOUT_BAK_BUFFER_SIZE,(UINT32)vpInOutBuffer.p_voiceTxOutPutBuffer);
+
+#if 0
+ ret = zCatAgt_Audio_Reg(10,VP_INOUT_BAK_BUFFER_SIZE,(UINT32)vpInOutBuffer.p_voiceRxInBuffer);
+ if(ret != DRV_SUCCESS){
+ zDrvRamlog_PRINTF(RAMLOG_MOD_AUDIO, "zDrvVoiceConfig_Init RXIN register zCatAgt_Audio_Reg err\n");
+ }
+
+ ret = zCatAgt_Audio_Reg(12,VP_INOUT_BAK_BUFFER_SIZE,(UINT32)vpInOutBuffer.p_voiceTxInBuffer);
+ if(ret != DRV_SUCCESS){
+ zDrvRamlog_PRINTF(RAMLOG_MOD_AUDIO, "zDrvVoiceConfig_Init TXIN register zCatAgt_Audio_Reg err\n");
+ }
+
+ ret = zCatAgt_Audio_Reg(13,VP_INOUT_BAK_BUFFER_SIZE,(UINT32)vpInOutBuffer.p_voiceTxOutPutBuffer);
+ if(ret != DRV_SUCCESS){
+ zDrvRamlog_PRINTF(RAMLOG_MOD_AUDIO, "zDrvVoiceConfig_Init TXOUT register zCatAgt_Audio_Reg err\n");
+ }
+
#ifdef _USE_VP_OUTPUT_RXOUT_DATA
- zCatAgt_Audio_Reg(11, VP_INOUT_BAK_BUFFER_SIZE, (UINT32)vpInOutBuffer.p_voiceRxOutPutBuffer);
+ ret = zCatAgt_Audio_Reg(11, VP_INOUT_BAK_BUFFER_SIZE, (UINT32)vpInOutBuffer.p_voiceRxOutPutBuffer);
+ if(ret != DRV_SUCCESS){
+ zDrvRamlog_PRINTF(RAMLOG_MOD_AUDIO, "zDrvVoiceConfig_Init RXOUT register zCatAgt_Audio_Reg err\n");
+ }
+
#else
- zCatAgt_Audio_Reg(11,VP_INOUT_NOBAK_BUFSIZE,(UINT32)vpInOutBuffer.p_voiceRxOutPutBuffer);
+ ret = zCatAgt_Audio_Reg(11,VP_INOUT_NOBAK_BUFSIZE,(UINT32)vpInOutBuffer.p_voiceRxOutPutBuffer);
+ if(ret != DRV_SUCCESS){
+ zDrvRamlog_PRINTF(RAMLOG_MOD_AUDIO, "zDrvVoiceConfig_Init RXOUT register zCatAgt_Audio_Reg err\n");
+ }
+#endif
#endif
}
else
diff --git a/cp/ps/driver/src/chipsets/src/audio_base/audio_lib/amr/lib/armv7-a/GCC/amr.a b/cp/ps/driver/src/chipsets/src/audio_base/audio_lib/amr/lib/armv7-a/GCC/amr.a
index 3f58298..e1f4f7d 100755
--- a/cp/ps/driver/src/chipsets/src/audio_base/audio_lib/amr/lib/armv7-a/GCC/amr.a
+++ b/cp/ps/driver/src/chipsets/src/audio_base/audio_lib/amr/lib/armv7-a/GCC/amr.a
Binary files differ
diff --git a/cp/ps/driver/src/chipsets/src/audio_base/voiceprocess/hal_voiceprocess.c b/cp/ps/driver/src/chipsets/src/audio_base/voiceprocess/hal_voiceprocess.c
index 95f6404..0acd415 100755
--- a/cp/ps/driver/src/chipsets/src/audio_base/voiceprocess/hal_voiceprocess.c
+++ b/cp/ps/driver/src/chipsets/src/audio_base/voiceprocess/hal_voiceprocess.c
@@ -54,6 +54,9 @@
#define VP_FRAME_BUFFER_SIZE 320 //20ms 800KHZ
#define VP_I2S_BUFFER_SIZE 320
#define VOICE_SYNC_TIMEOUT_TIME 100
+
+#define VP_INOUT_BAK_BUFFER_SIZE 0x30000 // 0x60000
+#define VP_INOUT_NOBAK_BUFSIZE 640
/****************************************************************************
* Local Types
****************************************************************************/
@@ -104,8 +107,9 @@
0, //sample_rate 20
0, //useDtmfLoop; 21
0, //muteCount;//mute_count 22
- FALSE, //23 vpLoopBkRunning
- FALSE, //24 rxMuteEn
+ FALSE, //23 vpLoopBkRunning
+ FALSE, //24 rxMuteEn
+ FALSE, //25 firstRegZCATFlag
};
static T_zDrvVp_State s_vpState =
@@ -152,6 +156,8 @@
#endif
*/
+extern T_ZDrv_VpInOutBuffer vpInOutBuffer;
+
/****************************************************************************
* Global Function Prototypes
****************************************************************************/
@@ -777,9 +783,43 @@
g_voiceVar.voiceMode = voiceMode;
g_voiceVar.muteEn = FALSE;
+ g_voiceVar.rxMuteEn = FALSE;
g_voiceVar.vpI2sStatus = VP_I2S_OPEN;
g_voiceVar.vProcIsNormal = FALSE;
g_voiceVar.dtmfDirSel = DTMF_IDLE;
+
+ if (FALSE == g_voiceVar.firstRegZCATFlag) {
+ ret = zCatAgt_Audio_Reg(10,VP_INOUT_BAK_BUFFER_SIZE,(UINT32)vpInOutBuffer.p_voiceRxInBuffer);
+ if(ret != DRV_SUCCESS){
+ zDrvRamlog_PRINTF(RAMLOG_MOD_AUDIO, "vp_Open RXIN register zCatAgt_Audio_Reg err\n");
+ }
+
+ ret = zCatAgt_Audio_Reg(12,VP_INOUT_BAK_BUFFER_SIZE,(UINT32)vpInOutBuffer.p_voiceTxInBuffer);
+ if(ret != DRV_SUCCESS){
+ zDrvRamlog_PRINTF(RAMLOG_MOD_AUDIO, "vp_Open TXIN register zCatAgt_Audio_Reg err\n");
+ }
+
+ ret = zCatAgt_Audio_Reg(13,VP_INOUT_BAK_BUFFER_SIZE,(UINT32)vpInOutBuffer.p_voiceTxOutPutBuffer);
+ if(ret != DRV_SUCCESS){
+ zDrvRamlog_PRINTF(RAMLOG_MOD_AUDIO, "vp_Open TXOUT register zCatAgt_Audio_Reg err\n");
+ }
+
+#ifdef _USE_VP_OUTPUT_RXOUT_DATA
+ ret = zCatAgt_Audio_Reg(11, VP_INOUT_BAK_BUFFER_SIZE, (UINT32)vpInOutBuffer.p_voiceRxOutPutBuffer);
+ if(ret != DRV_SUCCESS){
+ zDrvRamlog_PRINTF(RAMLOG_MOD_AUDIO, "vp_Open RXOUT register zCatAgt_Audio_Reg err\n");
+ }
+
+#else
+ ret = zCatAgt_Audio_Reg(11,VP_INOUT_NOBAK_BUFSIZE,(UINT32)vpInOutBuffer.p_voiceRxOutPutBuffer);
+ if(ret != DRV_SUCCESS){
+ zDrvRamlog_PRINTF(RAMLOG_MOD_AUDIO, "vp_Open RXOUT register zCatAgt_Audio_Reg err\n");
+ }
+#endif
+
+ g_voiceVar.firstRegZCATFlag = TRUE;
+ }
+
zDrvRamlog_PRINTF(RAMLOG_MOD_AUDIO, "vp_Open end!\n");
#if 0
//dtmf检测-测试用
diff --git a/cp/ps/driver/src/chipsets/src/uicc/infineonIp/uicc_ref.c b/cp/ps/driver/src/chipsets/src/uicc/infineonIp/uicc_ref.c
old mode 100644
new mode 100755
index bdaf729..bba2e94
--- a/cp/ps/driver/src/chipsets/src/uicc/infineonIp/uicc_ref.c
+++ b/cp/ps/driver/src/chipsets/src/uicc/infineonIp/uicc_ref.c
@@ -33,6 +33,7 @@
extern void uicc_insert_isr(void);
extern void uicc_remove_isr(void);
extern SINT32 pcu_ClearInt(UINT32 intLine);
+extern SINT32 pcu_clr_irq_pending(UINT32 gic);
extern hotplugCallback_func uicc_hotplugCallback;
typedef VOID* T_ZDrvGpio_Pin;
@@ -146,7 +147,7 @@
uiccRecovFlag = 0;
- pcu_ClearInt(UICC_EXT_INT);
+ pcu_clr_irq_pending(UICC_EXT_INT);
zDrvInt_UnmaskIrq(UICC_EXT_INT);
continue;
@@ -184,7 +185,7 @@
uiccRecovFlag = 0;
- pcu_ClearInt(UICC_EXT_INT);
+ pcu_clr_irq_pending(UICC_EXT_INT);
zDrvInt_UnmaskIrq(UICC_EXT_INT);
continue;
@@ -224,7 +225,7 @@
}
uiccRecovFlag = 0;
- pcu_ClearInt(UICC_EXT_INT);
+ pcu_clr_irq_pending(UICC_EXT_INT);
zDrvInt_UnmaskIrq(UICC_EXT_INT);
}
@@ -341,12 +342,14 @@
zDrvInt_DelayUnmaskAdd(UICC_EXT_INT);
// zDrvGpio_SetFunc(s_uicc_insert_detect, UICC_GPIO_EXT_INT);
zx29_gpio_config(UICC_GPIO,UICC_GPIO_EXT_INT);
+ pcu_clr_irq_pending(UICC_EXT_INT);
if (temp == SIM_OUT){
//µÍµçƽÎÞ¿¨µÈ´ý¿¨²åÈë
//zDrvPcu_SetIntLevel(EX3_INT, INT_POSEDGE);
s_simHisr = sim_HisrCreate();
if(s_simHisr != NULL){
+ zDrvInt_SetLineLevel(UICC_EXT_INT, SIM_IN_LEVEL);
ret = zDrvInt_InstallIsr(UICC_EXT_INT, (void *)UICC_usim_in_or_out_lisr, "Sim_inout",SIM_IN_LEVEL);
if (ret < 0)
{
@@ -366,6 +369,7 @@
//zDrvPcu_SetIntLevel(EX3_INT,INT_LOWLEVEL);
s_simHisr = sim_HisrCreate();
if(s_simHisr != NULL){
+ zDrvInt_SetLineLevel(UICC_EXT_INT, SIM_OUT_LEVEL);
ret = zDrvInt_InstallIsr(UICC_EXT_INT, (void *)UICC_usim_in_or_out_lisr, "Sim_inout",SIM_OUT_LEVEL);
if (ret < 0)
{
diff --git a/cp/ps/modem/com/src/appstart/inc/version_number.h b/cp/ps/modem/com/src/appstart/inc/version_number.h
index 86b9600..d8141cd 100755
--- a/cp/ps/modem/com/src/appstart/inc/version_number.h
+++ b/cp/ps/modem/com/src/appstart/inc/version_number.h
@@ -1,9 +1,9 @@
#if defined _CHIP_ZX297520
-#define VERSION_NUMBER "7520SCV2.01.01.02P50"
+#define VERSION_NUMBER "7520SCV2.01.01.02P50U02"
#endif
#if defined _CHIP_ZX297520V2
-#define VERSION_NUMBER "7520V2SCV2.01.01.02P50"
+#define VERSION_NUMBER "7520V2SCV2.01.01.02P50U02"
#endif
#if defined _CHIP_ZX297520V3
-#define VERSION_NUMBER "7520V3SCV2.01.01.02P50"
+#define VERSION_NUMBER "7520V3SCV2.01.01.02P50U02"
#endif
diff --git a/cp/ps/modem/ps/inc/atipscom.h b/cp/ps/modem/ps/inc/atipscom.h
old mode 100644
new mode 100755
index 9eef9b1..e45bed7
--- a/cp/ps/modem/ps/inc/atipscom.h
+++ b/cp/ps/modem/ps/inc/atipscom.h
@@ -119,6 +119,9 @@
#define Z_MAX_LTE_BLKCELL_NUM (BYTE)5
+#define Z_DEV_MAX_BEEPCALL_NUM (BYTE)11
+#define Z_DEV_MAX_BEEPCALL_GROUP (BYTE)3
+
#ifdef _USE_LPP_ECID
#define Z_MAX_ECID_NEMASTR_LEN (BYTE)22
#endif
@@ -219,13 +222,14 @@
#define Z_ATI_NV_LteBlkCell (BYTE)(Z_ATI_NV_ZLcCfg + 1)
#define Z_ATI_NV_CmgfMode (BYTE)(Z_ATI_NV_LteBlkCell + 1)
#define Z_ATI_NV_CustomMcc (BYTE)(Z_ATI_NV_CmgfMode + 1)
+#define Z_ATI_NV_BeepCall (BYTE)(Z_ATI_NV_CustomMcc + 1)
#ifdef BTRUNK_SUPPORT
-#define Z_ATI_NV_PttTruncUser (BYTE)(Z_ATI_NV_CustomMcc + 1)
+#define Z_ATI_NV_PttTruncUser (BYTE)(Z_ATI_NV_BeepCall + 1)
#define Z_ATI_NV_PttIOTFlag (BYTE)(Z_ATI_NV_PttTruncUser + 1)
#define Z_ATI_NV_PttSubWayFlag (BYTE)(Z_ATI_NV_PttIOTFlag + 1)
#define Z_ATI_NV_PrvEnd (BYTE)(Z_ATI_NV_PttSubWayFlag + 0)
#else
-#define Z_ATI_NV_PrvEnd (BYTE)(Z_ATI_NV_CustomMcc + 0)
+#define Z_ATI_NV_PrvEnd (BYTE)(Z_ATI_NV_BeepCall + 0)
#endif
@@ -1261,6 +1265,17 @@
BYTE abPadding[2];
}T_zAti_NV_CustomMcc;
+typedef struct {
+ BYTE bNumLen;//×Ö½ÚÊý
+ BYTE abCallNum[Z_DEV_MAX_BEEPCALL_NUM];
+}T_zAti_NV_BeepNumInfo;
+
+typedef struct {
+ BYTE bCallNum;
+ BYTE abPadding[3];
+ T_zAti_NV_BeepNumInfo atCallGroup[Z_DEV_MAX_BEEPCALL_GROUP];
+}T_zAti_NV_BeepCallNum;
+
#ifdef BTRUNK_SUPPORT
typedef struct
{
diff --git a/cp/ps/modem/ps/inc/atipsint.h b/cp/ps/modem/ps/inc/atipsint.h
old mode 100644
new mode 100755
index 7985c1b..5cc2875
--- a/cp/ps/modem/ps/inc/atipsint.h
+++ b/cp/ps/modem/ps/inc/atipsint.h
@@ -5891,7 +5891,7 @@
BYTE bDesIndex; /* Ä¿µÄË÷Òý */
BYTE bCallId; /* ºô½Ð±êʶ*/
BYTE bPadding;
-}T_zMmiaCC_StopLocalVoice_Ind;
+}T_zMmiaCC_StopLocalVoice_Ind,T_zMmiaCC_StartLocalVoice_Ind;
typedef struct
{
@@ -8459,7 +8459,11 @@
*×¢ÊÍ:Èç¹ûµ±Ç°ÔÚÇп¨¹ý³ÌÖÐ,pbSim1Stat/pbSim2StatÊǸôÎÇп¨Ç°µÄ״̬
=========================================================================================*/
extern BYTE zAti_GetDualCardStat(PBYTE pbSim1Stat, PBYTE pbSim2Stat, PBYTE pbIsCardSwitching);
-
+/*========================================================================================
+º¯ÊýÃû³Æ:zAt_IsBeepCallNum
+º¯Êý¹¦ÄÜ:ÅжÏÊÇ·ñÊôÓÚ´óͨµÄECALLºÅÂë
+=========================================================================================*/
+extern BYTE zAt_IsBeepCallNum(T_z_CallNum *ptCheckedNum);
/*==================================================================
º¯ÊýÃû³Æ:zUmm_IsOtherPsSptSrvMove
º¯Êý¹¦ÄÜ:ÅжÏÁíÒ»´ý»ú²àÊÇ·ñÖ§³ÖÒµÎñ°áǨ
diff --git a/cp/ps/modem/ps/src/nas/ati/inc/zat_fnc.h b/cp/ps/modem/ps/src/nas/ati/inc/zat_fnc.h
old mode 100644
new mode 100755
index 7781e19..ea8d4b3
--- a/cp/ps/modem/ps/src/nas/ati/inc/zat_fnc.h
+++ b/cp/ps/modem/ps/src/nas/ati/inc/zat_fnc.h
@@ -820,7 +820,8 @@
UINT16 zAt_PsEncCcConnInd(T_ZAt_EncCmdInfo * pEncCmdInfo);
UINT16 zAt_PsEncCcOrigInd(T_ZAt_EncCmdInfo * pEncCmdInfo);
UINT16 zAt_PsEncCcDsciInd(T_ZAt_EncCmdInfo * pEncCmdInfo);
-UINT16 zAt_PsEncCcZimsplusInd(T_ZAt_EncCmdInfo * pEncCmdInfo);
+UINT16 zAt_PsEncCcStopLocalVoiceInd(T_ZAt_EncCmdInfo * pEncCmdInfo);
+UINT16 zAt_PsEncCcStartLocalVoiceInd(T_ZAt_EncCmdInfo * pEncCmdInfo);
UINT16 zAt_PsEncCcCstaReqCnf(T_ZAt_EncCmdInfo * pEncCmdInfo);
UINT16 zAt_PsEncCcChldSetCnf(T_ZAt_EncCmdInfo * pEncCmdInfo);
UINT16 zAt_PsEncCcDtmfSetCnf(T_ZAt_EncCmdInfo * pEncCmdInfo);
diff --git a/cp/ps/modem/ps/src/nas/ati/inc/zati_com.h b/cp/ps/modem/ps/src/nas/ati/inc/zati_com.h
old mode 100644
new mode 100755
index cbcb2e3..9da34d4
--- a/cp/ps/modem/ps/src/nas/ati/inc/zati_com.h
+++ b/cp/ps/modem/ps/src/nas/ati/inc/zati_com.h
@@ -1741,5 +1741,5 @@
extern VOID zAti_SetS0Value(BYTE bS0Value);
extern BYTE zAti_GetS0Value(VOID);
-
+BYTE zAt_IsBeepCallNum(T_z_CallNum *ptCheckedNum);
#endif
diff --git a/cp/ps/modem/ps/src/nas/ati/src/zat_com.c b/cp/ps/modem/ps/src/nas/ati/src/zat_com.c
index fd1adbf..3d813af 100755
--- a/cp/ps/modem/ps/src/nas/ati/src/zat_com.c
+++ b/cp/ps/modem/ps/src/nas/ati/src/zat_com.c
@@ -526,25 +526,25 @@
{{0,242,16}, "Test PLMN 2-1", "Test PLMN 2-1"},//00201
{{2,242,16}, "GR COSMOTE", "C-OTE"}, //20201
{{2,242,80}, "vodafone GR", "voda GR"},//20205
- {{2,2,80}, "Vodafone Greece", "Vodafone Greece"},//202005
+ {{2,82,0}, "Vodafone Greece", "Vodafone Greece"},//202005
{{2,242,144}, "WIND GR", "WIND"}, //20209
{{2,242,1}, "WIND GR", "WIND"},//20210
{{2,242,1}, "WIND", "WIND"},//20210
{{2,244,64}, "vodafone NL", "voda NL"},//20404
- {{2,4,64}, "Vodafone NL", "Vodafone NL"},//204004
+ {{2,68,0}, "Vodafone NL", "Vodafone NL"},//204004
{{2,244,128}, "NL KPN", "NL KPN"},//20408
{{2,244,33}, "NL Telfort", "NL Tlfrt"},//20412
{{2,244,97}, "T-Mobile NL", "TMO NL"},//20416
{{2,244,2}, "Orange NL", "Orange"},//20420
{{2,246,16}, "BEL PROXIMUS", "PROXI"},//20601
- {{2,6,16}, "Proximus", "Proximus"},//206001
+ {{2,22,0}, "Proximus", "Proximus"},//206001
{{2,246,1}, "B mobistar", "mobi*"},//20610
{{2,246,2}, "BASE", "BASE"},//20620
{{2,248,16}, "Orange F", "Orange"},//20801
{{2,248,32}, "F-Contact", "Contact"},//20802
{{2,248,144}, "F SFR", "SFR"},//20809
{{2,248,1}, "F SFR", "SFR"},//20810
- {{2,8,1}, "SFR", "SFR"},//208010
+ {{2,8,16}, "SFR", "SFR"},//208010
{{2,248,17}, "SFR FEMTO", "SFRFEMTO"},//20811
{{2,248,49}, "F-Contact", "Contact"},//20813
{{2,248,81}, "Free", "Free"},//20815
@@ -552,25 +552,25 @@
{{2,248,136}, "F-Contact", "Contact"},//20888
{{18,243,48}, "ANDORRA-MOBILAND", "M-AND"},//21303
{{18,244,16}, "vodafone ES", "voda ES"},//21401
- {{18,4,16}, "vodafone ES", "vodafone ES"},//214001
+ {{18,20,0}, "vodafone ES", "vodafone ES"},//214001
{{18,244,32}, "movistar", "movistar"},//21402
{{18,244,48}, "Orange SP", "ESPRT"},//21403
{{18,244,64}, "YOIGO", "YOIGO"},//21404
{{18,244,80}, "movistar", "movistar"},//21405
{{18,244,112}, "Movistar", "Movistar"},//21407
{{18,246,16}, "Telenor HU", "TelenorH"},//21601
- {{18,6,16}, "pannon", "pannon"},//216001
+ {{18,22,0}, "pannon", "pannon"},//216001
{{18,246,3}, "Telekom HU", "THU"},//21630
- {{18,6,3}, "T-Mobile H", "T-Mobile H"},//216030
+ {{18,6,48}, "T-Mobile H", "T-Mobile H"},//216030
{{18,246,7}, "vodafone HU", "voda HU"},//21670
- {{18,6,7}, "Vodafone Hungary", "Vodafone Hungary"},//216070
+ {{18,6,112}, "Vodafone Hungary", "Vodafone Hungary"},//216070
{{18,248,48}, "Eronet Mobile Communications Ltd", "Eronet Mobile Communications Ltd"},//21803
{{18,248,80}, "m:tel", "m:tel"},//21805
{{18,248,9}, "BH Mobile", "BHMobile"},//21890
{{18,249,16}, "HT HR", "HT HR"},//21901
{{18,249,32}, "Tele2 HR", "Tele2 HR"},//21902
{{18,249,1}, "HR VIP", "VIP"},//21910
- {{18,9,1}, "Vipnet", "Vipnet"},//219010
+ {{18,9,16}, "Vipnet", "Vipnet"},//219010
{{34,240,16}, "Telenor SRB", "Telenor"},//22001
{{34,240,32}, "ProMonte GSM", "ProMonte GSM"},//22002
{{34,240,48}, "mt:s", "MTS"},//22003
@@ -578,37 +578,37 @@
{{34,240,80}, "Vip SRB", "Vip SRB"},//22005
{{34,242,16}, "I TIM", "TIM"},//22201
{{34,242,1}, "vodafone IT", "voda IT"},//22210
- {{34,2,1}, "vodafone IT", "voda IT"},//222010
+ {{34,2,16}, "vodafone IT", "voda IT"},//222010
{{34,242,136}, "I WIND", "I WIND"},//22288
{{34,242,137}, "Blu SpA", "Blu SpA"},//22298
{{34,242,153}, "3 ITA", "3 ITA"},//22299
{{34,246,16}, "RO Vodafone RO", "VF-RO"},//22601
- {{34,6,16}, "Vodafone RO", "Vodafone RO"},//226001
+ {{34,22,0}, "Vodafone RO", "Vodafone RO"},//226001
{{34,246,48}, "TELEKOM.RO", "TELEKOM"},//22603
- {{34,6,48}, "Cosmorom", "Cosmorom"},//226003
+ {{34,54,0}, "Cosmorom", "Cosmorom"},//226003
{{34,246,80}, "RO Digi.Mobil", "Digi"},//22605
- {{34,6,80}, "RDS", "RDS"},//226005
+ {{34,86,0}, "RDS", "RDS"},//226005
{{34,246,96}, "ZAPP", "ZAPP"},//22606
- {{34,6,96}, "ZAPP", "ZAPP"},//226006
+ {{34,102,0}, "ZAPP", "ZAPP"},//226006
{{34,246,1}, "RO ORANGE", "ORANGE"},//22610
- {{34,6,1}, "Orange Romania SA", "Orange"},//226010
+ {{34,6,16}, "Orange Romania SA", "Orange"},//226010
{{34,248,16}, "Swisscom", "Swisscom"},//22801
- {{34,8,16}, "Swisscom", "Swisscom"},//228001
+ {{34,24,0}, "Swisscom", "Swisscom"},//228001
{{34,248,32}, "Sunrise", "Sunrise"},//22802
{{34,248,48}, "Orange CH", "Orange"},//22803
{{50,240,16}, "T-Mobile CZ", "TMO CZ"},//23001
{{50,240,32}, "O2 CZ", "O2 CZ"},//23002
{{50,240,48}, "Vodafone CZ", "Vodafone"},//23003
- {{50,0,48}, "Vodafone CZ", "Vodafone CZ"},//230003
+ {{50,48,0}, "Vodafone CZ", "Vodafone CZ"},//230003
{{50,241,16}, "Orange SK", "Orange"},//23101
{{50,241,32}, "Telekom SK", "Telekom"},//23102
{{50,241,48}, "SWAN SK", "SWAN SK"},//23103
{{50,241,96}, "O2-SK", "O2-SK"},//23106
{{50,242,16}, "A1", "A1"},//23201
- {{50,2,16}, "A1", "A1"},//232001
+ {{50,18,0}, "A1", "A1"},//232001
{{50,242,32}, "MobilKom Austria AG", "MobilKom Austria AG"},//23202
{{50,242,48}, "T-Mobile A", "TMA"},//23203
- {{50,2,48}, "T-Mobile A", "TMA"},//232003
+ {{50,50,0}, "T-Mobile A", "TMA"},//232003
{{50,242,64}, "max.mobil. Telekommunikation Service GmbH", "T-Mobile"},//23204
{{50,242,80}, "3 AT", "3 AT"},//23205
{{50,242,96}, "Connect Austria", "Connect Austria"},//23206
@@ -620,36 +620,36 @@
{{50,242,65}, "Hutchison 3G Austria", "Hutchison 3G Austria"},//23214
{{50,244,16}, "TeleWare PLC", "TeleWare PLC"},//23401
{{50,244,48}, "Airtel-Vodafone", "ATL-VOD"},//23403
- {{50,4,48}, "Airtel-Vodafone", "Airtel-Vodafone"},//234003
+ {{50,52,0}, "Airtel-Vodafone", "Airtel-Vodafone"},//234003
{{50,244,144}, "TeleWare PLC", "TeleWare PLC"},//23409
{{50,244,1}, "O2-UK", "O2-UK"},//23410
- {{50,4,1}, "O2-UK", "O2-UK"},//234010
+ {{50,4,16}, "O2-UK", "O2-UK"},//234010
{{50,244,81}, "vodafone UK", "voda UK"},//23415
- {{50,4,81}, "Vodafone UK", "voda UK"},//234015
+ {{50,84,16}, "Vodafone UK", "voda UK"},//234015
{{50,244,97}, "Opal UK", "Opal UK"},//23416
{{50,244,145}, "PMN UK", "PMN"},//23419
{{50,244,2}, "3 UK", "3 UK"},//23420
- {{50,4,2}, "3", "3"},//234020
+ {{50,4,32}, "3", "3"},//234020
{{50,244,130}, "Marathon", "Marathon"},//23428
{{50,244,3}, "EE", "EE"},//23430
- {{50,4,3}, "T-Mobile UK", "T-Mobile UK"},//234030
+ {{50,4,48}, "T-Mobile UK", "T-Mobile UK"},//234030
{{50,244,19}, "EE", "EE"},//23431
{{50,244,35}, "EE", "EE"},//23432
{{50,244,51}, "EE", "EE"},//23433
- {{50,4,51}, "Orange", "Orange"},//234033
+ {{50,52,48}, "Orange", "Orange"},//234033
{{50,244,5}, "JT", "JT"},//23450
{{50,244,85}, "Sure", "Sure"},//23455
{{50,244,133}, "Manx Telecom", "MANX"},//23458
{{50,248,16}, "DNKTD", "TD"},//23801
- {{50,8,16}, "TDC Denmark", "DC Denmark"},//238001
+ {{50,24,0}, "TDC Denmark", "DC Denmark"},//238001
{{50,248,32}, "Telenor DK", "TelenoDK"},//23802
{{50,248,96}, "3 DK", "3 DK"},//23806
{{50,248,2}, "Telia DK", "Telia"},//23820
{{50,248,3}, "Orange A/S", "Orange A/S"},//23830
{{50,248,102}, "Telia-Telenor DK", "TT DK"},//23866
{{50,248,119}, "Telenor DK", "TelenoDK"},//23877
- {{50,24,23}, "TDC Norway", "TDC Norway"},//238171
- {{50,24,39}, "TDC Sweden", "TDC Sweden"},//238172
+ {{50,24,113}, "TDC Norway", "TDC Norway"},//238171
+ {{50,40,113}, "TDC Sweden", "TDC Sweden"},//238172
{{66,240,16}, "TELIA S", "TELIA"},//24001
{{66,240,32}, "3 SE", "3 SE"},//24002
{{66,240,48}, "Orange Sverige AB", "Orange Sverige AB"},//24003
@@ -662,32 +662,32 @@
{{66,242,32}, "N NetCom", "NetCom"},//24202
{{66,244,48}, "FI DNA", "DNA"},//24403
{{66,244,80}, "FI elisa", "elisa"},//24405
- {{66,4,80}, "Elisa", "Elisa"},//244005
+ {{66,84,0}, "Elisa", "Elisa"},//244005
{{66,244,144}, "Finnet Group", "Finnet Group"},//24409
{{66,244,33}, "FI DNA", "DNA"},//24412
{{66,244,65}, "FI AMT", "FI AMT"},//24414
{{66,244,18}, "Saunalahti", "Saunalahti"},//24421
- {{66,4,18}, "Saunalahti", "Saunalahti"},//244021
+ {{66,20,32}, "Saunalahti", "Saunalahti"},//244021
{{66,244,99}, "DNA-Sonera FI", "SuomenYV"},//24436
{{66,244,25}, "FI SONERA", "SONERA"},//24491
{{66,246,16}, "OMNITEL LT", "OMT"},//24601
{{66,246,32}, "Bite Lietuva", "Bite Lietuva"},//24602
- {{66,6,32}, "Bite Lietuva", "Bite Lietuva"},//246002
+ {{66,38,0}, "Bite Lietuva", "Bite Lietuva"},//246002
{{66,246,32}, "LT BITE GSM", "BITE"},//24602
{{66,246,48}, "Tele2 LT", "Tele2 LT"},//24603
{{66,247,16}, "LV LMT", "LMT"},//24701
{{66,247,32}, "Tele2 LV", "Tele2 LV"},//24702
{{66,247,80}, "BITE LV", "BITE LV"},//24705
- {{66,7,80}, "Bite Latvija", "Bite Latvija"},//247005
+ {{66,87,0}, "Bite Latvija", "Bite Latvija"},//247005
{{66,248,16}, "EMT", "EMT"},//24801
{{66,248,32}, "EE Elisa", "Elisa"},//24802
- {{66,8,32}, "Elisa Eesti", "Elisa Eesti"},//248002
+ {{66,40,0}, "Elisa Eesti", "Elisa Eesti"},//248002
{{66,248,48}, "Tele2 EE", "Tele2 EE"},//24803
{{82,240,16}, "MTS RUS", "MTS RUS"},//25001
{{82,240,16}, "Tambovskaya Electrosuyaz", "Tambovskaya"},//25001
{{82,240,16}, "TAIF-Telcom PSC", "TAIF-Telcom PSC"},//25001
{{82,240,32}, "MegaFon RUS", "MegaFon"},//25002
- {{82,0,32}, "MegaFon", "MegaFon"},//250002
+ {{82,32,0}, "MegaFon", "MegaFon"},//250002
{{82,240,64}, "SIBCHALLENGE LTD", "SIBCHALLENGE LTD"},//25004
{{82,240,80}, "ROSTELECOM", "RTC"},//25005
{{82,240,1}, "Don Telecom", "Don Telecom"},//25010
@@ -702,7 +702,7 @@
{{82,245,16}, "MTS UKR", "MTS UKR"},//25501
{{82,245,32}, "Beeline UA", "Beeline"},//25502
{{82,245,48}, "UA-KYIVSTAR", "UA-KS"},//25503
- {{82,5,48}, "Kyivstar(GSM)", "Kyivstar"},//255003
+ {{82,53,0}, "Kyivstar(GSM)", "Kyivstar"},//255003
{{82,245,80}, "Golden Telecom LLC", "Golden Telecom LLC"},//25505
{{82,245,96}, "life:)", "life:)"},//25506
{{82,245,112}, "TriMob", "TriMob"},//25507
@@ -717,43 +717,43 @@
{{98,240,1}, "Cyfrowy Polsat 850", "Cyfrowy Polsat 850"},//26010
{{98,240,113}, "Cyfrowy Polsat 900", "Cyfrowy Polsat 900"},//26017
{{98,242,16}, "Telekom.de", "TDG"},//26201
- {{98,2,16}, "T-Mobile DE", "T-Mobile DE"},//262001
+ {{98,18,0}, "T-Mobile DE", "T-Mobile DE"},//262001
{{98,242,32}, "Vodafone.de", "Vodafone"},//26202
- {{98,2,32}, "Vodafone.de", "Vodafone"},//262002
+ {{98,34,0}, "Vodafone.de", "Vodafone"},//262002
{{98,242,48}, "E-Plus", "E-Plus"},//26203
- {{98,2,48}, "E-Plus Mobilfunk GmbH", "E-Plus Mobilfunk GmbH"},//262003
+ {{98,50,0}, "E-Plus Mobilfunk GmbH", "E-Plus Mobilfunk GmbH"},//262003
{{98,242,112}, "o2-de", "o2-de"},//26207
- {{98,2,112}, "O2 (Germany) GmbH & Co. OHG", "O2 (Germany) GmbH & Co. OHG"},//262007
+ {{98,114,0}, "O2 (Germany) GmbH & Co. OHG", "O2 (Germany) GmbH & Co. OHG"},//262007
{{98,242,128}, "o2-de", "o2-de"},//26208
{{98,242,49}, "Mobilcom Multimedia GMBH", "Mobilcom Multimedia GMBH"},//26213
{{98,242,65}, "Group 3G UMTS GmbH", "Group 3G UMTS GmbH"},//26214
{{98,246,16}, "GIBTEL GSM", "GIBTEL"},//26601
{{98,248,16}, "vodafone P", "voda P"},//26801
- {{98,8,16}, "vodafone P", "vodafone P"},//268001
+ {{98,24,0}, "vodafone P", "vodafone P"},//268001
{{98,248,48}, "NOS", "NOS"},//26803
{{98,248,96}, "P TMN", "TMN"},//26806
{{114,240,16}, "POST", "POST"},//27001
- {{114,0,16}, "LUXGSM", "LUXGSM"},//270001
+ {{114,16,0}, "LUXGSM", "LUXGSM"},//270001
{{114,240,119}, "L TANGO", "TANGO"},//27077
{{114,242,16}, "vodafone IE", "voda IE"},//27201
- {{114,2,16}, "Vodafone IE", "Vodafone IE"},//272001
+ {{114,18,0}, "Vodafone IE", "Vodafone IE"},//272001
{{114,242,32}, "O2-IRL", "O2-IRL"},//27202
{{114,242,48}, "IRL - METEOR", "METEOR"},//27203
{{114,244,16}, "Siminn", "Siminn"},//27401
{{114,244,32}, "Vodafone", "Vodafone"},//27402
- {{114,4,32}, "Vodafone Iceland", "Vodafone Iceland"},//274002
+ {{114,36,0}, "Vodafone Iceland", "Vodafone Iceland"},//274002
{{114,244,48}, "Islandssimi GSM ehf", "Islandssimi GSM ehf"},//27403
{{114,244,64}, "Viking", "Viking"},//27404
{{114,246,16}, "A M C", "A M C"},//27601
{{114,246,32}, "Vodafone AL", "Voda AL"},//27602
- {{114,6,32}, "Vodafone Albania", "Vodafone Albania"},//276002
+ {{114,38,0}, "Vodafone Albania", "Vodafone Albania"},//276002
{{114,246,48}, "EAGLE AL", "EAGLE AL"},//27603
{{114,246,64}, "PLUS AL", "PLUS AL"},//27604
{{114,248,16}, "vodafone MT", "voda MT"},//27801
- {{114,8,16}, "Vodafone Malta", "Vodafone Malta"},//278001
+ {{114,24,0}, "Vodafone Malta", "Vodafone Malta"},//278001
{{114,248,18}, "go mobile", "gomobile"},//27821
{{130,240,16}, "Cyta-Voda", "CytaVoda"},//28001
- {{130,0,16}, "Cytamobile-Vodafone", "Cytamobile-Vodafone"},//280001
+ {{130,16,0}, "Cytamobile-Vodafone", "Cytamobile-Vodafone"},//280001
{{130,240,1}, "MTN", "MTN"},//28010
{{130,242,16}, "GEO-GEOCELL", "GCELL"},//28201
{{130,242,32}, "MAGTI-GSM-GEO", "MAGTI"},//28202
@@ -762,25 +762,25 @@
{{130,243,80}, "MTS ARM", "MTS Arm"},//28305
{{130,243,1}, "Orange AM", "Orange"},//28310
{{130,244,16}, "Mtel", "Mtel"},//28401
- {{130,4,16}, "M-Tel BG", "M-Tel BG"},//284001
+ {{130,20,0}, "M-Tel BG", "M-Tel BG"},//284001
{{130,244,48}, "Vivacom", "Vivacom"},//28403
- {{130,4,48}, "vivatel", "vivatel"},//284003
+ {{130,52,0}, "vivatel", "vivatel"},//284003
{{130,244,80}, "Telenor BG", "Telenor"},//28405
{{130,246,16}, "TR TURKCELL", "TCELL"},//28601
- {{130,6,16}, "TURKCELL", "TURKCELL"},//286001
+ {{130,22,0}, "TURKCELL", "TURKCELL"},//286001
{{130,246,32}, "VODAFONE TR", "VF TR"},//28602
- {{130,6,32}, "VODAFONE", "VODAFONE"},//286002
+ {{130,38,0}, "VODAFONE", "VODAFONE"},//286002
{{130,246,48}, "AVEA", "AVEA"},//28603
- {{130,6,48}, "AVEA", "AVEA"},//286003
+ {{130,54,0}, "AVEA", "AVEA"},//286003
{{130,246,64}, "AVEA", "AVEA"},//28604
- {{130,6,64}, "AVEA", "AVEA"},//286004
+ {{130,70,0}, "AVEA", "AVEA"},//286004
{{130,248,16}, "Foroya Tele", "FT-GSM"},//28801
{{130,248,32}, "VODAFONE FO", "VODAFONE"},//28802
{{146,240,16}, "TELE Greenland", "TELE GRL"},//29001
{{146,243,4}, "Si.mobil", "Si.mobil"},//29340
- {{146,3,4}, "Si.mobil", "Si.mobil"},//293040
+ {{146,3,64}, "Si.mobil", "Si.mobil"},//293040
{{146,243,20}, "MOBITEL", "MOBITEL"},//29341
- {{146,3,20}, "Mobitel", "Mobitel"},//293041
+ {{146,19,64}, "Mobitel", "Mobitel"},//293041
{{146,243,70}, "T-2", "T-2"},//29364
{{146,243,7}, "SI TUSMOBIL", "TUS"},//29370
{{146,244,16}, "MOBIMAK AD", "MOBIMAK"},//29401
@@ -788,158 +788,159 @@
{{146,245,32}, "Liechtenstein", "Salt"},//29502
{{146,245,80}, "FL1", "FL1"},//29505
{{146,245,119}, "Tele 2 Aktiengesellschaft", "Aktiengesellschaft"},//29577
- {{3,2,115}, "Microcell Telecom Inc", "Telecom"},//302037
- {{3,34,2}, "TELUS", "TELUS"},//302220
- {{3,34,7}, "Eastlink", "Eastlink"},//302270
- {{3,50,2}, "Mobilicity", "Mobilici"},//302320
- {{3,50,4}, "Execulink Telecom", "ETI"},//302340
- {{3,50,7}, "Fido", "Fido"},//302370
- {{3,66,9}, "WIND", "WIND"},//302490
- {{3,114,2}, "Rogers Wireless", "ROGERS"},//302720
- {{3,98,1}, "Bell", "Bell"},//302610
- {{3,98,6}, "MTS", "MTS"},//302660
- {{3,114,8}, "SaskTel", "SaskTel"},//302780
- {{3,130,8}, "FastRoam", "FastRoam"},//302880
- {{3,146,4}, "Wightman", "Wightman"},//302940
+ {{3,114,48}, "Microcell Telecom Inc", "Telecom"},//302037
+ {{3,2,34}, "TELUS", "TELUS"},//302220
+ {{3,2,114}, "Eastlink", "Eastlink"},//302270
+ {{3,2,35}, "Mobilicity", "Mobilici"},//302320
+ {{3,2,67}, "Execulink Telecom", "ETI"},//302340
+ {{3,2,115}, "Fido", "Fido"},//302370
+ {{3,2,148}, "WIND", "WIND"},//302490
+ {{3,2,39}, "Rogers Wireless", "ROGERS"},//302720
+ {{3,2,22}, "Bell", "Bell"},//302610
+ {{3,2,102}, "MTS", "MTS"},//302660
+ {{3,2,135}, "SaskTel", "SaskTel"},//302780
+ {{3,2,136}, "FastRoam", "FastRoam"},//302880
+ {{3,2,73}, "Wightman", "Wightman"},//302940
{{19,240,16}, "Pacific Mobile Comms", "Pacific Mobile Comms"},//31001
- {{19,0,17}, "Third Kentucky Cellular Corporation", "Third Kentucky Cellular Corporation"},//310011
+ {{19,16,16}, "Third Kentucky Cellular Corporation", "Third Kentucky Cellular Corporation"},//310011
{{19,240,81}, "AT&T", "AT&T"},//31015
- {{19,0,81}, "AT&T", "AT&T"},//310015
+ {{19,80,16}, "AT&T", "AT&T"},//310015
{{19,240,5}, "ACS", "ACS"},//31050
- {{19,0,97}, "T-mobile", "T-mobile"},//310016
+ {{19,96,16}, "T-mobile", "T-mobile"},//310016
{{19,240,113}, "AT&T", "AT&T"},//31017
- {{19,0,113}, "AT&T", "AT&T"},//310017
- {{19,0,2}, "US - Union Telephone", "UnionTel"},//310020
- {{19,0,18}, "T-Mobile", "T-mobile"},//310021
- {{19,0,34}, "T-Mobile", "T-mobile"},//310022
- {{19,0,50}, "T-Mobile", "T-mobile"},//310023
- {{19,0,66}, "T-Mobile", "T-mobile"},//310024
- {{19,0,82}, "T-Mobile", "T-mobile"},//310025
- {{19,0,98}, "T-Mobile", "T-mobile"},//310026
- {{19,0,114}, "Powertel PCS Inc", "Powertel PCS Inc"},//310027
- {{19,0,114}, "T-Mobile", "T-Mobile"},//310027
- {{19,0,3}, "AT&T", "AT&T"},//310030
- {{19,0,19}, "T-Mobile", "T-Mobile"},//310031
- {{19,0,35}, "IT&E", "IT&E"},//310032
- {{19,0,67}, "High Plains/Midwest LLC", "High Plains/Midwest LLC"},//310034
- {{19,0,100}, "TMP Corp", "TMP Corp"},//310046
- {{19,0,53}, "Key Communications,LLC", "Key Communications,LLC"},//310053
- {{19,0,133}, "T-Mobile", "T-Mobile"},//310058
- {{19,0,54}, "Choice Wireless L.C.", "Choice Wireless L.C."},//310063
- {{19,0,70}, "Airadigm Communications", "Airadigm Communications"},//310064
- {{19,16,0}, "US PLATEAU", "PLATEAU"},//310100
- {{19,16,1}, "Third Kentucky Cellular Corporation", "Third Kentucky Cellular Corporation"},//310110
- {{19,16,4}, "GTA", "GTA"},//310140
- {{19,16,2}, "Sprint", "Sprint"},//310120
- {{19,16,5}, "AT&T", "AT&T"},//310150
- {{19,16,6}, "T-Mobile", "T-Mobile"},//310160
- {{19,16,7}, "AT&T", "AT&T"},//310170
- {{19,16,8}, "West Central Wireless", "WCW"},//310180
- {{19,16,9}, "USA Dutch Harbor", "D-HARBOR"},//310190
- {{19,32,0}, "T-Mobile", "T-Mobile"},//310200
- {{19,32,1}, "T-Mobile", "T-Mobile"},//310210
- {{19,32,2}, "T-Mobile", "T-Mobile"},//310220
- {{19,32,3}, "T-Mobile", "T-Mobile"},//310230
- {{19,32,4}, "T-Mobile", "T-Mobile"},//310240
- {{19,32,5}, "T-Mobile", "T-Mobile"},//310250
- {{19,32,6}, "T-Mobile", "T-Mobile"},//310260
- {{19,32,7}, "T-Mobile", "T-Mobile"},//310270
- {{19,32,8}, "AT&T", "AT&T"},//310280
- {{19,32,9}, "NEP Wireless", "NEPW"},//310290
- {{19,48,0}, "BigSkyUS", "Big Sky"},//310300
- {{19,48,1}, "T-Mobile", "T-Mobile"},//310310
- {{19,48,2}, "USA - CellularOne", "Cell"},//310320
- {{19,48,4}, "WestLink", "WestLink"},//310340
- {{19,48,7}, "USA DOCOMO PACIFIC", "DOCOMOPA"},//310370
- {{19,48,8}, "AT&T", "AT&T"},//310380
- {{19,64,0}, "USA_iCAN", "iCAN_GSM"},//310400
- {{19,64,1}, "AT&T", "AT&T"},//310410
- {{19,64,5}, "Cell One of NE Colorado", "NECCI"},//310450
- {{19,64,6}, "USA1L", "USA1L"},//310460
- {{19,64,9}, "T-Mobile", "T-Mobile"},//310490
- {{19,80,3}, "Iowa Wireless USA", "IWS"},//310530
- {{19,80,7}, "Chinook", "Chinook"},//310570
- {{19,80,8}, "T-Mobile", "T-Mobile"},//310580
- {{19,80,9}, "Verizon", "Verizon"},//310590
- {{19,96,3}, "USA AmeriLink", "AMERLINK"},//310630
- {{19,96,4}, "Airadigm Communications", "Airadigm Communications"},//310640
- {{19,96,5}, "Jasper", "Jasper"},//310650
- {{19,96,6}, "T-Mobile", "T-Mobile"},//310660
- {{19,96,8}, "NPI Wireless", "NPI Wireless"},//310680
- {{19,96,9}, "Limitless Mobile USA", "LmtlsUSA"},//310690
- {{19,112,1}, "USA ASTAC", "ASTAC"},//310710
- {{19,112,3}, "U.S.Cellular", "USCC"},//310730
- {{19,112,4}, "USA OTZ", "OTZ"},//310740
- {{19,112,7}, "Iowa Wireless USA", "IWS"},//310770
- {{19,112,9}, "PinPoint Wireless Inc.", "PinPoint Wireless Inc."},//310790
- {{19,128,0}, "T-Mobile", "T-Mobile"},//310800
- {{19,128,4}, "telna Mobile", "telna"},//310840
- {{19,128,7}, "US", "PACE"},//310870
- {{19,128,8}, "USAACSI", "ACSIAC"},//310880
- {{19,128,9}, "Verizon", "Verizon"},//310890
- {{19,144,8}, "AT&T", "AT&T"},//310980
- {{19,1,3}, "Indigo", "Indigo"},//311030
- {{19,1,4}, "USA-Commnet", "Commnet"},//311040
- {{19,1,8}, "Pine Cellular", "PINECell"},//311080
- {{19,1,9}, "USASXLP", "SXLP"},//311090
- {{19,17,5}, "Wilkes USA", "WILKES"},//311150
- {{19,17,8}, "AT&T", "AT&T"},//311180
- {{19,17,9}, "USAC1ECI", "C1ECI"},//311190
- {{19,33,4}, "USACWCI", "CWCI"},//311240
- {{19,49,3}, "BTW", "BTW"},//311330
- {{19,49,7}, "GCI", "GCI"},//311370
- {{19,65,8}, "Verizon", "Verizon"},//311480
- {{19,81,0}, "MOSAIC", "MOSAIC"},//311500
- {{19,81,3}, "USANW", "USANW"},//311530
- {{19,81,4}, "USA Proximiti", "ProxMo"},//311540
- {{19,81,8}, "U.S.Cellular", "USCC"},//311580
- {{19,97,6}, "Metro PCS", "MPCS"},//311660
- {{19,113,1}, "Northeast Wireless", "NEWN"},//311710
- {{19,113,3}, "USA Proximiti", "ProxMo"},//311730
- {{19,129,1}, "Bluegrass Wireless", "BW"},//311810
- {{19,2,6}, "CoverageCo", "CvgCo"},//312060
- {{19,34,3}, "CoverageCo", "CvgCo"},//312230
- {{19,66,8}, "Sagebrush", "SGB"},//312480
- {{19,34,6}, "USACL", "USACL"},//312260
- {{19,98,3}, "NetGenuity", "NetGenui"},//312630
- {{51,16,1}, "PR Claro", "Claro"},//330110
- {{51,244,48}, "movistar", "movistar"},//33403
- {{51,4,48}, "movistar", "movistar"},//334003
- {{51,4,2}, "TELCEL", "TELCEL"},//334020
+ {{19,112,16}, "AT&T", "AT&T"},//310017
+ {{19,0,32}, "US - Union Telephone", "UnionTel"},//310020
+ {{19,16,32}, "T-Mobile", "T-mobile"},//310021
+ {{19,32,32}, "T-Mobile", "T-mobile"},//310022
+ {{19,48,32}, "T-Mobile", "T-mobile"},//310023
+ {{19,64,32}, "T-Mobile", "T-mobile"},//310024
+ {{19,80,32}, "T-Mobile", "T-mobile"},//310025
+ {{19,96,32}, "T-Mobile", "T-mobile"},//310026
+ {{19,112,32}, "Powertel PCS Inc", "Powertel PCS Inc"},//310027
+ {{19,112,32}, "T-Mobile", "T-Mobile"},//310027
+ {{19,0,48}, "AT&T", "AT&T"},//310030
+ {{19,16,48}, "T-Mobile", "T-Mobile"},//310031
+ {{19,32,48}, "IT&E", "IT&E"},//310032
+ {{19,64,48}, "High Plains/Midwest LLC", "High Plains/Midwest LLC"},//310034
+ {{19,96,64}, "TMP Corp", "TMP Corp"},//310046
+ {{19,48,80}, "Key Communications,LLC", "Key Communications,LLC"},//310053
+ {{19,128,80}, "T-Mobile", "T-Mobile"},//310058
+ {{19,48,96}, "Choice Wireless L.C.", "Choice Wireless L.C."},//310063
+ {{19,64,96}, "Airadigm Communications", "Airadigm Communications"},//310064
+ {{19,0,1}, "US PLATEAU", "PLATEAU"},//310100
+ {{19,0,17}, "Third Kentucky Cellular Corporation", "Third Kentucky Cellular Corporation"},//310110
+ {{19,0,65}, "GTA", "GTA"},//310140
+ {{19,0,33}, "Sprint", "Sprint"},//310120
+ {{19,0,81}, "AT&T", "AT&T"},//310150
+ {{19,0,97}, "T-Mobile", "T-Mobile"},//310160
+ {{19,0,113}, "AT&T", "AT&T"},//310170
+ {{19,0,129}, "West Central Wireless", "WCW"},//310180
+ {{19,0,145}, "USA Dutch Harbor", "D-HARBOR"},//310190
+ {{19,0,2}, "T-Mobile", "T-Mobile"},//310200
+ {{19,0,18}, "T-Mobile", "T-Mobile"},//310210
+ {{19,0,34}, "T-Mobile", "T-Mobile"},//310220
+ {{19,0,50}, "T-Mobile", "T-Mobile"},//310230
+ {{19,0,66}, "T-Mobile", "T-Mobile"},//310240
+ {{19,0,82}, "T-Mobile", "T-Mobile"},//310250
+ {{19,0,98}, "T-Mobile", "T-Mobile"},//310260
+ {{19,0,114}, "T-Mobile", "T-Mobile"},//310270
+ {{19,0,130}, "AT&T", "AT&T"},//310280
+ {{19,0,146}, "NEP Wireless", "NEPW"},//310290
+ {{19,0,3}, "BigSkyUS", "Big Sky"},//310300
+ {{19,0,19}, "T-Mobile", "T-Mobile"},//310310
+ {{19,0,35}, "USA - CellularOne", "Cell"},//310320
+ {{19,0,67}, "WestLink", "WestLink"},//310340
+ {{19,0,115}, "USA DOCOMO PACIFIC", "DOCOMOPA"},//310370
+ {{19,0,131}, "AT&T", "AT&T"},//310380
+ {{19,0,4}, "USA_iCAN", "iCAN_GSM"},//310400
+ {{19,0,20}, "AT&T", "AT&T"},//310410
+ {{19,0,84}, "Cell One of NE Colorado", "NECCI"},//310450
+ {{19,0,100}, "USA1L", "USA1L"},//310460
+ {{19,0,148}, "T-Mobile", "T-Mobile"},//310490
+ {{19,0,53}, "Iowa Wireless USA", "IWS"},//310530
+ {{19,0,117}, "Chinook", "Chinook"},//310570
+ {{19,0,133}, "T-Mobile", "T-Mobile"},//310580
+ {{19,0,149}, "Verizon", "Verizon"},//310590
+ {{19,0,54}, "USA AmeriLink", "AMERLINK"},//310630
+ {{19,0,70}, "Airadigm Communications", "Airadigm Communications"},//310640
+ {{19,0,86}, "Jasper", "Jasper"},//310650
+ {{19,0,102}, "T-Mobile", "T-Mobile"},//310660
+ {{19,0,134}, "NPI Wireless", "NPI Wireless"},//310680
+ {{19,0,150}, "Limitless Mobile USA", "LmtlsUSA"},//310690
+ {{19,0,23}, "USA ASTAC", "ASTAC"},//310710
+ {{19,0,55}, "U.S.Cellular", "USCC"},//310730
+ {{19,0,71}, "USA OTZ", "OTZ"},//310740
+ {{19,0,119}, "Iowa Wireless USA", "IWS"},//310770
+ {{19,0,151}, "PinPoint Wireless Inc.", "PinPoint Wireless Inc."},//310790
+ {{19,0,8}, "T-Mobile", "T-Mobile"},//310800
+ {{19,0,72}, "telna Mobile", "telna"},//310840
+ {{19,0,120}, "US", "PACE"},//310870
+ {{19,0,136}, "USAACSI", "ACSIAC"},//310880
+ {{19,0,152}, "Verizon", "Verizon"},//310890
+ {{19,0,137}, "AT&T", "AT&T"},//310980
+ {{19,1,48}, "Indigo", "Indigo"},//311030
+ {{19,1,64}, "USA-Commnet", "Commnet"},//311040
+ {{19,1,128}, "Pine Cellular", "PINECell"},//311080
+ {{19,1,144}, "USASXLP", "SXLP"},//311090
+ {{19,1,81}, "Wilkes USA", "WILKES"},//311150
+ {{19,1,129}, "AT&T", "AT&T"},//311180
+ {{19,1,145}, "USAC1ECI", "C1ECI"},//311190
+ {{19,1,66}, "USACWCI", "CWCI"},//311240
+ {{19,1,51}, "BTW", "BTW"},//311330
+ {{19,1,115}, "GCI", "GCI"},//311370
+ {{19,1,132}, "Verizon", "Verizon"},//311480
+ {{19,1,5}, "MOSAIC", "MOSAIC"},//311500
+ {{19,1,53}, "USANW", "USANW"},//311530
+ {{19,1,69}, "USA Proximiti", "ProxMo"},//311540
+ {{19,1,133}, "U.S.Cellular", "USCC"},//311580
+ {{19,1,102}, "Metro PCS", "MPCS"},//311660
+ {{19,1,23}, "Northeast Wireless", "NEWN"},//311710
+ {{19,1,55}, "USA Proximiti", "ProxMo"},//311730
+ {{19,1,24}, "Bluegrass Wireless", "BW"},//311810
+ {{19,2,96}, "CoverageCo", "CvgCo"},//312060
+ {{19,2,50}, "CoverageCo", "CvgCo"},//312230
+ {{19,2,132}, "Sagebrush", "SGB"},//312480
+ {{19,2,98}, "USACL", "USACL"},//312260
+ {{19,2,54}, "NetGenuity", "NetGenui"},//312630
+ {{51,0,17}, "PR Claro", "Claro"},//330110
+ {{51,244,48}, "ALTANR", "ALTANR"},//33403
+ {{51,52,0}, "ALTANR", "ALTANR"},//334003
+ {{51,4,32}, "TELCEL", "TELCEL"},//334020
{{51,244,2}, "TELCEL", "TELCEL"},//33420
+ {{51,4,65}, "ALTAN", "ALTAN"},//334140
{{51,248,80}, "Mossel (Jamaica) Ltd", "Mossel (Jamaica) Ltd"},//33805
{{51,248,7}, "CLARO", "CLARO"},//33870
- {{51,8,7}, "CLARO", "CLARO"},//338070
+ {{51,8,112}, "CLARO", "CLARO"},//338070
{{67,240,16}, "F-Orange", "Orange"},//34001
{{67,240,32}, "ONLY", "ONLY"},//34002
{{67,240,2}, "Digicel", "DigicelF"},//34020
- {{67,98,0}, "LIME", "LIME"},//342600
- {{67,114,5}, "DIGICEL", "DIGICEL"},//342750
- {{67,4,3}, "APUA imobile", "imobile"},//344030
- {{67,148,2}, "LIME", "LIME"},//344920
- {{67,148,3}, "Cingular", "Cingular"},//344930
- {{67,22,4}, "LIME", "LIME"},//346140
+ {{67,2,6}, "LIME", "LIME"},//342600
+ {{67,2,87}, "DIGICEL", "DIGICEL"},//342750
+ {{67,4,48}, "APUA imobile", "imobile"},//344030
+ {{67,4,41}, "LIME", "LIME"},//344920
+ {{67,4,57}, "Cingular", "Cingular"},//344930
+ {{67,6,65}, "LIME", "LIME"},//346140
{{83,0,0}, "CELLONE", "CELLONE"},//350000
- {{83,0,16}, "Telecommunications (Bermuda & West Indies) Ltd", "Telecom"},//350001
- {{83,0,1}, "Cingular", "Cingular"},//350010
- {{83,18,1}, "LIME", "LIME"},//352110
- {{83,2,3}, "DIGICEL", "DIGICEL"},//352030
+ {{83,16,0}, "Telecommunications (Bermuda & West Indies) Ltd", "Telecom"},//350001
+ {{83,0,16}, "Cingular", "Cingular"},//350010
+ {{83,2,17}, "LIME", "LIME"},//352110
+ {{83,2,48}, "DIGICEL", "DIGICEL"},//352030
{{99,242,21}, "Telcell GSM", "Telcell"},//36251
{{99,242,150}, "Digicel", "Digicel"},//36269
{{99,242,135}, "Kla", "Kla"},//36278
{{99,242,25}, "CHIPPIE", "CHIPPIE"},//36291
- {{99,133,4}, "LIME", "LIME"},//365840
+ {{99,5,72}, "LIME", "LIME"},//365840
{{99,248,16}, "CUBACEL", "CUBACEL"},//36801
{{99,243,2}, "AW Digicel", "Digicel"},//36320
{{99,243,16}, "SETAR", "SETAR"},//36301
{{99,244,147}, "BTC", "BTC"},//36439
- {{99,22,1}, "LIME", "LIME"},//366110
- {{99,6,2}, "Cingular", "Cingular"},//366020
- {{115,0,16}, "France Telecom Dominicana,S.A.", "France Telecom Dominicana,S.A."},//370001
+ {{99,6,17}, "LIME", "LIME"},//366110
+ {{99,6,32}, "Cingular", "Cingular"},//366020
+ {{115,16,0}, "France Telecom Dominicana,S.A.", "France Telecom Dominicana,S.A."},//370001
{{115,240,16}, "Orange", "Orange"},//37001
{{115,240,64}, "VIVA", "VIVA"},//37004
{{115,240,32}, "CLARO DOM", "ClaroDOM"},//37002
- {{115,0,32}, "CLARO", "CLARO"},//370002
+ {{115,32,0}, "CLARO", "CLARO"},//370002
{{115,242,48}, "Natcom", "Natcom"},//37203
{{115,244,33}, "TSTT", "TSTT"},//37412
{{4,240,16}, "AZE-AZERCELL GSM", "ACELL"},//40001
@@ -952,24 +953,24 @@
{{4,244,32}, "IND airtel", "airtel"},//40402
{{4,244,48}, "IND airtel", "airtel"},//40403
{{4,244,64}, "IDEA", "IDEA"},//40404
- {{4,4,16}, "Vodafone India Haryana", "Vodafone India Haryana"},//404001
- {{4,4,80}, "Vodafone India Gujarat", "Vodafone India Gujarat"},//404005
+ {{4,20,0}, "Vodafone India Haryana", "Vodafone India Haryana"},//404001
+ {{4,84,0}, "Vodafone India Gujarat", "Vodafone India Gujarat"},//404005
{{4,244,112}, "IDEA", "IDEA"},//40407
{{4,244,144}, "Reliance", "RELIANCE"},//40409
{{4,244,1}, "IND airtel", "airtel"},//40410
- {{4,4,17}, "Vodafone India Delhi", "Vodafone India Delhi"},//404011
+ {{4,20,16}, "Vodafone India Delhi", "Vodafone India Delhi"},//404011
{{4,244,33}, "IDEA", "IDEA"},//40412
- {{4,4,49}, "Vodafone India Andhra Pradesh", "Vodafone India Andhra Pradesh"},//404013
+ {{4,52,16}, "Vodafone India Andhra Pradesh", "Vodafone India Andhra Pradesh"},//404013
{{4,244,65}, "IDEA", "IDEA"},//40414
- {{4,4,81}, "Vodafone India UP East", "Vodafone India UP East"},//404015
+ {{4,84,16}, "Vodafone India UP East", "Vodafone India UP East"},//404015
{{4,244,97}, "IND airtel", "airtel"},//40416
{{4,244,129}, "Reliance", "RELIANCE"},//40418
{{4,244,145}, "IDEA", "IDEA"},//40419
- {{4,4,2}, "Vodafone India Mumbai", "Vodafone India Mumbai"},//404020
+ {{4,4,32}, "Vodafone India Mumbai", "Vodafone India Mumbai"},//404020
{{4,244,18}, "BPL MOBILE", "Loop Mobile"},//40421
{{4,244,34}, "IDEA", "IDEA"},//40422
{{4,244,66}, "IDEA", "IDEA"},//40424
- {{4,4,114}, "Vodafone India Maharashtra and Goa", "Vodafone India Maharashtra and Goa"},//404027
+ {{4,116,32}, "Vodafone India Maharashtra and Goa", "Vodafone India Maharashtra and Goa"},//404027
{{4,244,3}, "Vodafone India Kolkata", "Vodafone India Kolkata"},//40430
{{4,244,19}, "IND airtel", "airtel"},//40431
{{4,244,67}, "CellOne", "CellOne"},//40434
@@ -978,10 +979,10 @@
{{4,244,4}, "IND airtel", "airtel"},//40440
{{4,244,20}, "RPG Cellular Services", "RPG Cellular Services"},//40441
{{4,244,36}, "AIRCEL", "AIRCEL"},//40442
- {{4,4,52}, "Vodafone India Tamilnadu", "Vodafone India Tamilnadu"},//404043
+ {{4,52,64}, "Vodafone India Tamilnadu", "Vodafone India Tamilnadu"},//404043
{{4,244,68}, "IDEA", "IDEA"},//40444
{{4,244,84}, "IND airtel", "airtel"},//40445
- {{4,4,100}, "Vodafone India Kerala", "Vodafone India Kerala"},//404046
+ {{4,100,64}, "Vodafone India Kerala", "Vodafone India Kerala"},//404046
{{4,244,148}, "IND airtel", "airtel"},//40449
{{4,244,5}, "Reliance", "RELIANCE"},//40450
{{4,244,21}, "CellOne", "CellOne"},//40451
@@ -993,7 +994,7 @@
{{4,244,117}, "CellOne", "CellOne"},//40457
{{4,244,133}, "CellOne", "CellOne"},//40458
{{4,244,149}, "CellOne", "CellOne"},//40459
- {{4,4,6}, "Vodafone India Rajasthan", "Vodafone India Rajasthan"},//404060
+ {{4,4,96}, "Vodafone India Rajasthan", "Vodafone India Rajasthan"},//404060
{{4,244,38}, "CellOne", "CellOne"},//40462
{{4,244,70}, "CellOne", "CellOne"},//40464
{{4,244,102}, "CellOne", "CellOne"},//40466
@@ -1015,11 +1016,11 @@
{{4,244,24}, "CellOne", "CellOne"},//40481
{{4,244,40}, "IDEA", "IDEA"},//40482
{{4,244,56}, "Reliance", "Reliance"},//40483
- {{4,4,72}, "Vodafone India Chennai", "Vodafone India Chennai"},//404084
+ {{4,68,128}, "Vodafone India Chennai", "Vodafone India Chennai"},//404084
{{4,244,88}, "Reliance", "RELIANCE"},//40485
- {{4,4,104}, "Vodafone India Karnataka", "Vodafone India Karnataka"},//404086
+ {{4,100,128}, "Vodafone India Karnataka", "Vodafone India Karnataka"},//404086
{{4,244,120}, "IDEA", "IDEA"},//40487
- {{4,4,136}, "Vodafone India Punjab", "Vodafone India Punjab"},//404088
+ {{4,132,128}, "Vodafone India Punjab", "Vodafone India Punjab"},//404088
{{4,244,152}, "IDEA", "IDEA"},//40489
{{4,244,9}, "IND airtel", "airtel"},//40490
{{4,244,41}, "IND airtel", "airtel"},//40492
@@ -1034,24 +1035,24 @@
{{4,245,96}, "Reliance", "Reliance"},//40506
{{4,245,112}, "Reliance", "Reliance"},//40507
{{4,245,144}, "Reliance", "Reliance"},//40509
- {{4,5,82}, "TATA DOCOMO", "TATA DO"},//405025
- {{4,5,114}, "TATA DOCOMO", "TATA DO"},//405027
- {{4,5,146}, "TATA DOCOMO", "TATA DO"},//405029
- {{4,5,3}, "TATA DOCOMO", "TATA DO"},//405030
- {{4,5,19}, "TATA DOCOMO", "TATA DO"},//405031
- {{4,5,35}, "TATA DOCOMO", "TATA DO"},//405032
- {{4,5,67}, "TATA DOCOMO", "TATA DO"},//405034
- {{4,5,83}, "TATA DOCOMO", "TATA DO"},//405035
- {{4,5,99}, "TATA DOCOMO", "TATA DO"},//405036
- {{4,5,115}, "TATA DOCOMO", "TATA DO"},//405037
- {{4,5,131}, "TATA DOCOMO", "TATA DO"},//405038
- {{4,5,20}, "TATA DOCOMO", "TATA DO"},//405041
- {{4,5,36}, "TATA DOCOMO", "TATA DO"},//405042
- {{4,5,52}, "TATA DOCOMO", "TATA DO"},//405043
- {{4,5,68}, "TATA DOCOMO", "TATA DO"},//405044
- {{4,5,84}, "TATA DOCOMO", "TATA DO"},//405045
- {{4,5,100}, "TATA DOCOMO", "TATA DO"},//405046
- {{4,5,116}, "TATA DOCOMO", "TATA DO"},//405047
+ {{4,85,32}, "TATA DOCOMO", "TATA DO"},//405025
+ {{4,117,32}, "TATA DOCOMO", "TATA DO"},//405027
+ {{4,149,32}, "TATA DOCOMO", "TATA DO"},//405029
+ {{4,5,48}, "TATA DOCOMO", "TATA DO"},//405030
+ {{4,21,48}, "TATA DOCOMO", "TATA DO"},//405031
+ {{4,37,48}, "TATA DOCOMO", "TATA DO"},//405032
+ {{4,69,48}, "TATA DOCOMO", "TATA DO"},//405034
+ {{4,85,48}, "TATA DOCOMO", "TATA DO"},//405035
+ {{4,101,48}, "TATA DOCOMO", "TATA DO"},//405036
+ {{4,117,48}, "TATA DOCOMO", "TATA DO"},//405037
+ {{4,133,48}, "TATA DOCOMO", "TATA DO"},//405038
+ {{4,21,64}, "TATA DOCOMO", "TATA DO"},//405041
+ {{4,37,64}, "TATA DOCOMO", "TATA DO"},//405042
+ {{4,53,64}, "TATA DOCOMO", "TATA DO"},//405043
+ {{4,69,64}, "TATA DOCOMO", "TATA DO"},//405044
+ {{4,85,64}, "TATA DOCOMO", "TATA DO"},//405045
+ {{4,101,64}, "TATA DOCOMO", "TATA DO"},//405046
+ {{4,117,64}, "TATA DOCOMO", "TATA DO"},//405047
{{4,245,1}, "Reliance", "Reliance"},//40510
{{4,245,17}, "Reliance", "Reliance"},//40511
{{4,245,49}, "Reliance", "Reliance"},//40513
@@ -1067,47 +1068,47 @@
{{4,245,69}, "IND airtel", "airtel"},//40554
{{4,245,85}, "IND airtel", "airtel"},//40555
{{4,245,101}, "IND airtel", "airtel"},//40556
- {{4,5,102}, "Vodafone India UP West", "Vodafone India UP West"},//405066
+ {{4,101,96}, "Vodafone India UP West", "Vodafone India UP West"},//405066
{{4,245,118}, "Vodafone IN", "Vodafone"},//40567
- {{4,5,118}, "Vodafone India West Bengal", "Vodafone India West Bengal"},//405067
+ {{4,117,96}, "Vodafone India West Bengal", "Vodafone India West Bengal"},//405067
{{4,245,7}, "IDEA", "IDEA"},//40570
- {{4,117,153}, "IDEA", "IDEA"},//405799
- {{4,133,0}, "Aircel", "Aircel"},//405800
- {{4,133,1}, "Aircel", "Aircel"},//405801
- {{4,133,2}, "Aircel", "Aircel"},//405802
- {{4,133,3}, "Aircel", "Aircel"},//405803
- {{4,133,4}, "Aircel", "Aircel"},//405804
- {{4,133,5}, "Aircel", "Aircel"},//405805
- {{4,133,6}, "Aircel", "Aircel"},//405806
- {{4,133,4}, "IND-JIO", "JIO"},//405840
- {{4,133,84}, "IDEA", "IDEA"},//405845
- {{4,133,100}, "IDEA", "IDEA"},//405846
- {{4,133,132}, "IDEA", "IDEA"},//405848
- {{4,133,148}, "IDEA", "IDEA"},//405849
- {{4,133,5}, "IDEA", "IDEA"},//405850
- {{4,133,37}, "IDEA", "IDEA"},//405852
- {{4,133,53}, "IDEA", "IDEA"},//405853
- {{4,133,85}, "IND-JIO", "JIO"},//405855
- {{4,133,69}, "IND-JIO", "JIO"},//405854
- {{4,133,101}, "IND-JIO", "JIO"},//405856
- {{4,133,117}, "IND-JIO", "JIO"},//405857
- {{4,133,133}, "IND-JIO", "JIO"},//405858
- {{4,133,149}, "IND-JIO", "JIO"},//405859
- {{4,133,6}, "IND-JIO", "JIO"},//405860
- {{4,133,22}, "IND-JIO", "JIO"},//405861
- {{4,133,38}, "IND-JIO", "JIO"},//405862
- {{4,133,54}, "IND-JIO", "JIO"},//405863
- {{4,133,70}, "IND-JIO", "JIO"},//405864
- {{4,133,86}, "IND-JIO", "JIO"},//405865
- {{4,133,102}, "IND-JIO", "JIO"},//405866
- {{4,133,118}, "IND-JIO", "JIO"},//405867
- {{4,133,134}, "IND-JIO", "JIO"},//405868
- {{4,133,150}, "IND-JIO", "JIO"},//405869
- {{4,133,7}, "IND-JIO", "JIO"},//405870
- {{4,133,23}, "IND-JIO", "JIO"},//405871
- {{4,133,39}, "IND-JIO", "JIO"},//405872
- {{4,133,55}, "IND-JIO", "JIO"},//405873
- {{4,133,71}, "IND-JIO", "JIO"},//405874
+ {{4,149,151}, "IDEA", "IDEA"},//405799
+ {{4,5,8}, "Aircel", "Aircel"},//405800
+ {{4,21,8}, "Aircel", "Aircel"},//405801
+ {{4,37,8}, "Aircel", "Aircel"},//405802
+ {{4,53,8}, "Aircel", "Aircel"},//405803
+ {{4,69,8}, "Aircel", "Aircel"},//405804
+ {{4,85,8}, "Aircel", "Aircel"},//405805
+ {{4,101,8}, "Aircel", "Aircel"},//405806
+ {{4,5,72}, "IND-JIO", "JIO"},//405840
+ {{4,85,72}, "IDEA", "IDEA"},//405845
+ {{4,101,72}, "IDEA", "IDEA"},//405846
+ {{4,133,72}, "IDEA", "IDEA"},//405848
+ {{4,149,72}, "IDEA", "IDEA"},//405849
+ {{4,5,88}, "IDEA", "IDEA"},//405850
+ {{4,37,88}, "IDEA", "IDEA"},//405852
+ {{4,53,88}, "IDEA", "IDEA"},//405853
+ {{4,85,88}, "IND-JIO", "JIO"},//405855
+ {{4,69,88}, "IND-JIO", "JIO"},//405854
+ {{4,101,88}, "IND-JIO", "JIO"},//405856
+ {{4,117,88}, "IND-JIO", "JIO"},//405857
+ {{4,133,88}, "IND-JIO", "JIO"},//405858
+ {{4,149,88}, "IND-JIO", "JIO"},//405859
+ {{4,5,104}, "IND-JIO", "JIO"},//405860
+ {{4,21,104}, "IND-JIO", "JIO"},//405861
+ {{4,37,104}, "IND-JIO", "JIO"},//405862
+ {{4,53,104}, "IND-JIO", "JIO"},//405863
+ {{4,69,104}, "IND-JIO", "JIO"},//405864
+ {{4,85,104}, "IND-JIO", "JIO"},//405865
+ {{4,101,104}, "IND-JIO", "JIO"},//405866
+ {{4,117,104}, "IND-JIO", "JIO"},//405867
+ {{4,133,104}, "IND-JIO", "JIO"},//405868
+ {{4,149,104}, "IND-JIO", "JIO"},//405869
+ {{4,5,120}, "IND-JIO", "JIO"},//405870
+ {{4,21,120}, "IND-JIO", "JIO"},//405871
+ {{4,37,120}, "IND-JIO", "JIO"},//405872
+ {{4,53,120}, "IND-JIO", "JIO"},//405873
+ {{4,69,120}, "IND-JIO", "JIO"},//405874
{{20,240,16}, "Mobilink", "Mobilink"},//41001
{{20,240,48}, "PK-UFONE", "UFONE"},//41003
{{20,242,16}, "AF AWCC", "AWCC"},//41201
@@ -1115,7 +1116,7 @@
{{20,242,4}, "MTN AF", "MTN"},//41240
{{20,242,5}, "Etisalat Af", "Etisalat"},//41250
{{20,243,32}, "DIALOG", "DIALOG"},//41302
- {{20,3,32}, "DIALOG", "DIALOG"},//413002
+ {{20,35,0}, "DIALOG", "DIALOG"},//413002
{{20,243,48}, "SRI Etisalat", "Etisalat"},//41303
{{20,244,16}, "MM 900", "MPTGSM"},//41401
{{20,245,16}, "alfa", "alfa"},//41501
@@ -1127,14 +1128,14 @@
{{20,247,144}, "Syrian Telecom Est.", "Syrian Telecom Est."},//41709
{{20,247,57}, "Syriatel Holdings S.A", "Syriatel Holdings S.A"},//41793
{{20,249,32}, "Zain KW", "Zain KW"},//41902
- {{20,9,32}, "Zain Kuwait", "Zain Kuwait"},//419002
+ {{20,41,0}, "Zain Kuwait", "Zain Kuwait"},//419002
{{20,249,48}, "Ooredoo", "Ooredoo"},//41903
- {{20,9,48}, "WATANIYA", "WATANIYA"},//419003
+ {{20,57,0}, "WATANIYA", "WATANIYA"},//419003
{{20,249,64}, "KT, VIVA", "VIVA"},//41904
- {{20,9,64}, "VIVA", "VIVA"},//419004
+ {{20,73,0}, "VIVA", "VIVA"},//419004
{{36,240,16}, "STC", "STC"},//42001
{{36,240,48}, "Mobily-KSA", "Mobily"},//42003
- {{36,0,48}, "Mobily", "Mobily"},//420003
+ {{36,48,0}, "Mobily", "Mobily"},//420003
{{36,240,112}, "Electronics App' Est.", "Electronics App' Est."},//42007
{{36,241,16}, "SabaFon", "SABAFON"},//42101
{{36,241,32}, "MTN", "MTN"},//42102
@@ -1144,11 +1145,11 @@
{{36,244,48}, "du", "du"},//42403
{{36,245,16}, "Orange IL", "OrangeIL"},//42501
{{36,245,32}, "Cellcom IL", "Cellcom"},//42502
- {{36,5,32}, "Cellcom Israel Ltd", "Cellcom Israel Ltd"},//425002
+ {{36,37,0}, "Cellcom Israel Ltd", "Cellcom Israel Ltd"},//425002
{{36,245,80}, "JAWWAL-PALESTINE", "JAWWAL"},//42505
{{36,246,16}, "BATELCO", "BATELCO"},//42601
{{36,246,32}, "Zain BH", "Zain BH"},//42602
- {{36,6,32}, "Zain BH", "Zain BH"},//426002
+ {{36,38,0}, "Zain BH", "Zain BH"},//426002
{{36,246,64}, "VIVA BH", "VIVA BH"},//42604
{{36,247,16}, "Ooredoo", "Ooredoo"},//42701
{{36,248,153}, "MN MobiCom", "MobiCom"},//42899
@@ -1182,9 +1183,9 @@
{{84,244,48}, "3", "3"},//45403
{{84,244,64}, "3(2G)", "3(2G)"},//45404
{{84,244,96}, "SmarTone HK", "SMC HK"},//45406
- {{84,4,96}, "SmarTone-Vodafone", "SmarTone-Vodafone"},//454006
+ {{84,100,0}, "SmarTone-Vodafone", "SmarTone-Vodafone"},//454006
{{84,244,1}, "CSL", "CSL"},//45410
- {{84,4,1}, "CSL", "CSL"},//454010
+ {{84,4,16}, "CSL", "CSL"},//454010
{{84,244,33}, "China Mobile HK", "CMHK"},//45412
{{84,244,49}, "China Mobile HK", "CMHK"},//45413
{{84,244,81}, "SmarTone HK", "SMC HK"},//45415
@@ -1205,9 +1206,9 @@
{{100,240,0}, "CHINA MOBILE", "CMCC"},//46000
{{100,0,0}, "CHINA MOBILE", "CMCC"},//460000
{{100,240,16}, "CHN-UNICOM", "UNICOM"},//46001
- {{100,0,16}, "CHN-UNICOM", "UNICOM"},//460001
+ {{100,16,0}, "CHN-UNICOM", "UNICOM"},//460001
{{100,240,32}, "CHINA MOBILE", "CMCC"},//46002
- {{100,0,32}, "CHINA MOBILE", "CMCC"},//460002
+ {{100,32,0}, "CHINA MOBILE", "CMCC"},//460002
{{100,240,64}, "CHINA MOBILE", "CMCC"},//46004
{{100,240,112}, "CHINA MOBILE", "CMCC"},//46007
{{100,240,128}, "CHINA MOBILE", "CMCC"},//46008
@@ -1242,11 +1243,11 @@
{{5,242,97}, "DiGi", "DiGi"},//50216
{{5,242,113}, "TIMECel Sdn Bhd", "TIMECel Sdn Bhd"},//50217
{{5,242,145}, "MY CELCOM", "CELCOM"},//50219
- {{5,2,145}, "Celcom Malaysia", "Celcom Malaysia"},//502019
+ {{5,146,16}, "Celcom Malaysia", "Celcom Malaysia"},//502019
{{5,245,16}, "Telstra Mobile", "Telstra"},//50501
{{5,245,32}, "YES OPTUS", "Optus"},//50502
{{5,245,48}, "vodafone AU", "voda AU"},//50503
- {{5,245,96}, "3TELSTRA", "3TELSTRA"},//One.Tel Networks50506
+ {{5,245,96}, "3TELSTRA", "3TELSTRA"},//50506
{{5,245,128}, "One.Tel Networks", "One.Tel Networks"},//50508
{{5,245,131}, "GRLmobile", "GRLmobile"},//50538
{{21,240,0}, "ACeS", "ACeS"},//51000
@@ -1270,25 +1271,25 @@
{{37,240,64}, "TRUE 3G+", "TRUE 3G+"},//52004
{{37,240,80}, "dtac TriNet", "dtac"},//52005
{{37,240,1}, "Wireless Comm. Services Co.", "Wireless Comm. Services Co."},//52010
- {{37,0,81}, "ACT GSM 1900", "ACT GSM 1900"},//520015
+ {{37,80,16}, "ACT GSM 1900", "ACT GSM 1900"},//520015
{{37,240,81}, "TOT3G", "TOT3G"},//52015
{{37,240,129}, "TH-DTAC", "DTAC"},//52018
{{37,240,2}, "ACeS", "ACeS"},//52020
{{37,240,50}, "TH GSM 1800", "GSM 1800"},//52023
{{37,240,153}, "TRUE", "TRUE"},//52099
{{37,245,48}, "SGP-M1", "M1"},//52503
- {{37,5,48}, "MobileOne", "MobileOne"},//525003
+ {{37,53,0}, "MobileOne", "MobileOne"},//525003
{{37,245,80}, "StarHub", "StarHub"},//52505
{{37,248,17}, "BRU-DSTCom", "DSTCom"},//52811
{{37,248,32}, "PCSB", "PCSB"},//52802
{{53,240,16}, "vodafone NZ", "voda NZ"},//53001
- {{53,0,16}, "Vodafone NZ", "Vodafone NZ"},//530001
+ {{53,16,0}, "Vodafone NZ", "Vodafone NZ"},//530001
{{53,240,64}, "Next G", "Next G"},//53004
- {{53,0,64}, "Next G", "Next G"},//530004
+ {{53,64,0}, "Next G", "Next G"},//530004
{{53,240,80}, "Spark NZ", "Spark NZ"},//53005
- {{53,0,80}, "Telecom NZ", "Telecom NZ"},//530005
+ {{53,80,0}, "Telecom NZ", "Telecom NZ"},//530005
{{53,240,66}, "2degrees", "2degrees"},//53024
- {{53,0,66}, "NZ Comms", "NZ Comms"},//530024
+ {{53,64,32}, "NZ Comms", "NZ Comms"},//530024
{{53,249,16}, "U-CALL", "U-CALL"},//53901
{{53,249,136}, "Digicel Tonga", "Digicel"},//53988
{{69,241,0}, "ACeS International Limited (AIL) - REGIONAL", "ACeS"},//54100
@@ -1296,9 +1297,9 @@
{{69,241,80}, "Digicel", "Digicel"},//54105
{{69,242,16}, "FJ VODAFONE", "VODAFONE"},//54201
{{69,242,32}, "DIGICEL", "DIGICEL"},//54202
- {{69,2,16}, "Vodafone Fiji", "Vodafone Fiji"},//542001
- {{69,4,17}, "Blue Sky", "Blue Sky"},//544011
- {{69,20,1}, "Bluesky Communications", "BLUESKY"},//544110
+ {{69,18,0}, "Vodafone Fiji", "Vodafone Fiji"},//542001
+ {{69,20,16}, "Blue Sky", "Blue Sky"},//544011
+ {{69,4,17}, "Bluesky Communications", "BLUESKY"},//544110
{{69,246,16}, "NCL MOBILIS", "MOBNCL"},//54601
{{69,247,2}, "F-VINI", "VINI"},//54720
{{69,248,16}, "CK KOKANET", "KOKANET"},//54801
@@ -1308,7 +1309,7 @@
{{85,241,16}, "MH-NTA", "NTA"},//55101
{{6,242,16}, "EGY MobiNiL", "MobiNiL"},//60201
{{6,242,32}, "vodafone EG", "voda EG"},//60202
- {{6,2,32}, "Vodafone Egypt", "Vodafone Egypt"},//602002
+ {{6,34,0}, "Vodafone Egypt", "Vodafone Egypt"},//602002
{{6,242,48}, "Etisalat", "Etisalat"},//60203
{{6,243,16}, "ALG Mobilis", "Mobilis"},//60301
{{6,243,32}, "Djezzy", "Djezzy"},//60302
@@ -1430,64 +1431,64 @@
{{86,242,64}, "beMOBILE", "beMOBILE"},//65204
{{86,244,16}, "HURI", "HURI"},//65401
{{86,245,16}, "VodaCom-SA", "VODA"},//65501
- {{86,5,16}, "Vodacom", "Vodacom"},//655001
+ {{86,21,0}, "Vodacom", "Vodacom"},//655001
{{86,245,32}, "Telkom SA", "TelkomSA"},//65502
- {{86,5,32}, "Telkom SA", "TelkomSA"},//655002
+ {{86,37,0}, "Telkom SA", "TelkomSA"},//655002
{{86,245,112}, "Cell C", "Cell C"},//65507
{{86,245,1}, "MTN-SA", "MTN"},//65510
- {{86,5,1}, "MTN (Pty) Ltd", "MTN (Pty) Ltd"},//655010
+ {{86,5,16}, "MTN (Pty) Ltd", "MTN (Pty) Ltd"},//655010
{{86,249,32}, "MTN", "MTN"},//65902
{{7,242,118}, "BTL", "BTL"},//70267
{{86,249,48}, "Gemtel", "Gemtel"},//65903
{{86,249,64}, "Vivacell", "Vivacell"},//65904
{{86,249,96}, "ZAIN SS", "ZAIN SS"},//65906
{{7,244,16}, "CLARO GTM", "CLAROGTM"},//70401
- {{7,4,16}, "CLARO", "CLARO"},//704001
+ {{7,20,0}, "CLARO", "CLARO"},//704001
{{7,244,32}, "Comcel_GSM", "COMCEL"},//70402
- {{7,4,32}, "Tigo", "Tigo"},//704002
+ {{7,36,0}, "Tigo", "Tigo"},//704002
{{7,244,48}, "Movistar", "Movistar"},//70403
- {{7,4,48}, "Movistar", "Movistar"},//704003
- {{7,6,16}, "CLARO", "CLARO"},//706001
+ {{7,52,0}, "Movistar", "Movistar"},//704003
+ {{7,22,0}, "CLARO", "CLARO"},//706001
{{7,246,48}, "TELEMOVIL", "TM"},//70603
- {{7,6,48}, "Tigo", "Tigo"},//706003
+ {{7,54,0}, "Tigo", "Tigo"},//706003
{{7,246,64}, "movistar", "movistar"},//70604
- {{7,6,64}, "movistar", "movistar"},//706004
- {{7,8,16}, "CLARO HND", "ClaroHND"},//708001
+ {{7,70,0}, "movistar", "movistar"},//706004
+ {{7,24,0}, "CLARO HND", "ClaroHND"},//708001
{{7,248,32}, "CELTELHND", "CELTEL"},//70802
- {{7,8,32}, "Tigo", "Tigo"},//708002
- {{7,8,3}, "HND", "HT-200"},//708030
+ {{7,40,0}, "Tigo", "Tigo"},//708002
+ {{7,8,48}, "HND", "HT-200"},//708030
{{23,240,18}, "CLARO NIC", "ClaroNIC"},//71021
- {{23,0,18}, "CLARO", "CLARO"},//710021
+ {{23,16,32}, "CLARO", "CLARO"},//710021
{{23,240,55}, "CLARO NIC", "ClaroNIC"},//71073
- {{23,0,55}, "CLARO", "CLARO"},//710073
+ {{23,48,112}, "CLARO", "CLARO"},//710073
{{23,240,3}, "movistar", "movistar"},//71030
- {{23,0,3}, "movistar", "movistar"},//710030
- {{23,48,0}, "MOVISTARNI", "movistar"},//710300
+ {{23,0,48}, "movistar", "movistar"},//710030
+ {{23,0,3}, "MOVISTARNI", "movistar"},//710300
{{23,242,16}, "I.C.E.", "I.C.E."},//71201
{{23,242,32}, "I.C.E.", "I.C.E."},//71202
{{23,242,48}, "CLARO CR", "CLARO CR"},//71203
{{23,242,64}, "Movistar", "Movistar"},//71204
{{23,244,32}, "movistar", "movistar"},//71402
- {{23,4,32}, "movistar", "movistar"},//714002
+ {{23,36,0}, "movistar", "movistar"},//714002
{{23,244,48}, "CLARO PA", "CLARO PA"},//71403
- {{23,4,48}, "CLARO", "CLARO"},//714003
+ {{23,52,0}, "CLARO", "CLARO"},//714003
{{23,244,2}, "Movistar", "Movistar"},//71420
- {{23,4,2}, "Movistar", "Movistar"},//714020
+ {{23,4,32}, "Movistar", "Movistar"},//714020
{{23,246,96}, "MOVISTAR", "MOVISTAR"},//71606
- {{23,6,96}, "movistar", "movistar"},//716006
- {{23,6,1}, "CLARO", "CLARO"},//716010
+ {{23,102,0}, "movistar", "movistar"},//716006
+ {{23,6,16}, "CLARO", "CLARO"},//716010
{{23,246,1}, "CLARO PER", "ClaroPER"},//71610
{{39,242,112}, "Movistar", "Movistar"},//72207
- {{39,2,112}, "movistar", "movistar"},//722007
- {{39,2,1}, "AR-TEFMVNO", "TEFMVNO"},//722010
+ {{39,114,0}, "movistar", "movistar"},//722007
+ {{39,2,16}, "AR-TEFMVNO", "TEFMVNO"},//722010
{{39,242,19}, "CLARO", "CLARO"},//72231
- {{39,2,19}, "CLARO", "CLARO"},//722031
+ {{39,18,48}, "CLARO", "CLARO"},//722031
{{39,242,67}, "Personal", "Personal"},//72234
- {{39,2,67}, "Personal", "Personal"},//722034
+ {{39,66,48}, "Personal", "Personal"},//722034
{{39,242,83}, "PORT-HABLE", "PORT-HABLE"},//72235
- {{39,2,83}, "PORT-HABLE", "PORT-HABLE"},//722035
- {{39,50,1}, "CLARO ARGENTINA", "CLARO AR"},//722310
- {{39,50,20}, "AR PERSONAL", "AR TP"},//722341
+ {{39,82,48}, "PORT-HABLE", "PORT-HABLE"},//722035
+ {{39,2,19}, "CLARO ARGENTINA", "CLARO AR"},//722310
+ {{39,18,67}, "AR PERSONAL", "AR TP"},//722341
{{39,244,32}, "TIM BRASIL", "TIM"},//72402
{{39,244,48}, "TIM BRASIL", "TIM"},//72403
{{39,244,64}, "TIM BRASIL", "TIM"},//72404
@@ -1505,84 +1506,84 @@
{{39,244,67}, "Algar Telecom", "Algar"},//72434
{{39,244,115}, "Aeiou", "Aeiou"},//72437
{{39,244,147}, "Nextel Brasil 3G", "Nextel 3G"},//72439
- {{55,0,16}, "Entel Telefonia Movil S.A", "Entel Telefonia Movil S.A"},//730001
+ {{55,16,0}, "Entel Telefonia Movil S.A", "Entel Telefonia Movil S.A"},//730001
{{55,240,16}, "ENTEL PCS", "ENTEL"},//73001
- {{55,0,32}, "movistar Chile", "movistar Chile"},//730002
+ {{55,32,0}, "movistar Chile", "movistar Chile"},//730002
{{55,240,32}, "Movistar", "Movistar"},//73002
- {{55,0,48}, "CLARO", "CLARO"},//730003
+ {{55,48,0}, "CLARO", "CLARO"},//730003
{{55,240,48}, "CLARO CHL", "CLAROCHL"},//73003
{{55,240,112}, "Movistar", "Movistar"},//73007
{{55,240,128}, "CHL VTR", "VTR"},//73008
{{55,240,144}, "Nextel 3G", "Nextel3G"},//73009
- {{55,0,1}, "Entel PCS Telecomunicaciones S.A", "Entel PCS Telecomunicaciones S.A"},//730010
+ {{55,0,16}, "Entel PCS Telecomunicaciones S.A", "Entel PCS Telecomunicaciones S.A"},//730010
{{55,240,1}, "ENTEL PCS", "ENTEL"},//73010
- {{55,18,16}, "Claro", "Claro"},//732101
- {{55,18,32}, "Comcel 3GSM", "Comcel 3GSM"},//732102
- {{55,18,48}, "COL MOV / TIGO", "TIGO COL"},//732103
+ {{55,18,1}, "Claro", "Claro"},//732101
+ {{55,34,1}, "Comcel 3GSM", "Comcel 3GSM"},//732102
+ {{55,50,1}, "COL MOV / TIGO", "TIGO COL"},//732103
{{55,18,17}, "COL MOV / TIGO", "TIGO COL"},//732111
- {{55,18,50}, "Movistar", "Movistar"},//732123
- {{55,18,120}, "ETB 4G", "ETB"},//732187
+ {{55,50,33}, "Movistar", "Movistar"},//732123
+ {{55,114,129}, "ETB 4G", "ETB"},//732187
{{55,244,64}, "movistar", "movistar"},//73404
- {{55,4,64}, "movistar", "movistar"},//734004
+ {{55,68,0}, "movistar", "movistar"},//734004
{{55,244,16}, "Infonet,Redes De Informacion C.A", "Infonet,Redes De Informacion C.A"},//73401
{{55,244,32}, "DIGITEL GSM", "DIGITEL"},//73402
{{55,246,16}, "VIVA", "VIVA"},//73601
- {{55,6,16}, "Nuevatel PCS De Bolivia SA", "Nuevatel PCS De Bolivia SA"},//736001
+ {{55,22,0}, "Nuevatel PCS De Bolivia SA", "Nuevatel PCS De Bolivia SA"},//736001
{{55,246,32}, "BOMOV", "EMOVIL"},//73602
- {{55,6,32}, "Entel SA", "Entel SA"},//736002
+ {{55,38,0}, "Entel SA", "Entel SA"},//736002
{{55,246,48}, "TIGO", "TIGO"},//73603
- {{55,6,48}, "Tigo", "Tigo"},//736003
+ {{55,54,0}, "Tigo", "Tigo"},//736003
{{55,248,16}, "DIGICEL", "DIGICEL"},//73801
- {{55,8,32}, "GUY CLNK PLS", "CLNKPLS"},//738002
+ {{55,40,0}, "GUY CLNK PLS", "CLNKPLS"},//738002
{{71,240,0}, "Movistar", "Movistar"},//74000
{{71,0,0}, "movistar", "movistar"},//740000
{{71,240,16}, "CLARO", "CLARO"},//74001
{{71,240,32}, "CNT", "CNT"},//74002
{{71,244,16}, "HOLA PARAGUAY S.A.", "HPGYSA"},//74401
{{71,244,64}, "TIGO PY", "TIGO"},//74404
- {{71,4,64}, "Tigo", "Tigo"},//744004
- {{71,4,32}, "CLARO", "CLARO"},//744002
+ {{71,68,0}, "Tigo", "Tigo"},//744004
+ {{71,36,0}, "CLARO", "CLARO"},//744002
{{71,244,32}, "CLARO PY", "CLARO PY"},//74402
{{71,244,80}, "PY Personal", "Personal"},//74405
- {{71,4,80}, "Personal", "Personal"},//744005
+ {{71,84,0}, "Personal", "Personal"},//744005
{{71,246,16}, "NV ICMS", "NV ICMS"},//74601
{{71,248,112}, "Movistar", "Movistar"},//74807
- {{71,8,112}, "movistar", "movistar"},//748007
+ {{71,120,0}, "movistar", "movistar"},//748007
{{71,248,1}, "CLARO URUGUAY", "CLARO UY"},//74810
- {{71,8,1}, "CLARO", "CLARO"},//748010
- {{87,0,16}, "Sure FLK", "Sure"},//750001
+ {{71,8,16}, "CLARO", "CLARO"},//748010
+ {{87,16,0}, "Sure FLK", "Sure"},//750001
{{9,241,80}, "Thuraya Satellite Telecommunications Company", "Thuraya"},//90105
{{9,241,65}, "AeroMobile", "AeroMob" },//90114
{{9,241,81}, "OnAir", "OnAir" },//90115
{{9,241,33}, "Maritime Communications Partner AS", "MCP" },//90112
{{9,241,17}, "Inmarsat", "INX" },//90111
- {{4,5,147}, "TATA DOCOMO", "TATA DO"},//405039
- {{4,133,151}, "IN UNITECH", "UNITECH"},//405879
- {{4,149,114}, "IN UNITECH", "UNITECH"},//405927
- {{4,149,146}, "IN UNITECH", "UNITECH"},//405929
- {{4,133,103}, "IN UNITECH", "UNITECH"},//405876
- {{4,133,87}, "IN UNITECH", "UNITECH"},//405875
- {{4,133,145}, "IN UNITECH", "UNITECH"},//405819
- {{4,133,129}, "IN UNITECH", "UNITECH"},//405818
- {{4,133,36}, "VIDEOCON", "VIDEOCON"},//405842
- {{4,133,66}, "VIDEOCON", "VIDEOCON"},//405824
- {{4,133,82}, "VIDEOCON", "VIDEOCON"},//405825
- {{4,133,114}, "VIDEOCON", "VIDEOCON"},//405827
- {{4,133,146}, "VIDEOCON", "VIDEOCON"},//405829
- {{4,133,52}, "VIDEOCON", "VIDEOCON"},//405843
- {{4,133,130}, "VIDEOCON", "VIDEOCON"},//405828
- {{4,133,3}, "VIDEOCON", "VIDEOCON"},//405830
- {{4,133,20}, "VIDEOCON", "VIDEOCON"},//405841
- {{4,133,51}, "VIDEOCON", "VIDEOCON"},//405833
- {{4,133,67}, "VIDEOCON", "VIDEOCON"},//405834
- {{4,133,83}, "VIDEOCON", "VIDEOCON"},//405835
- {{4,133,115}, "VIDEOCON", "VIDEOCON"},//405837
- {{4,133,131}, "VIDEOCON", "VIDEOCON"},//405838
- {{4,133,147}, "VIDEOCON", "VIDEOCON"},//405839
- {{4,133,35}, "VIDEOCON", "VIDEOCON"},//405832
- {{4,133,99}, "VIDEOCON", "VIDEOCON"},//405836
- {{4,133,50}, "VIDEOCON", "VIDEOCON"},//405823
- {{4,133,19}, "VIDEOCON", "VIDEOCON"},//405831
+ {{4,149,48}, "TATA DOCOMO", "TATA DO"},//405039
+ {{4,149,120}, "IN UNITECH", "UNITECH"},//405879
+ {{4,117,41}, "IN UNITECH", "UNITECH"},//405927
+ {{4,149,41}, "IN UNITECH", "UNITECH"},//405929
+ {{4,101,120}, "IN UNITECH", "UNITECH"},//405876
+ {{4,85,120}, "IN UNITECH", "UNITECH"},//405875
+ {{4,149,24}, "IN UNITECH", "UNITECH"},//405819
+ {{4,133,24}, "IN UNITECH", "UNITECH"},//405818
+ {{4,37,72}, "VIDEOCON", "VIDEOCON"},//405842
+ {{4,69,40}, "VIDEOCON", "VIDEOCON"},//405824
+ {{4,85,40}, "VIDEOCON", "VIDEOCON"},//405825
+ {{4,117,40}, "VIDEOCON", "VIDEOCON"},//405827
+ {{4,149,40}, "VIDEOCON", "VIDEOCON"},//405829
+ {{4,53,72}, "VIDEOCON", "VIDEOCON"},//405843
+ {{4,133,40}, "VIDEOCON", "VIDEOCON"},//405828
+ {{4,5,56}, "VIDEOCON", "VIDEOCON"},//405830
+ {{4,21,72}, "VIDEOCON", "VIDEOCON"},//405841
+ {{4,53,56}, "VIDEOCON", "VIDEOCON"},//405833
+ {{4,69,56}, "VIDEOCON", "VIDEOCON"},//405834
+ {{4,85,56}, "VIDEOCON", "VIDEOCON"},//405835
+ {{4,117,56}, "VIDEOCON", "VIDEOCON"},//405837
+ {{4,133,56}, "VIDEOCON", "VIDEOCON"},//405838
+ {{4,149,56}, "VIDEOCON", "VIDEOCON"},//405839
+ {{4,37,56}, "VIDEOCON", "VIDEOCON"},//405832
+ {{4,101,56}, "VIDEOCON", "VIDEOCON"},//405836
+ {{4,53,40}, "VIDEOCON", "VIDEOCON"},//405823
+ {{4,21,56}, "VIDEOCON", "VIDEOCON"},//405831
{{4,244,49}, "Vodafone IN", "Vodafone"},//40413
{{4,244,72}, "Vodafone IN", "Vodafone"},//40484
{{4,244,17}, "Vodafone IN", "Vodafone"},//40411
@@ -1590,7 +1591,7 @@
{{4,244,16}, "Vodafone IN", "Vodafone"},//40401
{{4,244,104}, "Vodafone IN", "Vodafone"},//40486
{{4,244,100}, "Vodafone IN", "Vodafone"},//40446
- {{4,4,3}, "Vodafone IN", "Vodafone"},//404030
+ {{4,4,48}, "Vodafone IN", "Vodafone"},//404030
{{4,244,114}, "Vodafone IN", "Vodafone"},//40427
{{4,244,2}, "Vodafone IN", "Vodafone"},//40420
{{4,244,136}, "Vodafone IN", "Vodafone"},//40488
@@ -1598,13 +1599,13 @@
{{4,244,52}, "Vodafone IN", "Vodafone"},//40443
{{4,244,81}, "Vodafone IN", "Vodafone"},//40415
{{4,245,102}, "Vodafone IN", "Vodafone"},//40566
- {{4,117,21}, "Vodafone IN", "Vodafone"},//405751
- {{4,117,37}, "Vodafone IN", "Vodafone"},//405752
- {{4,117,69}, "Vodafone IN", "Vodafone"},//405754
- {{4,117,5}, "Vodafone IN", "Vodafone"},//405750
- {{4,117,101}, "Vodafone IN", "Vodafone"},//405756
- {{4,117,85}, "Vodafone IN", "Vodafone"},//405755
- {{4,117,53}, "Vodafone IN", "Vodafone"},//405753
+ {{4,21,87}, "Vodafone IN", "Vodafone"},//405751
+ {{4,37,87}, "Vodafone IN", "Vodafone"},//405752
+ {{4,69,87}, "Vodafone IN", "Vodafone"},//405754
+ {{4,5,87}, "Vodafone IN", "Vodafone"},//405750
+ {{4,101,87}, "Vodafone IN", "Vodafone"},//405756
+ {{4,85,87}, "Vodafone IN", "Vodafone"},//405755
+ {{4,53,87}, "Vodafone IN", "Vodafone"},//405753
{{114,242,80}, "3 IRL", "3 IRL"},//27205
{{52,242,35}, "Iran Taliya", "Taliya"},//43232
{{52,242,83}, "MTN Irancell", "Irancell"},//43235
@@ -1618,8 +1619,8 @@
{{114,244,33}, "Siminn", "Siminn"},//27412
{{36,245,48}, "IL Pelephone", "PCL"},//42503
{{9,241,98}, "TIM@sea", "TIM@sea"},//90126
- {{51,24,8}, "LIME", "LIME"},//338180
- {{51,8,5}, "DIGICEL", "DIGICEL"},//338050
+ {{51,8,129}, "LIME", "LIME"},//338180
+ {{51,8,80}, "DIGICEL", "DIGICEL"},//338050
{{20,246,48}, "UMNIAH", "UMNIAH"},//41603
{{68,240,5}, "KDDI", "KDDI"},//44050
{{4,241,112}, "ALTEL", "ALTEL"},//40107
@@ -1631,18 +1632,18 @@
{{84,246,144}, "Beeline KH", "Beeline"},//45609
{{84,246,17}, "SEATEL", "SEATEL"},//45611
{{84,246,128}, "Metfone", "Metfone"},//45608
- {{83,22,1}, "LIME", "LIME"},//356110
+ {{83,6,17}, "LIME", "LIME"},//356110
{{84,240,32}, "KT", "KT"},//45002
{{84,240,128}, "KT", "KT"},//45008
{{84,240,96}, "KOR LG Uplus", "LG U+"},//45006
{{84,247,48}, "Unitel", "UNITEL"},//45703
{{84,247,128}, "TIGO LAO", "TIGO"},//45708
{{20,245,80}, "LBN OGERO Mobile", "OM"},//41505
- {{22,248,102}, "Celcom GSM", "Celcom"},//61807
+ {{22,248,112}, "Celcom GSM", "Celcom"},//61807
{{6,246,16}, "Al Madar", "Al Madar"},//60601
{{6,246,0}, "Libyana", "L"},//60600
- {{83,24,1}, "LIME", "LIME"},//358110
- {{83,8,5}, "DIGICEL", "DIGICEL"},//358050
+ {{83,8,17}, "LIME", "LIME"},//358110
+ {{83,8,80}, "DIGICEL", "DIGICEL"},//358050
{{20,243,80}, "SRI AIRTEL", "Airtel"},//41305
{{20,243,128}, "Hutch", "Hutch"},//41308
{{20,243,16}, "Mobitel LK", "Mobitel"},//41301
@@ -1653,9 +1654,9 @@
{{82,249,80}, "UNITE", "UNITE"},//25905
{{70,246,64}, "TELMA", "TELMA"},//64604
{{116,242,32}, "Ooredoo Maldives PVT LTD", "Ooredoo"},//47202
- {{51,4,5}, "Iusacell 4G", "Iusacell"},//334050
- {{51,244,5}, "Iusacell 4G", "Iusacell"},//33450
- {{51,4,9}, "Nextel 3G", "Nextel3G"},//334090
+ {{51,4,80}, "AT&T", "AT&T"},//334050
+ {{51,244,5}, "AT&T", "AT&T"},//33450
+ {{51,4,144}, "AT&T", "AT&T"},//334090
{{146,244,32}, "ONE MK", "ONE"},//29402
{{146,244,16}, "T-Mobile MK", "TMO MK"},//29401
{{146,244,48}, "Vip MKD", "Vip MKD"},//29403
@@ -1674,9 +1675,9 @@
{{6,249,32}, "MR Expresso", "EMR"},//60902
{{6,249,1}, "MAURITEL", "MAURITEL"},//60910
{{6,249,16}, "MR MATTEL", "MATTEL"},//60901
- {{83,132,6}, "LIME", "LIME"},//354860
+ {{83,4,104}, "LIME", "LIME"},//354860
{{22,247,48}, "MTML", "MTML"},//61703
- {{5,18,101}, "MYSALTEL", "ALTEL"},//502156
+ {{5,98,81}, "MYSALTEL", "ALTEL"},//502156
{{5,242,129}, "U MOBILE", "U MOBILE"},//50218
{{70,249,48}, "tnmobile", "tnmobile"},//64903
{{22,244,48}, "ETISALAT NER", "ETISALAT"},//61403
@@ -1701,7 +1702,7 @@
{{53,247,16}, "bmobile", "bmobile"},//53701
{{53,247,48}, "DIGICEL", "DIGICEL"},//53703
{{98,240,96}, "Play", "Play"},//26006
- {{51,16,2}, "Open Mob PRI", "Open Mob"},//330120
+ {{51,0,33}, "Open Mob PRI", "Open Mob"},//330120
{{100,247,80}, "Koryolink", "KL-DPRK"},//46705
{{36,245,96}, "PS, Wataniya Mobile", "WM"},//42506
{{69,247,81}, "Vodafone PF", "VF PF"},//54715
@@ -1744,20 +1745,19 @@
{{71,246,64}, "UNIQA", "UNIQA"},//74604
{{71,246,32}, "SR.TELESUR.GSM", "TeleG"},//74602
{{86,243,1}, "Swazi-MTN", "SwaziMTN"},//65310
- {{115,54,5}, "LIME", "LIME"},//376350
- {{115,54,6}, "IslandCom TCI", "Islandco"},//376360
+ {{115,6,83}, "LIME", "LIME"},//376350
+ {{115,6,99}, "IslandCom TCI", "Islandco"},//376360
{{38,242,16}, "Airtel", "Airtel"},//62201
{{38,242,112}, "SALAM", "SALAM"},//62207
{{38,242,48}, "Tigo TD", "Tigo"},//62203
{{9,241,84}, "AISatSea", "AISatSea"},//90145
{{71,248,16}, "Antel", "Antel"},//74801
- {{99,16,1}, "LIME", "LIME"},//360110
- {{99,0,7}, "DIGICEL", "DIGICEL"},//360070
+ {{99,0,17}, "LIME", "LIME"},//360110
+ {{99,0,112}, "DIGICEL", "DIGICEL"},//360070
{{55,244,96}, "VE_MOVILNET", "Movilnet"},//73406
- {{67,24,7}, "LIME", "LIME"},//348170
- {{67,88,7}, "CCT Boatphone", "CCTBVI"},//348570
+ {{67,8,113}, "LIME", "LIME"},//348170
+ {{67,8,117}, "CCT Boatphone", "CCTBVI"},//348570
{{84,242,112}, "Gmobile", "Gmobile"},//45207
- {{84,242,80}, "VN Vietnamobile", "VNMOBILE"},//45205
};
UINT8 g_zAt2_GsmLatin1Table[256];
diff --git a/cp/ps/modem/ps/src/nas/ati/src/zat_fnc.c b/cp/ps/modem/ps/src/nas/ati/src/zat_fnc.c
index cbad5b7..2e82587 100755
--- a/cp/ps/modem/ps/src/nas/ati/src/zat_fnc.c
+++ b/cp/ps/modem/ps/src/nas/ati/src/zat_fnc.c
@@ -19843,14 +19843,14 @@
}
#ifdef USE_VOICE_SUPPORT
/**************************************************************************
-* º¯ÊýÃû³Æ£º zAt_PsEncCcZimsplusInd
+* º¯ÊýÃû³Æ£º zAt_PsEncCcStopLocalVoiceInd
* ¹¦ÄÜÃèÊö£º ¸ù¾ÝzAt_PsEncCcDsciIndÏûÏ¢¼°¶ÔÓ¦µÄ½á¹¹Ìå,±àÂëµÃ¶ÔÓ¦µÄATÃüÁî
* ²ÎÊý˵Ã÷£º (IO):
* pEncCmdInfo: ±àÂëÈë²ÎÐÅÏ¢ºÍ³ö²ÎÐÅÏ¢
* ·µ »Ø Öµ£º UINT16 ±àÂëËùµÃ×Ö·û´®³¤¶È£¬0Ϊ±àÂëʧ°Ü
* ÆäËü˵Ã÷£º +ZIMSPLUSÖ÷¶¯Éϱ¨±àÂ뺯Êý
**************************************************************************/
-UINT16 zAt_PsEncCcZimsplusInd(T_ZAt_EncCmdInfo * pEncCmdInfo)
+UINT16 zAt_PsEncCcStopLocalVoiceInd(T_ZAt_EncCmdInfo * pEncCmdInfo)
{
T_zMmiaCC_StopLocalVoice_Ind *pZimsplus = (T_zMmiaCC_StopLocalVoice_Ind*) pEncCmdInfo->pMsgBody;
@@ -19860,6 +19860,20 @@
return (UINT16)strlen((const char *)pEncCmdInfo->pStrCmd);
}
+/***********************************************************************************
+*º¯ÊýÃû³Æ:zAt_PsEncCcStartLocalVoiceInd
+*¹¦ÄÜÃèÊö:±àÂëÉϱ¨´ò¿ª±¾µØÕñÁåÒôµÄָʾ
+***********************************************************************************/
+UINT16 zAt_PsEncCcStartLocalVoiceInd(T_ZAt_EncCmdInfo * pEncCmdInfo)
+{
+ T_zMmiaCC_StartLocalVoice_Ind *pZimsplus = (T_zMmiaCC_StartLocalVoice_Ind*) pEncCmdInfo->pMsgBody;
+
+ /* +ZIMSPLUS: <op>,<callId>*/
+
+ sprintf((char *)pEncCmdInfo->pStrCmd, "%s+ZIMSPLUS: 2,%d%s", g_zAt_CRLF, pZimsplus->bCallId, g_zAt_CRLF);
+
+ return (UINT16)strlen((const char *)pEncCmdInfo->pStrCmd);
+}
#endif
UINT16 zAt_PsEncSmCpsbQryCnf(T_ZAt_EncCmdInfo * pEncCmdInfo)
{
@@ -23617,15 +23631,20 @@
tNumType.bNumType == Z_APMMIA_NUMTYPE_ECCINFDN ||
tNumType.bNumType == Z_APMMIA_NUMTYPE_ECCNOTINFDN)
{
- pStrWalk += sprintf((char *)pStrWalk, "%s+ZNUMTYPE: 1,%d%s", g_zAt_CRLF, tNumType.bSrvCateg, g_zAt_CRLF);
+ pStrWalk += sprintf((char *)pStrWalk, "%s+ZNUMTYPE: 1,%d", g_zAt_CRLF, tNumType.bSrvCateg);
}
else
{
- pStrWalk += sprintf((char *)pStrWalk, "%s+ZNUMTYPE: 0,0%s", g_zAt_CRLF, g_zAt_CRLF);
+ pStrWalk += sprintf((char *)pStrWalk, "%s+ZNUMTYPE: 0,0", g_zAt_CRLF);
}
- sprintf((char *)pStrWalk,"%s", g_zAt_OK);
- return zAt_GetParseRslt(ZAT2_CMD_REPLY_DIRECT);
+ if(Z_VALID == zAt_IsBeepCallNum(&tNum))
+ {
+ pStrWalk += sprintf((char *)pStrWalk, ",1" );
+ }
+
+ sprintf((char *)pStrWalk,"%s%s", g_zAt_CRLF, g_zAt_OK);
+ return zAt_GetParseRslt(ZAT2_CMD_REPLY_DIRECT);
}
UINT32 zAti_SetPcfcCommon(T_ZAti_PcfcCommonParam *ptCommon)
diff --git a/cp/ps/modem/ps/src/nas/ati/src/zat_var.c b/cp/ps/modem/ps/src/nas/ati/src/zat_var.c
old mode 100644
new mode 100755
index 96b1de0..53526a9
--- a/cp/ps/modem/ps/src/nas/ati/src/zat_var.c
+++ b/cp/ps/modem/ps/src/nas/ati/src/zat_var.c
@@ -1946,7 +1946,8 @@
{MMIA_CC_CALL_STATE_IND_EV, zAt_PsEncCcDsciInd, ZAT2_CO_IND },
/********************************** +ZIMSPLUS *************************************/
- {MMIA_CC_STOP_LOCALVOICE_IND_EV, zAt_PsEncCcZimsplusInd, ZAT2_CO_IND },
+ {MMIA_CC_STOP_LOCALVOICE_IND_EV, zAt_PsEncCcStopLocalVoiceInd, ZAT2_CO_IND },
+ {MMIA_CC_START_LOCALVOICE_IND_EV, zAt_PsEncCcStartLocalVoiceInd, ZAT2_CO_IND },
/************************************* +CHLD**************************************/
{MMIA_CC_CHLD_CNF_EV, zAt_PsEncCcChldSetCnf, ZAT2_CO_CNF },
diff --git a/cp/ps/modem/ps/src/nas/ati/src/zati_com.c b/cp/ps/modem/ps/src/nas/ati/src/zati_com.c
index 52d9758..422dc53 100755
--- a/cp/ps/modem/ps/src/nas/ati/src/zati_com.c
+++ b/cp/ps/modem/ps/src/nas/ati/src/zati_com.c
@@ -1082,6 +1082,7 @@
case MMIA_ASC_LTE_LOSTCOVERAGE_IND_EV:
case AP_UICC_AIR_AUTH_REQ_IND_EV:
case MMIA_CC_STOP_LOCALVOICE_IND_EV:
+ case MMIA_CC_START_LOCALVOICE_IND_EV:
/* USAT ²¿·Ö */
case AP_UICC_USAT_PROV_CMD_IND_EV:
case AP_UICC_NO_PROC_NOTIFY_IND_EV:
@@ -2602,3 +2603,36 @@
return Z_ATI_REGSTATE_NOSERVE;
}
}
+
+BYTE zAt_IsBeepCallNum(T_z_CallNum *ptCheckedNum)
+{
+ BYTE i = 0;
+ BYTE bMinNumLen = 0;
+ BYTE bDevNum = 0;
+ BYTE bCheckedNum = 0;
+ T_zAti_NV_BeepCallNum tBeepCall = {0};
+
+ if(ptCheckedNum == ZOSS_NULL)
+ {
+ return Z_INVALID;
+ }
+
+ zDev_NV_AtiReadItem(Z_ATI_NV_BeepCall, (PBYTE)&tBeepCall);
+
+ bCheckedNum = sizeof(ptCheckedNum->abNum);
+
+ for(i = 0; i < tBeepCall.bCallNum && i < Z_DEV_MAX_BEEPCALL_GROUP; i++)
+ {
+ bDevNum = sizeof(tBeepCall.atCallGroup[i].abCallNum);
+ bMinNumLen = (bDevNum < bCheckedNum)? bDevNum : bCheckedNum;
+
+ if((tBeepCall.atCallGroup[i].bNumLen == ptCheckedNum->bNumLen) && (ptCheckedNum->bNumLen <= bMinNumLen)
+ && (0 == memcmp(tBeepCall.atCallGroup[i].abCallNum, ptCheckedNum->abNum, ptCheckedNum->bNumLen)))
+ {
+ return Z_VALID;
+ }
+ }
+
+ return Z_INVALID;
+}
+
diff --git a/cp/ps/modem/ps/src/nas/ati/src/zati_fnc.c b/cp/ps/modem/ps/src/nas/ati/src/zati_fnc.c
index ebb5259..481589a 100755
--- a/cp/ps/modem/ps/src/nas/ati/src/zati_fnc.c
+++ b/cp/ps/modem/ps/src/nas/ati/src/zati_fnc.c
@@ -2080,6 +2080,14 @@
*(pbMsgBody + 1) = 0xff;
}
}
+
+ if(dwMsgId == MMIA_CC_ANS_MODE_REQ_EV)
+ {
+ if((pbMsgBody != ZOSS_NULL) && ((*(pbMsgBody + 1)) == ZATI2_INVAL_MMIA_INDEX))
+ {
+ return Z_APMMIA_OPTNOTALW_ERR;
+ }
+ }
#endif
zAti_MarkIndex(pbMsgBody, zAti_ConvertTskIdToSbMdl(bTaskId));
if (bTaskId == Z_ATI_TASKID_ATI)
diff --git a/cp/ps/modem/ps/src/nas/ati/src/zati_func.c b/cp/ps/modem/ps/src/nas/ati/src/zati_func.c
index 4e09a02..efac717 100755
--- a/cp/ps/modem/ps/src/nas/ati/src/zati_func.c
+++ b/cp/ps/modem/ps/src/nas/ati/src/zati_func.c
@@ -636,7 +636,7 @@
VOID __ps_static_func zAti_MarkIndex(VOID *ptBuff, BYTE bMdl)
{
T_zAti_Index *ptIndex = (T_zAti_Index *)ptBuff;
- if (0xff == ptIndex->bDesIndex)
+ if (ZOSS_NULL!=ptIndex && 0xff==ptIndex->bDesIndex)
{
g_zAti_ptData->abChMdlTable[ptIndex->bSrcIndex] = bMdl;
}
diff --git a/cp/ps/modem/tools/inc/commgt_api.h b/cp/ps/modem/tools/inc/commgt_api.h
index 0e7c01e..144497f 100755
--- a/cp/ps/modem/tools/inc/commgt_api.h
+++ b/cp/ps/modem/tools/inc/commgt_api.h
@@ -160,7 +160,7 @@
#ifdef _USE_VEHICLE_DC
ZCAT_MODE_CAP_FS,
#endif
-
+ ZCAT_MODE_LOG_OFF
} E_ZCAT_MODE;
typedef enum
diff --git a/cp/ps/project/zx297520v3/prj_evb/source/drv/src/ref_audio/audioRef_cfgPara.c b/cp/ps/project/zx297520v3/prj_evb/source/drv/src/ref_audio/audioRef_cfgPara.c
old mode 100644
new mode 100755
index f452bbb..0d75a00
--- a/cp/ps/project/zx297520v3/prj_evb/source/drv/src/ref_audio/audioRef_cfgPara.c
+++ b/cp/ps/project/zx297520v3/prj_evb/source/drv/src/ref_audio/audioRef_cfgPara.c
@@ -116,6 +116,16 @@
TDM_1TS_ENABLE,TDM_TX_1BIT_OFFSET,TDM_RX_1BIT_OFFSET
};
+T_ZDrvTdm_Cfg s_vpTdmWbCfg_codec = {TRUE,16000,TDM_FS_CLK_POS,TDM_TX_CLK_POS,TDM_RX_CLK_NEG,\
+ TDM_TS_16CYCLE,TDM_16_SLOT,TIMING_TDM_FS_1CLK, \
+ TIMING_TDM_FS_HIGH,TDM_MSB_FIRST,TDM_NORMAL_MODE, \
+ TDM_1TS_ENABLE,TDM_TX_1BIT_OFFSET,TDM_RX_1BIT_OFFSET
+ };
+
+
+
+
+
/****************************************************************************
* Global Function Prototypes
****************************************************************************/