utils/dvb: Update headers to DVB API v5.5

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/utils/dvb/dvb-v5-std.h b/utils/dvb/dvb-v5-std.h
index 4008dab..c542037 100644 (file)
--- a/utils/dvb/dvb-v5-std.h
+++ b/utils/dvb/dvb-v5-std.h
@@ -132,7 +132,8 @@ const unsigned int sys_isdbs_props[] = {
 
 const unsigned int *dvb_v5_delivery_system[] = {
        [SYS_ATSC] =          sys_atsc_props,
-       [SYS_DVBC_ANNEX_AC] = sys_dvbc_annex_ac_props,
+       [SYS_DVBC_ANNEX_A] =  sys_dvbc_annex_ac_props,
+       [SYS_DVBC_ANNEX_C] =  sys_dvbc_annex_ac_props,
        [SYS_DVBC_ANNEX_B] =  sys_dvbc_annex_b_props,
        [SYS_DVBS] =          sys_dvbs_props,
        [SYS_DVBS2] =         sys_dvbs2_props,

diff --git a/utils/dvb/dvb-v5.h b/utils/dvb/dvb-v5.h
index 4ffa8e6..6a384a0 100644 (file)
--- a/utils/dvb/dvb-v5.h
+++ b/utils/dvb/dvb-v5.h
@@ -153,7 +153,7 @@ const char *fe_rolloff_name[4] = {
        [ROLLOFF_AUTO] = "AUTO",
 };
 
-const char *dvb_v5_name[44] = {
+const char *dvb_v5_name[45] = {
        [DTV_API_VERSION] =                    "API_VERSION",
        [DTV_BANDWIDTH_HZ] =                   "BANDWIDTH_HZ",
        [DTV_CLEAR] =                          "CLEAR",
@@ -163,6 +163,7 @@ const char *dvb_v5_name[44] = {
        [DTV_DISEQC_MASTER] =                  "DISEQC_MASTER",
        [DTV_DISEQC_SLAVE_REPLY] =             "DISEQC_SLAVE_REPLY",
        [DTV_DVBT2_PLP_ID] =                   "DVBT2_PLP_ID",
+       [DTV_ENUM_DELSYS] =                    "ENUM_DELSYS",
        [DTV_FE_CAPABILITY] =                  "FE_CAPABILITY",
        [DTV_FE_CAPABILITY_COUNT] =            "FE_CAPABILITY_COUNT",
        [DTV_FREQUENCY] =                      "FREQUENCY",
@@ -200,25 +201,26 @@ const char *dvb_v5_name[44] = {
        [DTV_VOLTAGE] =                        "VOLTAGE",
 };
 
-const char *delivery_system_name[18] = {
-       [SYS_ATSC] =          "ATSC",
-       [SYS_ATSCMH] =        "ATSCMH",
-       [SYS_CMMB] =          "CMMB",
-       [SYS_DAB] =           "DAB",
-       [SYS_DMBTH] =         "DMBTH",
-       [SYS_DSS] =           "DSS",
-       [SYS_DVBC_ANNEX_AC] = "DVBC/ANNEX_AC",
-       [SYS_DVBC_ANNEX_B] =  "DVBC/ANNEX_B",
-       [SYS_DVBH] =          "DVBH",
-       [SYS_DVBS] =          "DVBS",
-       [SYS_DVBS2] =         "DVBS2",
-       [SYS_DVBT] =          "DVBT",
-       [SYS_DVBT2] =         "DVBT2",
-       [SYS_ISDBC] =         "ISDBC",
-       [SYS_ISDBS] =         "ISDBS",
-       [SYS_ISDBT] =         "ISDBT",
-       [SYS_TURBO] =         "TURBO",
-       [SYS_UNDEFINED] =     "UNDEFINED",
+const char *delivery_system_name[19] = {
+       [SYS_ATSC] =         "ATSC",
+       [SYS_ATSCMH] =       "ATSCMH",
+       [SYS_CMMB] =         "CMMB",
+       [SYS_DAB] =          "DAB",
+       [SYS_DMBTH] =        "DMBTH",
+       [SYS_DSS] =          "DSS",
+       [SYS_DVBC_ANNEX_A] = "DVBC/ANNEX_A",
+       [SYS_DVBC_ANNEX_B] = "DVBC/ANNEX_B",
+       [SYS_DVBC_ANNEX_C] = "DVBC/ANNEX_C",
+       [SYS_DVBH] =         "DVBH",
+       [SYS_DVBS] =         "DVBS",
+       [SYS_DVBS2] =        "DVBS2",
+       [SYS_DVBT] =         "DVBT",
+       [SYS_DVBT2] =        "DVBT2",
+       [SYS_ISDBC] =        "ISDBC",
+       [SYS_ISDBS] =        "ISDBS",
+       [SYS_ISDBT] =        "ISDBT",
+       [SYS_TURBO] =        "TURBO",
+       [SYS_UNDEFINED] =    "UNDEFINED",
 };
 
 #endif

diff --git a/utils/dvb/dvb_frontend.h b/utils/dvb/dvb_frontend.h
index 1b1094c..7e7cb64 100644 (file)
--- a/utils/dvb/dvb_frontend.h
+++ b/utils/dvb/dvb_frontend.h
@@ -181,6 +181,7 @@ typedef enum fe_transmit_mode {
        TRANSMISSION_MODE_32K,
 } fe_transmit_mode_t;
 
+#if defined(__DVB_CORE__) || !defined (__KERNEL__)
 typedef enum fe_bandwidth {
        BANDWIDTH_8_MHZ,
        BANDWIDTH_7_MHZ,
@@ -190,7 +191,7 @@ typedef enum fe_bandwidth {
        BANDWIDTH_10_MHZ,
        BANDWIDTH_1_712_MHZ,
 } fe_bandwidth_t;
-
+#endif
 
 typedef enum fe_guard_interval {
        GUARD_INTERVAL_1_32,
@@ -213,6 +214,7 @@ typedef enum fe_hierarchy {
 } fe_hierarchy_t;
 
 
+#if defined(__DVB_CORE__) || !defined (__KERNEL__)
 struct dvb_qpsk_parameters {
        __u32           symbol_rate;  /* symbol rate in Symbols per second */
        fe_code_rate_t  fec_inner;    /* forward error correction (see above) */
@@ -251,11 +253,11 @@ struct dvb_frontend_parameters {
        } u;
 };
 
-
 struct dvb_frontend_event {
        fe_status_t status;
        struct dvb_frontend_parameters parameters;
 };
+#endif
 
 /* S2API Commands */
 #define DTV_UNDEFINED          0
@@ -316,7 +318,9 @@ struct dvb_frontend_event {
 
 #define DTV_DVBT2_PLP_ID       43
 
-#define DTV_MAX_COMMAND                                DTV_DVBT2_PLP_ID
+#define DTV_ENUM_DELSYS                44
+
+#define DTV_MAX_COMMAND                                DTV_ENUM_DELSYS
 
 typedef enum fe_pilot {
        PILOT_ON,
@@ -333,7 +337,7 @@ typedef enum fe_rolloff {
 
 typedef enum fe_delivery_system {
        SYS_UNDEFINED,
-       SYS_DVBC_ANNEX_AC,
+       SYS_DVBC_ANNEX_A,
        SYS_DVBC_ANNEX_B,
        SYS_DVBT,
        SYS_DSS,
@@ -350,8 +354,13 @@ typedef enum fe_delivery_system {
        SYS_DAB,
        SYS_DVBT2,
        SYS_TURBO,
+       SYS_DVBC_ANNEX_C,
 } fe_delivery_system_t;
 
+
+#define SYS_DVBC_ANNEX_AC      SYS_DVBC_ANNEX_A
+
+
 struct dtv_cmds_h {
        char    *name;          /* A display name for debugging purposes */