* [2.6 patch] select for drivers/media
@ 2003-09-28 16:05 Adrian Bunk
2003-09-28 21:04 ` Michael Hunold
0 siblings, 1 reply; 7+ messages in thread
From: Adrian Bunk @ 2003-09-28 16:05 UTC (permalink / raw)
To: Ralph Metzler, Marcus Metzler, kraxel; +Cc: linux-kernel, video4linux-list
The patch below switches drivers/mtd to use select where appropriate.
Could someone with a knowledge of the code please check the following:
DVB_AV7110 and DVB_BUDGET select VIDEO_SAA7146 (without my patch
VIDEO_SAA7146 depends on them) although they don't fulfill the
VIDEO_SAA7146 dependencies VIDEO_DEV && PCI && I2C.
Is the intention to enable VIDEO_SAA7146 only when these options are
enabled or should DVB_AV7110 and DVB_BUDGET depend on these options?
diffstat output:
drivers/media/Kconfig | 8 --------
drivers/media/common/Kconfig | 7 ++-----
drivers/media/dvb/ttpci/Kconfig | 3 +++
drivers/media/video/Kconfig | 12 ++++++++++++
4 files changed, 17 insertions(+), 13 deletions(-)
cu
Adrian
--- linux-2.6.0-test6-full/drivers/media/Kconfig.old 2003-09-28 17:40:12.000000000 +0200
+++ linux-2.6.0-test6-full/drivers/media/Kconfig 2003-09-28 17:49:12.000000000 +0200
@@ -34,20 +34,12 @@
config VIDEO_TUNER
tristate
- default y if VIDEO_BT848=y || VIDEO_SAA7134=y || VIDEO_MXB=y
- default m if VIDEO_BT848=m || VIDEO_SAA7134=m || VIDEO_MXB=m
- depends on VIDEO_DEV
config VIDEO_BUF
tristate
- default y if VIDEO_BT848=y || VIDEO_SAA7134=y || VIDEO_SAA7146=y
- default m if VIDEO_BT848=m || VIDEO_SAA7134=m || VIDEO_SAA7146=m
- depends on VIDEO_DEV
config VIDEO_BTCX
tristate
- default VIDEO_BT848
- depends on VIDEO_DEV
endmenu
--- linux-2.6.0-test6-full/drivers/media/video/Kconfig.old 2003-09-28 17:41:10.000000000 +0200
+++ linux-2.6.0-test6-full/drivers/media/video/Kconfig 2003-09-28 17:45:19.000000000 +0200
@@ -10,6 +10,10 @@
config VIDEO_BT848
tristate "BT848 Video For Linux"
depends on VIDEO_DEV && PCI && I2C_ALGOBIT && SOUND
+ select VIDEO_TUNER
+ select VIDEO_BUF
+ select VIDEO_BTCX
+ select VIDEO_VIDEOBUF
---help---
Support for BT848 based frame grabber/overlay boards. This includes
the Miro, Hauppauge and STB boards. Please read the material in
@@ -219,6 +223,9 @@
config VIDEO_SAA7134
tristate "Philips SAA7134 support"
depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_TUNER
+ select VIDEO_BUF
+ select VIDEO_VIDEOBUF
---help---
This is a video4linux driver for Philips SAA7130/7134 based
TV cards.
@@ -229,6 +236,8 @@
config VIDEO_MXB
tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_TUNER
+ select VIDEO_SAA7146
---help---
This is a video4linux driver for the 'Multimedia eXtension Board'
TV card by Siemens-Nixdorf.
@@ -239,6 +248,7 @@
config VIDEO_DPC
tristate "Philips-Semiconductors 'dpc7146 demonstration board'"
depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_SAA7146
---help---
This is a video4linux driver for the 'dpc7146 demonstration
board' by Philips-Semiconductors. It's the reference design
@@ -252,6 +262,7 @@
config VIDEO_HEXIUM_ORION
tristate "Hexium HV-PCI6 and Orion frame grabber"
depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_SAA7146
---help---
This is a video4linux driver for the Hexium HV-PCI6 and
Orion frame grabber cards by Hexium.
@@ -262,6 +273,7 @@
config VIDEO_HEXIUM_GEMINI
tristate "Hexium Gemini frame grabber"
depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_SAA7146
---help---
This is a video4linux driver for the Hexium Gemini frame
grabber card by Hexium. Please note that the Gemini Dual
--- linux-2.6.0-test6-full/drivers/media/dvb/ttpci/Kconfig.old 2003-09-28 17:46:33.000000000 +0200
+++ linux-2.6.0-test6-full/drivers/media/dvb/ttpci/Kconfig 2003-09-28 17:49:11.000000000 +0200
@@ -1,6 +1,7 @@
config DVB_AV7110
tristate "AV7110 cards"
depends on VIDEO_DEV && DVB_CORE
+ select VIDEO_SAA7146
help
Support for SAA7146 and AV7110 based DVB cards as produced
by Fujitsu-Siemens, Technotrend, Hauppauge and others.
@@ -26,6 +27,7 @@
config DVB_BUDGET
tristate "Budget cards"
depends on DVB_CORE
+ select VIDEO_SAA7146
help
Support for simple SAA7146 based DVB cards
(so called Budget- or Nova-PCI cards) without onboard
--- linux-2.6.0-test6-full/drivers/media/common/Kconfig.old 2003-09-28 17:39:34.000000000 +0200
+++ linux-2.6.0-test6-full/drivers/media/common/Kconfig 2003-09-28 17:55:43.000000000 +0200
@@ -1,11 +1,8 @@
config VIDEO_SAA7146
tristate
- default y if DVB_AV7110=y || DVB_BUDGET=y || DVB_BUDGET_AV=y || VIDEO_MXB=y || VIDEO_DPC=y || VIDEO_HEXIUM_ORION=y || VIDEO_HEXIUM_GEMINI=y
- default m if DVB_AV7110=m || DVB_BUDGET=m || DVB_BUDGET_AV=m || VIDEO_MXB=m || VIDEO_DPC=m || VIDEO_HEXIUM_ORION=m || VIDEO_HEXIUM_GEMINI=m
depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_BUF
+ select VIDEO_VIDEOBUF
config VIDEO_VIDEOBUF
tristate
- default y if VIDEO_SAA7134=y || VIDEO_BT848=y || VIDEO_SAA7146=y
- default m if VIDEO_SAA7134=m || VIDEO_BT848=m || VIDEO_SAA7146=m
- depends on VIDEO_DEV
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [2.6 patch] select for drivers/media
2003-09-28 16:05 [2.6 patch] select for drivers/media Adrian Bunk
@ 2003-09-28 21:04 ` Michael Hunold
2003-09-28 21:26 ` Adrian Bunk
0 siblings, 1 reply; 7+ messages in thread
From: Michael Hunold @ 2003-09-28 21:04 UTC (permalink / raw)
To: Adrian Bunk; +Cc: linux-kernel, video4linux-list
Hello Adrian,
> The patch below switches drivers/mtd to use select where appropriate.
Ok.
> Could someone with a knowledge of the code please check the following:
>
> DVB_AV7110 and DVB_BUDGET select VIDEO_SAA7146 (without my patch
> VIDEO_SAA7146 depends on them) although they don't fulfill the
> VIDEO_SAA7146 dependencies VIDEO_DEV && PCI && I2C.
I admit that this is somewhat broken and might fail under certain
cirumstances. It's possible that someone sets DVB_AV7110, but does not
have I2C enabled. Then VIDEO_SAA7146 is not build, although it should. Doh!
Does your patch fix this issue as well?
> Is the intention to enable VIDEO_SAA7146 only when these options are
> enabled or should DVB_AV7110 and DVB_BUDGET depend on these options?
Both DVB_AV7110 and DVB_BUDGET need VIDEO_SAA7146 to work properly. Same
goes for the analog video drivers VIDEO_MXB, VIDEO_DPC and the other
saa7146 drivers.
It's somewhat annoying that you have to enable I2C before all these
drivers can be build. The user needs to know that I2C is used somewhere
in the driver, although he won't see anything -- all i2c drivers are
compiled automatically, a "modprobe mxb" loads all i2c drivers it needs.
It would be better, if I2C would be enabled automatically if SAA7146 is
set. I admit that this sort of reversed-selection can introduce new
problems.
What do you think?
> cu
> Adrian
CU
Michael.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [2.6 patch] select for drivers/media
2003-09-28 21:04 ` Michael Hunold
@ 2003-09-28 21:26 ` Adrian Bunk
2003-09-29 17:30 ` Greg KH
0 siblings, 1 reply; 7+ messages in thread
From: Adrian Bunk @ 2003-09-28 21:26 UTC (permalink / raw)
To: Michael Hunold, greg; +Cc: linux-kernel, video4linux-list
On Sun, Sep 28, 2003 at 11:04:12PM +0200, Michael Hunold wrote:
> Hello Adrian,
Hi Michael,
> >The patch below switches drivers/mtd to use select where appropriate.
>
> Ok.
>
> >Could someone with a knowledge of the code please check the following:
> >
> >DVB_AV7110 and DVB_BUDGET select VIDEO_SAA7146 (without my patch
> >VIDEO_SAA7146 depends on them) although they don't fulfill the
> >VIDEO_SAA7146 dependencies VIDEO_DEV && PCI && I2C.
>
> I admit that this is somewhat broken and might fail under certain
> cirumstances. It's possible that someone sets DVB_AV7110, but does not
> have I2C enabled. Then VIDEO_SAA7146 is not build, although it should. Doh!
>
> Does your patch fix this issue as well?
No, it doesn't.
> >Is the intention to enable VIDEO_SAA7146 only when these options are
> >enabled or should DVB_AV7110 and DVB_BUDGET depend on these options?
>
> Both DVB_AV7110 and DVB_BUDGET need VIDEO_SAA7146 to work properly. Same
> goes for the analog video drivers VIDEO_MXB, VIDEO_DPC and the other
> saa7146 drivers.
The problem described doesn't exist with the other drivers (they have
the appropriate dependencies).
> It's somewhat annoying that you have to enable I2C before all these
> drivers can be build. The user needs to know that I2C is used somewhere
> in the driver, although he won't see anything -- all i2c drivers are
> compiled automatically, a "modprobe mxb" loads all i2c drivers it needs.
>
> It would be better, if I2C would be enabled automatically if SAA7146 is
> set. I admit that this sort of reversed-selection can introduce new
> problems.
>
> What do you think?
Below is an updated patch that does additionally:
- let DVB_BUDGET depend on VIDEO_DEV
- let DVB_AV7110 and DVB_BUDGET select PCI and I2C
Other possibilitties would be:
- let DVB_AV7110 and DVB_BUDGET depend on PCI and I2C
or
- let VIDEO_SAA7146 select PCI and I2C
I don't have any strong opinion which solution is the best one.
@Greg:
What's your opinion on this issue?
> CU
> Michael.
cu
Adrian
--- linux-2.6.0-test6-full/drivers/media/Kconfig.old 2003-09-28 17:40:12.000000000 +0200
+++ linux-2.6.0-test6-full/drivers/media/Kconfig 2003-09-28 17:49:12.000000000 +0200
@@ -34,20 +34,12 @@
config VIDEO_TUNER
tristate
- default y if VIDEO_BT848=y || VIDEO_SAA7134=y || VIDEO_MXB=y
- default m if VIDEO_BT848=m || VIDEO_SAA7134=m || VIDEO_MXB=m
- depends on VIDEO_DEV
config VIDEO_BUF
tristate
- default y if VIDEO_BT848=y || VIDEO_SAA7134=y || VIDEO_SAA7146=y
- default m if VIDEO_BT848=m || VIDEO_SAA7134=m || VIDEO_SAA7146=m
- depends on VIDEO_DEV
config VIDEO_BTCX
tristate
- default VIDEO_BT848
- depends on VIDEO_DEV
endmenu
--- linux-2.6.0-test6-full/drivers/media/video/Kconfig.old 2003-09-28 17:41:10.000000000 +0200
+++ linux-2.6.0-test6-full/drivers/media/video/Kconfig 2003-09-28 17:45:19.000000000 +0200
@@ -10,6 +10,10 @@
config VIDEO_BT848
tristate "BT848 Video For Linux"
depends on VIDEO_DEV && PCI && I2C_ALGOBIT && SOUND
+ select VIDEO_TUNER
+ select VIDEO_BUF
+ select VIDEO_BTCX
+ select VIDEO_VIDEOBUF
---help---
Support for BT848 based frame grabber/overlay boards. This includes
the Miro, Hauppauge and STB boards. Please read the material in
@@ -219,6 +223,9 @@
config VIDEO_SAA7134
tristate "Philips SAA7134 support"
depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_TUNER
+ select VIDEO_BUF
+ select VIDEO_VIDEOBUF
---help---
This is a video4linux driver for Philips SAA7130/7134 based
TV cards.
@@ -229,6 +236,8 @@
config VIDEO_MXB
tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_TUNER
+ select VIDEO_SAA7146
---help---
This is a video4linux driver for the 'Multimedia eXtension Board'
TV card by Siemens-Nixdorf.
@@ -239,6 +248,7 @@
config VIDEO_DPC
tristate "Philips-Semiconductors 'dpc7146 demonstration board'"
depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_SAA7146
---help---
This is a video4linux driver for the 'dpc7146 demonstration
board' by Philips-Semiconductors. It's the reference design
@@ -252,6 +262,7 @@
config VIDEO_HEXIUM_ORION
tristate "Hexium HV-PCI6 and Orion frame grabber"
depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_SAA7146
---help---
This is a video4linux driver for the Hexium HV-PCI6 and
Orion frame grabber cards by Hexium.
@@ -262,6 +273,7 @@
config VIDEO_HEXIUM_GEMINI
tristate "Hexium Gemini frame grabber"
depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_SAA7146
---help---
This is a video4linux driver for the Hexium Gemini frame
grabber card by Hexium. Please note that the Gemini Dual
--- linux-2.6.0-test6-full/drivers/media/common/Kconfig.old 2003-09-28 17:39:34.000000000 +0200
+++ linux-2.6.0-test6-full/drivers/media/common/Kconfig 2003-09-28 23:16:54.000000000 +0200
@@ -1,11 +1,7 @@
config VIDEO_SAA7146
tristate
- default y if DVB_AV7110=y || DVB_BUDGET=y || DVB_BUDGET_AV=y || VIDEO_MXB=y || VIDEO_DPC=y || VIDEO_HEXIUM_ORION=y || VIDEO_HEXIUM_GEMINI=y
- default m if DVB_AV7110=m || DVB_BUDGET=m || DVB_BUDGET_AV=m || VIDEO_MXB=m || VIDEO_DPC=m || VIDEO_HEXIUM_ORION=m || VIDEO_HEXIUM_GEMINI=m
- depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_BUF
+ select VIDEO_VIDEOBUF
config VIDEO_VIDEOBUF
tristate
- default y if VIDEO_SAA7134=y || VIDEO_BT848=y || VIDEO_SAA7146=y
- default m if VIDEO_SAA7134=m || VIDEO_BT848=m || VIDEO_SAA7146=m
- depends on VIDEO_DEV
--- linux-2.6.0-test6-full/drivers/media/dvb/ttpci/Kconfig.old 2003-09-28 17:46:33.000000000 +0200
+++ linux-2.6.0-test6-full/drivers/media/dvb/ttpci/Kconfig 2003-09-28 23:16:11.000000000 +0200
@@ -1,6 +1,9 @@
config DVB_AV7110
tristate "AV7110 cards"
depends on VIDEO_DEV && DVB_CORE
+ select VIDEO_SAA7146
+ select PCI
+ select I2C
help
Support for SAA7146 and AV7110 based DVB cards as produced
by Fujitsu-Siemens, Technotrend, Hauppauge and others.
@@ -25,7 +28,10 @@
config DVB_BUDGET
tristate "Budget cards"
- depends on DVB_CORE
+ depends on VIDEO_DEV && DVB_CORE
+ select VIDEO_SAA7146
+ select PCI
+ select I2C
help
Support for simple SAA7146 based DVB cards
(so called Budget- or Nova-PCI cards) without onboard
@@ -52,6 +58,7 @@
config DVB_BUDGET_AV
tristate "Budget cards with analog video inputs"
depends on VIDEO_DEV && DVB_CORE && DVB_BUDGET
+ select VIDEO_SAA7146
help
Support for simple SAA7146 based DVB cards
(so called Budget- or Nova-PCI cards) without onboard
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [2.6 patch] select for drivers/media
2003-09-28 21:26 ` Adrian Bunk
@ 2003-09-29 17:30 ` Greg KH
2003-09-29 18:31 ` Michael Hunold
0 siblings, 1 reply; 7+ messages in thread
From: Greg KH @ 2003-09-29 17:30 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Michael Hunold, linux-kernel, video4linux-list
On Sun, Sep 28, 2003 at 11:26:30PM +0200, Adrian Bunk wrote:
> @Greg:
> What's your opinion on this issue?
Your patch looks fine to me.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [2.6 patch] select for drivers/media
2003-09-29 17:30 ` Greg KH
@ 2003-09-29 18:31 ` Michael Hunold
2003-09-29 19:10 ` Roman Zippel
0 siblings, 1 reply; 7+ messages in thread
From: Michael Hunold @ 2003-09-29 18:31 UTC (permalink / raw)
To: Greg KH; +Cc: Adrian Bunk, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 9177 bytes --]
Hello Greg, Adrian,
> Your patch looks fine to me.
Ok, here comes my suggestion: 8-)
"VIDEO_SAA7146" consists of two parts: saa7146.o and saa7146_vv.o
The former contains the low level functions only, whereas the second
one has all the *v*ideo and *v*bi functions, too.
So I split the stuff into VIDEO_SAA7146 and VIDEO_SAA7146_VV.
The reason is, that the so-called DVB budget cards without MPEG-Deocder
only need the core functions, while the full-featured cards with
MPEG-Decoder need both modules plus Video4Linux support. The budget cards
work just fine without Video4Linux.
So here it comes: The idea is to allow the user to basically select
everything. If a subsystem or utitlity stuff is needed (NET, INET, PCI, USB, I2C)
it's selected automatically.
Before, users had to set all these things correctly, before they could
even see the drivers. A co-worked argued, that now stuff is automatically
selected and experienced user now have to find out which driver toggled which
setting. He said that this is almost as bad as before.
What do you think?
Ok, here are some comments to the patch:
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/common/Kconfig linux-2.6.0-test6/drivers/media/common/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/common/Kconfig 2003-09-10 11:28:54.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/common/Kconfig 2003-09-29 14:17:09.000000000 +0200
@@ -1,11 +1,13 @@
config VIDEO_SAA7146
+ select I2C
+ select PCI
tristate
- default y if DVB_AV7110=y || DVB_BUDGET=y || DVB_BUDGET_AV=y || VIDEO_MXB=y || VIDEO_DPC=y || VIDEO_HEXIUM_ORION=y || VIDEO_HEXIUM_GEMINI=y
- default m if DVB_AV7110=m || DVB_BUDGET=m || DVB_BUDGET_AV=m || VIDEO_MXB=m || VIDEO_DPC=m || VIDEO_HEXIUM_ORION=m || VIDEO_HEXIUM_GEMINI=m
- depends on VIDEO_DEV && PCI && I2C
+
+config VIDEO_SAA7146_VV
+ tristate
+ select VIDEO_BUF
+ select VIDEO_VIDEOBUF
+ select VIDEO_SAA7146
config VIDEO_VIDEOBUF
tristate
- default y if VIDEO_SAA7134=y || VIDEO_BT848=y || VIDEO_SAA7146=y
- default m if VIDEO_SAA7134=m || VIDEO_BT848=m || VIDEO_SAA7146=m
- depends on VIDEO_DEV
VIDEO_SAA7146 needs I2C and PCI to function. VIDEO_SAA7146_VV needs VIDEO_BUF,
VIDEO_VIDEOBUF and VIDEO_SAA7146.
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/dvb/Kconfig linux-2.6.0-test6/drivers/media/dvb/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/dvb/Kconfig 2003-09-10 11:28:41.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/dvb/Kconfig 2003-09-29 14:38:43.000000000 +0200
@@ -3,16 +3,18 @@
#
menu "Digital Video Broadcasting Devices"
- depends on NET && INET
config DVB
bool "DVB For Linux"
+ select NET
+ select INET
+ select DVB_CORE
---help---
Support Digital Video Broadcasting hardware. Enable this if you
own a DVB adapter and want to use it or if you compile Linux for
a digital SetTopBox.
- API specs and user tools and are available for example from
+ API specs and user tools are available from
<http://www.linuxtv.org/>.
I simplified the handling here. Instead of relying that the user
has NET and INET set, DVB depends on this. Set DVB_CORE automatically
-- if somebody wants DVB support, he wants the DVB_CORE stuff, too...
@@ -33,18 +35,18 @@
source "drivers/media/dvb/frontends/Kconfig"
comment "Supported SAA7146 based PCI Adapters"
- depends on DVB && PCI
+ depends on DVB_CORE
source "drivers/media/dvb/ttpci/Kconfig"
comment "Supported USB Adapters"
- depends on DVB && USB
+ depends on DVB_CORE
source "drivers/media/dvb/ttusb-budget/Kconfig"
source "drivers/media/dvb/ttusb-dec/Kconfig"
comment "Supported FlexCopII (B2C2) Adapters"
- depends on DVB && PCI
+ depends on DVB_CORE
source "drivers/media/dvb/b2c2/Kconfig"
Make every bigger "subsystem" depend on DVB_CORE. The drivers are all
selectable by default, they set the corresponding dependencies
(PCI or USB) later on.
endmenu
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/dvb/b2c2/Kconfig linux-2.6.0-test6/drivers/media/dvb/b2c2/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/dvb/b2c2/Kconfig 2003-09-10 11:28:41.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/dvb/b2c2/Kconfig 2003-09-29 14:35:30.000000000 +0200
@@ -1,6 +1,7 @@
config DVB_B2C2_SKYSTAR
tristate "Technisat Skystar2 PCI"
depends on DVB_CORE
+ select PCI
help
Support for the Skystar2 PCI DVB card by Technisat, which
is equipped with the FlexCopII chipset by B2C2.
B2C2 needs PCI.
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/dvb/ttpci/Kconfig linux-2.6.0-test6/drivers/media/dvb/ttpci/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/dvb/ttpci/Kconfig 2003-09-29 13:58:00.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/dvb/ttpci/Kconfig 2003-09-29 14:28:39.000000000 +0200
@@ -1,6 +1,8 @@
config DVB_AV7110
tristate "AV7110 cards"
- depends on VIDEO_DEV && DVB_CORE
+ depends on DVB_CORE
+ select VIDEO_DEV
+ select VIDEO_SAA7146_VV
help
Support for SAA7146 and AV7110 based DVB cards as produced
by Fujitsu-Siemens, Technotrend, Hauppauge and others.
This is the full-featured card which needs everything: VIDEO_DEV for Video4Linux,
VIDEO_SAA7146_VV for video&vbi saa7146 support.
@@ -26,6 +28,7 @@
config DVB_BUDGET
tristate "Budget cards"
depends on DVB_CORE
+ select VIDEO_SAA7146
help
Support for simple SAA7146 based DVB cards
(so called Budget- or Nova-PCI cards) without onboard
@@ -38,7 +41,8 @@
config DVB_BUDGET_CI
tristate "Budget cards with onboard CI connector"
- depends on VIDEO_DEV && DVB_CORE && DVB_BUDGET
+ depends on DVB_CORE
+ select VIDEO_SAA7146
help
Support for simple SAA7146 based DVB cards
(so called Budget- or Nova-PCI cards) without onboard
@@ -51,7 +55,9 @@
config DVB_BUDGET_AV
tristate "Budget cards with analog video inputs"
- depends on VIDEO_DEV && DVB_CORE && DVB_BUDGET
+ depends on DVB_CORE
+ select VIDEO_DEV
+ select VIDEO_SAA7146_VV
help
Support for simple SAA7146 based DVB cards
(so called Budget- or Nova-PCI cards) without onboard
@@ -64,7 +70,9 @@
The "budget" cards only need the core functionality of saa7146.
config DVB_BUDGET_PATCH
tristate "AV7110 cards with Budget Patch"
- depends on DVB_CORE && DVB_BUDGET
+ depends on DVB_BUDGET
+ select VIDEO_DEV
+ select VIDEO_SAA7146_VV
help
Support for Budget Patch (full TS) modification on
SAA7146+AV7110 based cards (DVB-S cards). This
This is basically the "full" av7110 card, but with hardware modifications to
behave like a "budget" card...
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/dvb/ttusb-budget/Kconfig linux-2.6.0-test6/drivers/media/dvb/ttusb-budget/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/dvb/ttusb-budget/Kconfig 2003-09-10 11:28:41.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/dvb/ttusb-budget/Kconfig 2003-09-29 14:35:15.000000000 +0200
@@ -1,6 +1,7 @@
config DVB_TTUSB_BUDGET
tristate "Technotrend/Hauppauge Nova-USB devices"
- depends on DVB_CORE && USB
+ depends on DVB_CORE
+ select USB
help
Support for external USB adapters designed by Technotrend and
produced by Hauppauge, shipped under the brand name 'Nova-USB'.
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/dvb/ttusb-dec/Kconfig linux-2.6.0-test6/drivers/media/dvb/ttusb-dec/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/dvb/ttusb-dec/Kconfig 2003-09-10 11:29:20.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/dvb/ttusb-dec/Kconfig 2003-09-29 14:36:01.000000000 +0200
@@ -1,6 +1,8 @@
config DVB_TTUSB_DEC
tristate "Technotrend/Hauppauge USB DEC2000-T devices"
- depends on DVB_CORE && USB && !STANDALONE
+ depends on DVB_CORE
+ depends on !STANDALONE
+ select USB
help
Support for external USB adapters designed by Technotrend and
produced by Hauppauge, shipped under the brand name 'DEC2000-T'.
The USB drivers need USB to work. What does STANDALONE mean?
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/video/Kconfig linux-2.6.0-test6/drivers/media/video/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/video/Kconfig 2003-09-29 13:58:00.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/video/Kconfig 2003-09-29 14:13:01.000000000 +0200
@@ -228,7 +228,7 @@
config VIDEO_MXB
tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
- depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_SAA7146_VV
---help---
This is a video4linux driver for the 'Multimedia eXtension Board'
TV card by Siemens-Nixdorf.
@@ -238,7 +238,7 @@
config VIDEO_DPC
tristate "Philips-Semiconductors 'dpc7146 demonstration board'"
- depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_SAA7146_VV
---help---
This is a video4linux driver for the 'dpc7146 demonstration
board' by Philips-Semiconductors. It's the reference design
@@ -251,7 +251,7 @@
[...]
These are the "analog" drivers using the saa7146. They all need VIDEO_SAA7146_VV.
Ok, that's it. I'm planning to submit a DVB patchset for Linus within the next days.
I can incorporated these changes within my patchset easily.
CU
Michael.
[-- Attachment #2: media_kconfig.diff --]
[-- Type: text/plain, Size: 8887 bytes --]
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/common/Kconfig linux-2.6.0-test6/drivers/media/common/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/common/Kconfig 2003-09-10 11:28:54.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/common/Kconfig 2003-09-29 14:17:09.000000000 +0200
@@ -1,11 +1,13 @@
config VIDEO_SAA7146
+ select I2C
+ select PCI
tristate
- default y if DVB_AV7110=y || DVB_BUDGET=y || DVB_BUDGET_AV=y || VIDEO_MXB=y || VIDEO_DPC=y || VIDEO_HEXIUM_ORION=y || VIDEO_HEXIUM_GEMINI=y
- default m if DVB_AV7110=m || DVB_BUDGET=m || DVB_BUDGET_AV=m || VIDEO_MXB=m || VIDEO_DPC=m || VIDEO_HEXIUM_ORION=m || VIDEO_HEXIUM_GEMINI=m
- depends on VIDEO_DEV && PCI && I2C
+
+config VIDEO_SAA7146_VV
+ tristate
+ select VIDEO_BUF
+ select VIDEO_VIDEOBUF
+ select VIDEO_SAA7146
config VIDEO_VIDEOBUF
tristate
- default y if VIDEO_SAA7134=y || VIDEO_BT848=y || VIDEO_SAA7146=y
- default m if VIDEO_SAA7134=m || VIDEO_BT848=m || VIDEO_SAA7146=m
- depends on VIDEO_DEV
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/common/Makefile linux-2.6.0-test6/drivers/media/common/Makefile
--- xx-linux-2.6.0-test6/drivers/media/common/Makefile 2003-09-10 11:28:41.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/common/Makefile 2003-09-29 14:08:58.000000000 +0200
@@ -1,5 +1,6 @@
saa7146-objs := saa7146_i2c.o saa7146_core.o
saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
-obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o saa7146_vv.o
+obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
+obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/dvb/Kconfig linux-2.6.0-test6/drivers/media/dvb/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/dvb/Kconfig 2003-09-10 11:28:41.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/dvb/Kconfig 2003-09-29 14:38:43.000000000 +0200
@@ -3,16 +3,18 @@
#
menu "Digital Video Broadcasting Devices"
- depends on NET && INET
config DVB
bool "DVB For Linux"
+ select NET
+ select INET
+ select DVB_CORE
---help---
Support Digital Video Broadcasting hardware. Enable this if you
own a DVB adapter and want to use it or if you compile Linux for
a digital SetTopBox.
- API specs and user tools and are available for example from
+ API specs and user tools are available from
<http://www.linuxtv.org/>.
Please report problems regarding this driver to the LinuxDVB
@@ -33,18 +35,18 @@
source "drivers/media/dvb/frontends/Kconfig"
comment "Supported SAA7146 based PCI Adapters"
- depends on DVB && PCI
+ depends on DVB_CORE
source "drivers/media/dvb/ttpci/Kconfig"
comment "Supported USB Adapters"
- depends on DVB && USB
+ depends on DVB_CORE
source "drivers/media/dvb/ttusb-budget/Kconfig"
source "drivers/media/dvb/ttusb-dec/Kconfig"
comment "Supported FlexCopII (B2C2) Adapters"
- depends on DVB && PCI
+ depends on DVB_CORE
source "drivers/media/dvb/b2c2/Kconfig"
endmenu
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/dvb/b2c2/Kconfig linux-2.6.0-test6/drivers/media/dvb/b2c2/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/dvb/b2c2/Kconfig 2003-09-10 11:28:41.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/dvb/b2c2/Kconfig 2003-09-29 14:35:30.000000000 +0200
@@ -1,6 +1,7 @@
config DVB_B2C2_SKYSTAR
tristate "Technisat Skystar2 PCI"
depends on DVB_CORE
+ select PCI
help
Support for the Skystar2 PCI DVB card by Technisat, which
is equipped with the FlexCopII chipset by B2C2.
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/dvb/dvb-core/Kconfig linux-2.6.0-test6/drivers/media/dvb/dvb-core/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/dvb/dvb-core/Kconfig 2003-09-29 13:58:00.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/dvb/dvb-core/Kconfig 2003-09-29 15:50:51.000000000 +0200
@@ -4,5 +4,8 @@
select CRC32
help
DVB core utility functions for device handling, software fallbacks etc.
+ Say Y when you have a DVB card and want to use it. Say Y if your want
+ to build your drivers outside the kernel, but need the DVB core. All
+ in-kernel drivers will select this automatically if needed.
+ If unsure say N.
- Say Y when you have a DVB card and want to use it. If unsure say N.
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/dvb/ttpci/Kconfig linux-2.6.0-test6/drivers/media/dvb/ttpci/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/dvb/ttpci/Kconfig 2003-09-29 13:58:00.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/dvb/ttpci/Kconfig 2003-09-29 14:28:39.000000000 +0200
@@ -1,6 +1,8 @@
config DVB_AV7110
tristate "AV7110 cards"
- depends on VIDEO_DEV && DVB_CORE
+ depends on DVB_CORE
+ select VIDEO_DEV
+ select VIDEO_SAA7146_VV
help
Support for SAA7146 and AV7110 based DVB cards as produced
by Fujitsu-Siemens, Technotrend, Hauppauge and others.
@@ -26,6 +28,7 @@
config DVB_BUDGET
tristate "Budget cards"
depends on DVB_CORE
+ select VIDEO_SAA7146
help
Support for simple SAA7146 based DVB cards
(so called Budget- or Nova-PCI cards) without onboard
@@ -38,7 +41,8 @@
config DVB_BUDGET_CI
tristate "Budget cards with onboard CI connector"
- depends on VIDEO_DEV && DVB_CORE && DVB_BUDGET
+ depends on DVB_CORE
+ select VIDEO_SAA7146
help
Support for simple SAA7146 based DVB cards
(so called Budget- or Nova-PCI cards) without onboard
@@ -51,7 +55,9 @@
config DVB_BUDGET_AV
tristate "Budget cards with analog video inputs"
- depends on VIDEO_DEV && DVB_CORE && DVB_BUDGET
+ depends on DVB_CORE
+ select VIDEO_DEV
+ select VIDEO_SAA7146_VV
help
Support for simple SAA7146 based DVB cards
(so called Budget- or Nova-PCI cards) without onboard
@@ -64,7 +70,9 @@
config DVB_BUDGET_PATCH
tristate "AV7110 cards with Budget Patch"
- depends on DVB_CORE && DVB_BUDGET
+ depends on DVB_BUDGET
+ select VIDEO_DEV
+ select VIDEO_SAA7146_VV
help
Support for Budget Patch (full TS) modification on
SAA7146+AV7110 based cards (DVB-S cards). This
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/dvb/ttusb-budget/Kconfig linux-2.6.0-test6/drivers/media/dvb/ttusb-budget/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/dvb/ttusb-budget/Kconfig 2003-09-10 11:28:41.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/dvb/ttusb-budget/Kconfig 2003-09-29 14:35:15.000000000 +0200
@@ -1,6 +1,7 @@
config DVB_TTUSB_BUDGET
tristate "Technotrend/Hauppauge Nova-USB devices"
- depends on DVB_CORE && USB
+ depends on DVB_CORE
+ select USB
help
Support for external USB adapters designed by Technotrend and
produced by Hauppauge, shipped under the brand name 'Nova-USB'.
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/dvb/ttusb-dec/Kconfig linux-2.6.0-test6/drivers/media/dvb/ttusb-dec/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/dvb/ttusb-dec/Kconfig 2003-09-10 11:29:20.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/dvb/ttusb-dec/Kconfig 2003-09-29 14:36:01.000000000 +0200
@@ -1,6 +1,8 @@
config DVB_TTUSB_DEC
tristate "Technotrend/Hauppauge USB DEC2000-T devices"
- depends on DVB_CORE && USB && !STANDALONE
+ depends on DVB_CORE
+ depends on !STANDALONE
+ select USB
help
Support for external USB adapters designed by Technotrend and
produced by Hauppauge, shipped under the brand name 'DEC2000-T'.
diff -uNrwB --new-file -uraN xx-linux-2.6.0-test6/drivers/media/video/Kconfig linux-2.6.0-test6/drivers/media/video/Kconfig
--- xx-linux-2.6.0-test6/drivers/media/video/Kconfig 2003-09-29 13:58:00.000000000 +0200
+++ linux-2.6.0-test6/drivers/media/video/Kconfig 2003-09-29 14:13:01.000000000 +0200
@@ -228,7 +228,7 @@
config VIDEO_MXB
tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
- depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_SAA7146_VV
---help---
This is a video4linux driver for the 'Multimedia eXtension Board'
TV card by Siemens-Nixdorf.
@@ -238,7 +238,7 @@
config VIDEO_DPC
tristate "Philips-Semiconductors 'dpc7146 demonstration board'"
- depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_SAA7146_VV
---help---
This is a video4linux driver for the 'dpc7146 demonstration
board' by Philips-Semiconductors. It's the reference design
@@ -251,7 +251,7 @@
config VIDEO_HEXIUM_ORION
tristate "Hexium HV-PCI6 and Orion frame grabber"
- depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_SAA7146_VV
---help---
This is a video4linux driver for the Hexium HV-PCI6 and
Orion frame grabber cards by Hexium.
@@ -261,7 +261,7 @@
config VIDEO_HEXIUM_GEMINI
tristate "Hexium Gemini frame grabber"
- depends on VIDEO_DEV && PCI && I2C
+ select VIDEO_SAA7146_VV
---help---
This is a video4linux driver for the Hexium Gemini frame
grabber card by Hexium. Please note that the Gemini Dual
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [2.6 patch] select for drivers/media
2003-09-29 18:31 ` Michael Hunold
@ 2003-09-29 19:10 ` Roman Zippel
2003-10-01 16:39 ` Michael Hunold
0 siblings, 1 reply; 7+ messages in thread
From: Roman Zippel @ 2003-09-29 19:10 UTC (permalink / raw)
To: Michael Hunold; +Cc: Greg KH, Adrian Bunk, linux-kernel
Hi,
On Mon, 29 Sep 2003, Michael Hunold wrote:
> So here it comes: The idea is to allow the user to basically select
> everything. If a subsystem or utitlity stuff is needed (NET, INET, PCI, USB, I2C)
> it's selected automatically.
Please don't use select for something like PCI or NET, if e.g. PCI is not
selected no pci driver should be visible or you annoy users which don't
have a pci bus, but have to wade through thousands of nonrelevant drivers.
bye, Roman
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [2.6 patch] select for drivers/media
2003-09-29 19:10 ` Roman Zippel
@ 2003-10-01 16:39 ` Michael Hunold
0 siblings, 0 replies; 7+ messages in thread
From: Michael Hunold @ 2003-10-01 16:39 UTC (permalink / raw)
To: Roman Zippel; +Cc: Greg KH, Adrian Bunk, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 643 bytes --]
Hi Roman, Greg, Adrian,
> Please don't use select for something like PCI or NET, if e.g. PCI is not
> selected no pci driver should be visible or you annoy users which don't
> have a pci bus, but have to wade through thousands of nonrelevant drivers.
Ok, I understand. Point taken. 8-)
Attached you can find my latest patch: DVB depends on NET && INET again,
the only subsystem that's getting SELECTed is I2C. All dvb drivers
depend on DVB_CORE instead of DVB now, so the user is forced to select
the dvb-core, which he'll need anyway.
> bye, Roman
If it's ok like that, I can include this patch within my next patchset.
CU
Michael.
[-- Attachment #2: 10-DVB-Kconfig-and-Makefile-updates.diff --]
[-- Type: text/plain, Size: 9362 bytes --]
- [DVB] split up saa7146 compilation in core part (saa7146.o) and video+vbi part (saa7146_vv). some drivers need both (av7110.c), some drivers only need the core stuff (budget*.c)
- [DVB] add entry for sp887x DVB-T modulator to corresponding Kconfig
- [DVB] use new SELECT facility of Kconfig, first mentioned by Adrian Bunk and Roman Zippel in DVB subsystem
- [DVB] use SELECT in media/video/Kconfig, too.
diff -uNrwB --new-file -uraN linux-2.6.0-test6/drivers/media/common/Kconfig linux-2.6.0-test6-cvs/drivers/media/common/Kconfig
--- linux-2.6.0-test6/drivers/media/common/Kconfig 2003-10-01 12:25:26.000000000 +0200
+++ linux-2.6.0-test6-cvs/drivers/media/common/Kconfig 2003-10-01 12:12:33.000000000 +0200
@@ -1,8 +1,12 @@
config VIDEO_SAA7146
- def_tristate DVB_AV7110 || DVB_BUDGET || DVB_BUDGET_AV || \
- VIDEO_MXB || VIDEO_DPC || VIDEO_HEXIUM_ORION || \
- VIDEO_HEXIUM_GEMINI
- depends on VIDEO_DEV && PCI && I2C
+ tristate
+ select I2C
+
+config VIDEO_SAA7146_VV
+ tristate
+ select VIDEO_BUF
+ select VIDEO_VIDEOBUF
+ select VIDEO_SAA7146
+
config VIDEO_VIDEOBUF
- def_tristate VIDEO_SAA7134 || VIDEO_BT848 || VIDEO_SAA7146
- depends on VIDEO_DEV
+ tristate
diff -uNrwB --new-file -uraN linux-2.6.0-test6/drivers/media/common/Makefile linux-2.6.0-test6-cvs/drivers/media/common/Makefile
--- linux-2.6.0-test6/drivers/media/common/Makefile 2003-10-01 12:20:38.000000000 +0200
+++ linux-2.6.0-test6-cvs/drivers/media/common/Makefile 2003-09-29 14:08:58.000000000 +0200
@@ -1,5 +1,6 @@
saa7146-objs := saa7146_i2c.o saa7146_core.o
saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
-obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o saa7146_vv.o
+obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
+obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
diff -uNrwB --new-file -uraN linux-2.6.0-test6/drivers/media/dvb/Kconfig linux-2.6.0-test6-cvs/drivers/media/dvb/Kconfig
--- linux-2.6.0-test6/drivers/media/dvb/Kconfig 2003-10-01 12:20:38.000000000 +0200
+++ linux-2.6.0-test6-cvs/drivers/media/dvb/Kconfig 2003-09-30 19:43:56.000000000 +0200
@@ -3,16 +3,16 @@
#
menu "Digital Video Broadcasting Devices"
- depends on NET && INET
config DVB
bool "DVB For Linux"
+ depends on NET && INET
---help---
Support Digital Video Broadcasting hardware. Enable this if you
own a DVB adapter and want to use it or if you compile Linux for
a digital SetTopBox.
- API specs and user tools and are available for example from
+ API specs and user tools are available from
<http://www.linuxtv.org/>.
Please report problems regarding this driver to the LinuxDVB
@@ -33,18 +33,16 @@
source "drivers/media/dvb/frontends/Kconfig"
comment "Supported SAA7146 based PCI Adapters"
- depends on DVB && PCI
-
+ depends on DVB_CORE && PCI
source "drivers/media/dvb/ttpci/Kconfig"
comment "Supported USB Adapters"
- depends on DVB && USB
-
+ depends on DVB_CORE && USB
source "drivers/media/dvb/ttusb-budget/Kconfig"
source "drivers/media/dvb/ttusb-dec/Kconfig"
comment "Supported FlexCopII (B2C2) Adapters"
- depends on DVB && PCI
+ depends on DVB_CORE && PCI
source "drivers/media/dvb/b2c2/Kconfig"
endmenu
diff -uNrwB --new-file -uraN linux-2.6.0-test6/drivers/media/dvb/dvb-core/Kconfig linux-2.6.0-test6-cvs/drivers/media/dvb/dvb-core/Kconfig
--- linux-2.6.0-test6/drivers/media/dvb/dvb-core/Kconfig 2003-10-01 12:20:38.000000000 +0200
+++ linux-2.6.0-test6-cvs/drivers/media/dvb/dvb-core/Kconfig 2003-09-29 15:50:51.000000000 +0200
@@ -4,5 +4,8 @@
select CRC32
help
DVB core utility functions for device handling, software fallbacks etc.
+ Say Y when you have a DVB card and want to use it. Say Y if your want
+ to build your drivers outside the kernel, but need the DVB core. All
+ in-kernel drivers will select this automatically if needed.
+ If unsure say N.
- Say Y when you have a DVB card and want to use it. If unsure say N.
diff -uNrwB --new-file -uraN linux-2.6.0-test6/drivers/media/dvb/dvb-core/Makefile.lib linux-2.6.0-test6-cvs/drivers/media/dvb/dvb-core/Makefile.lib
--- linux-2.6.0-test6/drivers/media/dvb/dvb-core/Makefile.lib 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.0-test6-cvs/drivers/media/dvb/dvb-core/Makefile.lib 2002-11-08 18:13:22.000000000 +0100
@@ -0,0 +1 @@
+obj-$(CONFIG_DVB_CORE) += crc32.o
diff -uNrwB --new-file -uraN linux-2.6.0-test6/drivers/media/dvb/ttpci/Kconfig linux-2.6.0-test6-cvs/drivers/media/dvb/ttpci/Kconfig
--- linux-2.6.0-test6/drivers/media/dvb/ttpci/Kconfig 2003-10-01 12:20:38.000000000 +0200
+++ linux-2.6.0-test6-cvs/drivers/media/dvb/ttpci/Kconfig 2003-09-29 14:28:39.000000000 +0200
@@ -1,6 +1,8 @@
config DVB_AV7110
tristate "AV7110 cards"
- depends on VIDEO_DEV && DVB_CORE
+ depends on DVB_CORE
+ select VIDEO_DEV
+ select VIDEO_SAA7146_VV
help
Support for SAA7146 and AV7110 based DVB cards as produced
by Fujitsu-Siemens, Technotrend, Hauppauge and others.
@@ -26,6 +28,7 @@
config DVB_BUDGET
tristate "Budget cards"
depends on DVB_CORE
+ select VIDEO_SAA7146
help
Support for simple SAA7146 based DVB cards
(so called Budget- or Nova-PCI cards) without onboard
@@ -38,7 +41,8 @@
config DVB_BUDGET_CI
tristate "Budget cards with onboard CI connector"
- depends on VIDEO_DEV && DVB_CORE && DVB_BUDGET
+ depends on DVB_CORE
+ select VIDEO_SAA7146
help
Support for simple SAA7146 based DVB cards
(so called Budget- or Nova-PCI cards) without onboard
@@ -51,7 +55,9 @@
config DVB_BUDGET_AV
tristate "Budget cards with analog video inputs"
- depends on VIDEO_DEV && DVB_CORE && DVB_BUDGET
+ depends on DVB_CORE
+ select VIDEO_DEV
+ select VIDEO_SAA7146_VV
help
Support for simple SAA7146 based DVB cards
(so called Budget- or Nova-PCI cards) without onboard
@@ -64,7 +70,9 @@
config DVB_BUDGET_PATCH
tristate "AV7110 cards with Budget Patch"
- depends on DVB_CORE && DVB_BUDGET
+ depends on DVB_BUDGET
+ select VIDEO_DEV
+ select VIDEO_SAA7146_VV
help
Support for Budget Patch (full TS) modification on
SAA7146+AV7110 based cards (DVB-S cards). This
diff -uNrwB --new-file -uraN linux-2.6.0-test6/drivers/media/dvb/ttusb-budget/Kconfig linux-2.6.0-test6-cvs/drivers/media/dvb/ttusb-budget/Kconfig
--- linux-2.6.0-test6/drivers/media/dvb/ttusb-budget/Kconfig 2003-10-01 12:20:38.000000000 +0200
+++ linux-2.6.0-test6-cvs/drivers/media/dvb/ttusb-budget/Kconfig 2003-09-30 19:45:20.000000000 +0200
@@ -1,6 +1,6 @@
config DVB_TTUSB_BUDGET
tristate "Technotrend/Hauppauge Nova-USB devices"
- depends on DVB_CORE && USB
+ depends on DVB_CORE
help
Support for external USB adapters designed by Technotrend and
produced by Hauppauge, shipped under the brand name 'Nova-USB'.
diff -uNrwB --new-file -uraN linux-2.6.0-test6/drivers/media/dvb/frontends/Kconfig linux-2.6.0-test6-cvs/drivers/media/dvb/frontends/Kconfig
--- linux-2.6.0-test6/drivers/media/dvb/frontends/Kconfig 2003-10-01 13:36:35.000000000 +0200
+++ linux-2.6.0-test6-cvs/drivers/media/dvb/frontends/Kconfig 2003-10-01 13:04:16.000000000 +0200
@@ -26,6 +26,16 @@
DVB adapter simply enable all supported frontends, the
right one will get autodetected.
+config DVB_SP887X
+ tristate "Frontends with sp887x demodulators, e.g. Microtune DTF7072"
+ depends on DVB_CORE
+ help
+ A DVB-T demodulator driver. Say Y when you want to support the sp887x.
+
+ If you don't know what tuner module is soldered on your
+ DVB adapter simply enable all supported frontends, the
+ right one will get autodetected.
+
config DVB_ALPS_TDLB7
tristate "Alps TDLB7 (OFDM)"
depends on DVB_CORE
diff -uNrwB --new-file -uraN linux-2.6.0-test6/drivers/media/video/Kconfig linux-2.6.0-test6-cvs/drivers/media/video/Kconfig
--- linux-2.6.0-test6/drivers/media/video/Kconfig 2003-10-01 13:36:35.000000000 +0200
+++ linux-2.6.0-test6-cvs/drivers/media/video/Kconfig 2003-09-30 19:40:39.000000000 +0200
@@ -3,7 +3,7 @@
#
menu "Video For Linux"
- depends on VIDEO_DEV!=n
+ depends on VIDEO_DEV
comment "Video Adapters"
@@ -228,7 +228,8 @@
config VIDEO_MXB
tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
- depends on VIDEO_DEV && PCI && I2C
+ depends on VIDEO_DEV && PCI
+ select VIDEO_SAA7146_VV
---help---
This is a video4linux driver for the 'Multimedia eXtension Board'
TV card by Siemens-Nixdorf.
@@ -238,7 +239,8 @@
config VIDEO_DPC
tristate "Philips-Semiconductors 'dpc7146 demonstration board'"
- depends on VIDEO_DEV && PCI && I2C
+ depends on VIDEO_DEV && PCI
+ select VIDEO_SAA7146_VV
---help---
This is a video4linux driver for the 'dpc7146 demonstration
board' by Philips-Semiconductors. It's the reference design
@@ -251,7 +253,8 @@
config VIDEO_HEXIUM_ORION
tristate "Hexium HV-PCI6 and Orion frame grabber"
- depends on VIDEO_DEV && PCI && I2C
+ depends on VIDEO_DEV && PCI
+ select VIDEO_SAA7146_VV
---help---
This is a video4linux driver for the Hexium HV-PCI6 and
Orion frame grabber cards by Hexium.
@@ -261,7 +264,8 @@
config VIDEO_HEXIUM_GEMINI
tristate "Hexium Gemini frame grabber"
- depends on VIDEO_DEV && PCI && I2C
+ depends on VIDEO_DEV && PCI
+ select VIDEO_SAA7146_VV
---help---
This is a video4linux driver for the Hexium Gemini frame
grabber card by Hexium. Please note that the Gemini Dual
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2003-10-01 16:40 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-09-28 16:05 [2.6 patch] select for drivers/media Adrian Bunk
2003-09-28 21:04 ` Michael Hunold
2003-09-28 21:26 ` Adrian Bunk
2003-09-29 17:30 ` Greg KH
2003-09-29 18:31 ` Michael Hunold
2003-09-29 19:10 ` Roman Zippel
2003-10-01 16:39 ` Michael Hunold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).