Change in osmo-ttcn3-hacks[master]: fix BSSAP_LE_Types FIELDORDER

[neels]

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20362 )

Change subject: fix BSSAP_LE_Types FIELDORDER
......................................................................

fix BSSAP_LE_Types FIELDORDER

Change-Id: I6f3d5b238912923431db36a1ba7b4973ae4e2e91
---
M library/BSSAP_LE_Types.ttcn
M library/BSSMAP_LE_Templates.ttcn
2 files changed, 10 insertions(+), 10 deletions(-)

Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/library/BSSAP_LE_Types.ttcn b/library/BSSAP_LE_Types.ttcn
index 604fbe0..d46e3a4 100644
--- a/library/BSSAP_LE_Types.ttcn
+++ b/library/BSSAP_LE_Types.ttcn
@@ -195,12 +195,12 @@
 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 @@
 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 70805e7..a1fcc75 100644
--- a/library/BSSMAP_LE_Templates.ttcn
+++ b/library/BSSMAP_LE_Templates.ttcn
@@ -262,8 +262,8 @@
 				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 @@
 				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 @@
 	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 @@
 	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;
 }
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20362
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6f3d5b238912923431db36a1ba7b4973ae4e2e91
Gerrit-Change-Number: 20362
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201001/a6e94948/attachment.htm>