diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2009-06-02 11:04:14 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2009-06-02 11:04:14 +0000 |
| commit | 57d4cea4d5dbf47c38a7b31893cbd7aa93c4fd96 (patch) | |
| tree | b2fdd83a80040f403b9df0afb7ecc2fff7eb5a9d /asn1/p7 | |
| parent | 077d995cc16360952efe9ae4807125dff0182f69 (diff) | |
Update to:
* support the P3 protocol in addition to the P1 protocol; and
* reduce the number of changes to the ASN.1 modules (as asn2wrs now handles more of the ASN.1 constructs).
P3 is currently only supported over ROS (and not RTSE)
svn path=/trunk/; revision=28593
Diffstat (limited to 'asn1/p7')
| -rw-r--r-- | asn1/p7/MSAbstractService.asn | 4 | ||||
| -rw-r--r-- | asn1/p7/p7.cnf | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/asn1/p7/MSAbstractService.asn b/asn1/p7/MSAbstractService.asn index 7a78d1ee3e..07b0293c1f 100644 --- a/asn1/p7/MSAbstractService.asn +++ b/asn1/p7/MSAbstractService.asn @@ -27,7 +27,7 @@ IMPORTS ORAddressAndOrDirectoryName, ProbeSubmissionArgument, ProbeSubmissionResult, ResponderCredentials, SecurityContext, SecurityLabel, -- WS added imports because of expansion of COMPONENTS OF - MessageSubmissionIdentifier, ExtensionField, MTSOriginatorName, + MessageSubmissionIdentifier, ExtensionField, OriginatorName, OriginalEncodedInformationTypes, ContentType, ProbeSubmissionIdentifier, ProbeSubmissionTime FROM MTSAbstractService {joint-iso-itu-t mhs(6) mts(3) modules(0) @@ -897,7 +897,7 @@ MSProbeSubmissionArgument ::= SET { -- COMPONENTS OF -- ProbeSubmissionArgument - This imported type has IMPLICIT tags -, -- WS Expanded - originator-name MTSOriginatorName, + originator-name OriginatorName, original-encoded-information-types OriginalEncodedInformationTypes OPTIONAL, content-type ContentType, content-identifier ContentIdentifier OPTIONAL, diff --git a/asn1/p7/p7.cnf b/asn1/p7/p7.cnf index bc80d074c5..d5a09d438d 100644 --- a/asn1/p7/p7.cnf +++ b/asn1/p7/p7.cnf @@ -6,10 +6,6 @@ #.IMPORT ../ros/ros-exp.cnf #.IMPORT ../rtse/rtse-exp.cnf -#.MODULE_IMPORT -MTSAbstractService x411 -Reliable-Transfer-APDU rtse - #.EXPORTS SequenceNumber SignatureStatus |