openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] dvb: move the dvb core one level up 

just like the V4L2 core, move the DVB core to drivers/media, as the
intention is to get rid of both "video" and "dvb" directories.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2012-06-14 16:35:53 -03:00
parent 5bc3cb743b
commit 3d6c2bc08a
62 changed files with 68 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/Kconfig
View File

@ -161,6 +161,7 @@ source "drivers/media/radio/Kconfig"
# DVB adapters
#
source "drivers/media/dvb-core/Kconfig"
source "drivers/media/dvb/Kconfig"
endif # MEDIA_SUPPORT

2
drivers/media/Makefile
View File

@ -11,4 +11,4 @@ endif
obj-y += v4l2-core/ common/ rc/ video/
obj-$(CONFIG_VIDEO_DEV) += radio/
obj-$(CONFIG_DVB_CORE) += dvb/
obj-$(CONFIG_DVB_CORE) += dvb-core/ dvb/

2
drivers/media/common/tuners/Makefile
View File

@ -33,5 +33,5 @@ obj-$(CONFIG_MEDIA_TUNER_FC0011) += fc0011.o
obj-$(CONFIG_MEDIA_TUNER_FC0012) += fc0012.o
obj-$(CONFIG_MEDIA_TUNER_FC0013) += fc0013.o
ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends

29
drivers/media/dvb-core/Kconfig Normal file
View File

@ -0,0 +1,29 @@
#
# DVB device configuration
#
config DVB_MAX_ADAPTERS
int "maximum number of DVB/ATSC adapters"
depends on DVB_CORE
default 8
range 1 255
help
Maximum number of DVB/ATSC adapters. Increasing this number
increases the memory consumption of the DVB subsystem even
if a much lower number of DVB/ATSC adapters is present.
Only values in the range 4-32 are tested.
If you are unsure about this, use the default value 8
config DVB_DYNAMIC_MINORS
bool "Dynamic DVB minor allocation"
depends on DVB_CORE
default n
help
If you say Y here, the DVB subsystem will use dynamic minor
allocation for any device that uses the DVB major number.
This means that you can have more than 4 of a single type
of device (like demuxes and frontends) per adapter, but udev
will be required to manage the device nodes.
If you are unsure about this, say N here.

0
drivers/media/dvb/dvb-core/Makefile → drivers/media/dvb-core/Makefile
View File

0
drivers/media/dvb/dvb-core/demux.h → drivers/media/dvb-core/demux.h
View File

0
drivers/media/dvb/dvb-core/dmxdev.c → drivers/media/dvb-core/dmxdev.c
View File

0
drivers/media/dvb/dvb-core/dmxdev.h → drivers/media/dvb-core/dmxdev.h
View File

0
drivers/media/dvb/dvb-core/dvb-usb-ids.h → drivers/media/dvb-core/dvb-usb-ids.h
View File

0
drivers/media/dvb/dvb-core/dvb_ca_en50221.c → drivers/media/dvb-core/dvb_ca_en50221.c
View File

0
drivers/media/dvb/dvb-core/dvb_ca_en50221.h → drivers/media/dvb-core/dvb_ca_en50221.h
View File

0
drivers/media/dvb/dvb-core/dvb_demux.c → drivers/media/dvb-core/dvb_demux.c
View File

0
drivers/media/dvb/dvb-core/dvb_demux.h → drivers/media/dvb-core/dvb_demux.h
View File

0
drivers/media/dvb/dvb-core/dvb_filter.c → drivers/media/dvb-core/dvb_filter.c
View File

0
drivers/media/dvb/dvb-core/dvb_filter.h → drivers/media/dvb-core/dvb_filter.h
View File

0
drivers/media/dvb/dvb-core/dvb_frontend.c → drivers/media/dvb-core/dvb_frontend.c
View File

0
drivers/media/dvb/dvb-core/dvb_frontend.h → drivers/media/dvb-core/dvb_frontend.h
View File

