Try to remove unused code warnings, update HNBAP to 9.0.0.

svn path=/trunk/; revision=32057

8 files changed, 53 insertions, 13 deletions

diff --git a/asn1/hnbap/HNBAP-CommonDataTypes.asn b/asn1/hnbap/HNBAP-CommonDataTypes.asn
index 55147e5cd8..aaf4a3e787 100644
--- a/asn1/hnbap/HNBAP-CommonDataTypes.asn
+++ b/asn1/hnbap/HNBAP-CommonDataTypes.asn
@@ -1,6 +1,6 @@
 -- HNBAP-CommonDataTypes.asn
 --
--- 3GPP TS 25.469 V8.4.0 (2009-12)
+-- 3GPP TS 25.469 V9.0.0 (2009-12)
 -- 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 23ddfb639d..c8785bfe46 100644
--- a/asn1/hnbap/HNBAP-Constants.asn
+++ b/asn1/hnbap/HNBAP-Constants.asn
@@ -1,6 +1,6 @@
 -- HNBAP-Constants.asn
 --
--- 3GPP TS 25.469 V8.4.0 (2009-12)
+-- 3GPP TS 25.469 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.6	Constant Definitions
@@ -71,7 +71,11 @@ id-UE-Capabilities								ProtocolIE-ID ::= 13
 id-RNC-ID										ProtocolIE-ID ::= 14
 id-CSG-ID										ProtocolIE-ID ::= 15
 id-BackoffTimer									ProtocolIE-ID ::= 16
-id-HNB-Internet-Information							 ProtocolIE-ID ::= 17
+id-HNB-Internet-Information						ProtocolIE-ID ::= 17
+id-HNB-Cell-Access-Mode							ProtocolIE-ID ::= 18
+id-MuxPortNumber                                ProtocolIE-ID ::= 19
+id-Service-Area-For-Broadcast					ProtocolIE-ID ::= 20
+id-CSGMembershipStatus							ProtocolIE-ID ::= 21
 
 
 
diff --git a/asn1/hnbap/HNBAP-Containers.asn b/asn1/hnbap/HNBAP-Containers.asn
index b7a7f34ec9..e17821acdf 100644
--- a/asn1/hnbap/HNBAP-Containers.asn
+++ b/asn1/hnbap/HNBAP-Containers.asn
@@ -156,4 +156,4 @@ PrivateIE-Field {HNBAP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
 	value				HNBAP-PRIVATE-IES.&Value				({IEsSetParam}{@id})
 }
 
-END
\ No newline at end of file
+END
diff --git a/asn1/hnbap/HNBAP-IEs.asn b/asn1/hnbap/HNBAP-IEs.asn
index b32cdc7c4b..f5502a25f3 100644
--- a/asn1/hnbap/HNBAP-IEs.asn
+++ b/asn1/hnbap/HNBAP-IEs.asn
@@ -1,6 +1,6 @@
 -- HNBAP-IEs.asn
 --
--- 3GPP TS 25.469 V8.4.0 (2009-12)
+-- 3GPP TS 25.469 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.4	Information Element Definitions
@@ -143,6 +143,12 @@ CSG-Indicator	::=	ENUMERATED {
 				...
 			}
 
+CSGMembershipStatus ::= ENUMERATED { 
+	member, 
+	non-member,
+	...
+}
+
 CGI ::= SEQUENCE {
 	pLMNidentity		PLMNidentity,
 	lAC					LAC,
@@ -190,6 +196,14 @@ GeographicalCoordinates-ExtIEs HNBAP-PROTOCOL-EXTENSION ::= {
 }
 
 --H
+
+HNB-Cell-Access-Mode::= ENUMERATED {
+	closed,
+	hybrid,
+	open,
+	... 
+}
+
 HNB-Location-Information	::=	SEQUENCE	{
 	macroCoverageInfo		MacroCoverageInformation	OPTIONAL,
 	geographicalCoordinates	GeographicalLocation	OPTIONAL,
@@ -282,6 +296,8 @@ MacroCellID ::= CHOICE {
 	...
 }
 
+MuxPortNumber ::= INTEGER (1024..65535)
+
 --N
 --O
 --P
diff --git a/asn1/hnbap/HNBAP-PDU-Contents.asn b/asn1/hnbap/HNBAP-PDU-Contents.asn
index 4fd3896431..9b229e4eef 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 V8.4.0 (2009-12)
+-- 3GPP TS 25.469 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.3	PDU Definitions
@@ -30,7 +30,8 @@ BEGIN
 
 IMPORTS
 	Cause,
-	CriticalityDiagnostics,
+	CriticalityDiagnostics, 
+	CSGMembershipStatus,
 	HNB-Location-Information,
 	HNB-Identity,
 	Context-ID,
@@ -46,7 +47,10 @@ IMPORTS
 	CellIdentity,
 	RNC-ID,
 	CSG-ID,
-	BackoffTimer
+	HNB-Cell-Access-Mode,
+	BackoffTimer,
+	MuxPortNumber
+
 
 
 FROM HNBAP-IEs
@@ -64,7 +68,8 @@ FROM HNBAP-IEs
 FROM HNBAP-Containers
 
 	id-Cause,
-	id-CriticalityDiagnostics,
+	id-CriticalityDiagnostics, 
+	id-CSGMembershipStatus,
 	id-HNB-Location-Information,
 	id-HNB-Identity,
 	id-Context-ID,
@@ -78,7 +83,11 @@ FROM HNBAP-Containers
 	id-CellIdentity,
 	id-RNC-ID,
 	id-CSG-ID,
-	id-BackoffTimer
+	id-HNB-Cell-Access-Mode,
+	id-BackoffTimer,
+	id-Service-Area-For-Broadcast,
+	id-MuxPortNumber
+
 
 FROM HNBAP-Constants;
 
@@ -107,6 +116,8 @@ HNBRegisterRequestIEs HNBAP-PROTOCOL-IES ::= {
 }
 
 HNBRegisterRequestExtensions HNBAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-Service-Area-For-Broadcast		CRITICALITY ignore	EXTENSION SAC	PRESENCE optional }|
+	{ ID id-HNB-Cell-Access-Mode			CRITICALITY reject	EXTENSION HNB-Cell-Access-Mode				PRESENCE optional},
 	...
 }
 
