diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-04-22 05:18:40 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-04-22 05:18:40 +0200 |
| commit | 2009dcd0494a671e2492aa865e690446388c7a5a (patch) | |
| tree | 76b2da61393d8f4dbacef2d4474fdee5ea42e056 /src/fig/FIG0_1.cpp | |
| parent | dd14214e1ad46b9fa323be7e7e13c55c30085a67 (diff) | |
| download | dabmux-2009dcd0494a671e2492aa865e690446388c7a5a.tar.gz dabmux-2009dcd0494a671e2492aa865e690446388c7a5a.tar.bz2 dabmux-2009dcd0494a671e2492aa865e690446388c7a5a.zip | |
Move all FIG structures to cpp files, fix FIG0_21 rfa
Diffstat (limited to 'src/fig/FIG0_1.cpp')
| -rw-r--r-- | src/fig/FIG0_1.cpp | 38 |
1 files changed, 34 insertions, 4 deletions
diff --git a/src/fig/FIG0_1.cpp b/src/fig/FIG0_1.cpp index 6ed40dd..60704f2 100644 --- a/src/fig/FIG0_1.cpp +++ b/src/fig/FIG0_1.cpp @@ -23,11 +23,41 @@ along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. */ +#include "fig/FIG0structs.h" #include "fig/FIG0_1.h" #include "utils.h" namespace FIC { +struct FIGtype0_1 { + uint8_t Length:5; + uint8_t FIGtypeNumber:3; + uint8_t Extension:5; + uint8_t PD:1; + uint8_t OE:1; + uint8_t CN:1; +} PACKED; + +struct FIGtype0_1_SubChannel_ShortF { + uint8_t StartAdress_high:2; + uint8_t SubChId:6; + uint8_t StartAdress_low:8; + uint8_t TableIndex:6; + uint8_t TableSwitch:1; + uint8_t Short_Long_form:1; +} PACKED; + +struct FIGtype0_1_SubChannel_LongF { + uint8_t StartAdress_high:2; + uint8_t SubChId:6; + uint8_t StartAdress_low:8; + uint8_t Sub_ChannelSize_high:2; + uint8_t ProtectionLevel:2; + uint8_t Option:3; + uint8_t Short_Long_form:1; + uint8_t Sub_ChannelSize_low:8; +} PACKED; + FIG0_1::FIG0_1(FIGRuntimeInformation *rti) : m_rti(rti), m_initialised(false), @@ -133,8 +163,8 @@ FillStatus FIG0_1::fill(uint8_t *buf, size_t max_size) } if (protection->form == UEP) { - FIG_01_SubChannel_ShortF *fig0_1subchShort = - (FIG_01_SubChannel_ShortF*)buf; + FIGtype0_1_SubChannel_ShortF *fig0_1subchShort = + (FIGtype0_1_SubChannel_ShortF*)buf; fig0_1subchShort->SubChId = (*subchannelFIG0_1)->id; fig0_1subchShort->StartAdress_high = @@ -156,8 +186,8 @@ FillStatus FIG0_1::fill(uint8_t *buf, size_t max_size) << " ix=" << subch_iter_ix; } else if (protection->form == EEP) { - FIG_01_SubChannel_LongF *fig0_1subchLong1 = - (FIG_01_SubChannel_LongF*)buf; + FIGtype0_1_SubChannel_LongF *fig0_1subchLong1 = + (FIGtype0_1_SubChannel_LongF*)buf; fig0_1subchLong1->SubChId = (*subchannelFIG0_1)->id; fig0_1subchLong1->StartAdress_high = |