summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-09-23 15:30:23 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-09-23 15:30:23 +0200
commit02128c92b1cbe5a7c12739872e477e95f0ccf8f5 (patch)
treef5fe916fda77df1e126a4ebcbbece56545816155
parent263b13f0c81952d2355607cce0212916c6f4040e (diff)
downloaddabmux-02128c92b1cbe5a7c12739872e477e95f0ccf8f5.tar.gz
dabmux-02128c92b1cbe5a7c12739872e477e95f0ccf8f5.tar.bz2
dabmux-02128c92b1cbe5a7c12739872e477e95f0ccf8f5.zip
Update FIG0/9 to EN 300 401 V2.1.1
-rw-r--r--TODO5
-rw-r--r--src/fig/FIG0.cpp4
-rw-r--r--src/fig/FIG0.h2
3 files changed, 9 insertions, 2 deletions
diff --git a/TODO b/TODO
index 0e5c458..3bf746f 100644
--- a/TODO
+++ b/TODO
@@ -57,3 +57,8 @@ upcoming, but since that's not trivial to find out because the POSIX time
concept is totally unaware of that, this is not done. We need to know for EDI
TIST, and the ClockTAI class can get the information from the Internet, but it
is not used in FIG0/10.
+
+Add support for services with different ECC than ensemble
+---------------------------------------------------------
+FIG 0/9 can transmit an Extended field for this information. Needs change of
+configuration file, internal structures and FIG 0/9.
diff --git a/src/fig/FIG0.cpp b/src/fig/FIG0.cpp
index 4ac4e5e..c9e57dd 100644
--- a/src/fig/FIG0.cpp
+++ b/src/fig/FIG0.cpp
@@ -777,7 +777,7 @@ FillStatus FIG0_9::fill(uint8_t *buf, size_t max_size)
fig0_9->Extension = 9;
fig0_9->ext = 0;
- fig0_9->lto = 0; // Unique LTO for ensemble
+ fig0_9->rfa1 = 0; // Had a different meaning in EN 300 401 V1.4.1
if (ensemble->lto_auto) {
time_t now = time(NULL);
@@ -799,6 +799,8 @@ FillStatus FIG0_9::fill(uint8_t *buf, size_t max_size)
buf += 5;
remaining -= 5;
+ /* No extended field, no support for services with different ECC */
+
fs.num_bytes_written = max_size - remaining;
fs.complete_fig_transmitted = true;
return fs;
diff --git a/src/fig/FIG0.h b/src/fig/FIG0.h
index 3a0113b..dcd0df1 100644
--- a/src/fig/FIG0.h
+++ b/src/fig/FIG0.h
@@ -421,7 +421,7 @@ struct FIGtype0_9 {
uint8_t CN:1;
uint8_t ensembleLto:6;
- uint8_t lto:1;
+ uint8_t rfa1:1;
uint8_t ext:1;
uint8_t ensembleEcc;
uint8_t tableId;