@@ -129,6 +140,8 @@ HNBRegisterResponseIEs HNBAP-PROTOCOL-IES ::= {
 
 
 HNBRegisterResponseExtensions HNBAP-PROTOCOL-EXTENSION ::= {
+-- Extension for Release 9 to support CS Multiplexing --
+    {ID id-MuxPortNumber           CRITICALITY ignore	EXTENSION MuxPortNumber      PRESENCE optional},
 	...
 }
 
@@ -225,6 +238,7 @@ UERegisterAcceptIEs HNBAP-PROTOCOL-IES ::= {
 
 
 UERegisterAcceptExtensions HNBAP-PROTOCOL-EXTENSION ::= {
+	{ ID id-CSGMembershipStatus		CRITICALITY	 reject		EXTENSION CSGMembershipStatus			PRESENCE optional	},
 	...
 }
 
diff --git a/asn1/hnbap/HNBAP-PDU-Descriptions.asn b/asn1/hnbap/HNBAP-PDU-Descriptions.asn
index 43d739875f..b1fd9f8d1d 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 V8.4.0 (2009-12)
+-- 3GPP TS 25.469 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.2	Elementary Procedure definitions
diff --git a/asn1/hnbap/hnbap.cnf b/asn1/hnbap/hnbap.cnf
index cec6103d97..8ca3604994 100644
--- a/asn1/hnbap/hnbap.cnf
+++ b/asn1/hnbap/hnbap.cnf
@@ -39,6 +39,8 @@ HNB-Location-Information/geographicalCoordinates hnb_location_information_geogra
 #.OMIT_ASSIGNMENT
 Presence
 ProtocolIE-ContainerList
+ProtocolIE-Single-Container
+CN-DomainIndicator
 #.END
 
 #.FN_PARS ProtocolIE-ID  VAL_PTR = &ProtocolIE_ID
@@ -86,8 +88,11 @@ CSG-ID						N hnbap.ies id-CSG-ID
 BackoffTimer				N hnbap.ies id-BackoffTimer
 
 #HNBAP-PROTOCOL-EXTENSION
-IP-Address	N hnbap.extension id-HNB-Internet-Information
-
+IP-Address					N hnbap.extension id-HNB-Internet-Information
+HNB-Cell-Access-Mode		N hnbap.extension id-HNB-Cell-Access-Mode
+MuxPortNumber				N hnbap.extension id-MuxPortNumber
+SAC							N hnbap.extension id-Service-Area-For-Broadcast
+CSGMembershipStatus			N hnbap.extension id-CSGMembershipStatus
 
 #HNBAP-ELEMENTARY-PROCEDURE
 HNBRegisterRequest							N hnbap.proc.imsg id-HNBRegister
diff --git a/asn1/rua/rua.cnf b/asn1/rua/rua.cnf
index 1d830f2409..79b5455d86 100644
--- a/asn1/rua/rua.cnf
+++ b/asn1/rua/rua.cnf
@@ -34,6 +34,7 @@ PrivateIE-Field/id private_ie_field_id
 #.OMIT_ASSIGNMENT
 Presence
 ProtocolIE-ContainerList
+ProtocolIE-Single-Container
 #.END
 
 #.FN_PARS ProtocolIE-ID  VAL_PTR = &ProtocolIE_ID