Update to 3GPP TS 36.413 V9.0.0 (2009-09)

svn path=/trunk/; revision=30232

7 files changed, 197 insertions, 43 deletions

diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn
index 7af5c60833..d2f2bd39ce 100644
--- a/asn1/s1ap/S1AP-CommonDataTypes.asn
+++ b/asn1/s1ap/S1AP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.7.0 (2009-09)
+-- 3GPP TS 36.413 V9.0.0 (2009-09)
 -- 9.3.5	Common Definitions
 -- **************************************************************
 --
@@ -34,3 +34,4 @@ TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuc
 
 END
 
+
diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn
index 4c76324b98..7195226427 100644
--- a/asn1/s1ap/S1AP-Constants.asn
+++ b/asn1/s1ap/S1AP-Constants.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.7.0 (2009-09)
+-- 3GPP TS 36.413 V9.0.0 (2009-09)
 -- 9.3.6	Constant Definitions
 -- **************************************************************
 --
@@ -71,12 +71,13 @@ id-LocationReport					ProcedureCode ::= 33
 id-OverloadStart					ProcedureCode ::= 34
 id-OverloadStop						ProcedureCode ::= 35
 id-WriteReplaceWarning				ProcedureCode ::= 36
-id-eNBDirectInformationTransfer			ProcedureCode ::= 37
-id-MMEDirectInformationTransfer			ProcedureCode ::= 38
+id-eNBDirectInformationTransfer		ProcedureCode ::= 37
+id-MMEDirectInformationTransfer	ProcedureCode ::= 38
 id-PrivateMessage					ProcedureCode ::= 39
 id-eNBConfigurationTransfer			ProcedureCode ::= 40
 id-MMEConfigurationTransfer			ProcedureCode ::= 41
 id-CellTrafficTrace					ProcedureCode ::= 42
+id-Kill								ProcedureCode ::= 43
 
 -- **************************************************************
 --
@@ -113,9 +114,8 @@ maxnoofCellinTAI						INTEGER ::= 65535
 maxnoofCellinEAI						INTEGER ::= 65535 
 maxnoofeNBX2TLAs						INTEGER ::= 2
 maxnoofRATs								INTEGER ::= 8
-maxnoofGroupIDs								INTEGER ::= 65535
-maxnoofMMECs								INTEGER ::= 256
-
+maxnoofGroupIDs							INTEGER ::= 65535
+maxnoofMMECs							INTEGER ::= 256
 
 
 
@@ -125,12 +125,12 @@ maxnoofMMECs								INTEGER ::= 256
 --
 -- **************************************************************
 
-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-eNB-UE-S1AP-ID								ProtocolIE-ID ::= 8
+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-eNB-UE-S1AP-ID							ProtocolIE-ID ::= 8
 id-E-RABSubjecttoDataForwardingList			ProtocolIE-ID ::= 12
 id-E-RABtoReleaseListHOCmd					ProtocolIE-ID ::= 13
 id-E-RABDataForwardingItem					ProtocolIE-ID ::= 14
@@ -144,8 +144,8 @@ id-E-RABFailedtoSetupItemHOReqAck			ProtocolIE-ID ::= 21
 id-E-RABToBeSwitchedDLList					ProtocolIE-ID ::= 22
 id-E-RABToBeSwitchedDLItem					ProtocolIE-ID ::= 23
 id-E-RABToBeSetupListCtxtSUReq				ProtocolIE-ID ::= 24
-id-TraceActivation								ProtocolIE-ID ::= 25
-id-NAS-PDU										ProtocolIE-ID ::= 26
+id-TraceActivation							ProtocolIE-ID ::= 25
+id-NAS-PDU									ProtocolIE-ID ::= 26
 id-E-RABToBeSetupItemHOReq					ProtocolIE-ID ::= 27
 id-E-RABSetupListBearerSURes				ProtocolIE-ID ::= 28
 id-E-RABFailedToSetupListBearerSURes		ProtocolIE-ID ::= 29
@@ -180,16 +180,16 @@ id-MMEname										ProtocolIE-ID ::= 61
 id-ServedPLMNs									ProtocolIE-ID ::= 63
 id-SupportedTAs									ProtocolIE-ID ::= 64
 id-TimeToWait									ProtocolIE-ID ::= 65
