Update to V9.1.0 (2010-03)

svn path=/trunk/; revision=32778

7 files changed, 55 insertions, 15 deletions

diff --git a/asn1/hnbap/HNBAP-CommonDataTypes.asn b/asn1/hnbap/HNBAP-CommonDataTypes.asn
index aaf4a3e787..c053cc4e14 100644
--- a/asn1/hnbap/HNBAP-CommonDataTypes.asn
+++ b/asn1/hnbap/HNBAP-CommonDataTypes.asn
@@ -1,6 +1,6 @@
 -- HNBAP-CommonDataTypes.asn
 --
--- 3GPP TS 25.469 V9.0.0 (2009-12)
+-- 3GPP TS 25.469 V9.1.0 (2010-03)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.5	Common Definitions
diff --git a/asn1/hnbap/HNBAP-Constants.asn b/asn1/hnbap/HNBAP-Constants.asn
index c8785bfe46..347e1ff3fe 100644
--- a/asn1/hnbap/HNBAP-Constants.asn
+++ b/asn1/hnbap/HNBAP-Constants.asn
@@ -1,6 +1,6 @@
 -- HNBAP-Constants.asn
 --
--- 3GPP TS 25.469 V9.0.0 (2009-12)
+-- 3GPP TS 25.469 V9.1.0 (2010-03)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.6	Constant Definitions
@@ -36,7 +36,8 @@ id-HNBDe-Register					ProcedureCode ::= 2
 id-UERegister						ProcedureCode ::= 3
 id-UEDe-Register					ProcedureCode ::= 4
 id-ErrorIndication					ProcedureCode ::= 5
-id-privateMessage					ProcedureCode ::= 6
+id-privateMessage					ProcedureCode ::= 6 
+id-CSGMembershipUpdate				ProcedureCode ::= 7
  
 
 
@@ -46,7 +47,6 @@ id-privateMessage					ProcedureCode ::= 6
 --
 -- **************************************************************
 maxNrOfErrors						INTEGER ::= 256
-maxUEs								INTEGER ::= 64
 
 
 -- **************************************************************
diff --git a/asn1/hnbap/HNBAP-Containers.asn b/asn1/hnbap/HNBAP-Containers.asn
index e17821acdf..27d3913c37 100644
--- a/asn1/hnbap/HNBAP-Containers.asn
+++ b/asn1/hnbap/HNBAP-Containers.asn
@@ -1,6 +1,6 @@
 -- HNBAP-Containers.asn
 --
--- 3GPP TS 25.469 V8.4.0 (2009-12)
+-- 3GPP TS 25.469 V9.1.0 (2010-03)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.7	Container Definitions
diff --git a/asn1/hnbap/HNBAP-IEs.asn b/asn1/hnbap/HNBAP-IEs.asn
index f5502a25f3..3f5eaaa24d 100644
--- a/asn1/hnbap/HNBAP-IEs.asn
+++ b/asn1/hnbap/HNBAP-IEs.asn
@@ -1,6 +1,6 @@
 -- HNBAP-IEs.asn
 --
--- 3GPP TS 25.469 V9.0.0 (2009-12)
+-- 3GPP TS 25.469 V9.1.0 (2010-03)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.4	Information Element Definitions
@@ -24,7 +24,6 @@ BEGIN
 
 IMPORTS
 	maxNrOfErrors,
-	maxUEs,
 	id-HNB-Internet-Information
 	
 FROM HNBAP-Constants
