Update to latest spec.

svn path=/trunk/; revision=24849

1 files changed, 121 insertions, 92 deletions

diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn
index 5239d1911d..4cec21140c 100644
--- a/asn1/s1ap/S1AP-Constants.asn
+++ b/asn1/s1ap/S1AP-Constants.asn
@@ -16,29 +16,49 @@ BEGIN
 
 -- **************************************************************
 --
+-- IE parameter types from other modules.
+--
+-- **************************************************************
+
+IMPORTS
+	ProcedureCode,
+	ProtocolIE-ID
+
+FROM S1AP-CommonDataTypes;
+
+
+-- **************************************************************
+--
 -- Elementary Procedures
 --
 -- **************************************************************
 
-id-HandoverPreparation 				INTEGER ::= 0
-id-HandoverResourceAllocation 		INTEGER ::= 1
-id-HandoverNotification 			INTEGER ::= 2
-id-PathSwitchRequest 				INTEGER ::= 3
-id-HandoverCancel 					INTEGER ::= 4
-id-SAEBearerSetup						INTEGER ::= 5
-id-SAEBearerModify 					INTEGER ::= 6
-id-SAEBearerRelease					INTEGER ::= 7
-id-SAEBearerReleaseRequest				INTEGER ::= 8
-id-InitialContextSetup						INTEGER ::= 9
-id-Paging							INTEGER ::= 10
-id-downlinkNASTransport				INTEGER ::= 11
-id-initialUEMessage					INTEGER ::= 12
-id-uplinkNASTransport				INTEGER ::= 13
-id-Reset							INTEGER ::= 14
-id-ErrorIndication					INTEGER ::= 15
-id-NASNonDeliveryIndication			INTEGER ::= 16
-id-S1Setup							INTEGER ::= 17
-id-UEContextReleaseRequest			INTEGER ::= 18
+id-HandoverPreparation 				ProcedureCode ::= 0
+id-HandoverResourceAllocation 		ProcedureCode ::= 1
+id-HandoverNotification 			ProcedureCode ::= 2
+id-PathSwitchRequest 				ProcedureCode ::= 3
+id-HandoverCancel 					ProcedureCode ::= 4
+id-SAEBearerSetup						ProcedureCode ::= 5
+id-SAEBearerModify 					ProcedureCode ::= 6
+id-SAEBearerRelease					ProcedureCode ::= 7
+id-SAEBearerReleaseRequest				ProcedureCode ::= 8
+id-InitialContextSetup						ProcedureCode ::= 9
+id-Paging							ProcedureCode ::= 10
+id-downlinkNASTransport				ProcedureCode ::= 11
+id-initialUEMessage					ProcedureCode ::= 12
+id-uplinkNASTransport				ProcedureCode ::= 13
+id-Reset							ProcedureCode::= 14
+id-ErrorIndication					ProcedureCode ::= 15
+id-NASNonDeliveryIndication			ProcedureCode ::= 16
+id-S1Setup							ProcedureCode ::= 17
+id-UEContextReleaseRequest			ProcedureCode ::= 18
+id-DownlinkS1cdma2000tunneling		ProcedureCode ::= 19
+id-UplinkS1cdma2000tunneling		ProcedureCode ::= 20
+id-UEContextModification			ProcedureCode ::= 21
+id-UECapabilityInfoIndication		ProcedureCode ::= 22
+id-UEContextRelease					ProcedureCode ::= 23
+id-eNBStatusTransfer				ProcedureCode ::= 24
+id-MMEStatusTransfer				ProcedureCode ::= 25
 
 
 -- **************************************************************
@@ -61,7 +81,6 @@ maxNrOfInterfaces						INTEGER ::= 3   --FFS
 maxnoofTAI								INTEGER ::= 256 --FFS
 maxNrOfErrors							INTEGER ::= 256
 maxnoofBPLMNs							INTEGER ::= 6
