WIP: Rework FIG0/21 definition and get FIC insertion to compile

1 files changed, 39 insertions, 31 deletions

diff --git a/doc/servicelinking.mux b/doc/servicelinking.mux
index 38d4ca1..6c491c8 100644
--- a/doc/servicelinking.mux
+++ b/doc/servicelinking.mux
@@ -100,40 +100,48 @@ linking {
     }
 }
 
-; According to ETSI TR 101 496-2 Clause 3.6.10
+; According to ETSI TR 101 496-2 Clause 3.6.10.
+; The configuration structure reflects the FIG 0/21 of
+; ETSI EN 300 401 Clause 8.1.8
 frequency_information {
-    fi_dab_1 {
-        range_modulation dab
-        continuity true
-        frequencies {
-            entry_a {
-                signal_mode_1 true
-                adjacent true
-                frequency 234.208
-            }
-            entry_b {
-                signal_mode_1 true
-                adjacent true
-                frequency 188.928
+    fi_1 {
+        fi_dab_1 {
+            range_modulation dab
+            continuity true
+            eid 0x4fff
+            frequencies {
+                entry_a {
+                    signal_mode_1 true
+                    adjacent true
+                    frequency 234.208
+                }
+                entry_b {
+                    signal_mode_1 true
+                    adjacent true
+                    frequency 188.928
+                }
             }
         }
+        fi_fm_1 {
+            range_modulation fm
+            continuity true
+            pi_code 0x1234
+            frequencies "87.6 105.2"
+        }
     }
-    fi_fm_1 {
-        range_modulation fm
-        continuity true
-        frequencies "87.6 105.2"
-    }
-    fi_drm_3 {
-        range_modulation drm
-        continuity true
-        drm_id 0x12
-        frequencies "15.21 22.4"
-    }
-    fi_amss_4 {
-        range_modulation amss
-        continuity true
-        amss_id 0x33
-        frequencies "14.8"
+    fi_2 {
+        fi_drm_3 {
+            range_modulation drm
+            continuity true
+            drm_id 0x12ab45
+            frequencies "15.21 22.4"
+        }
+        fi_amss_4 {
+            range_modulation amss
+            continuity true
+            amss_id 0x33cc88
+            frequencies "14.8"
+        }
     }
 }
 
@@ -194,6 +202,6 @@ components {
 
 outputs {
     file "file://./test.eti?type=raw"
-    throttle "simul://"
+    ;throttle "simul://"
 }