summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2015-10-30 01:13:58 +0100
committerDimitri Sokolyuk <demon@dim13.org>2015-10-30 01:13:58 +0100
commit3ab5df93cc76a8e8eadbbf14d5d0aa5b95e626a3 (patch)
treedd50734dae412cfb1380986bccc87f88fb49cb4a
parentcb4c9b305391e2c511afd2e80fe38c7c85aad993 (diff)
Remove constraits
-rw-r--r--asn1/Remote-Operations-Generic-ROS-PDUs.asn190
1 files changed, 23 insertions, 67 deletions
diff --git a/asn1/Remote-Operations-Generic-ROS-PDUs.asn1 b/asn1/Remote-Operations-Generic-ROS-PDUs.asn1
index e55ea3c..f8fef51 100644
--- a/asn1/Remote-Operations-Generic-ROS-PDUs.asn1
+++ b/asn1/Remote-Operations-Generic-ROS-PDUs.asn1
@@ -10,38 +10,22 @@ IMPORTS
FROM Remote-Operations-Information-Objects {joint-iso-itu-t
remote-operations(4) informationObjects(5) version1(0)};
-ROS{InvokeId:InvokeIdSet, OPERATION:Invokable, OPERATION:Returnable} ::=
+ROS ::=
CHOICE {
- invoke [1] Invoke{{InvokeIdSet}, {Invokable}},
- returnResult [2] ReturnResult{{Returnable}},
- returnError [3] ReturnError{{Errors {{Returnable}}}},
+ invoke [1] Invoke,
+ returnResult [2] ReturnResult,
+ returnError [3] ReturnError,
reject [4] Reject
}
-(CONSTRAINED BY { -- must conform to the above definition --} !
- RejectProblem:general-unrecognizedPDU)
-
-Invoke{InvokeId:InvokeIdSet, OPERATION:Operations} ::= SEQUENCE {
- invokeId
- InvokeId(InvokeIdSet)
- (CONSTRAINED BY { -- must be unambiguous --} !
- RejectProblem:invoke-duplicateInvocation),
- linkedId
- CHOICE {present [0] IMPLICIT present < InvokeId,
+
+Invoke ::= SEQUENCE {
+ invokeId InvokeId,
+ linkedId CHOICE {present [0] IMPLICIT present < InvokeId,
absent [1] IMPLICIT NULL
- }
- (CONSTRAINED BY { -- must identify an outstanding operation --} !
- RejectProblem:invoke-unrecognizedLinkedId)
- (CONSTRAINED BY { -- which has one or more linked operations--} !
- RejectProblem:invoke-linkedResponseUnexpected) OPTIONAL,
- opcode
- OPERATION.&operationCode
- ({Operations} !RejectProblem:invoke-unrecognizedOperation),
- argument
- OPERATION.&ArgumentType
- ({Operations}{@opcode} !RejectProblem:invoke-mistypedArgument) OPTIONAL
+ } OPTIONAL,
+ opcode OPERATION.&operationCode,
+ argument OPERATION.&ArgumentType OPTIONAL
}
-(CONSTRAINED BY { -- must conform to the above definition --} !
- RejectProblem:general-mistypedPDU)
(WITH COMPONENTS {
...,
linkedId ABSENT
@@ -49,49 +33,23 @@ Invoke{InvokeId:InvokeIdSet, OPERATION:Operations} ::= SEQUENCE {
WITH COMPONENTS {
...,
linkedId PRESENT,
- opcode (CONSTRAINED BY { -- must be in the &Linked field of the associated operation --
- } !RejectProblem:invoke-unexpectedLinkedOperation)
+ opcode
})
-- continued on the next page
-ReturnResult{OPERATION:Operations} ::= SEQUENCE {
- invokeId
- InvokeId
- (CONSTRAINED BY { -- must be that for an outstanding operation --} !
- RejectProblem:returnResult-unrecognizedInvocation)
- (CONSTRAINED BY { -- which returns a result --} !
- RejectProblem:returnResult-resultResponseUnexpected),
- result
- SEQUENCE {opcode
- OPERATION.&operationCode({Operations})
- (CONSTRAINED BY { -- identified by invokeId --} !
- RejectProblem:returnResult-unrecognizedInvocation),
- result
- OPERATION.&ResultType
- ({Operations}{@.opcode} !
- RejectProblem:returnResult-mistypedResult)} OPTIONAL
+ReturnResult ::= SEQUENCE {
+ invokeId InvokeId,
+ result SEQUENCE {opcode
+ OPERATION.&operationCode,
+ result OPERATION.&ResultType
+ } OPTIONAL
}
-(CONSTRAINED BY { -- must conform to the above definition --} !
- RejectProblem:general-mistypedPDU)
-
-ReturnError{ERROR:Errors} ::= SEQUENCE {
- invokeId
- InvokeId
- (CONSTRAINED BY { -- must be that for an outstanding operation --} !
- RejectProblem:returnError-unrecognizedInvocation)
- (CONSTRAINED BY { -- which returns an error --} !
- RejectProblem:returnError-errorResponseUnexpected),
- errcode
- ERROR.&errorCode({Errors} !RejectProblem:returnError-unrecognizedError)
- (CONSTRAINED BY { -- must be in the &Errors field of the associated operation --
- } !RejectProblem:returnError-unexpectedError),
- parameter
- ERROR.&ParameterType
- ({Errors}{@errcode} !RejectProblem:returnError-mistypedParameter)
- OPTIONAL
+
+ReturnError ::= SEQUENCE {
+ invokeId InvokeId,
+ errcode ERROR.&errorCode,
+ parameter ERROR.&ParameterType OPTIONAL
}
-(CONSTRAINED BY { -- must conform to the above definition --} !
- RejectProblem:general-mistypedPDU)
Reject ::= SEQUENCE {
invokeId InvokeId,
@@ -101,8 +59,6 @@ Reject ::= SEQUENCE {
returnResult [2] ReturnResultProblem,
returnError [3] ReturnErrorProblem}
}
-(CONSTRAINED BY { -- must conform to the above definition --} !
- RejectProblem:general-mistypedPDU)
GeneralProblem ::= INTEGER {
unrecognizedPDU(0), mistypedPDU(1), badlyStructuredPDU(2)}