cap: Add Phase1 ACN and operations to the asn files

4 files changed, 172 insertions, 1 deletions

diff --git a/camel/CAP-datatypes.asn b/camel/CAP-datatypes.asn
index 946cd9e..90469dc 100644
--- a/camel/CAP-datatypes.asn
+++ b/camel/CAP-datatypes.asn
@@ -168,6 +168,11 @@ BasicGapCriteria {PARAMETERS-BOUND : bound} ::= CHOICE {
 -- incomplete numbers, in the sense that a limited amount of digits can be given.
 -- For the handling of numbers starting with the same digit string refer to the detailed
 -- procedure of the CallGap operation
+BCSMEventV1							::= SEQUENCE {
+	eventTypeBCSM					[0] EventTypeBCSM,
+	monitorMode						[1] MonitorMode,
+	legID							[2] LegID							OPTIONAL
+	}
 
 BCSMEvent{PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	eventTypeBCSM						[0] EventTypeBCSM,
diff --git a/camel/CAP-gsmSSF-gsmSCF-ops-args.asn b/camel/CAP-gsmSSF-gsmSCF-ops-args.asn
index f247016..16cb718 100644
--- a/camel/CAP-gsmSSF-gsmSCF-ops-args.asn
+++ b/camel/CAP-gsmSSF-gsmSCF-ops-args.asn
@@ -178,6 +178,10 @@ FROM CAP-errortypes errortypes
 
 ;
 
+activityTestV1 OPERATION ::= {
+	RETURN RESULT	TRUE
+	CODE			opcode-activityTest}
+
 activityTest OPERATION ::= {
 	RETURN RESULT	TRUE
 	CODE			opcode-activityTest}
@@ -365,6 +369,19 @@ CollectInformationArg {PARAMETERS-BOUND : bound} ::= SEQUENCE{
 	...
 }
 
+connectV1 OPERATION ::= {
+	ARGUMENT		ConnectArgV1
+	RETURN RESULT	FALSE
+	ERRORS {
+		missingParameter |
+		systemFailure |
+		taskRefused |
+		unexpectedComponentSequence |
+		unexpectedDataValue |
+		unexpectedParameter}
+	CODE			opcode-connect
+}
+
 connect {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ConnectArg {bound}
 	RETURN RESULT	FALSE
@@ -381,6 +398,19 @@ connect {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- This operation is used to request the gsmSSF to perform the call processing actions
 -- to route or forward a call to a specified destination.
 
+ConnectArgV1 ::= SEQUENCE {
+	destinationRoutingAddress	[0] DestinationRoutingAddress,
+	originalCalledPartyID		[6] OriginalCalledPartyID		OPTIONAL,
+	extensions					[10] SEQUENCE SIZE(1..numOfExtensionsV1) OF ExtensionField																		OPTIONAL,
+	genericNumbers				[14] GenericNumbers				OPTIONAL,
+	callingPartysCategory		[28] CallingPartysCategory		OPTIONAL,
+	redirectingPartyID			[29] RedirectingPartyID			OPTIONAL,
+	redirectionInformation		[30] RedirectionInformation		OPTIONAL,
+	suppressionOfAnnouncement	[55] SuppressionOfAnnouncement	OPTIONAL,
+	oCSIApplicable				[56] OCSIApplicable				OPTIONAL,
+	...
+}
+
 ConnectArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	destinationRoutingAddress			[0] DestinationRoutingAddress {bound},
 	alertingPattern						[1] AlertingPattern							OPTIONAL,
@@ -431,6 +461,12 @@ ConnectToResourceArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	...
 	}
 
+continueV1 OPERATION ::= {
+	RETURN RESULT	FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-continue
+}
+
 continue OPERATION ::= {
 	RETURN RESULT	FALSE
 	ALWAYS RESPONDS	FALSE
@@ -584,6 +620,13 @@ EstablishTemporaryConnectionArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	callingPartyNumber					[53] CallingPartyNumber {bound}				OPTIONAL
 	}
 
+eventReportBCSMV1 OPERATION ::= {
+	ARGUMENT		EventReportBCSMArgV1
+	RETURN RESULT	FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-eventReportBCSM
+}
+
 eventReportBCSM {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		EventReportBCSMArg {bound}
 	RETURN RESULT	FALSE
@@ -594,6 +637,15 @@ eventReportBCSM {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- events such as O_Busy or O_No_Answer) previously requested by the gsmSCF in a
 -- RequestReportBCSMEvent operation.
 
+EventReportBCSMArgV1					::= SEQUENCE {
+	eventTypeBCSM					[0] EventTypeBCSM,
+	eventSpecificInformationBCSM	[2] EventSpecificInformationBCSM	OPTIONAL,
+	legID							[3] LegID							OPTIONAL,
+	miscCallInfo					[4] MiscCallInfo			DEFAULT {messageType request},
+	extensions						[5] SEQUENCE SIZE(1..numOfExtensionsV1) OF ExtensionField																				OPTIONAL,
+	...
+	}
+
 EventReportBCSMArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	eventTypeBCSM						[0] EventTypeBCSM,
 	eventSpecificInformationBCSM		[2] EventSpecificInformationBCSM {bound}	OPTIONAL,
@@ -621,6 +673,20 @@ furnishChargingInformation {PARAMETERS-BOUND : bound} OPERATION ::= {
 FurnishChargingInformationArg {PARAMETERS-BOUND : bound} ::=
 	FCIBillingChargingCharacteristics{bound}
 
+initialDPV1 OPERATION ::= {
+	ARGUMENT		InitialDPArgV1
+	RETURN RESULT	FALSE
+	ERRORS {
+		missingCustomerRecord |
+		missingParameter |
+		systemFailure |
+		taskRefused |
+		unexpectedComponentSequence |
+		unexpectedDataValue |
+		unexpectedParameter
+		}
+	CODE			opcode-initialDP}
+
 initialDP {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		InitialDPArg {bound}
 	RETURN RESULT	FALSE
@@ -636,6 +702,30 @@ initialDP {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- Direction: gsmSSF -> gsmSCF, Timer: Tidp 
 -- This operation is used after a TDP to indicate request for service.
 
+InitialDPArgV1						::= SEQUENCE {
+	serviceKey						[0] ServiceKey,
+	calledPartyNumber				[2] CalledPartyNumber				OPTIONAL,
+	callingPartyNumber				[3] CallingPartyNumber				OPTIONAL,
+	callingPartysCategory			[5] CallingPartysCategory			OPTIONAL,
+	locationNumber					[10] LocationNumber					OPTIONAL,
+	originalCalledPartyID			[12] OriginalCalledPartyID			OPTIONAL,
+	extensions						[15] SEQUENCE SIZE(1..numOfExtensionsV1) OF ExtensionField																			OPTIONAL,
+	highLayerCompatibility			[23] HighLayerCompatibility			OPTIONAL,
+	additionalCallingPartyNumber	[25] AdditionalCallingPartyNumber	OPTIONAL,
+	bearerCapability				[27] BearerCapability				OPTIONAL,
+	eventTypeBCSM					[28] EventTypeBCSM					OPTIONAL,
+	redirectingPartyID				[29] RedirectingPartyID				OPTIONAL,
+	redirectionInformation			[30] RedirectionInformation			OPTIONAL,
+	iMSI							[50] IMSI							OPTIONAL,
+	subscriberState					[51] SubscriberState				OPTIONAL,
+	locationInformation				[52] LocationInformation			OPTIONAL,
+	ext-basicServiceCode			[53] Ext-BasicServiceCode			OPTIONAL,
+	callReferenceNumber				[54] CallReferenceNumber			OPTIONAL,
+	mscAddress						[55] ISDN-AddressString				OPTIONAL,
+	calledPartyBCDNumber			[56] CalledPartyBCDNumber			OPTIONAL,
+...
+	}
+
 InitialDPArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	serviceKey							[0] ServiceKey	,
 	calledPartyNumber					[2] CalledPartyNumber {bound}				OPTIONAL,
@@ -778,6 +868,13 @@ PlayToneArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	...
 	}
 
+releaseCallV1 OPERATION ::= {
+	ARGUMENT	ReleaseCallArgV1
+	RETURN RESULT	FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-releaseCall
+}
+
 releaseCall {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ReleaseCallArg {bound}
 	RETURN RESULT	FALSE
@@ -786,6 +883,7 @@ releaseCall {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- Direction: gsmSCF ->?gsmSSF, Timer: Trc 
 -- This operation is used to tear down an existing call at any phase of the call for all parties 
 -- involved in the call. 
+ReleaseCallArgV1						::= Cause
 
 ReleaseCallArg {PARAMETERS-BOUND : bound} ::= CHOICE {
 	allCallSegments					AllCallSegments,
@@ -800,6 +898,19 @@ AllCallSegmentsWithExtension ::= SEQUENCE {
 	extensions					[1] Extensions {bound} OPTIONAL
 	}
 
+requestReportBCSMEventV1 OPERATION ::= {
+	ARGUMENT		RequestReportBCSMEventArgV1
+	RETURN RESULT	FALSE
+	ERRORS			{missingParameter |
+					systemFailure |
+					taskRefused |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter}
+	CODE			opcode-requestReportBCSMEvent
+}
+
+
 requestReportBCSMEvent {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		RequestReportBCSMEventArg {bound}
 	RETURN RESULT	FALSE
@@ -822,6 +933,15 @@ requestReportBCSMEvent {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- No implicit arming of EDPs at the gsmSSF after reception of any operation (different 
 -- from RequestReportBCSMEvent) from the gsmSCF is allowed.
 
+numOfBCSMEventsV1				INTEGER ::= 10
+numOfExtensionsV1				INTEGER ::= 10
+
+RequestReportBCSMEventArgV1 ::= SEQUENCE  {
+	bcsmEvents						[0] SEQUENCE SIZE (1..numOfBCSMEventsV1) OF BCSMEventV1,
+	extensions						[2] SEQUENCE SIZE (1..numOfExtensionsV1) OF ExtensionField																			OPTIONAL,
+	...
+	}
+
 RequestReportBCSMEventArg {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	bcsmEvents							[0] SEQUENCE SIZE(1..bound.&numOfBCSMEvents) OF
 												BCSMEvent {bound},
diff --git a/camel/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn b/camel/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn
index 1652a4c..7c7ba4d 100644
--- a/camel/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn
+++ b/camel/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn
@@ -32,6 +32,7 @@ FROM TCAPMessages tc-Messages
 FROM TC-Notation-Extensions tc-NotationExtensions
 
 	activityTest,
+	activityTestV1,
 	applyCharging {},
 	applyChargingReport {},
 	assistRequestInstructions {},
@@ -41,8 +42,10 @@ FROM TC-Notation-Extensions tc-NotationExtensions
 	cancel {},
 	collectInformation {},
 	connect {},
+	connectV1,
 	connectToResource {},
 	continue,
+	continueV1,
 	continueWithArgument {},
 	disconnectForwardConnection,
 	disconnectForwardConnectionWithArgument {},
@@ -50,13 +53,17 @@ FROM TC-Notation-Extensions tc-NotationExtensions
 	entityReleased {},
 	establishTemporaryConnection {},
 	eventReportBCSM {},
+	eventReportBCSMV1,
 	furnishChargingInformation {},
 	initialDP {},
+	initialDPV1,
 	initiateCallAttempt {},
 	moveLeg {},
 	playTone {},
 	releaseCall {},
+	releaseCallV1,
 	requestReportBCSMEvent {},
+	requestReportBCSMEventV1,
 	resetTimer {},
 	sendChargingInformation {},
 	splitLeg {}
@@ -148,6 +155,13 @@ umts-network(1) modules(3) cap-object-identifiers(100) version8(7)};
 -- The structured DIALOGUE MODE is defined in ITU-T Recommendation Q.771; the
 -- dialogue-abstract-syntax ABSTRACT SYNTAX is defined in ITU-T Recommendation Q.775.
 
+capssf-scfGenericACV1 APPLICATION-CONTEXT ::= {
+	CONTRACT					capSsfToScfGenericV1
+	DIALOGUE MODE				structured
+	ABSTRACT SYNTAXES			{dialogue-abstract-syntax |
+								gsmSSF-scfGenericAbstractSyntax} 
+	APPLICATION CONTEXT NAME	id-ac-CAP-gsmSSF-scfGenericACV1}
+
 capssf-scfGenericAC APPLICATION-CONTEXT ::= {
 	CONTRACT					capSsfToScfGeneric
 	DIALOGUE MODE				structured
@@ -179,6 +193,12 @@ capscf-ssfGenericAC	APPLICATION-CONTEXT ::= {
 -- The CONTRACT definitions are updated for Rel-6, due to the fact that the individual
 -- OPERATION-PACKAGE definitions are updated in Rel-6.
 
+capSsfToScfGenericV1 CONTRACT ::= {
+	INITIATOR CONSUMER OF		{scfActivationPackageV1}
+	RESPONDER CONSUMER OF		{activityTestPackageV1 | connectPackageV1 | callHandlingPackageV1  |
+					bcsmEventHandlingPackageV1 | ssfCallProcessingPackageV1}
+}
+
 capSsfToScfGeneric CONTRACT ::= {
 -- dialogue initiated by gsmSSF with InitialDP Operation
 	INITIATOR CONSUMER OF		{exceptionInformPackage {cAPSpecificBoundSet} |
@@ -249,6 +269,10 @@ capScfToSsfGeneric CONTRACT ::= {
 -- OPERATION definitions are updated in Rel-6. The OPERATION definitions are IMPORTED from
 -- CAP-gsmSSF-gsmSCF-ops-args and from CAP-gsmSCF-gsmSRF-ops-args.
 
+scfActivationPackageV1 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{initialDPV1}
+}
+
 scfActivationPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{initialDP {bound}}
 	ID					id-package-scfActivation}
@@ -270,19 +294,36 @@ nonAssistedConnectionEstablishmentPackage {PARAMETERS-BOUND : bound} OPERATION-P
 	CONSUMER INVOKES	{connectToResource {bound}}
 	ID					id-package-nonAssistedConnectionEstablishment}
 
+connectPackageV1 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{connectV1}
+}
+
 connectPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{connect {bound}}
 	ID					id-package-connect}
 
+callHandlingPackageV1 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{releaseCallV1}
+}
+
 callHandlingPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{releaseCall {bound}}
 	ID					id-package-callHandling}
 
+bcsmEventHandlingPackageV1 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{eventReportBCSMV1}
+	SUPPLIER INVOKES	{requestReportBCSMEventV1}
+}
+
 bcsmEventHandlingPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{requestReportBCSMEvent {bound}}
 	SUPPLIER INVOKES	{eventReportBCSM {bound}}
 	ID					id-package-bcsmEventHandling}
 
+ssfCallProcessingPackageV1 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{continueV1}
+}
+
 ssfCallProcessingPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{collectInformation | continueWithArgument {bound} | continue}
 	ID					id-package-ssfCallProcessing}
@@ -317,6 +358,10 @@ signallingControlPackage {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{sendChargingInformation {bound}}
 	ID					id-package-signallingControl}
 
+activityTestPackageV1 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{activityTestV1}
+}
+
 activityTestPackage OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{activityTest}
 	ID					id-package-activityTest}
diff --git a/camel/CAP-object-identifiers.asn b/camel/CAP-object-identifiers.asn
index 5d799fb..9efd4dc 100644
--- a/camel/CAP-object-identifiers.asn
+++ b/camel/CAP-object-identifiers.asn
@@ -45,7 +45,7 @@ classes											OBJECT IDENTIFIER ::=
 gsmSSF-gsmSCF-Operations						OBJECT IDENTIFIER ::=
 	{itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
 	cap-gsmSSF-gsmSCF-ops-args(101) version8(7)}
--- The Object Identifier 'gsmSSF-gsmSCF-Operations’ is updated to version8(7) in Rel-6, so
+-- The Object Identifier 'gsmSSF-gsmSCF-Operations� is updated to version8(7) in Rel-6, so
 -- other modules can IMPORT Rel-6 Operation definitions related to call control.
 
 gsmSSF-gsmSCF-Protocol							OBJECT IDENTIFIER ::=
@@ -135,6 +135,7 @@ id-rosObject-smsSSF-V4							OBJECT IDENTIFIER ::= {id-rosObject 9}
 -- Application Contexts
 
 -- gsmSSF/gsmSCF AC
+id-ac-CAP-gsmSSF-scfGenericACV1					OBJECT IDENTIFIER ::= {id-GSM-ac cap-gsmssf-to-gsmscf(50) version1(0)}
 id-ac-CAP-gsmSSF-scfGenericAC					OBJECT IDENTIFIER ::= {id-acE 4}
 id-ac-CAP-gsmSSF-scfAssistHandoffAC				OBJECT IDENTIFIER ::= {id-acE 6}
 id-ac-CAP-scf-gsmSSFGenericAC					OBJECT IDENTIFIER ::= {id-acE 8}