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

+3 -1

drivers/media/Kconfig

··· 139 139 unsure say Y. 140 140 141 141 comment "Media drivers" 142 - source "drivers/media/common/Kconfig" 143 142 source "drivers/media/rc/Kconfig" 144 143 145 144 # ··· 171 172 comment "Supported DVB Frontends" 172 173 depends on DVB_CORE 173 174 source "drivers/media/dvb-frontends/Kconfig" 175 + 176 + # Common drivers 177 + source "drivers/media/common/Kconfig" 174 178 175 179 endif # MEDIA_SUPPORT

+2

drivers/media/common/Kconfig

··· 7 7 depends on VIDEO_V4L2 8 8 select VIDEOBUF_DMA_SG 9 9 select VIDEO_SAA7146 10 + 11 + source "drivers/media/common/b2c2/Kconfig"

+1 -1

drivers/media/common/Makefile

··· 1 1 saa7146-objs := saa7146_i2c.o saa7146_core.o 2 2 saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o 3 3 4 - obj-y += tuners/ 4 + obj-y += tuners/ b2c2/ 5 5 obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o 6 6 obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o

+31

drivers/media/common/b2c2/Kconfig

··· 1 + config DVB_B2C2_FLEXCOP 2 + tristate 3 + depends on DVB_CORE && I2C 4 + depends on DVB_B2C2_FLEXCOP_PCI || DVB_B2C2_FLEXCOP_USB 5 + default y 6 + select DVB_PLL if !DVB_FE_CUSTOMISE 7 + select DVB_STV0299 if !DVB_FE_CUSTOMISE 8 + select DVB_MT352 if !DVB_FE_CUSTOMISE 9 + select DVB_MT312 if !DVB_FE_CUSTOMISE 10 + select DVB_NXT200X if !DVB_FE_CUSTOMISE 11 + select DVB_STV0297 if !DVB_FE_CUSTOMISE 12 + select DVB_BCM3510 if !DVB_FE_CUSTOMISE 13 + select DVB_LGDT330X if !DVB_FE_CUSTOMISE 14 + select DVB_S5H1420 if !DVB_FE_CUSTOMISE 15 + select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE 16 + select DVB_ISL6421 if !DVB_FE_CUSTOMISE 17 + select DVB_CX24123 if !DVB_FE_CUSTOMISE 18 + select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE 19 + select DVB_TUNER_CX24113 if !DVB_FE_CUSTOMISE 20 + help 21 + Support for the digital TV receiver chip made by B2C2 Inc. included in 22 + Technisats PCI cards and USB boxes. 23 + 24 + Say Y if you own such a device and want to use it. 25 + 26 + config DVB_B2C2_FLEXCOP_DEBUG 27 + bool "Enable debug for the B2C2 FlexCop drivers" 28 + depends on DVB_B2C2_FLEXCOP 29 + help 30 + Say Y if you want to enable the module option to control debug messages 31 + of all B2C2 FlexCop drivers.

+7

drivers/media/common/b2c2/Makefile

··· 1 + b2c2-flexcop-objs = flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \ 2 + flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o 3 + obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o 4 + 5 + ccflags-y += -Idrivers/media/dvb-core/ 6 + ccflags-y += -Idrivers/media/dvb-frontends/ 7 + ccflags-y += -Idrivers/media/common/tuners/

+6 -15

drivers/media/pci/Kconfig