-id-uEaggregateMaximumBitrate						ProtocolIE-ID ::= 66
+id-uEaggregateMaximumBitrate					ProtocolIE-ID ::= 66
 id-TAI											ProtocolIE-ID ::= 67
-id-E-RABReleaseListBearerRelComp			ProtocolIE-ID ::= 69
+id-E-RABReleaseListBearerRelComp				ProtocolIE-ID ::= 69
 id-cdma2000PDU									ProtocolIE-ID ::= 70
 id-cdma2000RATType								ProtocolIE-ID ::= 71
 id-cdma2000SectorID								ProtocolIE-ID ::= 72
 id-SecurityKey									ProtocolIE-ID ::= 73
 id-UERadioCapability							ProtocolIE-ID ::= 74
 id-GUMMEI-ID									ProtocolIE-ID ::= 75
-id-E-RABInformationListItem					ProtocolIE-ID ::= 78
+id-E-RABInformationListItem						ProtocolIE-ID ::= 78
 id-Direct-Forwarding-Path-Availability			ProtocolIE-ID ::= 79
 id-UEIdentityIndexValue							ProtocolIE-ID ::= 80
 id-cdma2000HOStatus								ProtocolIE-ID ::= 83
@@ -202,23 +202,23 @@ id-eNB-StatusTransfer-TransparentContainer		ProtocolIE-ID ::= 90
 id-UE-associatedLogicalS1-ConnectionItem		ProtocolIE-ID ::= 91
 id-ResetType									ProtocolIE-ID ::= 92
 id-UE-associatedLogicalS1-ConnectionListResAck	ProtocolIE-ID ::= 93
-id-E-RABToBeSwitchedULItem					ProtocolIE-ID ::= 94
-id-E-RABToBeSwitchedULList					ProtocolIE-ID ::= 95
+id-E-RABToBeSwitchedULItem						ProtocolIE-ID ::= 94
+id-E-RABToBeSwitchedULList						ProtocolIE-ID ::= 95
 id-S-TMSI										ProtocolIE-ID ::= 96
 id-cdma2000OneXRAND								ProtocolIE-ID ::= 97
 id-RequestType									ProtocolIE-ID ::= 98
 id-UE-S1AP-IDs									ProtocolIE-ID ::= 99
-id-EUTRAN-CGI								ProtocolIE-ID ::= 100
+id-EUTRAN-CGI									ProtocolIE-ID ::= 100
 id-OverloadResponse								ProtocolIE-ID ::= 101
 id-cdma2000OneXSRVCCInfo						ProtocolIE-ID ::= 102
-id-E-RABFailedToBeReleasedList				ProtocolIE-ID ::= 103
-id-Source-ToTarget-TransparentContainer	ProtocolIE-ID ::= 104
+id-E-RABFailedToBeReleasedList					ProtocolIE-ID ::= 103
+id-Source-ToTarget-TransparentContainer			ProtocolIE-ID ::= 104
 id-ServedGUMMEIs								ProtocolIE-ID ::= 105
 id-SubscriberProfileIDforRFP					ProtocolIE-ID ::= 106
 id-UESecurityCapabilities						ProtocolIE-ID ::= 107
 id-CSFallbackIndicator							ProtocolIE-ID ::= 108
 id-CNDomain										ProtocolIE-ID ::= 109
-id-E-RABReleasedList						ProtocolIE-ID ::= 110
+id-E-RABReleasedList							ProtocolIE-ID ::= 110
 id-MessageIdentifier							ProtocolIE-ID ::= 111
 id-SerialNumber									ProtocolIE-ID ::= 112
 id-WarningAreaList								ProtocolIE-ID ::= 113
@@ -229,8 +229,8 @@ id-WarningSecurityInfo							ProtocolIE-ID ::= 117
 id-DataCodingScheme								ProtocolIE-ID ::= 118
 id-WarningMessageContents						ProtocolIE-ID ::= 119
 id-BroadcastCompletedAreaList					ProtocolIE-ID ::= 120
