diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-13 12:09:52 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-13 12:09:52 -0200 |
| commit | c04e90e2d38493e6c092095cc2441365dd3973af (patch) | |
| tree | 10f7dd48868de244e34380fc45ecac99601d9027 /linux/include | |
| parent | 2cea09a7e6ff7e5202803e6a6c2279ed254d7dff (diff) | |
| parent | a0184c08027dba2f30a12bcd1ca1ca1da7fc7963 (diff) | |
| download | mediapointer-dvb-s2-c04e90e2d38493e6c092095cc2441365dd3973af.tar.gz mediapointer-dvb-s2-c04e90e2d38493e6c092095cc2441365dd3973af.tar.bz2 | |
merge: http://linuxtv.org/hg/~stoth/s2
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/dvb/frontend.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/linux/include/linux/dvb/frontend.h b/linux/include/linux/dvb/frontend.h index d28f21796..72cb8ae55 100644 --- a/linux/include/linux/dvb/frontend.h +++ b/linux/include/linux/dvb/frontend.h @@ -164,9 +164,8 @@ typedef enum fe_modulation { QAM_AUTO, VSB_8, VSB_16, - _8PSK, - _16APSK, - NBC_QPSK, + PSK_8, + APSK_16, DQPSK, } fe_modulation_t; @@ -300,6 +299,14 @@ struct dvb_frontend_event { #define DTV_ISDB_LAYERC_TIME_INTERLEAVING 34 #endif #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, @@ -308,9 +315,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; @@ -358,14 +365,14 @@ struct dtv_property { 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) |