Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

[linux-2.6-omap-h63xx.git] / include / linux / dvb / frontend.h

diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index 7c17c71edb593e31d92faf4b77bbf135e3fb6f66..79a8ed8e6a7d6c02517c7407019b0302806035c1 100644 (file)
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -164,9 +164,9 @@ typedef enum fe_modulation {
        QAM_AUTO,
        VSB_8,
        VSB_16,
-       _8PSK,
-       _16APSK,
-       NBC_QPSK,
+       PSK_8,
+       APSK_16,
+       APSK_32,
        DQPSK,
 } fe_modulation_t;
 
@@ -268,6 +268,15 @@ struct dvb_frontend_event {
 #define DTV_FE_CAPABILITY      16
 #define DTV_DELIVERY_SYSTEM    17
 
+#define DTV_API_VERSION                                35
+#define DTV_API_VERSION                                35
+#define DTV_CODE_RATE_HP                       36
+#define DTV_CODE_RATE_LP                       37
+#define DTV_GUARD_INTERVAL                     38
+#define DTV_TRANSMISSION_MODE                  39
+#define DTV_HIERARCHY                          40
+
+#define DTV_MAX_COMMAND                                DTV_HIERARCHY
 
 typedef enum fe_pilot {
        PILOT_ON,
@@ -276,9 +285,9 @@ typedef enum fe_pilot {
 } fe_pilot_t;
 
 typedef enum fe_rolloff {
+       ROLLOFF_35, /* Implied value in DVB-S, default for DVB-S2 */
        ROLLOFF_20,
        ROLLOFF_25,
-       ROLLOFF_35,
        ROLLOFF_AUTO,
 } fe_rolloff_t;
 
@@ -287,6 +296,7 @@ typedef enum fe_delivery_system {
        SYS_DVBC_ANNEX_AC,
        SYS_DVBC_ANNEX_B,
        SYS_DVBT,
+       SYS_DSS,
        SYS_DVBS,
        SYS_DVBS2,
        SYS_DVBH,
@@ -323,16 +333,17 @@ struct dtv_property {
                        void *reserved2;
                } buffer;
        } u;
+       int result;
 } __attribute__ ((packed));
 
-/* No more than 16 properties during any given ioctl */
+/* num of properties cannot exceed DTV_IOCTL_MAX_MSGS per ioctl */
+#define DTV_IOCTL_MAX_MSGS 64
+
 struct dtv_properties {
        __u32 num;
        struct dtv_property *props;
 };
 
-#define DTV_IOCTL_MAX_MSGS 64
-
 #define FE_SET_PROPERTY                   _IOW('o', 82, struct dtv_properties)
 #define FE_GET_PROPERTY                   _IOR('o', 83, struct dtv_properties)