Steve Toth wrote:
>
>> Anyway, enable/disable_plli2c() should then probably be named
>> i2c_gate_ctrl(..., int enable) or something like that if it
>> doesn't deal with just plls.
>>
>
> Done. See attached.
>
> [Patch] Adding support for the Hauppauge HVR1100 and HVR1100-LP products
>
> Signed-off-by: Steven Toth <stoth@xxxxxxxxxxxxx>
[snip]
> Index: linux/drivers/media/video/cx88/cx88-dvb.c
> ===================================================================
> RCS file: /cvs/video4linux/v4l-dvb/linux/drivers/media/video/cx88/cx88-dvb.c,v
> retrieving revision 1.74
> diff -u -p -r1.74 cx88-dvb.c
> --- linux/drivers/media/video/cx88/cx88-dvb.c 22 Nov 2005 19:32:26 -0000 1.74
> +++ linux/drivers/media/video/cx88/cx88-dvb.c 1 Dec 2005 19:54:26 -0000
> @@ -197,6 +197,14 @@ static struct cx22702_config hauppauge_n
> .pll_address = 0x61,
> .pll_desc = &dvb_pll_thomson_dtt759x,
> };
> +static struct cx22702_config hauppauge_hvr1100_config = {
> + .demod_address = 0x63,
> +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
> + .output_mode = CX22702_SERIAL_OUTPUT,
> +#endif
> + .pll_address = 0x61,
> + .pll_desc = &dvb_pll_fmd1216me,
> +};
> #endif
Hmm.... I realize that the #if compile-time test above was in all of
your previous patches .... I'm sorry for not saying this sooner.
It's good that you have included this test, for the sake of
completeness, however, We're going to have to remove this across the board:
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
.output_mode = CX22702_SERIAL_OUTPUT,
#endif
...We had this previously, because of the difference in the cx22702
module in kernels earlier than 2.6.13 ... Now that dvb and v4l cvs trees
have merged, we must eliminate this test.
I get the feeling this patch is good enough to apply, but I think
Johannes has the final say this time. I'll wait until after Steve's
patches get applied, then I'll cleanup the CX22702_SERIAL_OUTPUT test.
Regards,
Mike
