diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-05-17 17:43:31 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-05-20 21:39:37 +0200 |
| commit | 126ac41ec051df2439eb87a4730b5fe88b97020f (patch) | |
| tree | 2143fb57eab626edfd09d629e6ae94cdd14b14bf | |
| parent | ceb01462fa3a9a3b82e3c0b8988d06406b2c7f72 (diff) | |
| download | dabmux-126ac41ec051df2439eb87a4730b5fe88b97020f.tar.gz dabmux-126ac41ec051df2439eb87a4730b5fe88b97020f.tar.bz2 dabmux-126ac41ec051df2439eb87a4730b5fe88b97020f.zip | |
remove useless stuff
| -rw-r--r-- | src/dabOutput/edi/AFPacket.cpp | 4 | ||||
| -rw-r--r-- | src/dabOutput/edi/AFPacket.h | 13 | ||||
| -rw-r--r-- | src/dabOutput/edi/TagItems.h | 1 | ||||
| -rw-r--r-- | src/dabOutput/edi/TagPacket.h | 1 |
4 files changed, 0 insertions, 19 deletions
diff --git a/src/dabOutput/edi/AFPacket.cpp b/src/dabOutput/edi/AFPacket.cpp index 1516561..782ae78 100644 --- a/src/dabOutput/edi/AFPacket.cpp +++ b/src/dabOutput/edi/AFPacket.cpp @@ -43,10 +43,6 @@ std::vector<uint8_t> AFPacket::Assemble(TagPacket tag_packet) { std::vector<uint8_t> payload = tag_packet.Assemble(); - header.ar_maj = 1; - header.ar_min = 0; - header.pt = protocol_type; - std::string pack_data("AF"); // SYNC std::vector<uint8_t> packet(pack_data.begin(), pack_data.end()); diff --git a/src/dabOutput/edi/AFPacket.h b/src/dabOutput/edi/AFPacket.h index 0d41878..0826a35 100644 --- a/src/dabOutput/edi/AFPacket.h +++ b/src/dabOutput/edi/AFPacket.h @@ -32,22 +32,10 @@ #include <stdint.h> #include "TagItems.h" #include "TagPacket.h" -#define PACKED __attribute__ ((packed)) #define EDI_AFPACKET_PROTOCOLTYPE_TAGITEMS ('T') // ETSI TS 102 821, 6.1 AF packet structure -struct AFHeader -{ - uint16_t sync; - uint32_t len; - uint16_t seq; - uint8_t ar_cf:1; - uint8_t ar_maj:3; - uint8_t ar_min:4; - uint8_t pt; -} PACKED; - class AFPacket { public: @@ -58,7 +46,6 @@ class AFPacket private: static const bool have_crc = true; - AFHeader header; uint16_t seq; //counter that overflows at 0xFFFF char protocol_type; diff --git a/src/dabOutput/edi/TagItems.h b/src/dabOutput/edi/TagItems.h index dc0037b..a44eb74 100644 --- a/src/dabOutput/edi/TagItems.h +++ b/src/dabOutput/edi/TagItems.h @@ -32,7 +32,6 @@ #include <vector> #include <string> #include <stdint.h> -#define PACKED __attribute__ ((packed)) class TagItem { diff --git a/src/dabOutput/edi/TagPacket.h b/src/dabOutput/edi/TagPacket.h index 2227085..a8154fd 100644 --- a/src/dabOutput/edi/TagPacket.h +++ b/src/dabOutput/edi/TagPacket.h @@ -26,7 +26,6 @@ #define _TAGPACKET_H_ #include "config.h" -#include "Eti.h" #include "TagItems.h" #include <vector> #include <string> |