Commit 3785bc17 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] b2c2: break it into common/pci/usb directories

b2c2 is, in fact, 2 drivers: one for PCI and one for USB, plus
a common bus-independent code. Break it accordingly.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 25aee3de
...@@ -139,7 +139,6 @@ config DVB_NET ...@@ -139,7 +139,6 @@ config DVB_NET
unsure say Y. unsure say Y.
comment "Media drivers" comment "Media drivers"
source "drivers/media/common/Kconfig"
source "drivers/media/rc/Kconfig" source "drivers/media/rc/Kconfig"
# #
...@@ -173,4 +172,7 @@ comment "Supported DVB Frontends" ...@@ -173,4 +172,7 @@ comment "Supported DVB Frontends"
depends on DVB_CORE depends on DVB_CORE
source "drivers/media/dvb-frontends/Kconfig" source "drivers/media/dvb-frontends/Kconfig"
# Common drivers
source "drivers/media/common/Kconfig"
endif # MEDIA_SUPPORT endif # MEDIA_SUPPORT
...@@ -7,3 +7,5 @@ config VIDEO_SAA7146_VV ...@@ -7,3 +7,5 @@ config VIDEO_SAA7146_VV
depends on VIDEO_V4L2 depends on VIDEO_V4L2
select VIDEOBUF_DMA_SG select VIDEOBUF_DMA_SG
select VIDEO_SAA7146 select VIDEO_SAA7146
source "drivers/media/common/b2c2/Kconfig"
saa7146-objs := saa7146_i2c.o saa7146_core.o saa7146-objs := saa7146_i2c.o saa7146_core.o
saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
obj-y += tuners/ obj-y += tuners/ b2c2/
obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
config DVB_B2C2_FLEXCOP
tristate
depends on DVB_CORE && I2C
depends on DVB_B2C2_FLEXCOP_PCI || DVB_B2C2_FLEXCOP_USB
default y
select DVB_PLL if !DVB_FE_CUSTOMISE
select DVB_STV0299 if !DVB_FE_CUSTOMISE
select DVB_MT352 if !DVB_FE_CUSTOMISE
select DVB_MT312 if !DVB_FE_CUSTOMISE
select DVB_NXT200X if !DVB_FE_CUSTOMISE
select DVB_STV0297 if !DVB_FE_CUSTOMISE
select DVB_BCM3510 if !DVB_FE_CUSTOMISE
select DVB_LGDT330X if !DVB_FE_CUSTOMISE
select DVB_S5H1420 if !DVB_FE_CUSTOMISE
select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE
select DVB_ISL6421 if !DVB_FE_CUSTOMISE
select DVB_CX24123 if !DVB_FE_CUSTOMISE
select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
select DVB_TUNER_CX24113 if !DVB_FE_CUSTOMISE
help
Support for the digital TV receiver chip made by B2C2 Inc. included in
Technisats PCI cards and USB boxes.
Say Y if you own such a device and want to use it.
config DVB_B2C2_FLEXCOP_DEBUG
bool "Enable debug for the B2C2 FlexCop drivers"
depends on DVB_B2C2_FLEXCOP
help
Say Y if you want to enable the module option to control debug messages
of all B2C2 FlexCop drivers.
b2c2-flexcop-objs = flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \
flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o
obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/common/tuners/
...@@ -3,48 +3,39 @@ ...@@ -3,48 +3,39 @@
# #
menuconfig DVB_CAPTURE_DRIVERS menuconfig DVB_CAPTURE_DRIVERS
bool "DVB/ATSC adapters" bool "DVB/ATSC PCI adapters"
depends on DVB_CORE depends on DVB_CORE
default y default y
---help--- ---help---
Say Y to select Digital TV adapters Say Y to select Digital TV adapters
if DVB_CAPTURE_DRIVERS && DVB_CORE if DVB_CAPTURE_DRIVERS && DVB_CORE && PCI && I2C
comment "Supported SAA7146 based PCI Adapters" comment "Supported SAA7146 based PCI Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/pci/ttpci/Kconfig" source "drivers/media/pci/ttpci/Kconfig"
comment "Supported FlexCopII (B2C2) Adapters" comment "Supported FlexCopII (B2C2) PCI Adapters"
depends on DVB_CORE && (PCI || USB) && I2C
source "drivers/media/pci/b2c2/Kconfig" source "drivers/media/pci/b2c2/Kconfig"
comment "Supported BT878 Adapters" comment "Supported BT878 Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/pci/bt8xx/Kconfig" source "drivers/media/pci/bt8xx/Kconfig"
comment "Supported Pluto2 Adapters" comment "Supported Pluto2 Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/pci/pluto2/Kconfig" source "drivers/media/pci/pluto2/Kconfig"
comment "Supported SDMC DM1105 Adapters" comment "Supported SDMC DM1105 Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/pci/dm1105/Kconfig" source "drivers/media/pci/dm1105/Kconfig"
comment "Supported Earthsoft PT1 Adapters" comment "Supported Earthsoft PT1 Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/pci/pt1/Kconfig" source "drivers/media/pci/pt1/Kconfig"
comment "Supported Mantis Adapters" comment "Supported Mantis Adapters"
depends on DVB_CORE && PCI && I2C source "drivers/media/pci/mantis/Kconfig"
source "drivers/media/pci/mantis/Kconfig"
comment "Supported nGene Adapters" comment "Supported nGene Adapters"
depends on DVB_CORE && PCI && I2C source "drivers/media/pci/ngene/Kconfig"
source "drivers/media/pci/ngene/Kconfig"
comment "Supported ddbridge ('Octopus') Adapters" comment "Supported ddbridge ('Octopus') Adapters"
depends on DVB_CORE && PCI && I2C source "drivers/media/pci/ddbridge/Kconfig"
source "drivers/media/pci/ddbridge/Kconfig"
endif # DVB_CAPTURE_DRIVERS endif # DVB_CAPTURE_DRIVERS
...@@ -10,4 +10,5 @@ obj-y := ttpci/ \ ...@@ -10,4 +10,5 @@ obj-y := ttpci/ \
pt1/ \ pt1/ \
mantis/ \ mantis/ \
ngene/ \ ngene/ \
ddbridge/ ddbridge/ \
b2c2/
config DVB_B2C2_FLEXCOP
tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
depends on DVB_CORE && I2C
select DVB_PLL if !DVB_FE_CUSTOMISE
select DVB_STV0299 if !DVB_FE_CUSTOMISE
select DVB_MT352 if !DVB_FE_CUSTOMISE
select DVB_MT312 if !DVB_FE_CUSTOMISE
select DVB_NXT200X if !DVB_FE_CUSTOMISE
select DVB_STV0297 if !DVB_FE_CUSTOMISE
select DVB_BCM3510 if !DVB_FE_CUSTOMISE
select DVB_LGDT330X if !DVB_FE_CUSTOMISE
select DVB_S5H1420 if !DVB_FE_CUSTOMISE
select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE
select DVB_ISL6421 if !DVB_FE_CUSTOMISE
select DVB_CX24123 if !DVB_FE_CUSTOMISE
select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE
select DVB_TUNER_CX24113 if !DVB_FE_CUSTOMISE
help
Support for the digital TV receiver chip made by B2C2 Inc. included in
Technisats PCI cards and USB boxes.
Say Y if you own such a device and want to use it.
config DVB_B2C2_FLEXCOP_PCI config DVB_B2C2_FLEXCOP_PCI
tristate "Technisat/B2C2 Air/Sky/Cable2PC PCI" tristate "Technisat/B2C2 Air/Sky/Cable2PC PCI"
depends on DVB_B2C2_FLEXCOP && PCI && I2C
help help
Support for the Air/Sky/CableStar2 PCI card (DVB/ATSC) by Technisat/B2C2. Support for the Air/Sky/CableStar2 PCI card (DVB/ATSC) by Technisat/B2C2.
Say Y if you own such a device and want to use it. Say Y if you own such a device and want to use it.
config DVB_B2C2_FLEXCOP_USB
tristate "Technisat/B2C2 Air/Sky/Cable2PC USB"
depends on DVB_B2C2_FLEXCOP && USB && I2C
help
Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2,
Say Y if you own such a device and want to use it.
config DVB_B2C2_FLEXCOP_DEBUG
bool "Enable debug for the B2C2 FlexCop drivers"
depends on DVB_B2C2_FLEXCOP
help
Say Y if you want to enable the module option to control debug messages
of all B2C2 FlexCop drivers.
b2c2-flexcop-objs = flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \
flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o
obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
ifneq ($(CONFIG_DVB_B2C2_FLEXCOP_PCI),) ifneq ($(CONFIG_DVB_B2C2_FLEXCOP_PCI),)
b2c2-flexcop-objs += flexcop-dma.o b2c2-flexcop-pci-objs += flexcop-dma.o
endif endif
b2c2-flexcop-pci-objs = flexcop-pci.o b2c2-flexcop-pci-objs = flexcop-pci.o
obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o
b2c2-flexcop-usb-objs = flexcop-usb.o ccflags-y += -Idrivers/media/dvb-core/
obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o ccflags-y += -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/common/tuners/ ccflags-y += -Idrivers/media/common/tuners/
ccflags-y += -Idrivers/media/common/b2c2/
...@@ -14,5 +14,6 @@ source "drivers/media/usb/dvb-usb-v2/Kconfig" ...@@ -14,5 +14,6 @@ source "drivers/media/usb/dvb-usb-v2/Kconfig"
source "drivers/media/usb/ttusb-budget/Kconfig" source "drivers/media/usb/ttusb-budget/Kconfig"
source "drivers/media/usb/ttusb-dec/Kconfig" source "drivers/media/usb/ttusb-dec/Kconfig"
source "drivers/media/usb/siano/Kconfig" source "drivers/media/usb/siano/Kconfig"
source "drivers/media/usb/b2c2/Kconfig"
endif endif
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
# #
# DVB USB-only drivers # DVB USB-only drivers
obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/
config DVB_B2C2_FLEXCOP_USB
tristate "Technisat/B2C2 Air/Sky/Cable2PC USB"
help
Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2,
Say Y if you own such a device and want to use it.
b2c2-flexcop-usb-objs = flexcop-usb.o
obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb-frontends/
ccflags-y += -Idrivers/media/common/tuners/
ccflags-y += -Idrivers/media/common/b2c2/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment