Blackfin arch: stub out pgprot_noncached() like other people seem to do on nommu

[safe/jmp/linux-2.6] / include / linux / dvb / frontend.h

diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index 3d4fab4..55026b1 100644 (file)
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -62,10 +62,11 @@ typedef enum fe_caps {
        FE_CAN_HIERARCHY_AUTO           = 0x100000,
        FE_CAN_8VSB                     = 0x200000,
        FE_CAN_16VSB                    = 0x400000,
-       FE_HAS_EXTENDED_CAPS            = 0x800000,   // We need more bitspace for newer APIs, indicate this.
-       FE_NEEDS_BENDING                = 0x20000000, // not supported anymore, don't use (frontend requires frequency bending)
-       FE_CAN_RECOVER                  = 0x40000000, // frontend can recover from a cable unplug automatically
-       FE_CAN_MUTE_TS                  = 0x80000000  // frontend can stop spurious TS data output
+       FE_HAS_EXTENDED_CAPS            = 0x800000,   /* We need more bitspace for newer APIs, indicate this. */
+       FE_CAN_2G_MODULATION            = 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */
+       FE_NEEDS_BENDING                = 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */
+       FE_CAN_RECOVER                  = 0x40000000, /* frontend can recover from a cable unplug automatically */
+       FE_CAN_MUTE_TS                  = 0x80000000  /* frontend can stop spurious TS data output */
 } fe_caps_t;
 
 
@@ -121,15 +122,15 @@ typedef enum fe_sec_mini_cmd {
 
 
 typedef enum fe_status {
-       FE_HAS_SIGNAL   = 0x01,   /*  found something above the noise level */
-       FE_HAS_CARRIER  = 0x02,   /*  found a DVB signal  */
-       FE_HAS_VITERBI  = 0x04,   /*  FEC is stable  */
-       FE_HAS_SYNC     = 0x08,   /*  found sync bytes  */
-       FE_HAS_LOCK     = 0x10,   /*  everything's working... */
-       FE_TIMEDOUT     = 0x20,   /*  no lock within the last ~2 seconds */
-       FE_REINIT       = 0x40    /*  frontend was reinitialized,  */
-} fe_status_t;                   /*  application is recommended to reset */
-                                 /*  DiSEqC, tone and parameters */
+       FE_HAS_SIGNAL   = 0x01,   /* found something above the noise level */
+       FE_HAS_CARRIER  = 0x02,   /* found a DVB signal  */
+       FE_HAS_VITERBI  = 0x04,   /* FEC is stable  */
+       FE_HAS_SYNC     = 0x08,   /* found sync bytes  */
+       FE_HAS_LOCK     = 0x10,   /* everything's working... */
+       FE_TIMEDOUT     = 0x20,   /* no lock within the last ~2 seconds */
+       FE_REINIT       = 0x40    /* frontend was reinitialized,  */
+} fe_status_t;                   /* application is recommended to reset */
+                                 /* DiSEqC, tone and parameters */
 
 typedef enum fe_spectral_inversion {
        INVERSION_OFF,
@@ -166,6 +167,7 @@ typedef enum fe_modulation {
        VSB_16,
        PSK_8,
        APSK_16,
+       APSK_32,
        DQPSK,
 } fe_modulation_t;
 
@@ -268,8 +270,14 @@ struct dvb_frontend_event {
 #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_API_VERSION
+#define DTV_MAX_COMMAND                                DTV_HIERARCHY
 
 typedef enum fe_pilot {
        PILOT_ON,
@@ -278,9 +286,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;
 
@@ -289,6 +297,7 @@ typedef enum fe_delivery_system {
        SYS_DVBC_ANNEX_AC,
        SYS_DVBC_ANNEX_B,
        SYS_DVBT,
+       SYS_DSS,
        SYS_DVBS,
        SYS_DVBS2,
        SYS_DVBH,