-id-Inter-SystemInformationTransferTypeEDT			ProtocolIE-ID ::= 121
-id-Inter-SystemInformationTransferTypeMDT			ProtocolIE-ID ::= 122
+id-Inter-SystemInformationTransferTypeEDT		ProtocolIE-ID ::= 121
+id-Inter-SystemInformationTransferTypeMDT		ProtocolIE-ID ::= 122
 id-Target-ToSource-TransparentContainer			ProtocolIE-ID ::= 123
 id-SRVCCOperationPossible						ProtocolIE-ID ::= 124
 id-SRVCCHOIndication							ProtocolIE-ID ::= 125
@@ -246,7 +246,12 @@ id-RRC-Establishment-Cause						ProtocolIE-ID ::= 134
 id-NASSecurityParametersfromE-UTRAN				ProtocolIE-ID ::= 135
 id-NASSecurityParameterstoE-UTRAN				ProtocolIE-ID ::= 136
 id-DefaultPagingDRX								ProtocolIE-ID ::= 137
-id-Source-ToTarget-TransparentContainer-Secondary			ProtocolIE-ID ::= 138
-id-Target-ToSource-TransparentContainer-Secondary			ProtocolIE-ID ::= 139
+id-Source-ToTarget-TransparentContainer-Secondary	ProtocolIE-ID ::= 138
+id-Target-ToSource-TransparentContainer-Secondary	ProtocolIE-ID ::= 139
+id-EUTRANRoundTripDelayEstimationInfo			ProtocolIE-ID ::= 140
+id-BroadcastCancelledAreaList					ProtocolIE-ID ::= 141
+id-ConcurrentWarningMessageIndicator			ProtocolIE-ID ::= 142
+
 END
 
+
diff --git a/asn1/s1ap/S1AP-Containers.asn b/asn1/s1ap/S1AP-Containers.asn
index af1aeb8698..6b9351416b 100644
--- a/asn1/s1ap/S1AP-Containers.asn
+++ b/asn1/s1ap/S1AP-Containers.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.7.0 (2009-09)
+-- 3GPP TS 36.413 V9.0.0 (2009-09)
 -- 9.3.7	Container Definitions
 -- **************************************************************
 --
