From 65a96c1c595841c3f77e16b0e018e89cc6840eb4 Mon Sep 17 00:00:00 2001
From: Martin Kaiser <wireshark@kaiser.cx>
Date: Sat, 16 Nov 2013 14:17:06 +0000
Subject: interpret the flags for EIT p/f, EIT sch usage

svn path=/trunk/; revision=53369
---
 epan/dissectors/packet-dvbci.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'epan/dissectors/packet-dvbci.c')

diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index 13c27da0bc..90c50e3f33 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -412,6 +412,13 @@
 #define OPP_DLV_CAP_T  0x5A
 #define OPP_DLV_CAP_S2 0x79
 
+/* EIT p/f, EIT schedule usage */
+#define OPP_EIT_ABSENT 0
+#define OPP_EIT_NOT_X  1
+#define OPP_EIT_FULL_X 2
+#define OPP_EIT_BARKER 3
+#define OPP_EPG_APP    4
+
 /* sas resource */
 #define SAS_SESS_STATE_CONNECTED 0
 #define SAS_SESS_STATE_NOT_FOUND 1
@@ -1557,6 +1564,20 @@ static const value_string dvbci_opp_ref_req_flag[] = {
     { OPP_REF_REG_FLG_SCHED, "scheduled" },
     { 0, NULL }
 };
+static const value_string dvbci_opp_eit_pf_usage[] = {
+    { OPP_EIT_ABSENT, "no EIT present" },
+    { OPP_EIT_NOT_X,  "EIT is not fully ross-carried" },
+    { OPP_EIT_FULL_X, "EIT is fully cross-carried" },
+    { 0, NULL }
+};
+static const value_string dvbci_opp_eit_sch_usage[] = {
+    { OPP_EIT_ABSENT, "no EIT present" },
+    { OPP_EIT_NOT_X,  "EIT is not fully ross-carried" },
+    { OPP_EIT_FULL_X, "EIT is fully cross-carried" },
+    { OPP_EIT_BARKER, "EIT is available from a barker channel" },
+    { OPP_EPG_APP,    "EPG is delivered using an application" },
+    { 0, NULL }
+};
 static const value_string dvbci_opp_dlv_cap[] = {
     { OPP_DLV_CAP_S,  "DVB-S" },
     { OPP_DLV_CAP_C,  "DVB-C" },
@@ -5691,11 +5712,11 @@ proto_register_dvbci(void)
         },
         { &hf_dvbci_eit_pf_usage,
           { "EIT present/following usage", "dvb-ci.opp.eit_pf_usage",
-            FT_UINT8, BASE_HEX, NULL, 0x30, NULL, HFILL }
+            FT_UINT8, BASE_HEX, VALS(dvbci_opp_eit_pf_usage), 0x30, NULL, HFILL }
         },
         { &hf_dvbci_eit_sch_usage,
           { "EIT schedule usage", "dvb-ci.opp.eit_sch_usage",
-            FT_UINT8, BASE_HEX, NULL, 0x0E, NULL, HFILL }
+            FT_UINT8, BASE_HEX, VALS(dvbci_opp_eit_sch_usage), 0x0E, NULL, HFILL }
         },
         { &hf_dvbci_ext_evt_usage,
           { "Extended event usage", "dvb-ci.opp.ext_evt_usage",
-- 
cgit v1.2.3