- Update ASN1 files to 3GPP TS 36.331 V8.7.0 (2009-09)

- Make it possible to use "decode as" on DL-CCCH messages sent over UDP.

svn path=/trunk/; revision=31107

4 files changed, 43 insertions, 28 deletions

diff --git a/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn b/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
index 4b9d45b24c..41cca64e37 100644
--- a/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
+++ b/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
@@ -1,8 +1,8 @@
--- 3GPP TS 36.331 V8.5.0 (2009-03)
+-- 3GPP TS 36.331 V8.7.0 (2009-09)
 -- $Id$
 --
 EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
- 
+
 BEGIN
 
 
diff --git a/asn1/lte-rrc/EUTRA-RRC-Definitions.asn b/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
index f3aef5af31..898e6432ae 100644
--- a/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
+++ b/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
@@ -1,8 +1,8 @@
--- 3GPP TS 36.331 V8.5.0 (2009-03)
+-- 3GPP TS 36.331 V8.7.0 (2009-09)
 -- $Id$
 --
 EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
- 
+
 BEGIN
 
 
@@ -816,7 +816,7 @@ ULInformationTransfer ::=			SEQUENCE {
 }
 
 ULInformationTransfer-r8-IEs ::=	SEQUENCE {
-	dedicatedInformationType			CHOICE {
+	dedicatedInfoType			CHOICE {
 		dedicatedInfoNAS					DedicatedInfoNAS,
 		dedicatedInfoCDMA2000-1XRTT			DedicatedInfoCDMA2000,
 		dedicatedInfoCDMA2000-HRPD			DedicatedInfoCDMA2000
@@ -947,11 +947,7 @@ InterFreqNeighCellInfo ::=			SEQUENCE {
 	q-OffsetCell						Q-OffsetRange
 }
 
-InterFreqBlackCellList ::=			SEQUENCE (SIZE (1..maxCellBlack)) OF InterFreqBlackCellInfo 
-
-InterFreqBlackCellInfo ::=			SEQUENCE {
-	physCellIdRange					PhysCellIdRange
-}
+InterFreqBlackCellList ::=			SEQUENCE (SIZE (1..maxCellBlack)) OF PhysCellIdRange
 
 
 SystemInformationBlockType6 ::=		SEQUENCE {
@@ -1019,7 +1015,7 @@ SystemInformationBlockType8 ::=		SEQUENCE {
 		cellReselectionParametersHRPD		CellReselectionParametersCDMA2000	OPTIONAL -- Need OR
 	}																		OPTIONAL,	-- Need OR
 	parameters1XRTT						SEQUENCE {
-		csfb-RegistrationParam1XRTT			CSFB-RegistrationParam1XRTT		OPTIONAL,	-- Need OR
+		csfb-RegistrationParam1XRTT			CSFB-RegistrationParam1XRTT		OPTIONAL,	-- Need OP
 		longCodeState1XRTT					BIT STRING (SIZE (42))			OPTIONAL,	-- Need OR
 		cellReselectionParameters1XRTT		CellReselectionParametersCDMA2000	OPTIONAL -- Need OR
 	}																		OPTIONAL,	-- Need OR
@@ -1418,21 +1414,21 @@ RACH-ConfigDedicated ::=		SEQUENCE {
 
 
 RadioResourceConfigCommonSIB ::=	SEQUENCE {
-	rach-Config							RACH-ConfigCommon,
+	rach-ConfigCommon					RACH-ConfigCommon,
 	bcch-Config 						BCCH-Config,
 	pcch-Config 						PCCH-Config,
 	prach-Config						PRACH-ConfigSIB,
-	pdsch-Config						PDSCH-ConfigCommon,
-	pusch-Config						PUSCH-ConfigCommon,
-	pucch-Config						PUCCH-ConfigCommon,
-	soundingRS-UL-Config				SoundingRS-UL-ConfigCommon,
-	uplinkPowerControl					UplinkPowerControlCommon,
+	pdsch-ConfigCommon					PDSCH-ConfigCommon,
+	pusch-ConfigCommon					PUSCH-ConfigCommon,
+	pucch-ConfigCommon					PUCCH-ConfigCommon,
+	soundingRS-UL-ConfigCommon			SoundingRS-UL-ConfigCommon,
+	uplinkPowerControlCommon			UplinkPowerControlCommon,
 	ul-CyclicPrefixLength				UL-CyclicPrefixLength,
 	...
 }
 
 RadioResourceConfigCommon ::=		SEQUENCE {
-	rach-Config							RACH-ConfigCommon					OPTIONAL,	-- Need ON
+	rach-ConfigCommon					RACH-ConfigCommon					OPTIONAL,	-- Need ON
 	prach-Config						PRACH-Config,
 	pdsch-ConfigCommon					PDSCH-ConfigCommon					OPTIONAL,	-- Need ON
 	pusch-ConfigCommon					PUSCH-ConfigCommon,
@@ -1469,7 +1465,7 @@ RadioResourceConfigDedicated ::=		SEQUENCE {
 	mac-MainConfig						CHOICE {
 			explicitValue					MAC-MainConfig,
 			defaultValue					NULL
-	}		OPTIONAL,																-- Need ON
+	}		OPTIONAL,																-- Cond HO-toEUTRA2
 	sps-Config							SPS-Config 					OPTIONAL,		-- Need ON
 	physicalConfigDedicated				PhysicalConfigDedicated		OPTIONAL,		-- Need ON
 	...
@@ -1849,9 +1845,9 @@ CellGlobalIdCDMA2000 ::=				CHOICE {
 
 MobilityControlInfo ::=		SEQUENCE {
 	targetPhysCellId					PhysCellId,
-	carrierFreq							CarrierFreqEUTRA					OPTIONAL,	-- Need ON
-	carrierBandwidth					CarrierBandwidthEUTRA				OPTIONAL,	-- Need ON
-	additionalSpectrumEmission			AdditionalSpectrumEmission			OPTIONAL,	-- Need ON
+	carrierFreq							CarrierFreqEUTRA					OPTIONAL,	-- Cond HO-toEUTRA
+	carrierBandwidth					CarrierBandwidthEUTRA				OPTIONAL,	-- Cond HO-toEUTRA
+	additionalSpectrumEmission			AdditionalSpectrumEmission			OPTIONAL,	-- Cond HO-toEUTRA
 	t304								ENUMERATED {
 											ms50, ms100, ms150, ms200, ms500, ms1000,
 											ms2000, spare1},
@@ -2641,5 +2637,4 @@ maxUTRA-FDD-Carrier			INTEGER ::= 16	-- Maximum number of UTRA FDD carrier frequ
 maxUTRA-TDD-Carrier			INTEGER ::= 16	-- Maximum number of UTRA TDD carrier frequencies
 
 
-END
-
+END
\ No newline at end of file
diff --git a/asn1/lte-rrc/EUTRA-UE-Variables.asn b/asn1/lte-rrc/EUTRA-UE-Variables.asn
index 6137271287..73028f44c6 100644
--- a/asn1/lte-rrc/EUTRA-UE-Variables.asn
+++ b/asn1/lte-rrc/EUTRA-UE-Variables.asn
@@ -1,8 +1,8 @@
--- 3GPP TS 36.331 V8.5.0 (2009-03)
+-- 3GPP TS 36.331 V8.7.0 (2009-09)
 -- $Id$
 --
 EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
- 
+
 BEGIN
 
 
@@ -20,7 +20,7 @@ VarMeasConfig ::=					SEQUENCE {
 		release								NULL,
 		setup								SEQUENCE {
 			mobilityStateParameters				MobilityStateParameters,
-			speedStateScaleFactors				SpeedStateScaleFactors
+			timeToTrigger-SF					SpeedStateScaleFactors
 		}
 	}																		OPTIONAL
 }
@@ -47,4 +47,3 @@ VarShortMAC-Input ::=					SEQUENCE {
 
 
 END
-
diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c
index 290015c9a1..032489cff6 100644
--- a/asn1/lte-rrc/packet-lte-rrc-template.c
+++ b/asn1/lte-rrc/packet-lte-rrc-template.c
@@ -64,6 +64,23 @@ static int ett_lte_rrc = -1;
 static int dissect_DL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_);
 #include "packet-lte-rrc-fn.c"
 
+static void
+dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	proto_item *ti;
+	proto_tree *lte_rrc_tree;
+
+	col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC DL_CCCH");
+	col_clear(pinfo->cinfo, COL_INFO);
+	if (tree) {
+
+		ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, FALSE);
+		lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+		dissect_DL_CCCH_Message_PDU(tvb, pinfo, lte_rrc_tree);
+	}
+
+}
+
 /*--- proto_register_rrc -------------------------------------------*/
 void proto_register_lte_rrc(void) {
 
@@ -82,6 +99,7 @@ void proto_register_lte_rrc(void) {
 
   /* Register protocol */
   proto_lte_rrc = proto_register_protocol(PNAME, PSNAME, PFNAME);
+  register_dissector("lte_rrc.dl_ccch", dissect_lte_rrc_DL_CCCH, proto_lte_rrc);
   /* Register fields and subtrees */
   proto_register_field_array(proto_lte_rrc, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
@@ -96,7 +114,10 @@ void proto_register_lte_rrc(void) {
 void
 proto_reg_handoff_lte_rrc(void)
 {
+	static dissector_handle_t lte_rrc_dl_ccch_handle;
 
+	lte_rrc_dl_ccch_handle = find_dissector("lte_rrc.dl_ccch");
+	dissector_add_handle("udp.port", lte_rrc_dl_ccch_handle);
 	nas_eps_handle = find_dissector("nas-eps");
 }