··· 3 3 # 4 4 5 5 menuconfig DVB_CAPTURE_DRIVERS 6 - bool "DVB/ATSC adapters" 6 + bool "DVB/ATSC PCI adapters" 7 7 depends on DVB_CORE 8 8 default y 9 9 ---help--- 10 10 Say Y to select Digital TV adapters 11 11 12 - if DVB_CAPTURE_DRIVERS && DVB_CORE 12 + if DVB_CAPTURE_DRIVERS && DVB_CORE && PCI && I2C 13 13 14 14 comment "Supported SAA7146 based PCI Adapters" 15 - depends on DVB_CORE && PCI && I2C 16 15 source "drivers/media/pci/ttpci/Kconfig" 17 16 18 - comment "Supported FlexCopII (B2C2) Adapters" 19 - depends on DVB_CORE && (PCI || USB) && I2C 17 + comment "Supported FlexCopII (B2C2) PCI Adapters" 20 18 source "drivers/media/pci/b2c2/Kconfig" 21 19 22 20 comment "Supported BT878 Adapters" 23 - depends on DVB_CORE && PCI && I2C 24 21 source "drivers/media/pci/bt8xx/Kconfig" 25 22 26 23 comment "Supported Pluto2 Adapters" 27 - depends on DVB_CORE && PCI && I2C 28 24 source "drivers/media/pci/pluto2/Kconfig" 29 25 30 26 comment "Supported SDMC DM1105 Adapters" 31 - depends on DVB_CORE && PCI && I2C 32 27 source "drivers/media/pci/dm1105/Kconfig" 33 28 34 29 comment "Supported Earthsoft PT1 Adapters" 35 - depends on DVB_CORE && PCI && I2C 36 30 source "drivers/media/pci/pt1/Kconfig" 37 31 38 32 comment "Supported Mantis Adapters" 39 - depends on DVB_CORE && PCI && I2C 40 - source "drivers/media/pci/mantis/Kconfig" 33 + source "drivers/media/pci/mantis/Kconfig" 41 34 42 35 comment "Supported nGene Adapters" 43 - depends on DVB_CORE && PCI && I2C 44 - source "drivers/media/pci/ngene/Kconfig" 36 + source "drivers/media/pci/ngene/Kconfig" 45 37 46 38 comment "Supported ddbridge ('Octopus') Adapters" 47 - depends on DVB_CORE && PCI && I2C 48 - source "drivers/media/pci/ddbridge/Kconfig" 39 + source "drivers/media/pci/ddbridge/Kconfig" 49 40 50 41 endif # DVB_CAPTURE_DRIVERS

+2 -1

drivers/media/pci/Makefile

··· 10 10 pt1/ \ 11 11 mantis/ \ 12 12 ngene/ \ 13 - ddbridge/ 13 + ddbridge/ \ 14 + b2c2/

-39

drivers/media/pci/b2c2/Kconfig

··· 1 - config DVB_B2C2_FLEXCOP 2 - tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters" 3 - depends on DVB_CORE && I2C 4 - select DVB_PLL if !DVB_FE_CUSTOMISE 5 - select DVB_STV0299 if !DVB_FE_CUSTOMISE 6 - select DVB_MT352 if !DVB_FE_CUSTOMISE 7 - select DVB_MT312 if !DVB_FE_CUSTOMISE 8 - select DVB_NXT200X if !DVB_FE_CUSTOMISE 9 - select DVB_STV0297 if !DVB_FE_CUSTOMISE 10 - select DVB_BCM3510 if !DVB_FE_CUSTOMISE 11 - select DVB_LGDT330X if !DVB_FE_CUSTOMISE 12 - select DVB_S5H1420 if !DVB_FE_CUSTOMISE 13 - select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE 14 - select DVB_ISL6421 if !DVB_FE_CUSTOMISE 15 - select DVB_CX24123 if !DVB_FE_CUSTOMISE 16 - select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE 17 - select DVB_TUNER_CX24113 if !DVB_FE_CUSTOMISE 18 - help 19 - Support for the digital TV receiver chip made by B2C2 Inc. included in 20 - Technisats PCI cards and USB boxes. 21 - 22 - Say Y if you own such a device and want to use it. 23 - 24 1 config DVB_B2C2_FLEXCOP_PCI 25 2 tristate "Technisat/B2C2 Air/Sky/Cable2PC PCI" 26 - depends on DVB_B2C2_FLEXCOP && PCI && I2C 27 3 help 28 4 Support for the Air/Sky/CableStar2 PCI card (DVB/ATSC) by Technisat/B2C2. 29 5 30 6 Say Y if you own such a device and want to use it. 31 - 32 - config DVB_B2C2_FLEXCOP_USB 33 - tristate "Technisat/B2C2 Air/Sky/Cable2PC USB" 34 - depends on DVB_B2C2_FLEXCOP && USB && I2C 35 - help 36 - Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2, 37 - 38 - Say Y if you own such a device and want to use it. 39 - 40 - config DVB_B2C2_FLEXCOP_DEBUG 41 - bool "Enable debug for the B2C2 FlexCop drivers" 42 - depends on DVB_B2C2_FLEXCOP 43 - help 44 - Say Y if you want to enable the module option to control debug messages 45 - of all B2C2 FlexCop drivers.

