From 3bbfb68ffae75da51a752f97eaff19d91a45e6d6 Mon Sep 17 00:00:00 2001 From: Jakub Zawadzki Date: Thu, 28 Nov 2013 22:31:55 +0000 Subject: Move MPEG section table id defines to packet-mpeg-sect.h svn path=/trunk/; revision=53632 --- epan/dissectors/packet-dvb-ait.c | 2 -- epan/dissectors/packet-dvb-bat.c | 2 -- epan/dissectors/packet-dvb-data-mpe.c | 3 --- epan/dissectors/packet-dvb-eit.c | 3 --- epan/dissectors/packet-dvb-nit.c | 3 --- epan/dissectors/packet-dvb-sdt.c | 3 --- epan/dissectors/packet-dvb-tdt.c | 2 -- epan/dissectors/packet-dvb-tot.c | 2 -- epan/dissectors/packet-eiss.c | 2 -- epan/dissectors/packet-etv.c | 3 --- epan/dissectors/packet-mpeg-ca.c | 2 -- epan/dissectors/packet-mpeg-dsmcc.c | 6 ------ epan/dissectors/packet-mpeg-pat.c | 2 -- epan/dissectors/packet-mpeg-pmt.c | 2 -- epan/dissectors/packet-mpeg-sect.h | 34 ++++++++++++++++++++++++++++++++++ 15 files changed, 34 insertions(+), 37 deletions(-) (limited to 'epan/dissectors') diff --git a/epan/dissectors/packet-dvb-ait.c b/epan/dissectors/packet-dvb-ait.c index 7e6944a8b6..508cde2918 100644 --- a/epan/dissectors/packet-dvb-ait.c +++ b/epan/dissectors/packet-dvb-ait.c @@ -79,8 +79,6 @@ static int hf_dvb_ait_org_id = -1; static int hf_dvb_ait_app_id = -1; static int hf_dvb_ait_app_ctrl_code = -1; -#define DVB_AIT_TID 0x74 - static const value_string app_ctrl_code[] = { { 0x01, "Autostart" }, { 0x02, "Present" }, diff --git a/epan/dissectors/packet-dvb-bat.c b/epan/dissectors/packet-dvb-bat.c index 0e7e1b6f1a..2adf1b14ab 100644 --- a/epan/dissectors/packet-dvb-bat.c +++ b/epan/dissectors/packet-dvb-bat.c @@ -58,8 +58,6 @@ static gint ett_dvb_bat = -1; static gint ett_dvb_bat_transport_stream = -1; -#define DVB_BAT_TID 0x4A - #define DVB_BAT_RESERVED1_MASK 0xC0 #define DVB_BAT_VERSION_NUMBER_MASK 0x3E #define DVB_BAT_CURRENT_NEXT_INDICATOR_MASK 0x01 diff --git a/epan/dissectors/packet-dvb-data-mpe.c b/epan/dissectors/packet-dvb-data-mpe.c index cc525a4d45..e7ac2cd666 100644 --- a/epan/dissectors/packet-dvb-data-mpe.c +++ b/epan/dissectors/packet-dvb-data-mpe.c @@ -49,9 +49,6 @@ static gint ett_dvb_data_mpe = -1; static dissector_handle_t ip_handle; static dissector_handle_t llc_handle; -#define DVB_DATA_MPE_TID 0x3E - - #define DVB_DATA_MPE_RESERVED_MASK 0xC0 #define DVB_DATA_MPE_PAYLOAD_SCRAMBLING_MASK 0x30 #define DVB_DATA_MPE_ADDRESS_SCRAMBLING_MASK 0x0C diff --git a/epan/dissectors/packet-dvb-eit.c b/epan/dissectors/packet-dvb-eit.c index d9c507441a..4145b0ada2 100644 --- a/epan/dissectors/packet-dvb-eit.c +++ b/epan/dissectors/packet-dvb-eit.c @@ -59,9 +59,6 @@ static gint ett_dvb_eit = -1; static gint ett_dvb_eit_event = -1; -#define DVB_EIT_TID_MIN 0x4E -#define DVB_EIT_TID_MAX 0x6F - #define DVB_EIT_RESERVED_MASK 0xC0 #define DVB_EIT_VERSION_NUMBER_MASK 0x3E #define DVB_EIT_CURRENT_NEXT_INDICATOR_MASK 0x01 diff --git a/epan/dissectors/packet-dvb-nit.c b/epan/dissectors/packet-dvb-nit.c index e7193c48ce..af45ea8734 100644 --- a/epan/dissectors/packet-dvb-nit.c +++ b/epan/dissectors/packet-dvb-nit.c @@ -57,9 +57,6 @@ static gint ett_dvb_nit = -1; static gint ett_dvb_nit_ts = -1; -#define DVB_NIT_TID 0x40 -#define DVB_NIT_TID_OTHER 0x41 - #define DVB_NIT_RESERVED1_MASK 0xC0 #define DVB_NIT_VERSION_NUMBER_MASK 0x3E #define DVB_NIT_CURRENT_NEXT_INDICATOR_MASK 0x01 diff --git a/epan/dissectors/packet-dvb-sdt.c b/epan/dissectors/packet-dvb-sdt.c index ed7bd7ce99..c57f5cf3b7 100644 --- a/epan/dissectors/packet-dvb-sdt.c +++ b/epan/dissectors/packet-dvb-sdt.c @@ -57,9 +57,6 @@ static int hf_dvb_sdt_descriptors_loop_length = -1; static gint ett_dvb_sdt = -1; static gint ett_dvb_sdt_service = -1; -#define DVB_SDT_TID_ACTUAL 0x42 -#define DVB_SDT_TID_OTHER 0x46 - #define DVB_SDT_RESERVED1_MASK 0xC0 #define DVB_SDT_VERSION_NUMBER_MASK 0x3E #define DVB_SDT_CURRENT_NEXT_INDICATOR_MASK 0x01 diff --git a/epan/dissectors/packet-dvb-tdt.c b/epan/dissectors/packet-dvb-tdt.c index 62e52cd2bc..9bd794bcba 100644 --- a/epan/dissectors/packet-dvb-tdt.c +++ b/epan/dissectors/packet-dvb-tdt.c @@ -38,8 +38,6 @@ static int hf_dvb_tdt_utc_time = -1; static gint ett_dvb_tdt = -1; -#define DVB_TDT_TID 0x70 - static void dissect_dvb_tdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { diff --git a/epan/dissectors/packet-dvb-tot.c b/epan/dissectors/packet-dvb-tot.c index fe0f1e43e1..9113780685 100644 --- a/epan/dissectors/packet-dvb-tot.c +++ b/epan/dissectors/packet-dvb-tot.c @@ -42,8 +42,6 @@ static int hf_dvb_tot_descriptors_loop_length = -1; static gint ett_dvb_tot = -1; -#define DVB_TOT_TID 0x73 - #define DVB_TOT_RESERVED_MASK 0xF000 #define DVB_TOT_DESCRIPTORS_LOOP_LENGTH_MASK 0x0FFF diff --git a/epan/dissectors/packet-eiss.c b/epan/dissectors/packet-eiss.c index 0073b8528e..1dcc4287de 100644 --- a/epan/dissectors/packet-eiss.c +++ b/epan/dissectors/packet-eiss.c @@ -99,8 +99,6 @@ static expert_field ei_eiss_section_number = EI_INIT; static expert_field ei_eiss_application_type = EI_INIT; static expert_field ei_eiss_invalid_reserved_bits = EI_INIT; -#define EISS_SECTION_TID 0xe0 - #define MPEG_SECT_SYNTAX_INDICATOR_MASK 0x8000 #define MPEG_SECT_RESERVED_MASK 0x7000 #define MPEG_SECT_LENGTH_MASK 0x0FFF diff --git a/epan/dissectors/packet-etv.c b/epan/dissectors/packet-etv.c index e155dbf29b..2d841a3808 100644 --- a/epan/dissectors/packet-etv.c +++ b/epan/dissectors/packet-etv.c @@ -59,9 +59,6 @@ static expert_field ei_etv_ddb_filter_info = EI_INIT; static gint ett_etv = -1; static gint ett_etv_payload = -1; -#define ETV_TID_DII_SECTION 0xe3 -#define ETV_TID_DDB_SECTION 0xe4 - static void dissect_etv_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int proto, int hf_filter_info, int hf_reserved, diff --git a/epan/dissectors/packet-mpeg-ca.c b/epan/dissectors/packet-mpeg-ca.c index 00a900e738..07c8c71be1 100644 --- a/epan/dissectors/packet-mpeg-ca.c +++ b/epan/dissectors/packet-mpeg-ca.c @@ -41,8 +41,6 @@ static int hf_mpeg_ca_last_section_number = -1; static gint ett_mpeg_ca = -1; -#define MPEG_CA_TID 0x01 - #define MPEG_CA_RESERVED_MASK 0xFFFFC0 #define MPEG_CA_VERSION_NUMBER_MASK 0x00003E #define MPEG_CA_CURRENT_NEXT_INDICATOR_MASK 0x000001 diff --git a/epan/dissectors/packet-mpeg-dsmcc.c b/epan/dissectors/packet-mpeg-dsmcc.c index 6cb22a9116..cd6336efcc 100644 --- a/epan/dissectors/packet-mpeg-dsmcc.c +++ b/epan/dissectors/packet-mpeg-dsmcc.c @@ -182,12 +182,6 @@ static gint ett_dsmcc_dii_module = -1; static expert_field ei_dsmcc_invalid_value = EI_INIT; static expert_field ei_dsmcc_crc_invalid = EI_INIT; -#define DSMCC_TID_LLCSNAP 0x3a -#define DSMCC_TID_UN_MSG 0x3b -#define DSMCC_TID_DD_MSG 0x3c -#define DSMCC_TID_DESC_LIST 0x3d -#define DSMCC_TID_PRIVATE 0x3e - #define DSMCC_TCP_PORT 13819 /* DSM-CC protocol discriminator, (table 2-1) */ diff --git a/epan/dissectors/packet-mpeg-pat.c b/epan/dissectors/packet-mpeg-pat.c index 80cfa48275..aaf292c264 100644 --- a/epan/dissectors/packet-mpeg-pat.c +++ b/epan/dissectors/packet-mpeg-pat.c @@ -47,8 +47,6 @@ static int hf_mpeg_pat_program_map_pid = -1; static gint ett_mpeg_pat = -1; static gint ett_mpeg_pat_prog = -1; -#define MPEG_PAT_TID 0x00 - #define MPEG_PAT_RESERVED_MASK 0xC0 #define MPEG_PAT_VERSION_NUMBER_MASK 0x3E #define MPEG_PAT_CURRENT_NEXT_INDICATOR_MASK 0x01 diff --git a/epan/dissectors/packet-mpeg-pmt.c b/epan/dissectors/packet-mpeg-pmt.c index 09980bdc26..f46b74750d 100644 --- a/epan/dissectors/packet-mpeg-pmt.c +++ b/epan/dissectors/packet-mpeg-pmt.c @@ -54,8 +54,6 @@ static int hf_mpeg_pmt_stream_es_info_length = -1; static gint ett_mpeg_pmt = -1; static gint ett_mpeg_pmt_stream = -1; -#define MPEG_PMT_TID 0x02 - #define MPEG_PMT_RESERVED1_MASK 0xC0 #define MPEG_PMT_VERSION_NUMBER_MASK 0x3E #define MPEG_PMT_CURRENT_NEXT_INDICATOR_MASK 0x01 diff --git a/epan/dissectors/packet-mpeg-sect.h b/epan/dissectors/packet-mpeg-sect.h index deb0ce69db..1dacc3b062 100644 --- a/epan/dissectors/packet-mpeg-sect.h +++ b/epan/dissectors/packet-mpeg-sect.h @@ -26,6 +26,40 @@ #ifndef __PACKET_MPEG_SECT_H__ #define __PACKET_MPEG_SECT_H__ +/* From ISO/IEC 13818-1 */ +#define MPEG_PAT_TID 0x00 /* packet-mpeg-pat.c */ +#define MPEG_CA_TID 0x01 /* packet-mpeg-ca.c */ +#define MPEG_PMT_TID 0x02 /* packet-mpeg-pmt.c */ + +/* From ISO/IEC 13818-6 */ +#define DSMCC_TID_LLCSNAP 0x3a /* packet-dsmcc.c */ +#define DSMCC_TID_UN_MSG 0x3b /* packet-dsmcc.c */ +#define DSMCC_TID_DD_MSG 0x3c /* packet-dsmcc.c */ +#define DSMCC_TID_DESC_LIST 0x3d /* packet-dsmcc.c */ +#define DSMCC_TID_PRIVATE 0x3e /* packet-dsmcc.c */ + +/* From ETSI EN 300 468 */ +#define DVB_NIT_TID 0x40 /* packet-dvb-nit.c */ +#define DVB_NIT_TID_OTHER 0x41 /* packet-dvb-nit.c */ +#define DVB_SDT_TID_ACTUAL 0x42 /* packet-dvb-sdt.c */ +#define DVB_SDT_TID_OTHER 0x46 /* packet-dvb-sdt.c */ +#define DVB_BAT_TID 0x4A /* packet-dvb-bat.c */ +#define DVB_EIT_TID_MIN 0x4E /* packet-dvb-eit.c */ +#define DVB_EIT_TID_MAX 0x6F /* packet-dvb-eit.c */ +#define DVB_TDT_TID 0x70 /* packet-dvb-tdt.c */ +#define DVB_TOT_TID 0x73 /* packet-dvb-tot.c */ + +/* From ETSI TS 102 899 */ +#define DVB_AIT_TID 0x74 /* packet-dvb-ait.c */ + +/* From ESTI EN 301 192 */ +#define DVB_DATA_MPE_TID 0x3E /* packet-dvb-data-mpe.c */ + +/* From OC-SP-ETV-AM 1.0-IO5 */ +#define EISS_SECTION_TID 0xe0 /* packet-eiss.c */ +#define ETV_TID_DII_SECTION 0xe3 /* packet-etv.c */ +#define ETV_TID_DDB_SECTION 0xe4 /* packet-etv.c */ + #define PACKET_MPEG_SECT_PI__TABLE_ID 0 #define PACKET_MPEG_SECT_PI__SSI 1 #define PACKET_MPEG_SECT_PI__RESERVED 2 -- cgit v1.2.3