-maxnoofNRIs								INTEGER ::= 512 -- FFS
 maxnoofPLMNsPerMME						INTEGER ::= 32 -- FFS
 maxnoofTAIs								INTEGER ::= 256  -- FFS 
 maxnoofEPLMNs							INTEGER ::= 15
@@ -77,77 +96,87 @@ maxnoofForbTAIs							INTEGER ::= 256		-- FFS Value to be checked
 --
 -- **************************************************************
 
-id-MME-UE-S1AP-ID									INTEGER ::= 0
-id-HandoverType									INTEGER ::= 1
-id-Cause										INTEGER ::= 2
-id-SourceID										INTEGER ::= 3
-id-TargetID										INTEGER ::= 4
-id-Intra-LTEHOInformationReq					INTEGER ::= 5
-id-LTEtoUTRANHOInformationReq					INTEGER ::= 6
-id-LTEtoGERANHOInformationReq					INTEGER ::= 7
-id-eNB-UE-S1AP-ID								INTEGER ::= 8
-id-Intra-LTEHOInformationRes					INTEGER ::= 9
-id-LTEtoUTRANHOInformationRes					INTEGER ::= 10
-id-LTEtoGERANHOInformationRes					INTEGER ::= 11
-id-SAEBearerSubjecttoDataForwardingList		INTEGER ::= 12
-id-SAEBearertoReleaseListHOCmd				INTEGER ::= 13
-id-SAEBearerDataForwardingItem				INTEGER ::= 14
-id-SAEBearerReleaseItemBearerRelComp			INTEGER ::= 15
-id-SAEBearerToBeSetupListBearerSUReq			INTEGER ::= 16
-id-SAEBearerToBeSetupItemBearerSUReq			INTEGER ::= 17
-id-SAEBearerAdmittedList						INTEGER ::= 18
-id-SAEBearerFailedToSetupListHOReqAck		INTEGER ::= 19
-id-SAEBearerAdmittedItem						INTEGER ::= 20
-id-SAEBearerFailedtoSetupItemHOReqAck				INTEGER ::= 21
-id-SAEBearerToBeSwitchedDLList					INTEGER ::= 22
-id-SAEBearerToBeSwitchedDLItem				INTEGER ::= 23
-id-SAEBearerToBeSetupListCtxtSUReq				INTEGER::= 24
-id-TraceActivation								INTEGER::= 25
-id-NAS-PDU								INTEGER ::= 26
-id-SAEBearerToBeSetupItemHOReq						INTEGER ::= 27
-id-SAEBearerSetupListBearerSURes					INTEGER ::= 28
-id-SAEBearerFailedToSetupListBearerSURes			INTEGER ::= 29
-id-SAEBearerToBeModifiedListBearerModReq			INTEGER ::= 30
-id-SAEBearerModifyListBearerModRes					INTEGER ::= 31
-id-SAEBearerFailedToModifyList						INTEGER ::= 32
-id-SAEBearerToBeReleasedList						INTEGER ::= 33
-id-SAEBearerReleaseListBearerRelComp				INTEGER ::= 33
-id-SAEBearerFailedToReleaseList					INTEGER ::= 34
-id-SAEBearerItem									INTEGER ::= 35
-id-SAEBearerToBeModifiedItemBearerModReq		INTEGER ::= 36
-id-SAEBearerModifyItemBearerModRes				INTEGER ::= 37
-id-SAEBearerReleaseItem							INTEGER ::= 38
-id-SAEBearerSetupItemBearerSURes					INTEGER ::= 39
-id-Security-Information							INTEGER ::= 40
-id-HandoverRestrictionList						INTEGER ::= 41
-id-s-TMSI 										INTEGER ::= 43
-id-pagingDRX 									INTEGER ::= 44
-id-pagingCause									INTEGER ::= 45
-id-TAIdList										INTEGER ::= 46
-id-TAIdItem										INTEGER ::= 47
-id-SAEBearerFailedToSetupListCtxtSURes			INTEGER ::= 48
-id-SAEBearerReleaseItemHOCmd					INTEGER ::= 49
-id-SAEBearerSetupItemCtxtSURes					INTEGER ::= 50
-id-SAEBearerSetupListCtxtSURes					INTEGER ::= 51
-id-SAEBearerToBeSetupItemCtxtSUReq				INTEGER ::= 52
-id-SAEBearerToBeSetupListHOReq				INTEGER ::= 53
-id-GERANtoLTEHOInformationReq				INTEGER ::= 54
-id-GERANtoLTEHOInformationRes				INTEGER ::= 55
-id-UTRANtoLTEHOInformationReq				INTEGER ::= 56
-id-UTRANtoLTEHOInformationRes				INTEGER ::= 57
-id-CriticalityDiagnostics 					INTEGER ::= 58
-id-ENB-ID									INTEGER ::= 59
-id-eNBname									INTEGER ::= 60
-id-MMEname									INTEGER ::= 61
-id-NRIs										INTEGER ::= 62
-id-ServedPLMNs								INTEGER ::= 63
-id-SupportedTAIs							INTEGER ::= 64
-id-TimeToWait								INTEGER ::= 65
-id-aggregateMaximumBitrate					INTEGER ::= 66
-id-TAId										INTEGER ::= 67
-id-ServingPLMN								INTEGER ::= 68
-
-
-
+id-MME-UE-S1AP-ID									ProtocolIE-ID ::= 0
+id-HandoverType									ProtocolIE-ID ::= 1
+id-Cause										ProtocolIE-ID ::= 2
+id-SourceID										ProtocolIE-ID ::= 3
+id-TargetID										ProtocolIE-ID ::= 4
+id-Intra-LTEHOInformationReq					ProtocolIE-ID ::= 5
+id-LTEtoUTRANHOInformationReq					ProtocolIE-ID ::= 6
+id-LTEtoGERANHOInformationReq					ProtocolIE-ID ::= 7
+id-eNB-UE-S1AP-ID								ProtocolIE-ID ::= 8
+id-Intra-LTEHOInformationRes					ProtocolIE-ID ::= 9
+id-LTEtoUTRANHOInformationRes					ProtocolIE-ID ::= 10
+id-LTEtoGERANHOInformationRes					ProtocolIE-ID ::= 11
+id-SAEBearerSubjecttoDataForwardingList			ProtocolIE-ID ::= 12
+id-SAEBearertoReleaseListHOCmd					ProtocolIE-ID ::= 13
+id-SAEBearerDataForwardingItem					ProtocolIE-ID ::= 14
+id-SAEBearerReleaseItemBearerRelComp			ProtocolIE-ID ::= 15
+id-SAEBearerToBeSetupListBearerSUReq			ProtocolIE-ID ::= 16
+id-SAEBearerToBeSetupItemBearerSUReq			ProtocolIE-ID ::= 17
+id-SAEBearerAdmittedList						ProtocolIE-ID ::= 18
+id-SAEBearerFailedToSetupListHOReqAck			ProtocolIE-ID ::= 19
+id-SAEBearerAdmittedItem						ProtocolIE-ID ::= 20
+id-SAEBearerFailedtoSetupItemHOReqAck			ProtocolIE-ID ::= 21
+id-SAEBearerToBeSwitchedDLList					ProtocolIE-ID ::= 22
+id-SAEBearerToBeSwitchedDLItem					ProtocolIE-ID ::= 23
+id-SAEBearerToBeSetupListCtxtSUReq				ProtocolIE-ID ::= 24
+id-TraceActivation								ProtocolIE-ID ::= 25
+id-NAS-PDU										ProtocolIE-ID ::= 26
+id-SAEBearerToBeSetupItemHOReq					ProtocolIE-ID ::= 27
+id-SAEBearerSetupListBearerSURes				ProtocolIE-ID ::= 28
+id-SAEBearerFailedToSetupListBearerSURes		ProtocolIE-ID ::= 29
+id-SAEBearerToBeModifiedListBearerModReq		ProtocolIE-ID ::= 30
+id-SAEBearerModifyListBearerModRes				ProtocolIE-ID ::= 31
+id-SAEBearerFailedToModifyList					ProtocolIE-ID ::= 32
+id-SAEBearerToBeReleasedList					ProtocolIE-ID ::= 33
+id-SAEBearerFailedToReleaseList					ProtocolIE-ID ::= 34
+id-SAEBearerItem								ProtocolIE-ID ::= 35
+id-SAEBearerToBeModifiedItemBearerModReq		ProtocolIE-ID ::= 36
+id-SAEBearerModifyItemBearerModRes				ProtocolIE-ID ::= 37
+id-SAEBearerReleaseItem							ProtocolIE-ID ::= 38
+id-SAEBearerSetupItemBearerSURes				ProtocolIE-ID ::= 39
+id-Security-Information							ProtocolIE-ID ::= 40
+id-HandoverRestrictionList						ProtocolIE-ID ::= 41
+id-UEPagingID 									ProtocolIE-ID ::= 43
+id-pagingDRX 									ProtocolIE-ID ::= 44
+id-pagingCause									ProtocolIE-ID ::= 45
+id-TAIdList										ProtocolIE-ID ::= 46
+id-TAIdItem										ProtocolIE-ID ::= 47
+id-SAEBearerFailedToSetupListCtxtSURes			ProtocolIE-ID ::= 48
+id-SAEBearerReleaseItemHOCmd					ProtocolIE-ID ::= 49
+id-SAEBearerSetupItemCtxtSURes					ProtocolIE-ID ::= 50
+id-SAEBearerSetupListCtxtSURes					ProtocolIE-ID ::= 51
+id-SAEBearerToBeSetupItemCtxtSUReq				ProtocolIE-ID ::= 52
+id-SAEBearerToBeSetupListHOReq					ProtocolIE-ID ::= 53
+id-GERANtoLTEHOInformationReq					ProtocolIE-ID ::= 54
+id-GERANtoLTEHOInformationRes					ProtocolIE-ID ::= 55
+id-UTRANtoLTEHOInformationReq					ProtocolIE-ID ::= 56
+id-UTRANtoLTEHOInformationRes					ProtocolIE-ID ::= 57
+id-CriticalityDiagnostics 						ProtocolIE-ID ::= 58
+id-ENB-Global-ID								ProtocolIE-ID ::= 59
+id-eNBname										ProtocolIE-ID ::= 60
+id-MMEname										ProtocolIE-ID ::= 61
+id-ServedPLMNs									ProtocolIE-ID ::= 63
+id-SupportedTAIs								ProtocolIE-ID ::= 64
+id-TimeToWait									ProtocolIE-ID ::= 65
+id-aggregateMaximumBitrate						ProtocolIE-ID ::= 66
+id-TAId											ProtocolIE-ID ::= 67
+id-ServingPLMN									ProtocolIE-ID ::= 68
+id-SAEBearerReleaseListBearerRelComp			ProtocolIE-ID ::= 69
+id-cdma2000PDU									ProtocolIE-ID ::= 70
+id-cdma2000RATType								ProtocolIE-ID ::= 71
+id-cdma2000SectorID								ProtocolIE-ID ::= 72
+id-SecurityInfo									ProtocolIE-ID ::= 73
+id-UERadioCapability							ProtocolIE-ID ::= 74
+id-GUMMEI-ID									ProtocolIE-ID ::= 75
+id-Bearers-SubjectToStatusTransferENB-List		ProtocolIE-ID ::= 76
+id-Bearers-SubjectToStatusTransferENB-Item		ProtocolIE-ID ::= 77
+id-SAEBearerInformationListItem					ProtocolIE-ID ::= 78
+id-Direct-Forwarding-Path-Availability			ProtocolIE-ID ::= 79
+id-UEIdentityIndexValue							ProtocolIE-ID ::= 80
+id-Bearers-SubjectToStatusTransferMME-List		ProtocolIE-ID ::= 80
+id-Bearers-SubjectToStatusTransferMME-Item		ProtocolIE-ID ::= 81
 
 END
+