@@ -42,7 +41,7 @@ FROM HNBAP-Containers;
 
 --A
 Access-stratum-release-indicator ::=	ENUMERATED {r99,
-										rel-4, rel-5, rel-6, rel-7, rel-8,
+										rel-4, rel-5, rel-6, rel-7, rel-8-and-beyond,
 										...}
 
 AltitudeAndDirection ::= SEQUENCE {
@@ -382,7 +381,7 @@ UE-Identity	::=	CHOICE {
 	eSN			ESN,
 	iMSIDS41	IMSIDS41,
 	iMSIESN		IMSIESN,
-	tMSIDS1		TMSIDS41,
+	tMSIDS41	TMSIDS41,
 	...
 }
 
diff --git a/asn1/hnbap/HNBAP-PDU-Contents.asn b/asn1/hnbap/HNBAP-PDU-Contents.asn
index 9b229e4eef..df5db8041a 100644
--- a/asn1/hnbap/HNBAP-PDU-Contents.asn
+++ b/asn1/hnbap/HNBAP-PDU-Contents.asn
@@ -1,6 +1,6 @@
 -- HNBAP-PDU-Contents.asn
 --
--- 3GPP TS 25.469 V9.0.0 (2009-12)
+-- 3GPP TS 25.469 V9.1.0 (2010-03)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.3	PDU Definitions
@@ -232,7 +232,7 @@ UERegisterAccept ::= SEQUENCE {
 
 UERegisterAcceptIEs HNBAP-PROTOCOL-IES ::= {
 	{ ID id-UE-Identity				CRITICALITY reject	TYPE UE-Identity		PRESENCE mandatory } |
-	{ ID id-Context-ID				CRITICALITY ignore	TYPE Context-ID			PRESENCE mandatory },
+	{ ID id-Context-ID				CRITICALITY reject	TYPE Context-ID			PRESENCE mandatory },
 	...
 }
 
@@ -288,6 +288,28 @@ UEDe-RegisterExtensions HNBAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+-- **************************************************************
+--
+-- CSG Membership Update
+--
+-- **************************************************************
+
+CSGMembershipUpdate ::= SEQUENCE {
+	protocolIEs			ProtocolIE-Container		{ {CSGMembershipUpdateIEs} },
+	protocolExtensions	ProtocolExtensionContainer	{ {CSGMembershipUpdateExtensions} } 	OPTIONAL,
+	...
+}
+
+CSGMembershipUpdateIEs HNBAP-PROTOCOL-IES ::= {
+	{ ID id-Context-ID					CRITICALITY reject	TYPE Context-ID					PRESENCE mandatory } |
+	{ ID id-CSGMembershipStatus			CRITICALITY	reject	TYPE CSGMembershipStatus		PRESENCE mandatory },
+	...
+}
+
+CSGMembershipUpdateExtensions HNBAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 
 
 -- **************************************************************
diff --git a/asn1/hnbap/HNBAP-PDU-Descriptions.asn b/asn1/hnbap/HNBAP-PDU-Descriptions.asn
index b1fd9f8d1d..bfba5c7652 100644
--- a/asn1/hnbap/HNBAP-PDU-Descriptions.asn
+++ b/asn1/hnbap/HNBAP-PDU-Descriptions.asn
@@ -1,6 +1,6 @@
 -- HNBAP-PDU-Descriptions.asn
 --
--- 3GPP TS 25.469 V9.0.0 (2009-12)
+-- 3GPP TS 25.469 V9.1.0 (2010-03)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.2	Elementary Procedure definitions
@@ -13,6 +13,7 @@
 -- Elementary Procedure definitions
 --
 -- **************************************************************
+-- **************************************************************
 HNBAP-PDU-Descriptions  { 
 itu-t (0) identified-organization (4) etsi (0) mobileDomain (0) 
 umts-Access (20) modules (3) hnbap(6) version1 (1) hnbap-PDU-Descriptions (0)}
@@ -41,7 +42,9 @@ FROM HNBAP-CommonDataTypes
 	UERegisterReject,
 	UEDe-Register,
 	ErrorIndication,
-	PrivateMessage
+	 PrivateMessage,
+    CSGMembershipUpdate
+
 
 FROM HNBAP-PDU-Contents
 	id-HNBRegister,
@@ -49,7 +52,9 @@ FROM HNBAP-PDU-Contents
 	id-UEDe-Register,
 	id-HNBDe-Register,
 	id-ErrorIndication,
-	id-privateMessage
+	id-privateMessage,
+	id-CSGMembershipUpdate
+
 FROM HNBAP-Constants;
 
 -- **************************************************************
@@ -130,7 +135,8 @@ HNBAP-ELEMENTARY-PROCEDURES-CLASS-2 HNBAP-ELEMENTARY-PROCEDURE ::= {
 	hNBDe-Register |
 	errorIndication	|
 	privateMessage,
-	...
+	...,
+	csg-membership-update
 }
 
 -- **************************************************************
@@ -174,6 +180,12 @@ errorIndication HNBAP-ELEMENTARY-PROCEDURE ::= {
 	CRITICALITY				ignore
 }
 
+csg-membership-update HNBAP-ELEMENTARY-PROCEDURE ::= {
+	INITIATING MESSAGE		CSGMembershipUpdate
+	PROCEDURE CODE			id-CSGMembershipUpdate
+	CRITICALITY				ignore
+}
+
 privateMessage HNBAP-ELEMENTARY-PROCEDURE ::= {
 	INITIATING MESSAGE		PrivateMessage
 	PROCEDURE CODE			id-privateMessage
diff --git a/asn1/hnbap/hnbap.cnf b/asn1/hnbap/hnbap.cnf
index a99b52ee05..e48949ed4d 100644
--- a/asn1/hnbap/hnbap.cnf
+++ b/asn1/hnbap/hnbap.cnf
@@ -114,6 +114,11 @@ CN-DomainIndicator
     col_set_fence(actx->pinfo->cinfo, COL_INFO); /* Protect info from CriticalityDiagnostics decodes */
 %(DEFAULT_BODY)s
 
+#.FN_BODY CSGMembershipUpdate
+    col_set_str(actx->pinfo->cinfo, COL_INFO,
+               "CSG_MEMBERSHIP_UPDATE_MESSAGE ");
+%(DEFAULT_BODY)s
+
 #.FN_BODY PrivateMessage
     col_set_str(actx->pinfo->cinfo, COL_INFO,
                "PRIVATE_MESSAGE ");
@@ -170,6 +175,7 @@ UE-Capabilities						N hnbap.ies id-UE-Capabilities
 RNC-ID								N hnbap.ies id-RNC-ID
 CSG-ID								N hnbap.ies id-CSG-ID
 BackoffTimer						N hnbap.ies id-BackoffTimer
+CSGMembershipStatus					N hnbap.ies id-CSGMembershipStatus
 
 #HNBAP-PROTOCOL-EXTENSION
 IP-Address							N hnbap.extension id-HNB-Internet-Information
@@ -190,5 +196,6 @@ UERegisterReject					N hnbap.proc.uout id-UERegister
 UEDe-Register						N hnbap.proc.imsg id-UEDe-Register
 HNBDe-Register						N hnbap.proc.imsg id-HNBDe-Register
 ErrorIndication						N hnbap.proc.imsg id-ErrorIndication
+CSGMembershipUpdate					N hnbap.proc.imsg id-CSGMembershipUpdate
 PrivateMessage						N hnbap.proc.imsg id-privateMessage
 #.END