libdvbv5: don't use ATSC_HEADER() macro

This macro was a very bad idea, as it causes doxygen to produce
wrong data. Get rid of it.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

3 files changed, 14 insertions, 7 deletions

diff --git a/lib/include/libdvbv5/atsc_eit.h b/lib/include/libdvbv5/atsc_eit.h
index 7d0b7289..a6219d94 100644
--- a/lib/include/libdvbv5/atsc_eit.h
+++ b/lib/include/libdvbv5/atsc_eit.h
@@ -129,8 +129,10 @@ union atsc_table_eit_desc_length {
  * @struct atsc_table_eit
  * @brief ATSC EIT table
  *
- * @param events	events
- * @param event	pointer to struct event
+ * @param header			struct dvb_table_header content
+ * @param protocol_version		protocol version
+ * @param events			events
+ * @param event				pointer to struct event
  *
  * This structure is used to store the original ATSC EIT table,
  * converting the integer fields to the CPU endianness.
@@ -140,7 +142,8 @@ union atsc_table_eit_desc_length {
  * there.
  */
 struct atsc_table_eit {
-	ATSC_HEADER();
+	struct dvb_table_header header;
+	uint8_t  protocol_version;
 	uint8_t events;
 	struct atsc_table_eit_event *event;
 } __attribute__((packed));
@@ -148,8 +151,8 @@ struct atsc_table_eit {
 /**
  * @brief Macro used to find event on an ATSC EIT table
  *
- * @param _event	event to seek
- * @param _eit		pointer to struct atsc_table_eit_event
+ * @param _event			event to seek
+ * @param _eit				pointer to struct atsc_table_eit_event
  */
 #define atsc_eit_event_foreach(_event, _eit) \
 	for( struct atsc_table_eit_event *_event = _eit->event; _event; _event = _event->next ) \
diff --git a/lib/include/libdvbv5/mgt.h b/lib/include/libdvbv5/mgt.h
index eb4403ed..e9288680 100644
--- a/lib/include/libdvbv5/mgt.h
+++ b/lib/include/libdvbv5/mgt.h
@@ -52,7 +52,8 @@ struct atsc_table_mgt_table {
 } __attribute__((packed));
 
 struct atsc_table_mgt {
-	ATSC_HEADER();
+	struct dvb_table_header header;
+	uint8_t  protocol_version;
         uint16_t tables;
         struct atsc_table_mgt_table *table;
 	struct dvb_desc *descriptor;
diff --git a/lib/include/libdvbv5/vct.h b/lib/include/libdvbv5/vct.h
index 4b9e03b6..acd45292 100644
--- a/lib/include/libdvbv5/vct.h
+++ b/lib/include/libdvbv5/vct.h
@@ -151,6 +151,8 @@ struct atsc_table_vct_channel {
  * @struct atsc_table_vct
  * @brief ATSC VCT table (covers both CVCT and TVCT)
  *
+ * @param header			struct dvb_table_header content
+ * @param protocol_version		protocol version
  * @param num_channels_in_section	num channels in section
  *
  * @param channel			pointer to struct channel
@@ -160,7 +162,8 @@ struct atsc_table_vct_channel {
  * to the data parsed from the MPEG TS. So, metadata are added there
  */
 struct atsc_table_vct {
-	ATSC_HEADER();
+	struct dvb_table_header header;
+	uint8_t  protocol_version;
 
 	uint8_t num_channels_in_section;