0
drivers/media/dvb/dvb-core/dvb_math.c → drivers/media/dvb-core/dvb_math.c
View File

0
drivers/media/dvb/dvb-core/dvb_math.h → drivers/media/dvb-core/dvb_math.h
View File

0
drivers/media/dvb/dvb-core/dvb_net.c → drivers/media/dvb-core/dvb_net.c
View File

0
drivers/media/dvb/dvb-core/dvb_net.h → drivers/media/dvb-core/dvb_net.h
View File

0
drivers/media/dvb/dvb-core/dvb_ringbuffer.c → drivers/media/dvb-core/dvb_ringbuffer.c
View File

0
drivers/media/dvb/dvb-core/dvb_ringbuffer.h → drivers/media/dvb-core/dvb_ringbuffer.h
View File

0
drivers/media/dvb/dvb-core/dvbdev.c → drivers/media/dvb-core/dvbdev.c
View File

0
drivers/media/dvb/dvb-core/dvbdev.h → drivers/media/dvb-core/dvbdev.h
View File

26
drivers/media/dvb/Kconfig
View File

@ -2,32 +2,6 @@
# DVB device configuration
#
config DVB_MAX_ADAPTERS
int "maximum number of DVB/ATSC adapters"
depends on DVB_CORE
default 8
range 1 255
help
Maximum number of DVB/ATSC adapters. Increasing this number
increases the memory consumption of the DVB subsystem even
if a much lower number of DVB/ATSC adapters is present.
Only values in the range 4-32 are tested.
If you are unsure about this, use the default value 8
config DVB_DYNAMIC_MINORS
bool "Dynamic DVB minor allocation"
depends on DVB_CORE
default n
help
If you say Y here, the DVB subsystem will use dynamic minor
allocation for any device that uses the DVB major number.
This means that you can have more than 4 of a single type
of device (like demuxes and frontends) per adapter, but udev
will be required to manage the device nodes.
If you are unsure about this, say N here.
menuconfig DVB_CAPTURE_DRIVERS
bool "DVB/ATSC adapters"
depends on DVB_CORE

3
drivers/media/dvb/Makefile
View File

@ -2,8 +2,7 @@
# Makefile for the kernel multimedia device drivers.
#
obj-y := dvb-core/ \
frontends/ \
obj-y := frontends/ \
ttpci/ \
ttusb-dec/ \
ttusb-budget/ \

2
drivers/media/dvb/b2c2/Makefile
View File

@ -12,5 +12,5 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o
b2c2-flexcop-usb-objs = flexcop-usb.o
obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/common/tuners/

2
drivers/media/dvb/bt8xx/Makefile
View File

@ -1,6 +1,6 @@
obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/video/bt8xx
ccflags-y += -Idrivers/media/common/tuners

2
drivers/media/dvb/ddbridge/Makefile
View File

@ -6,7 +6,7 @@ ddbridge-objs := ddbridge-core.o
obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o
ccflags-y += -Idrivers/media/dvb/dvb-core/
ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/common/tuners/

2
drivers/media/dvb/dm1105/Makefile
View File

@ -1,3 +1,3 @@
obj-$(CONFIG_DVB_DM1105) += dm1105.o
ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends

2
drivers/media/dvb/dvb-usb-v2/Makefile
View File

@ -42,7 +42,7 @@ obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o
dvb-usb-rtl28xxu-objs = rtl28xxu.o
obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o
ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/
ccflags-y += -I$(srctree)/drivers/media/common/tuners

2
drivers/media/dvb/dvb-usb/Makefile
View File

@ -75,7 +75,7 @@ obj-$(CONFIG_DVB_USB_AZ6027) += dvb-usb-az6027.o
dvb-usb-technisat-usb2-objs = technisat-usb2.o
obj-$(CONFIG_DVB_USB_TECHNISAT_USB2) += dvb-usb-technisat-usb2.o
ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/
# due to tuner-xc3028
ccflags-y += -I$(srctree)/drivers/media/common/tuners