@@ -200,3 +200,4 @@ PrivateIE-Field {S1AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 
 END
 
+
diff --git a/asn1/s1ap/S1AP-IEs.asn b/asn1/s1ap/S1AP-IEs.asn
index 69a5bd8bb4..0d843d8cfb 100644
--- a/asn1/s1ap/S1AP-IEs.asn
+++ b/asn1/s1ap/S1AP-IEs.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.7.0 (2009-09)
+-- 3GPP TS 36.413 V9.0.0 (2009-09)
 -- 9.3.4	Information Element Definitions
 -- **************************************************************
 --
@@ -100,6 +100,13 @@ BitRate	::= INTEGER (0..10000000000)
 
 BPLMNs ::= SEQUENCE (SIZE(1.. maxnoofBPLMNs)) OF PLMNidentity
 
+BroadcastCancelledAreaList ::= CHOICE {
+	cellID-Cancelled				CellID-Cancelled,
+	tAI-Cancelled					TAI-Cancelled,
+	emergencyAreaID-Cancelled		EmergencyAreaID-Cancelled,
+	...
+}
+
 BroadcastCompletedAreaList ::= CHOICE {
 	cellID-Broadcast				CellID-Broadcast,
 	tAI-Broadcast					TAI-Broadcast,
@@ -110,6 +117,32 @@ BroadcastCompletedAreaList ::= CHOICE {
 
 -- C
 
+CancelledCellinEAI ::= SEQUENCE (SIZE(1..maxnoofCellinEAI)) OF CancelledCellinEAI-Item
+
+CancelledCellinEAI-Item ::= SEQUENCE {
+	eCGI					EUTRAN-CGI,
+	numberOfBroadcasts	NumberOfBroadcasts,
+	iE-Extensions			ProtocolExtensionContainer { {CancelledCellinEAI-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+CancelledCellinEAI-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
+CancelledCellinTAI ::= SEQUENCE (SIZE(1..maxnoofCellinTAI)) OF CancelledCellinTAI-Item
+
+CancelledCellinTAI-Item ::= SEQUENCE{
+	eCGI				EUTRAN-CGI,
+	numberOfBroadcasts	NumberOfBroadcasts,
+	iE-Extensions		ProtocolExtensionContainer { {CancelledCellinTAI-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+CancelledCellinTAI-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 Cause ::= CHOICE {
 	radioNetwork		CauseRadioNetwork,
 	transport			CauseTransport,
@@ -211,6 +244,18 @@ CellID-Broadcast-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+CellID-Cancelled::= SEQUENCE (SIZE(1..maxnoofCellID)) OF CellID-Cancelled-Item
+
+CellID-Cancelled-Item ::= SEQUENCE {
+	eCGI				EUTRAN-CGI,
+	numberOfBroadcasts	NumberOfBroadcasts,
+	iE-Extensions		ProtocolExtensionContainer { {CellID-Cancelled-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+CellID-Cancelled-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 Cdma2000PDU	::= OCTET STRING
 
@@ -286,6 +331,10 @@ CNDomain ::= ENUMERATED {
 	cs 
 }
 
+ConcurrentWarningMessageIndicator ::= ENUMERATED {
+	true
+}
+
 CSFallbackIndicator ::= ENUMERATED { 
 	cs-fallback-required,
 	...,
@@ -359,6 +408,7 @@ Direct-Forwarding-Path-Availability ::= ENUMERATED {
 	...
 }
 
+
 -- E
 
 ECGIList ::= SEQUENCE (SIZE(1..maxnoofCellID)) OF EUTRAN-CGI
@@ -380,6 +430,18 @@ EmergencyAreaID-Broadcast-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+EmergencyAreaID-Cancelled ::= SEQUENCE (SIZE(1..maxnoofEmergencyAreaID)) OF EmergencyAreaID-Cancelled-Item
+
+EmergencyAreaID-Cancelled-Item ::= SEQUENCE {
+	emergencyAreaID			EmergencyAreaID,
+	cancelledCellinEAI		CancelledCellinEAI,
+	iE-Extensions			ProtocolExtensionContainer { {EmergencyAreaID-Cancelled-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+EmergencyAreaID-Cancelled-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
 
 CompletedCellinEAI ::= SEQUENCE (SIZE(1..maxnoofCellinEAI)) OF CompletedCellinEAI-Item
 
@@ -514,6 +576,8 @@ EUTRAN-CGI-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+EUTRANRoundTripDelayEstimationInfo ::= INTEGER (0..255)
+
 ExtendedRNC-ID					::= INTEGER (4096..65535)
 
 -- F
@@ -693,7 +757,7 @@ NASSecurityParameterstoE-UTRAN ::= OCTET STRING
 
 NumberofBroadcastRequest ::= INTEGER (0..65535)
 
-NumberofBroadcast ::= INTEGER (0..65535)
+NumberOfBroadcasts ::= INTEGER (0..65535)
 
 -- O
 OldBSS-ToNewBSS-Information		::= OCTET STRING
@@ -976,6 +1040,19 @@ TAI-Broadcast-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+TAI-Cancelled ::= SEQUENCE (SIZE(1..maxnoofTAIforWarning)) OF TAI-Cancelled-Item
+
+TAI-Cancelled-Item ::= SEQUENCE {
+	tAI					TAI,
+	cancelledCellinTAI	CancelledCellinTAI,
+	iE-Extensions			ProtocolExtensionContainer { {TAI-Cancelled-Item-ExtIEs} } OPTIONAL,
+	...
+}
+
+TAI-Cancelled-Item-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 CompletedCellinTAI ::= SEQUENCE (SIZE(1..maxnoofCellinTAI)) OF CompletedCellinTAI-Item
 
 CompletedCellinTAI-Item ::= SEQUENCE{
@@ -1178,3 +1255,4 @@ X2TNLConfigurationInfo-ExtIEs S1AP-PROTOCOL-EXTENSION ::= {
 
 END
 
+
diff --git a/asn1/s1ap/S1AP-PDU-Contents.asn b/asn1/s1ap/S1AP-PDU-Contents.asn
index 9e0a8ab6be..978413a980 100644
--- a/asn1/s1ap/S1AP-PDU-Contents.asn
+++ b/asn1/s1ap/S1AP-PDU-Contents.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.7.0 (2009-09)
+-- 3GPP TS 36.413V9.0.0 (2009-09)
 -- 9.3.3	PDU Definitions
 -- **************************************************************
 --
@@ -32,7 +32,9 @@ IMPORTS
 	Cdma2000PDU,
 	Cdma2000RATType,
 	Cdma2000SectorID,
+	EUTRANRoundTripDelayEstimationInfo,
 	CNDomain,
+	ConcurrentWarningMessageIndicator,
 	CriticalityDiagnostics,
 	CSFallbackIndicator,
 	CSG-Id,
@@ -102,7 +104,8 @@ IMPORTS
 	DataCodingScheme,
 	WarningMessageContents,
 	BroadcastCompletedAreaList,
-	RRC-Establishment-Cause
+	RRC-Establishment-Cause,
+	BroadcastCancelledAreaList
 
 FROM S1AP-IEs
 
@@ -129,7 +132,9 @@ FROM S1AP-Containers
 	id-cdma2000PDU,
 	id-cdma2000RATType,
 	id-cdma2000SectorID,
+	id-EUTRANRoundTripDelayEstimationInfo,
 	id-CNDomain,
+	id-ConcurrentWarningMessageIndicator,
 	id-CriticalityDiagnostics,
 	id-CSFallbackIndicator,
 	id-CSG-Id,
@@ -240,6 +245,7 @@ FROM S1AP-Containers
 	id-DataCodingScheme,
 	id-WarningMessageContents,
 	id-BroadcastCompletedAreaList,
+	id-BroadcastCancelledAreaList,
 	id-RRC-Establishment-Cause,
 	id-TraceCollectionEntityIPAddress,
 	maxnoofTAIs,
@@ -1191,12 +1197,13 @@ UEContextModificationRequest ::= SEQUENCE {
 }
 
 UEContextModificationRequestIEs S1AP-PROTOCOL-IES ::= {	
-	{ ID id-MME-UE-S1AP-ID					CRITICALITY reject	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
+	{ ID id-MME-UE-S1AP-ID				CRITICALITY reject	TYPE MME-UE-S1AP-ID		 			PRESENCE mandatory	} |
 	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory	} |	
 	{ ID id-SecurityKey					CRITICALITY reject	TYPE SecurityKey		 			PRESENCE optional	}|
-	{ ID id-SubscriberProfileIDforRFP		CRITICALITY ignore	TYPE SubscriberProfileIDforRFP	PRESENCE optional	}|
-	{ ID id-uEaggregateMaximumBitrate		CRITICALITY ignore	TYPE UEAggregateMaximumBitrate		PRESENCE optional	}|
-	{ ID id-CSFallbackIndicator				CRITICALITY reject		TYPE CSFallbackIndicator		PRESENCE optional	},
+	{ ID id-SubscriberProfileIDforRFP	CRITICALITY ignore	TYPE SubscriberProfileIDforRFP	PRESENCE optional	}|
+	{ ID id-uEaggregateMaximumBitrate	CRITICALITY ignore	TYPE UEAggregateMaximumBitrate		PRESENCE optional	}|
+	{ ID id-CSFallbackIndicator			CRITICALITY reject		TYPE CSFallbackIndicator		PRESENCE optional	}|
+	{ ID id-UESecurityCapabilities		CRITICALITY reject	TYPE UESecurityCapabilities			PRESENCE optional	},
 	...
 }
 -- **************************************************************
@@ -1648,10 +1655,12 @@ UplinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-eNB-UE-S1AP-ID				CRITICALITY reject	TYPE ENB-UE-S1AP-ID				PRESENCE mandatory	} |
 	{ ID id-cdma2000RATType				CRITICALITY reject	TYPE Cdma2000RATType 			PRESENCE mandatory	} |
 	{ ID id-cdma2000SectorID			CRITICALITY reject	TYPE Cdma2000SectorID 			PRESENCE mandatory	} |
-	{ ID id-cdma2000HORequiredIndication			CRITICALITY ignore	TYPE Cdma2000HORequiredIndication 			PRESENCE optional	} |
-	{ ID id-cdma2000OneXSRVCCInfo			CRITICALITY reject	TYPE Cdma2000OneXSRVCCInfo 			PRESENCE optional	} |
+	{ ID id-cdma2000HORequiredIndication	CRITICALITY ignore	TYPE Cdma2000HORequiredIndication 			PRESENCE optional	} |
+	{ ID id-cdma2000OneXSRVCCInfo		CRITICALITY reject	TYPE Cdma2000OneXSRVCCInfo 			PRESENCE optional	} |
 	{ ID id-cdma2000OneXRAND			CRITICALITY reject	TYPE Cdma2000OneXRAND 			PRESENCE optional	} |
-	{ ID id-cdma2000PDU					CRITICALITY reject	TYPE Cdma2000PDU	 			PRESENCE mandatory	},
+	{ ID id-cdma2000PDU					CRITICALITY reject	TYPE Cdma2000PDU	 			PRESENCE mandatory	}|
+	{ ID id-EUTRANRoundTripDelayEstimationInfo	CRITICALITY ignore	TYPE EUTRANRoundTripDelayEstimationInfo		PRESENCE optional},
+	-- Extension for Release 9 to assist target HRPD access with the acquisition of the UE --
 	...
 }
 
@@ -1946,7 +1955,8 @@ WriteReplaceWarningRequestIEs S1AP-PROTOCOL-IES ::= {
 	{ ID id-WarningType					CRITICALITY ignore	TYPE WarningType			PRESENCE optional		}|
 	{ ID id-WarningSecurityInfo			CRITICALITY ignore	TYPE WarningSecurityInfo	PRESENCE optional		}|
 	{ ID id-DataCodingScheme			CRITICALITY ignore	TYPE DataCodingScheme		PRESENCE optional		}|
-	{ ID id-WarningMessageContents		CRITICALITY ignore	TYPE WarningMessageContents		PRESENCE optional		},
+	{ ID id-WarningMessageContents		CRITICALITY ignore	TYPE WarningMessageContents		PRESENCE optional		}|
+	{ ID id-ConcurrentWarningMessageIndicator	CRITICALITY reject	TYPE ConcurrentWarningMessageIndicator		PRESENCE optional		},
 	...
 }
 -- **************************************************************
@@ -2081,5 +2091,43 @@ PrivateMessageIEs S1AP-PRIVATE-IES ::= {
 	...
 }
 
+-- **************************************************************
+--
+-- Kill Request
+--
+-- **************************************************************
+
+
+KillRequest ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container       { {KillRequestIEs} },
+	...
+}
+
+KillRequestIEs S1AP-PROTOCOL-IES ::= {	
+	{ ID id-MessageIdentifier			CRITICALITY reject	TYPE MessageIdentifier		PRESENCE mandatory		}|
+	{ ID id-SerialNumber				CRITICALITY reject	TYPE SerialNumber		PRESENCE mandatory		}|
+	{ ID id-WarningAreaList				CRITICALITY ignore	TYPE WarningAreaList		PRESENCE optional		},
+	...
+}
+
+-- **************************************************************
+--
+-- Kill Response
+--
+-- **************************************************************
+
+KillResponse ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container		{ {KillResponseIEs} },
+	...
+}
+
+KillResponseIEs S1AP-PROTOCOL-IES ::= {
+	{ ID id-MessageIdentifier			CRITICALITY reject	TYPE MessageIdentifier				PRESENCE mandatory		}|
+	{ ID id-SerialNumber				CRITICALITY reject	TYPE SerialNumber					PRESENCE mandatory		}|
+	{ ID id-BroadcastCancelledAreaList	CRITICALITY ignore	TYPE BroadcastCancelledAreaList		PRESENCE mandatory	}|
+	{ ID id-CriticalityDiagnostics		CRITICALITY ignore	TYPE CriticalityDiagnostics			PRESENCE optional},
+	...
+}
+
 END
 
diff --git a/asn1/s1ap/S1AP-PDU-Descriptions.asn b/asn1/s1ap/S1AP-PDU-Descriptions.asn
index a96d4892db..de5b91d37b 100644
--- a/asn1/s1ap/S1AP-PDU-Descriptions.asn
+++ b/asn1/s1ap/S1AP-PDU-Descriptions.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V8.7.0 (2009-09)
+-- 3GPP TS 36.413 V9.0.0 (2009-09)
 -- 9.3.2	Elementary Procedure Definitions
 -- **************************************************************
 --
@@ -49,6 +49,8 @@ FROM S1AP-CommonDataTypes
 	InitialContextSetupRequest,
 	InitialContextSetupResponse,
 	InitialUEMessage,
+	KillRequest,
+	KillResponse,
 	LocationReportingControl,
 	LocationReportingFailureIndication,
 	LocationReport,
@@ -109,6 +111,7 @@ FROM S1AP-PDU-Contents
 	id-InitialContextSetup,
 	id-initialUEMessage,
 	id-ENBConfigurationUpdate,
+	id-Kill,
 	id-LocationReportingControl,
 	id-LocationReportingFailureIndication,
 	id-LocationReport,
@@ -216,6 +219,7 @@ S1AP-ELEMENTARY-PROCEDURES-CLASS-1 S1AP-ELEMENTARY-PROCEDURE ::= {
 	e-RABRelease					|
 	initialContextSetup				|
 	handoverCancel					|
+	kill							|
 	reset							|
 	s1Setup							|
 	uEContextModification			|
@@ -545,4 +549,12 @@ privateMessage S1AP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY			ignore
 }
 
+kill S1AP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE	KillRequest
+	SUCCESSFUL OUTCOME	KillResponse
+	PROCEDURE CODE		id-Kill
+	CRITICALITY			reject
+}
+
 END
+
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index c9e1df36b1..04318e4ec6 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -29,7 +29,6 @@ ProtocolError-IE-ContainerList
 E-RAB-IE-ContainerPairList
 Presence
 L3-Information
-NumberofBroadcast
 OldBSS-ToNewBSS-Information
 SourceBSS-ToTargetBSS-TransparentContainer
 SourceeNB-ToTargeteNB-TransparentContainer
@@ -295,6 +294,7 @@ id-PrivateMessage						ProcedureCode
 id-eNBConfigurationTransfer				ProcedureCode
 id-MMEConfigurationTransfer				ProcedureCode
 id-CellTrafficTrace						ProcedureCode
+id-Kill									ProcedureCode
 
 # ProtocolIE-ID
 id-MME-UE-S1AP-ID									ProtocolIE-ID
@@ -420,6 +420,9 @@ id-NASSecurityParameterstoE-UTRAN					ProtocolIE-ID
 id-DefaultPagingDRX									ProtocolIE-ID
 id-Source-ToTarget-TransparentContainer-Secondary	ProtocolIE-ID
 id-Target-ToSource-TransparentContainer-Secondary	ProtocolIE-ID
+id-EUTRANRoundTripDelayEstimationInfo				ProtocolIE-ID
+id-BroadcastCancelledAreaList						ProtocolIE-ID
+id-ConcurrentWarningMessageIndicator				ProtocolIE-ID
 #.END
 
 #.REGISTER_NEW
@@ -544,6 +547,9 @@ NASSecurityParameterstoE-UTRAN			N s1ap.ies id-NASSecurityParameterstoE-UTRAN
 PagingDRX								N s1ap.ies id-DefaultPagingDRX
 Source-ToTarget-TransparentContainer	N s1ap.ies id-Source-ToTarget-TransparentContainer-Secondary
 Target-ToSource-TransparentContainer	N s1ap.ies id-Target-ToSource-TransparentContainer-Secondary
+EUTRANRoundTripDelayEstimationInfo		N s1ap.ies id-EUTRANRoundTripDelayEstimationInfo
+BroadcastCancelledAreaList				N s1ap.ies id-BroadcastCancelledAreaList
+ConcurrentWarningMessageIndicator		N s1ap.ies id-ConcurrentWarningMessageIndicator
 
 #S1AP-PROTOCOL-IES-PAIR
 #RAB-SetupOrModifyItemFirst				N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
@@ -663,6 +669,9 @@ MMEConfigurationTransfer				N s1ap.proc.imsg id-MMEConfigurationTransfer
 
 CellTrafficTrace						N s1ap.proc.imsg id-CellTrafficTrace
 
+KillRequest								N s1ap.proc.imsg id-Kill
+KillResponse							N s1ap.proc.sout id-Kill
+
 
 #.TYPE_ATTR
 BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL