From 3342f01f9a0e6f1effc7a698208a072d4a120ff8 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Mon, 3 Oct 2016 21:29:29 +0200
Subject: Fix byte order in FIG0/6 structures

---
 src/fig/FIG0structs.h | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'src/fig/FIG0structs.h')

diff --git a/src/fig/FIG0structs.h b/src/fig/FIG0structs.h
index 4b9b7e0..3b9bfbf 100644
--- a/src/fig/FIG0structs.h
+++ b/src/fig/FIG0structs.h
@@ -153,11 +153,18 @@ struct FIGtype0_5_short {
 } PACKED;
 
 struct FIGtype0_6 {
-    uint16_t IdListFlag:1;
-    uint16_t LA:1; // Linkage actuator
-    uint16_t SH:1; // 0=Soft link / 1=Hard link
-    uint16_t ILS:1; // 0=national / 1=international
-    uint16_t LSN:12; // Linkage Set Number
+    uint8_t LSN_high:4; // Linkage Set Number
+    uint8_t ILS:1; // 0=national / 1=international
+    uint8_t SH:1; // 0=Soft link / 1=Hard link
+    uint8_t LA:1; // Linkage actuator
+    uint8_t IdListFlag:1; // Marks the presence of the list
+
+    uint8_t LSN_low; // Linkage Set Number
+
+    void setLSN(uint16_t LSN) {
+        LSN_high = LSN >> 8;
+        LSN_low = LSN & 0xff;
+    }
 } PACKED;
 
 #define FIG0_6_IDLQ_DAB 0x0
@@ -165,10 +172,10 @@ struct FIGtype0_6 {
 #define FIG0_6_IDLQ_DRM_AMSS 0x3
 
 struct FIGtype0_6_header {
-    uint8_t rfu:1; // must be 0
-    uint8_t IdLQ:2; // Identifier List Qualifier, see above defines
-    uint8_t rfa:1; // must be 0
     uint8_t num_ids:4; // number of Ids to follow in the list
+    uint8_t rfa:1; // must be 0
+    uint8_t IdLQ:2; // Identifier List Qualifier, see above defines
+    uint8_t rfu:1; // must be 0
 } PACKED;
 
 struct FIGtype0_8_short {
-- 
cgit v1.2.3