2
drivers/media/dvb/firewire/Makefile
View File

@ -3,4 +3,4 @@ obj-$(CONFIG_DVB_FIREDTV) += firedtv.o
firedtv-y := firedtv-avc.o firedtv-ci.o firedtv-dvb.o firedtv-fe.o firedtv-fw.o
firedtv-$(CONFIG_DVB_FIREDTV_INPUT) += firedtv-rc.o
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core

2
drivers/media/dvb/frontends/Makefile
View File

@ -2,7 +2,7 @@
# Makefile for the kernel DVB frontend device drivers.
#
ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core/
ccflags-y += -I$(srctree)/drivers/media/dvb-core/
ccflags-y += -I$(srctree)/drivers/media/common/tuners/
stb0899-objs = stb0899_drv.o stb0899_algo.o

2
drivers/media/dvb/mantis/Makefile
View File

@ -25,4 +25,4 @@ obj-$(CONFIG_MANTIS_CORE) += mantis_core.o
obj-$(CONFIG_DVB_MANTIS) += mantis.o
obj-$(CONFIG_DVB_HOPPER) += hopper.o
ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/

2
drivers/media/dvb/ngene/Makefile
View File

@ -6,7 +6,7 @@ ngene-objs := ngene-core.o ngene-i2c.o ngene-cards.o ngene-dvb.o
obj-$(CONFIG_DVB_NGENE) += ngene.o
ccflags-y += -Idrivers/media/dvb/dvb-core/
ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/common/tuners/

2
drivers/media/dvb/pluto2/Makefile
View File

@ -1,3 +1,3 @@
obj-$(CONFIG_DVB_PLUTO2) += pluto2.o
ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/

2
drivers/media/dvb/pt1/Makefile
View File

@ -2,4 +2,4 @@ earth-pt1-objs := pt1.o va1j5jf8007s.o va1j5jf8007t.o
obj-$(CONFIG_DVB_PT1) += earth-pt1.o
ccflags-y += -Idrivers/media/dvb/dvb-core -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-core -Idrivers/media/dvb/frontends

2
drivers/media/dvb/siano/Makefile
View File

@ -5,7 +5,7 @@ obj-$(CONFIG_SMS_SIANO_MDTV) += smsmdtv.o smsdvb.o
obj-$(CONFIG_SMS_USB_DRV) += smsusb.o
obj-$(CONFIG_SMS_SDIO_DRV) += smssdio.o
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)

2
drivers/media/dvb/ttpci/Makefile
View File

@ -17,5 +17,5 @@ obj-$(CONFIG_DVB_BUDGET_CI) += budget-ci.o
obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-patch.o
obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o
ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/common/tuners

2
drivers/media/dvb/ttusb-budget/Makefile
View File

@ -1,3 +1,3 @@
obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o
ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb-core/ -Idrivers/media/dvb/frontends

2
drivers/media/dvb/ttusb-dec/Makefile
View File

@ -1,3 +1,3 @@
obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o ttusbdecfe.o
ccflags-y += -Idrivers/media/dvb/dvb-core/
ccflags-y += -Idrivers/media/dvb-core/

2
drivers/media/v4l2-core/Makefile
View File

@ -29,7 +29,7 @@ obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o
obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o
obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o
ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
ccflags-y += -I$(srctree)/drivers/media/common/tuners

2
drivers/media/video/Makefile
View File

@ -190,6 +190,6 @@ obj-y += davinci/
obj-$(CONFIG_ARCH_OMAP) += omap/
ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
ccflags-y += -I$(srctree)/drivers/media/common/tuners

2
drivers/media/video/au0828/Makefile
View File

@ -3,7 +3,7 @@ au0828-objs := au0828-core.o au0828-i2c.o au0828-cards.o au0828-dvb.o au0828-vid
obj-$(CONFIG_VIDEO_AU0828) += au0828.o
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)

