Add a few EUTRAN related elementary files and reorder some value_string arrays

svn path=/trunk/; revision=45629

1 files changed, 34 insertions, 26 deletions

diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c
index 1a4d9a9e66..2ae404cff0 100644
--- a/epan/dissectors/packet-gsm_sim.c
+++ b/epan/dissectors/packet-gsm_sim.c
@@ -749,8 +749,8 @@ static const value_string seek_mode_vals[] = {
 /* Files at the MF level */
 static const value_string mf_dfs[] = {
 	{ 0x3f00, "MF" },
-	{ 0x7f20, "DF.GSM" },
 	{ 0x7f10, "DF.TELECOM" },
+	{ 0x7f20, "DF.GSM" },
 	{ 0x7f22, "DF.IS-41" },
 	{ 0x7f23, "DF.FP-CTS" },
 	{ 0x7fff, "ADF" },
@@ -841,10 +841,10 @@ static const value_string df_gsm_dfs[] = {
 	{ 0x5f31, "DF.GLOBST" },
 	{ 0x5f32, "DF.ICO" },
 	{ 0x5f33, "DF.ACeS" },
+	{ 0x5f3c, "DF.MExE" },
 	{ 0x5f40, "DF.EIA/TIA-533" },
 	{ 0x5f60, "DF.CTS" },
 	{ 0x5f70, "DF.SoLSA" },
-	{ 0x5f3c, "DF.MExE" },
 #if 0
 	{ 0, NULL }
 };
@@ -854,8 +854,8 @@ static const value_string adf_usim_dfs[] = {
 	{ 0x5f3a, "DF.PHONEBOOK" },
 	{ 0x5f3b, "DF.GSM-ACCESS" },
 	{ 0x5f3c, "DF.MExE" },
-	{ 0x5f70, "DF.SoLSA" },
 	{ 0x5f40, "DF.WLAN" },
+	{ 0x5f70, "DF.SoLSA" },
 #if 0
 	{ 0, NULL }
 };
@@ -890,6 +890,7 @@ static const value_string adf_usim_efs[] = {
 	{ 0x6f4c, "EF.EXT3" },
 	{ 0x6f4d, "EF.BDN" },
 	{ 0x6f4e, "EF.EXT5" },
+	{ 0x6f4f, "EF.CCP2" },
 	{ 0x6f50, "EF.CBMIR" },
 	{ 0x6f55, "EF.EXT4" },
 	{ 0x6f56, "EF.EST" },
@@ -900,7 +901,6 @@ static const value_string adf_usim_efs[] = {
 	{ 0x6f60, "EF.PLMNwAcT" },
 	{ 0x6f61, "EF.OPLMNwAcT" },
 	{ 0x6f62, "EF.HPLMNAcT" },
-	{ 0x6fd9, "EF.EHPLMN" },
 	{ 0x6f73, "EF.PSLOCI" },
 	{ 0x6f78, "EF.ACC" },
 	{ 0x6f7b, "EF.FPLMN" },
@@ -910,6 +910,10 @@ static const value_string adf_usim_efs[] = {
 	{ 0x6f82, "EF.ICT" },
 	{ 0x6f83, "EF.OCT" },
 	{ 0x6fad, "EF.AD" },
+	{ 0x6fb1, "EF.VGCS" },
+	{ 0x6fb2, "EF.VGCSS" },
+	{ 0x6fb3, "EF.VBS" },
+	{ 0x6fb4, "EF.VBSS" },
 	{ 0x6fb5, "EF.eMLPP" },
 	{ 0x6fb6, "EF.AAeM" },
 	{ 0x6fb7, "EF.ECC" },
@@ -930,48 +934,52 @@ static const value_string adf_usim_efs[] = {
 	{ 0x6fd1, "EF.MMSUP" },
 	{ 0x6fd2, "EF.MMSUCP" },
 	{ 0x6fd3, "EF.NIA" },
-	{ 0x6f4f, "EF.CCP2" },
-	{ 0x6fb1, "EF.VGCS" },
-	{ 0x6fb2, "EF.VGCSS" },
-	{ 0x6fb3, "EF.VBS" },
-	{ 0x6fb4, "EF.VBSS" },
 	{ 0x6fd4, "EF.VGCSCA" },
 	{ 0x6fd5, "EF.VBSCA" },
 	{ 0x6fd6, "EF.GBAP" },
 	{ 0x6fd7, "EF.MSK" },
 	{ 0x6fd8, "EF.MUK" },
+	{ 0x6fd9, "EF.EHPLMN" },
 	{ 0x6fda, "EF.GBANL" },
+	{ 0x6fdb, "EF.EHPLMNPI" },
+	{ 0x6fdc, "EF.LRPLMNSI" },
+	{ 0x6fdd, "EF.NAFKCA" },
+	{ 0x6fde, "EF.SPNI" },
+	{ 0x6fdf, "EF.PNNI" },
+	{ 0x6fe2, "EF.NCP-IP" },
+	{ 0x6fe3, "EF.EPSLOCI" },
+	{ 0x6fe4, "EF.EPSNSC" },
 #if 0
 	{ 0, NULL }
 };
 
 static const value_string df_phonebook_efs[] = {
 #endif
-	{ 0x4f30, "EF.PBR" },
-	{ 0x4f4a, "EF.EXT1" },
-	{ 0x4f4b, "EF.AAS" },
-	{ 0x4f4c, "EF.GAS" },
-	{ 0x4f22, "EF.FSC" },
-	{ 0x4f23, "EF.CC" },
-	{ 0x4f24, "EF.PUID" },
-	{ 0x4f3a, "EF.ADN" },
 	{ 0x4f09, "EF.PBC" },
+	{ 0x4f0a, "EF.PBC1" },
 	{ 0x4f11, "EF.ANRA" },
+	{ 0x4f12, "EF.ANRA1" },
 	{ 0x4f13, "EF.ANRB" },
-	{ 0x4f50, "EF.EMAIL" },
+	{ 0x4f14, "EF.ANRB1" },
+	{ 0x4f15, "EF.ANRC" },
+	{ 0x4f16, "EF.ANRC1" },
 	{ 0x4f19, "EF.SNE" },
+	{ 0x4f1a, "EF.SNE1" },
+	{ 0x4f20, "EF.UID1" },
 	{ 0x4f21, "EF.UID" },
+	{ 0x4f22, "EF.FSC" },
+	{ 0x4f23, "EF.CC" },
+	{ 0x4f24, "EF.PUID" },
+	{ 0x4f25, "EF.GRP1" },
 	{ 0x4f26, "EF.GRP" },
-	{ 0x4f15, "EF.ANRC" },
+	{ 0x4f30, "EF.PBR" },
+	{ 0x4f3a, "EF.ADN" },
 	{ 0x4f3b, "EF.ADN1" },
-	{ 0x4f0a, "EF.PBC1" },
-	{ 0x4f12, "EF.ANRA1" },
-	{ 0x4f14, "EF.ANRB1" },
+	{ 0x4f4a, "EF.EXT1" },
+	{ 0x4f4b, "EF.AAS" },
+	{ 0x4f4c, "EF.GAS" },
+	{ 0x4f50, "EF.EMAIL" },
 	{ 0x4f51, "EF.EMAIL1" },
-	{ 0x4f1a, "EF.SNE1" },
-	{ 0x4f20, "EF.UID1" },
-	{ 0x4f25, "EF.GRP1" },
-	{ 0x4f16, "EF.ANRC1" },
 	{ 0, NULL }
 };