diff options
author | Anders Broman <anders.broman@ericsson.com> | 2009-10-29 06:19:36 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2009-10-29 06:19:36 +0000 |
commit | a26552a27f8e80711a79fec5f139bba4f9bb281c (patch) | |
tree | 0825abbdf8cfebb10c35c4c0725354d75a0fac46 /asn1 | |
parent | a9c313a864ba338de2c1000fbac780f0b6a644db (diff) |
Update to the Mars verion of the protocol and export HandoverCommand.
svn path=/trunk/; revision=30751
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn | 3 | ||||
-rw-r--r-- | asn1/lte-rrc/EUTRA-RRC-Definitions.asn | 35 | ||||
-rw-r--r-- | asn1/lte-rrc/EUTRA-UE-Variables.asn | 5 | ||||
-rw-r--r-- | asn1/lte-rrc/Makefile.common | 9 | ||||
-rw-r--r-- | asn1/lte-rrc/lte-rrc.cnf | 5 | ||||
-rw-r--r-- | asn1/lte-rrc/packet-lte-rrc-template.h | 30 |
6 files changed, 69 insertions, 18 deletions
diff --git a/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn b/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn index e1ebd1f6b4..4b9d45b24c 100644 --- a/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn +++ b/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn @@ -1,3 +1,6 @@ +-- 3GPP TS 36.331 V8.5.0 (2009-03) +-- $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 9abad9871c..f3aef5af31 100644 --- a/asn1/lte-rrc/EUTRA-RRC-Definitions.asn +++ b/asn1/lte-rrc/EUTRA-RRC-Definitions.asn @@ -1,3 +1,6 @@ +-- 3GPP TS 36.331 V8.5.0 (2009-03) +-- $Id$ +-- EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::= BEGIN @@ -813,7 +816,7 @@ ULInformationTransfer ::= SEQUENCE { } ULInformationTransfer-r8-IEs ::= SEQUENCE { - dedicatedInfoType CHOICE { + dedicatedInformationType CHOICE { dedicatedInfoNAS DedicatedInfoNAS, dedicatedInfoCDMA2000-1XRTT DedicatedInfoCDMA2000, dedicatedInfoCDMA2000-HRPD DedicatedInfoCDMA2000 @@ -944,7 +947,11 @@ InterFreqNeighCellInfo ::= SEQUENCE { q-OffsetCell Q-OffsetRange } -InterFreqBlackCellList ::= SEQUENCE (SIZE (1..maxCellBlack)) OF PhysCellIdRange +InterFreqBlackCellList ::= SEQUENCE (SIZE (1..maxCellBlack)) OF InterFreqBlackCellInfo + +InterFreqBlackCellInfo ::= SEQUENCE { + physCellIdRange PhysCellIdRange +} SystemInformationBlockType6 ::= SEQUENCE { @@ -1012,7 +1019,7 @@ SystemInformationBlockType8 ::= SEQUENCE { cellReselectionParametersHRPD CellReselectionParametersCDMA2000 OPTIONAL -- Need OR } OPTIONAL, -- Need OR parameters1XRTT SEQUENCE { - csfb-RegistrationParam1XRTT CSFB-RegistrationParam1XRTT OPTIONAL, -- Need OP + csfb-RegistrationParam1XRTT CSFB-RegistrationParam1XRTT OPTIONAL, -- Need OR longCodeState1XRTT BIT STRING (SIZE (42)) OPTIONAL, -- Need OR cellReselectionParameters1XRTT CellReselectionParametersCDMA2000 OPTIONAL -- Need OR } OPTIONAL, -- Need OR @@ -1411,21 +1418,21 @@ RACH-ConfigDedicated ::= SEQUENCE { RadioResourceConfigCommonSIB ::= SEQUENCE { - rach-ConfigCommon RACH-ConfigCommon, + rach-Config RACH-ConfigCommon, bcch-Config BCCH-Config, pcch-Config PCCH-Config, prach-Config PRACH-ConfigSIB, - pdsch-ConfigCommon PDSCH-ConfigCommon, - pusch-ConfigCommon PUSCH-ConfigCommon, - pucch-ConfigCommon PUCCH-ConfigCommon, - soundingRS-UL-ConfigCommon SoundingRS-UL-ConfigCommon, - uplinkPowerControlCommon UplinkPowerControlCommon, + pdsch-Config PDSCH-ConfigCommon, + pusch-Config PUSCH-ConfigCommon, + pucch-Config PUCCH-ConfigCommon, + soundingRS-UL-Config SoundingRS-UL-ConfigCommon, + uplinkPowerControl UplinkPowerControlCommon, ul-CyclicPrefixLength UL-CyclicPrefixLength, ... } RadioResourceConfigCommon ::= SEQUENCE { - rach-ConfigCommon RACH-ConfigCommon OPTIONAL, -- Need ON + rach-Config RACH-ConfigCommon OPTIONAL, -- Need ON prach-Config PRACH-Config, pdsch-ConfigCommon PDSCH-ConfigCommon OPTIONAL, -- Need ON pusch-ConfigCommon PUSCH-ConfigCommon, @@ -1462,7 +1469,7 @@ RadioResourceConfigDedicated ::= SEQUENCE { mac-MainConfig CHOICE { explicitValue MAC-MainConfig, defaultValue NULL - } OPTIONAL, -- Cond HO-toEUTRA2 + } OPTIONAL, -- Need ON sps-Config SPS-Config OPTIONAL, -- Need ON physicalConfigDedicated PhysicalConfigDedicated OPTIONAL, -- Need ON ... @@ -1842,9 +1849,9 @@ CellGlobalIdCDMA2000 ::= CHOICE { MobilityControlInfo ::= SEQUENCE { targetPhysCellId PhysCellId, - carrierFreq CarrierFreqEUTRA OPTIONAL, -- Cond HO-toEUTRA - carrierBandwidth CarrierBandwidthEUTRA OPTIONAL, -- Cond HO-toEUTRA - additionalSpectrumEmission AdditionalSpectrumEmission OPTIONAL, -- Cond HO-toEUTRA + carrierFreq CarrierFreqEUTRA OPTIONAL, -- Need ON + carrierBandwidth CarrierBandwidthEUTRA OPTIONAL, -- Need ON + additionalSpectrumEmission AdditionalSpectrumEmission OPTIONAL, -- Need ON t304 ENUMERATED { ms50, ms100, ms150, ms200, ms500, ms1000, ms2000, spare1}, diff --git a/asn1/lte-rrc/EUTRA-UE-Variables.asn b/asn1/lte-rrc/EUTRA-UE-Variables.asn index 3f61b21622..6137271287 100644 --- a/asn1/lte-rrc/EUTRA-UE-Variables.asn +++ b/asn1/lte-rrc/EUTRA-UE-Variables.asn @@ -1,3 +1,6 @@ +-- 3GPP TS 36.331 V8.5.0 (2009-03) +-- $Id$ +-- EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::= BEGIN @@ -17,7 +20,7 @@ VarMeasConfig ::= SEQUENCE { release NULL, setup SEQUENCE { mobilityStateParameters MobilityStateParameters, - timeToTrigger-SF SpeedStateScaleFactors + speedStateScaleFactors SpeedStateScaleFactors } } OPTIONAL } diff --git a/asn1/lte-rrc/Makefile.common b/asn1/lte-rrc/Makefile.common index f64727605c..ae78ecf1d6 100644 --- a/asn1/lte-rrc/Makefile.common +++ b/asn1/lte-rrc/Makefile.common @@ -23,8 +23,10 @@ PROTOCOL_NAME = lte-rrc DISSECTOR_FILES = \ - packet-$(PROTOCOL_NAME).c - + packet-$(PROTOCOL_NAME).c \ + packet-$(PROTOCOL_NAME).h + +EXPORT_FILES = $(PROTOCOL_NAME)-exp.cnf EXT_ASN_FILE_LIST = @@ -37,13 +39,14 @@ EXTRA_DIST = \ Makefile.nmake \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ + packet-$(PROTOCOL_NAME)-template.h \ $(PROTOCOL_NAME).cnf SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS = -L +A2W_FLAGS = -e -L EXTRA_CNF = diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf index 218aa793fd..14655ca365 100644 --- a/asn1/lte-rrc/lte-rrc.cnf +++ b/asn1/lte-rrc/lte-rrc.cnf @@ -11,7 +11,12 @@ UNALIGNED #.OMIT_ASSIGNMENT #.END +#.EXPORTS +HandoverCommand +HandoverCommand_PDU + #.PDU_NEW +HandoverCommand BCCH-BCH-Message @bcch.bch BCCH-DL-SCH-Message @bcch.dl.sch PCCH-Message @pcch diff --git a/asn1/lte-rrc/packet-lte-rrc-template.h b/asn1/lte-rrc/packet-lte-rrc-template.h new file mode 100644 index 0000000000..46ed16dfa6 --- /dev/null +++ b/asn1/lte-rrc/packet-lte-rrc-template.h @@ -0,0 +1,30 @@ +/* packet-llc-rrc-template.h
+ * Copyright 2009, Anders Broman <anders.broman@ericsson.com>
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef PACKET_LTE_RRC_H
+#define PACKET_LTE_RRC_H
+
+#include "packet-lte-rrc-exp.h"
+
+#endif /* PACKET_LTE_RRC_H */
|