diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2020-09-05 19:02:05 +0000 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2020-10-01 06:48:55 +0200 |
| commit | c4c2a9176bb42482c559ea29cdb072e42f62d9b6 (patch) | |
| tree | 693ffebe2e4d1ea11334e3b73354654efebf3949 | |
| parent | 929b406940556694e5a8551be95531feeaed2695 (diff) | |
fix BSSAP_LE_Types FIELDORDER
Change-Id: I6f3d5b238912923431db36a1ba7b4973ae4e2e91
| -rw-r--r-- | library/BSSAP_LE_Types.ttcn | 6 | ||||
| -rw-r--r-- | library/BSSMAP_LE_Templates.ttcn | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/library/BSSAP_LE_Types.ttcn b/library/BSSAP_LE_Types.ttcn index 604fbe01..d46e3a4a 100644 --- a/library/BSSAP_LE_Types.ttcn +++ b/library/BSSAP_LE_Types.ttcn @@ -195,12 +195,12 @@ type union BSSMAP_LE_PDU { type record BSSMAP_LE_IE_APDU { BSSMAP_LE_IEI iei, uint16_t len, - BIT1 spare, BSSMAP_LE_ProtocolId protocol_id, + BIT1 spare, octetstring data } with { variant "PRESENCE(iei = BSSMAP_LE_IEI_APDU)" - variant (len) "LENGTHTO(spare,protocol_id,data)" + variant (len) "LENGTHTO(protocol_id,spare,data)" }; type enumerated BSSMAP_LE_ProtocolId { BSSMAP_LE_PROT_RESERVED ('0000000'B), @@ -591,4 +591,4 @@ external function dec_PDU_BSSAP_LE(in octetstring stream) return PDU_BSSAP_LE with { extension "prototype(convert) decode(RAW)" } -} with { encode "RAW" ; variant "FIELDORDER(msb)" } +} with { encode "RAW" ; } diff --git a/library/BSSMAP_LE_Templates.ttcn b/library/BSSMAP_LE_Templates.ttcn index 70805e7e..a1fcc759 100644 --- a/library/BSSMAP_LE_Templates.ttcn +++ b/library/BSSMAP_LE_Templates.ttcn @@ -262,8 +262,8 @@ modifies ts_BSSAP_LE_BSSMAP := { bsslap_apdu := { iei := BSSMAP_LE_IEI_APDU, len := 0, - spare := '0'B, protocol_id := prot_id, + spare := '0'B, data := data }, segmentation := segm @@ -282,8 +282,8 @@ modifies tr_BSSAP_LE_BSSMAP := { bsslap_apdu := { iei := BSSMAP_LE_IEI_APDU, len := ?, - spare := '0'B, protocol_id := prot_id, + spare := '0'B, data := data }, segmentation := segm @@ -341,8 +341,8 @@ return template (omit) BSSMAP_LE_IE_APDU { var BSSMAP_LE_IE_APDU ie := { iei := BSSMAP_LE_IEI_APDU, len := 0, // overwritten - spare := '0'B, - protocol_id := prot_id + protocol_id := prot_id, + spare := '0'B } if (istemplatekind(data, "omit")) { return omit; @@ -356,15 +356,15 @@ return template BSSMAP_LE_IE_APDU { var template BSSMAP_LE_IE_APDU ie := { iei := BSSMAP_LE_IEI_APDU, len := ?, - spare := '0'B, - protocol_id := prot_id + protocol_id := prot_id, + spare := '0'B } if (istemplatekind(data, "omit")) { return omit; } else if (istemplatekind(data, "*")) { return *; } - ie.data := valueof(data); + ie.data := data; return ie; } |