+4 -9

drivers/media/pci/b2c2/Makefile

··· 1 - b2c2-flexcop-objs = flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \ 2 - flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o 3 - obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o 4 - 5 1 ifneq ($(CONFIG_DVB_B2C2_FLEXCOP_PCI),) 6 - b2c2-flexcop-objs += flexcop-dma.o 2 + b2c2-flexcop-pci-objs += flexcop-dma.o 7 3 endif 8 4 9 5 b2c2-flexcop-pci-objs = flexcop-pci.o 10 6 obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o 11 7 12 - b2c2-flexcop-usb-objs = flexcop-usb.o 13 - obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o 14 - 15 - ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/ 8 + ccflags-y += -Idrivers/media/dvb-core/ 9 + ccflags-y += -Idrivers/media/dvb-frontends/ 16 10 ccflags-y += -Idrivers/media/common/tuners/ 11 + ccflags-y += -Idrivers/media/common/b2c2/

drivers/media/pci/b2c2/flexcop-common.h drivers/media/common/b2c2/flexcop-common.h

drivers/media/pci/b2c2/flexcop-eeprom.c drivers/media/common/b2c2/flexcop-eeprom.c

drivers/media/pci/b2c2/flexcop-fe-tuner.c drivers/media/common/b2c2/flexcop-fe-tuner.c

drivers/media/pci/b2c2/flexcop-hw-filter.c drivers/media/common/b2c2/flexcop-hw-filter.c

drivers/media/pci/b2c2/flexcop-i2c.c drivers/media/common/b2c2/flexcop-i2c.c

drivers/media/pci/b2c2/flexcop-misc.c drivers/media/common/b2c2/flexcop-misc.c

drivers/media/pci/b2c2/flexcop-reg.h drivers/media/common/b2c2/flexcop-reg.h

drivers/media/pci/b2c2/flexcop-sram.c drivers/media/common/b2c2/flexcop-sram.c

drivers/media/pci/b2c2/flexcop-usb.c drivers/media/usb/b2c2/flexcop-usb.c

drivers/media/pci/b2c2/flexcop-usb.h drivers/media/usb/b2c2/flexcop-usb.h

drivers/media/pci/b2c2/flexcop.c drivers/media/common/b2c2/flexcop.c

drivers/media/pci/b2c2/flexcop.h drivers/media/common/b2c2/flexcop.h

drivers/media/pci/b2c2/flexcop_ibi_value_be.h drivers/media/common/b2c2/flexcop_ibi_value_be.h

drivers/media/pci/b2c2/flexcop_ibi_value_le.h drivers/media/common/b2c2/flexcop_ibi_value_le.h

+1

drivers/media/usb/Kconfig

··· 14 14 source "drivers/media/usb/ttusb-budget/Kconfig" 15 15 source "drivers/media/usb/ttusb-dec/Kconfig" 16 16 source "drivers/media/usb/siano/Kconfig" 17 + source "drivers/media/usb/b2c2/Kconfig" 17 18 18 19 endif

+1 -1

drivers/media/usb/Makefile

··· 3 3 # 4 4 5 5 # DVB USB-only drivers 6 - obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ 6 + obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/

+6

drivers/media/usb/b2c2/Kconfig

··· 1 + config DVB_B2C2_FLEXCOP_USB 2 + tristate "Technisat/B2C2 Air/Sky/Cable2PC USB" 3 + help 4 + Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2, 5 + 6 + Say Y if you own such a device and want to use it.

+7

drivers/media/usb/b2c2/Makefile

··· 1 + b2c2-flexcop-usb-objs = flexcop-usb.o 2 + obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o 3 + 4 + ccflags-y += -Idrivers/media/dvb-core/ 5 + ccflags-y += -Idrivers/media/dvb-frontends/ 6 + ccflags-y += -Idrivers/media/common/tuners/ 7 + ccflags-y += -Idrivers/media/common/b2c2/