aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
Diffstat (limited to 'asn1')
-rw-r--r--asn1/pcap/PCAP-CommonDataTypes.asn2
-rw-r--r--asn1/pcap/PCAP-Constants.asn18
-rw-r--r--asn1/pcap/PCAP-IEs.asn5
-rw-r--r--asn1/pcap/PCAP-PDU-Contents.asn3
-rw-r--r--asn1/pcap/PCAP-PDU-Descriptions.asn2
-rw-r--r--asn1/pcap/pcap.cnf4
-rw-r--r--asn1/s1ap/S1AP-Constants.asn28
7 files changed, 55 insertions, 7 deletions
diff --git a/asn1/pcap/PCAP-CommonDataTypes.asn b/asn1/pcap/PCAP-CommonDataTypes.asn
index 689ae83d2a..028997839d 100644
--- a/asn1/pcap/PCAP-CommonDataTypes.asn
+++ b/asn1/pcap/PCAP-CommonDataTypes.asn
@@ -1,6 +1,6 @@
-- $Id$
--
--- 3GPP TS 25.453 V9.1.0 (2010-03)
+-- 3GPP TS 25.453 V9.2.0 (2010-09)
--
--9.3.5 Common Definitions
-- **************************************************************
diff --git a/asn1/pcap/PCAP-Constants.asn b/asn1/pcap/PCAP-Constants.asn
index 4e91e9ac0c..baa04d8304 100644
--- a/asn1/pcap/PCAP-Constants.asn
+++ b/asn1/pcap/PCAP-Constants.asn
@@ -109,12 +109,18 @@ id-RequestedDataValue ProtocolIE-ID ::= 15
id-RequestedDataValueInformation ProtocolIE-ID ::= 16
id-TransactionID ProtocolIE-ID ::= 17
id-UE-PositionEstimate ProtocolIE-ID ::= 18
+-- WS extension
+id-Unknown-19 ProtocolIE-ID ::= 19
id-CellId-MeasuredResultsSets ProtocolIE-ID ::= 20
+-- WS extension
+id-Unknown-21 ProtocolIE-ID ::= 21
id-OTDOA-MeasurementGroup ProtocolIE-ID ::= 22
id-AccuracyFulfilmentIndicator ProtocolIE-ID ::= 23
id-HorizontalAccuracyCode ProtocolIE-ID ::= 24
id-VerticalAccuracyCode ProtocolIE-ID ::= 25
id-UTDOA-Group ProtocolIE-ID ::= 26
+-- WS extension
+id-Unknown-27 ProtocolIE-ID ::= 27
id-RequestType ProtocolIE-ID ::= 28
id-UE-PositioningCapability ProtocolIE-ID ::= 29
id-UC-id ProtocolIE-ID ::= 30
@@ -139,6 +145,10 @@ id-UTRAN-GPS-DriftRate ProtocolIE-ID ::= 48
id-OTDOA-AddMeasuredResultsInfo ProtocolIE-ID ::= 49
id-GPS-ReferenceLocation ProtocolIE-ID ::= 50
id-OTDOA-MeasuredResultsSets ProtocolIE-ID ::= 51
+-- WS extension
+id-Unknown-52 ProtocolIE-ID ::= 52
+id-Unknown-53 ProtocolIE-ID ::= 53
+id-Unknown-54 ProtocolIE-ID ::= 54
id-rxTimingDeviation384extInfo ProtocolIE-ID ::= 55
id-ExtendedRoundTripTime ProtocolIE-ID ::= 56
id-PeriodicPosCalcInfo ProtocolIE-ID ::= 57
@@ -149,6 +159,8 @@ id-RRCstateChange ProtocolIE-ID ::= 61
id-PeriodicTerminationCause ProtocolIE-ID ::= 62
id-MeasurementValidity ProtocolIE-ID ::= 63
id-roundTripTimeInfoWithType1 ProtocolIE-ID ::= 64
+-- WS extension
+id-Unknown-65 ProtocolIE-ID ::= 65
id-CellIDPositioning ProtocolIE-ID ::= 66
id-AddMeasurementInfo ProtocolIE-ID ::= 67
id-Extended-RNC-ID ProtocolIE-ID ::= 68
@@ -156,7 +168,8 @@ id-GANSS-CommonAssistanceData ProtocolIE-ID ::= 69
id-GANSS-GenericAssistanceDataList ProtocolIE-ID ::= 70
id-GANSS-MeasuredResultsList ProtocolIE-ID ::= 71
id-GANSS-UTRAN-TRU ProtocolIE-ID ::= 72
-id-GANSSPositioning ProtocolIE-ID ::= 73 id-GANSS-PositioningDataSet ProtocolIE-ID ::= 74
+id-GANSSPositioning ProtocolIE-ID ::= 73
+id-GANSS-PositioningDataSet ProtocolIE-ID ::= 74
id-GNSS-PositioningMethod ProtocolIE-ID ::= 75
id-NetworkAssistedGANSSSuport ProtocolIE-ID ::= 76
id-TUTRANGANSSMeasurementValueInfo ProtocolIE-ID ::= 77
@@ -167,7 +180,8 @@ id-extendedTimingAdvanceLCR ProtocolIE-ID ::= 81
id-additionalMeasurementInforLCR ProtocolIE-ID ::= 82
id-timingAdvanceLCR-R7 ProtocolIE-ID ::= 83
id-rxTimingDeviationLCR ProtocolIE-ID ::= 84
-id-GPSReferenceTimeUncertainty ProtocolIE-ID ::= 85 id-GANSS-AddIonoModelReq ProtocolIE-ID ::= 86
+id-GPSReferenceTimeUncertainty ProtocolIE-ID ::= 85
+id-GANSS-AddIonoModelReq ProtocolIE-ID ::= 86
id-GANSS-EarthOrientParaReq ProtocolIE-ID ::= 87
id-GANSS-Additional-Ionospheric-Model ProtocolIE-ID ::= 88
id-GANSS-Earth-Orientation-Parameters ProtocolIE-ID ::= 89
diff --git a/asn1/pcap/PCAP-IEs.asn b/asn1/pcap/PCAP-IEs.asn
index b03aa42eba..64e5bc6f73 100644
--- a/asn1/pcap/PCAP-IEs.asn
+++ b/asn1/pcap/PCAP-IEs.asn
@@ -1,6 +1,6 @@
-- $Id$
--
--- 3GPP TS 25.453 V9.1.0 (2010-03)
+-- 3GPP TS 25.453 V9.2.0 (2010-09)
--
-- 9.3.4 Information Element Definitions
-- **************************************************************
@@ -1047,7 +1047,8 @@ DGANSS-SignalInformationItem ::= SEQUENCE {
...
}
-DGANSS-SignalInformationItem-ExtIEs PCAP-PROTOCOL-EXTENSION ::= { {ID id-DGNSS-ValidityPeriod CRITICALITY ignore EXTENSION DGNSS-ValidityPeriod PRESENCE OPTIONAL},
+DGANSS-SignalInformationItem-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+ {ID id-DGNSS-ValidityPeriod CRITICALITY ignore EXTENSION DGNSS-ValidityPeriod PRESENCE optional},
...
}
diff --git a/asn1/pcap/PCAP-PDU-Contents.asn b/asn1/pcap/PCAP-PDU-Contents.asn
index ce0bec522e..9210f59f18 100644
--- a/asn1/pcap/PCAP-PDU-Contents.asn
+++ b/asn1/pcap/PCAP-PDU-Contents.asn
@@ -1,6 +1,6 @@
-- $Id$
--
--- 3GPP TS 25.453 V9.1.0 (2010-03)
+-- 3GPP TS 25.453 V9.2.0 (2010-09)
--
--9.3.3 PDU Definitions
-- **************************************************************
@@ -754,3 +754,4 @@ PositionPeriodicTermination-Extensions PCAP-PROTOCOL-EXTENSION ::= {
...
}
END
+
diff --git a/asn1/pcap/PCAP-PDU-Descriptions.asn b/asn1/pcap/PCAP-PDU-Descriptions.asn
index 4d48cb1c05..39313a19ba 100644
--- a/asn1/pcap/PCAP-PDU-Descriptions.asn
+++ b/asn1/pcap/PCAP-PDU-Descriptions.asn
@@ -1,6 +1,6 @@
-- $Id$
--
--- 3GPP TS 25.453 V9.1.0 (2010-03)
+-- 3GPP TS 25.453 V9.2.0 (2010-09)
--
-- 9.3.2 Elementary Procedure Definitions
-- **************************************************************
diff --git a/asn1/pcap/pcap.cnf b/asn1/pcap/pcap.cnf
index 3b1bca8d54..5721b172cf 100644
--- a/asn1/pcap/pcap.cnf
+++ b/asn1/pcap/pcap.cnf
@@ -23,6 +23,10 @@ ProtocolIE-ID
CauseRadioNetwork
TDD-ChannelisationCode
SFN-SFN-Drift
+CodePhaseSearchWindow
+TUTRAN-GANSS-DriftRate
+UTRAN-GPS-DriftRate
+ExplicitInformation
#.NO_EMIT
diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn
index ffd5f14b2a..ecd22589fb 100644
--- a/asn1/s1ap/S1AP-Constants.asn
+++ b/asn1/s1ap/S1AP-Constants.asn
@@ -134,7 +134,15 @@ id-HandoverType ProtocolIE-ID ::= 1
id-Cause ProtocolIE-ID ::= 2
id-SourceID ProtocolIE-ID ::= 3
id-TargetID ProtocolIE-ID ::= 4
+--WS extension
+id-Unknown-5 ProtocolIE-ID ::= 5
+id-Unknown-6 ProtocolIE-ID ::= 6
+id-Unknown-7 ProtocolIE-ID ::= 7
id-eNB-UE-S1AP-ID ProtocolIE-ID ::= 8
+--WS extension
+id-Unknown-9 ProtocolIE-ID ::= 9
+id-Unknown-10 ProtocolIE-ID ::= 10
+id-Unknown-11 ProtocolIE-ID ::= 11
id-E-RABSubjecttoDataForwardingList ProtocolIE-ID ::= 12
id-E-RABtoReleaseListHOCmd ProtocolIE-ID ::= 13
id-E-RABDataForwardingItem ProtocolIE-ID ::= 14
@@ -165,8 +173,12 @@ id-E-RABReleaseItem ProtocolIE-ID ::= 38
id-E-RABSetupItemBearerSURes ProtocolIE-ID ::= 39
id-SecurityContext ProtocolIE-ID ::= 40
id-HandoverRestrictionList ProtocolIE-ID ::= 41
+--WS extension
+id-Unknown-42 ProtocolIE-ID ::= 42
id-UEPagingID ProtocolIE-ID ::= 43
id-pagingDRX ProtocolIE-ID ::= 44
+--WS extension
+id-Unknown-45 ProtocolIE-ID ::= 45
id-TAIList ProtocolIE-ID ::= 46
id-TAIItem ProtocolIE-ID ::= 47
id-E-RABFailedToSetupListCtxtSURes ProtocolIE-ID ::= 48
@@ -175,17 +187,25 @@ id-E-RABSetupItemCtxtSURes ProtocolIE-ID ::= 50
id-E-RABSetupListCtxtSURes ProtocolIE-ID ::= 51
id-E-RABToBeSetupItemCtxtSUReq ProtocolIE-ID ::= 52
id-E-RABToBeSetupListHOReq ProtocolIE-ID ::= 53
+--WS extension
+id-Unknown-54 ProtocolIE-ID ::= 54
id-GERANtoLTEHOInformationRes ProtocolIE-ID ::= 55
+--WS extension
+id-Unknown-56 ProtocolIE-ID ::= 56
id-UTRANtoLTEHOInformationRes ProtocolIE-ID ::= 57
id-CriticalityDiagnostics ProtocolIE-ID ::= 58
id-Global-ENB-ID ProtocolIE-ID ::= 59
id-eNBname ProtocolIE-ID ::= 60
id-MMEname ProtocolIE-ID ::= 61
+--WS extension
+id-Unknown-62 ProtocolIE-ID ::= 62
id-ServedPLMNs ProtocolIE-ID ::= 63
id-SupportedTAs ProtocolIE-ID ::= 64
id-TimeToWait ProtocolIE-ID ::= 65
id-uEaggregateMaximumBitrate ProtocolIE-ID ::= 66
id-TAI ProtocolIE-ID ::= 67
+--WS extension
+id-Unknown-68 ProtocolIE-ID ::= 68
id-E-RABReleaseListBearerRelComp ProtocolIE-ID ::= 69
id-cdma2000PDU ProtocolIE-ID ::= 70
id-cdma2000RATType ProtocolIE-ID ::= 71
@@ -193,11 +213,19 @@ id-cdma2000SectorID ProtocolIE-ID ::= 72
id-SecurityKey ProtocolIE-ID ::= 73
id-UERadioCapability ProtocolIE-ID ::= 74
id-GUMMEI-ID ProtocolIE-ID ::= 75
+--WS extension
+id-Unknown-76 ProtocolIE-ID ::= 76
+id-Unknown-77 ProtocolIE-ID ::= 77
id-E-RABInformationListItem ProtocolIE-ID ::= 78
id-Direct-Forwarding-Path-Availability ProtocolIE-ID ::= 79
id-UEIdentityIndexValue ProtocolIE-ID ::= 80
+--WS extension
+id-Unknown-81 ProtocolIE-ID ::= 81
+id-Unknown-82 ProtocolIE-ID ::= 82
id-cdma2000HOStatus ProtocolIE-ID ::= 83
id-cdma2000HORequiredIndication ProtocolIE-ID ::= 84
+--WS extension
+id-Unknown-85 ProtocolIE-ID ::= 85
id-E-UTRAN-Trace-ID ProtocolIE-ID ::= 86
id-RelativeMMECapacity ProtocolIE-ID ::= 87
id-SourceMME-UE-S1AP-ID ProtocolIE-ID ::= 88