2
drivers/media/video/bt8xx/Makefile
View File

@ -10,4 +10,4 @@ obj-$(CONFIG_VIDEO_BT848) += bttv.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core

2
drivers/media/video/cx18/Makefile
View File

@ -8,6 +8,6 @@ cx18-alsa-objs := cx18-alsa-main.o cx18-alsa-pcm.o
obj-$(CONFIG_VIDEO_CX18) += cx18.o
obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/common/tuners

2
drivers/media/video/cx231xx/Makefile
View File

@ -10,6 +10,6 @@ obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends

2
drivers/media/video/cx23885/Makefile
View File

@ -9,7 +9,7 @@ obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)

2
drivers/media/video/cx25821/Makefile
View File

@ -9,5 +9,5 @@ obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
ccflags-y := -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends

2
drivers/media/video/cx88/Makefile
View File

@ -12,5 +12,5 @@ obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends

2
drivers/media/video/em28xx/Makefile
View File

@ -11,5 +11,5 @@ obj-$(CONFIG_VIDEO_EM28XX_RC) += em28xx-rc.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends

2
drivers/media/video/ivtv/Makefile
View File

@ -9,6 +9,6 @@ obj-$(CONFIG_VIDEO_FB_IVTV) += ivtvfb.o
ccflags-y += -I$(srctree)/drivers/media/video
ccflags-y += -I$(srctree)/drivers/media/common/tuners
ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends

2
drivers/media/video/pvrusb2/Makefile
View File

@ -18,5 +18,5 @@ obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends

2
drivers/media/video/saa7134/Makefile
View File

@ -12,5 +12,5 @@ obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
ccflags-y += -I$(srctree)/drivers/media/video
ccflags-y += -I$(srctree)/drivers/media/common/tuners
ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends

2
drivers/media/video/saa7164/Makefile
View File

@ -6,7 +6,7 @@ obj-$(CONFIG_VIDEO_SAA7164) += saa7164.o
ccflags-y += -I$(srctree)/drivers/media/video
ccflags-y += -I$(srctree)/drivers/media/common/tuners
ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)

2
drivers/media/video/tlg2300/Makefile
View File

@ -4,6 +4,6 @@ obj-$(CONFIG_VIDEO_TLG2300) += poseidon.o
ccflags-y += -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends

2
drivers/media/video/tm6000/Makefile
View File

@ -11,5 +11,5 @@ obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o
ccflags-y := -Idrivers/media/video
ccflags-y += -Idrivers/media/common/tuners
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core
ccflags-y += -Idrivers/media/dvb/frontends

2
drivers/staging/media/as102/Makefile
View File

@ -3,4 +3,4 @@ dvb-as102-objs := as102_drv.o as102_fw.o as10x_cmd.o as10x_cmd_stream.o \
obj-$(CONFIG_DVB_AS102) += dvb-as102.o
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
EXTRA_CFLAGS += -Idrivers/media/dvb-core

2
drivers/staging/media/cxd2099/Makefile
View File

@ -1,5 +1,5 @@
obj-$(CONFIG_DVB_CXD2099) += cxd2099.o
ccflags-y += -Idrivers/media/dvb/dvb-core/
ccflags-y += -Idrivers/media/dvb-core/
ccflags-y += -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/common/tuners/

2
drivers/staging/media/go7007/Makefile
View File

@ -27,4 +27,4 @@ s2250-y := s2250-board.o
ccflags-$(CONFIG_VIDEO_GO7007_USB_S2250_BOARD:m=y) += -Idrivers/media/dvb/dvb-usb
ccflags-y += -Idrivers/media/dvb/frontends
ccflags-y += -Idrivers/media/dvb/dvb-core
ccflags-y += -Idrivers/media/dvb-core