diff options
| author | Gerd Knorr <devnull@localhost> | 2005-02-22 09:56:28 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2005-02-22 09:56:28 +0000 |
| commit | 3f08c54d9289e972068dd8676d823c479925dfb5 (patch) | |
| tree | abdc728df8694341de1e757fb46ad56ec960cb7a /v4l/or51132.c | |
| parent | 8a8d071d5d022bbf5bc92d5172f362e8fa98a9ae (diff) | |
| download | mediapointer-dvb-s2-3f08c54d9289e972068dd8676d823c479925dfb5.tar.gz mediapointer-dvb-s2-3f08c54d9289e972068dd8676d823c479925dfb5.tar.bz2 | |
- misc fixes from various people.
- make or51132.c compile (not work) on 2.6.10.
Diffstat (limited to 'v4l/or51132.c')
| -rw-r--r-- | v4l/or51132.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/v4l/or51132.c b/v4l/or51132.c index 4ebf1321b..5789b4960 100644 --- a/v4l/or51132.c +++ b/v4l/or51132.c @@ -31,6 +31,7 @@ #define OR51132_VSB_FIRMWARE "dvb-fe-or51132-vsb.fw" #define OR51132_QAM_FIRMWARE "dvb-fe-or51132-qam.fw" +#include <linux/version.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/moduleparam.h> @@ -254,10 +255,12 @@ static int or51132_setmode(struct dvb_frontend* fe) /* Auto-deinterleave; MPEG ser, MPEG2tr, phase noise-high*/ cmd_buf[2] = 0x5F; break; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10) case VSB_8: /* Auto CH, Auto NTSC rej, MPEGser, MPEG2tr, phase noise-high*/ cmd_buf[2] = 0x50; break; +#endif default: printk("setmode:Modulation set to unsupported value\n"); }; @@ -290,12 +293,14 @@ static int or51132_setmode(struct dvb_frontend* fe) /* Channel MODE QAM64 */ cmd_buf[2] = 0x43; break; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10) case VSB_8: /* REC MODE inv IF spectrum, Normal */ cmd_buf[1] = 0x03; /* Channel MODE ATSC/VSB8 */ cmd_buf[2] = 0x06; break; +#endif default: printk("setmode: Modulation set to unsupported value\n"); }; @@ -319,6 +324,7 @@ static int or51132_set_parameters(struct dvb_frontend* fe, struct or51132_state* state = (struct or51132_state*) fe->demodulator_priv; const struct firmware *fw; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10) /* Change only if we are actually changing the modulation */ if (state->current_modulation != param->u.vsb.modulation) { switch(param->u.vsb.modulation) { @@ -369,6 +375,9 @@ static int or51132_set_parameters(struct dvb_frontend* fe, state->current_modulation = param->u.vsb.modulation; or51132_setmode(fe); } +#else + printk("%s: you need a newer kernel for this, sorry\n",__FUNCTION__); +#endif /* Change only if we are actually changing the channel */ if (state->current_frequency != param->frequency) { |