1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
|
#!/bin/sh
echo creating symlinks
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/dvb-pll.c dvb-pll.c
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/dvb-pll.h dvb-pll.h
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352.c mt352.c
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352.h mt352.h
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352_priv.h mt352_priv.h
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.c cx22702.c
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.h cx22702.h
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x.c lgdt330x.c
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x.h lgdt330x.h
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x_priv.h lgdt330x_priv.h
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.c or51132.c
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.h or51132.h
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/tda1004x.c tda1004x.c
ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/tda1004x.h tda1004x.h
patch -p1 <<'DIFF'
diff -upr video4linux.orig/Makefile video4linux/Makefile
--- video4linux.orig/Makefile 2005-07-29 21:41:18.000000000 +0000
+++ video4linux/Makefile 2005-07-29 21:41:59.000000000 +0000
@@ -39,8 +39,8 @@ obj-$(CONFIG_VIDEO_IR) += ir-common.o
obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o
obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o
-obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o
-obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
+obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt330x.o mt352.o
+obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o
# 2.6-only stuff
ifeq ($(VERSION).$(PATCHLEVEL),2.6)
@@ -54,6 +54,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
endif
# for DVB
+EXTRA_CFLAGS += -DDVB_CVS=1
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
@@ -131,6 +132,7 @@ ifeq ($(inst-m),)
endif
inst_common := ir-common.ko
+inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt330x.ko or51132.ko tda1004x.ko
inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko
inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko
inst_video += video-buf.ko video-buf-dvb.ko
@@ -157,6 +159,9 @@ install:: rminstall
-install -d $(KDIR26)/common
-install -m 644 -c $(inst_common) $(KDIR26)/common
+ -install -d $(KDIR26)/dvb/frontends
+ -install -m 644 -c $(inst_frontends) $(KDIR26)/dvb/frontends
+
-install -d $(KDIR26)/video
-install -m 644 -c $(inst_video) $(KDIR26)/video
diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c
--- video4linux.orig/cx88-dvb.c 2005-07-29 21:40:53.000000000 +0000
+++ video4linux/cx88-dvb.c 2005-07-29 21:41:59.000000000 +0000
@@ -32,10 +32,6 @@
#include <linux/config.h>
#include "compat.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-#undef HAVE_LGDT330X
-#endif
-
#include "cx88.h"
#include "dvb-pll.h"
@@ -216,7 +216,6 @@ static struct or51132_config pchdtv_hd30
#endif
#ifdef HAVE_LGDT330X
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
static int lgdt330x_pll_set(struct dvb_frontend* fe,
struct dvb_frontend_parameters* params)
{
@@ -246,18 +245,6 @@ static int lgdt330x_pll_set(struct dvb_f
}
return 0;
}
-#else
-static int lgdt330x_pll_set(struct dvb_frontend* fe,
- struct dvb_frontend_parameters* params, u8* pllbuf)
-{
- struct cx8802_dev *dev= fe->dvb->priv;
-
- pllbuf[0] = dev->core->pll_addr;
- dvb_pll_configure(dev->core->pll_desc, &pllbuf[1],
- params->frequency, 0);
- return 0;
-}
-#endif
static int lgdt330x_pll_rf_set(struct dvb_frontend* fe, int index)
{
@@ -284,7 +271,6 @@ static int lgdt330x_set_ts_param(struct
static struct lgdt330x_config fusionhdtv_3_gold = {
.demod_address = 0x0e,
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
.chip = LGDT3302,
.serial_mpeg = 1,
.pll_set = lgdt330x_pll_set,
@@ -296,7 +282,6 @@ static struct lgdt330x_config fusionhdtv
.demod_address = 0x0e,
.chip = LGDT3303,
.serial_mpeg = 1,
-#endif
.pll_set = lgdt330x_pll_set,
.set_ts_params = lgdt330x_set_ts_param,
};
@@ -385,7 +370,6 @@ static int dvb_register(struct cx8802_de
&dev->core->i2c_adap);
}
break;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD:
dev->ts_gen_cntrl = 0x08;
{
@@ -403,7 +387,6 @@ static int dvb_register(struct cx8802_de
}
break;
#endif
-#endif
default:
printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
dev->core->name);
diff -upr video4linux.orig/saa7134-dvb.c video4linux/saa7134-dvb.c
--- video4linux.orig/saa7134-dvb.c 2005-07-29 21:40:53.000000000 +0000
+++ video4linux/saa7134-dvb.c 2005-07-29 21:41:59.000000000 +0000
@@ -32,10 +32,6 @@
#include <linux/config.h>
#include "compat.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-#undef HAVE_TDA1004X
-#endif
-
#include "saa7134-reg.h"
#include "saa7134.h"
|
