From 3d6c2bc08ac4f75bf3597740357c98f2207ca412 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 14 Jun 2012 16:35:53 -0300 Subject: [PATCH] [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 --- [[ stefanr: only firewire part included here ]] drivers/media/Kconfig | 1 + drivers/media/Makefile | 2 +- drivers/media/common/tuners/Makefile | 2 +- drivers/media/dvb-core/Kconfig | 29 + drivers/media/dvb-core/Makefile | 11 + drivers/media/dvb-core/demux.h | 280 +++ drivers/media/dvb-core/dmxdev.c | 1275 +++++++++++++ drivers/media/dvb-core/dmxdev.h | 118 ++ drivers/media/dvb-core/dvb-usb-ids.h | 361 ++++ drivers/media/dvb-core/dvb_ca_en50221.c | 1753 ++++++++++++++++++ drivers/media/dvb-core/dvb_ca_en50221.h | 136 ++ drivers/media/dvb-core/dvb_demux.c | 1318 ++++++++++++++ drivers/media/dvb-core/dvb_demux.h | 151 ++ drivers/media/dvb-core/dvb_filter.c | 603 +++++++ drivers/media/dvb-core/dvb_filter.h | 246 +++ drivers/media/dvb-core/dvb_frontend.c | 2553 +++++++++++++++++++++++++++ drivers/media/dvb-core/dvb_frontend.h | 425 +++++ drivers/media/dvb-core/dvb_math.c | 145 ++ drivers/media/dvb-core/dvb_math.h | 58 + drivers/media/dvb-core/dvb_net.c | 1516 ++++++++++++++++ drivers/media/dvb-core/dvb_net.h | 66 + drivers/media/dvb-core/dvb_ringbuffer.c | 299 ++++ drivers/media/dvb-core/dvb_ringbuffer.h | 186 ++ drivers/media/dvb-core/dvbdev.c | 507 ++++++ drivers/media/dvb-core/dvbdev.h | 146 ++ drivers/media/dvb/Kconfig | 26 - drivers/media/dvb/Makefile | 3 +- drivers/media/dvb/b2c2/Makefile | 2 +- drivers/media/dvb/bt8xx/Makefile | 2 +- drivers/media/dvb/ddbridge/Makefile | 2 +- drivers/media/dvb/dm1105/Makefile | 2 +- drivers/media/dvb/dvb-core/Makefile | 11 - drivers/media/dvb/dvb-core/demux.h | 280 --- drivers/media/dvb/dvb-core/dmxdev.c | 1275 ------------- drivers/media/dvb/dvb-core/dmxdev.h | 118 -- drivers/media/dvb/dvb-core/dvb-usb-ids.h | 361 ---- drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 1753 ------------------ drivers/media/dvb/dvb-core/dvb_ca_en50221.h | 136 -- drivers/media/dvb/dvb-core/dvb_demux.c | 1318 -------------- drivers/media/dvb/dvb-core/dvb_demux.h | 151 -- drivers/media/dvb/dvb-core/dvb_filter.c | 603 ------- drivers/media/dvb/dvb-core/dvb_filter.h | 246 --- drivers/media/dvb/dvb-core/dvb_frontend.c | 2553 --------------------------- drivers/media/dvb/dvb-core/dvb_frontend.h | 425 ----- drivers/media/dvb/dvb-core/dvb_math.c | 145 -- drivers/media/dvb/dvb-core/dvb_math.h | 58 - drivers/media/dvb/dvb-core/dvb_net.c | 1516 ---------------- drivers/media/dvb/dvb-core/dvb_net.h | 66 - drivers/media/dvb/dvb-core/dvb_ringbuffer.c | 299 ---- drivers/media/dvb/dvb-core/dvb_ringbuffer.h | 186 -- drivers/media/dvb/dvb-core/dvbdev.c | 507 ------ drivers/media/dvb/dvb-core/dvbdev.h | 146 -- drivers/media/dvb/dvb-usb-v2/Makefile | 2 +- drivers/media/dvb/dvb-usb/Makefile | 2 +- drivers/media/dvb/firewire/Makefile | 2 +- drivers/media/dvb/frontends/Makefile | 2 +- drivers/media/dvb/mantis/Makefile | 2 +- drivers/media/dvb/ngene/Makefile | 2 +- drivers/media/dvb/pluto2/Makefile | 2 +- drivers/media/dvb/pt1/Makefile | 2 +- drivers/media/dvb/siano/Makefile | 2 +- drivers/media/dvb/ttpci/Makefile | 2 +- drivers/media/dvb/ttusb-budget/Makefile | 2 +- drivers/media/dvb/ttusb-dec/Makefile | 2 +- drivers/media/v4l2-core/Makefile | 2 +- drivers/media/video/Makefile | 2 +- drivers/media/video/au0828/Makefile | 2 +- drivers/media/video/bt8xx/Makefile | 2 +- drivers/media/video/cx18/Makefile | 2 +- drivers/media/video/cx231xx/Makefile | 2 +- drivers/media/video/cx23885/Makefile | 2 +- drivers/media/video/cx25821/Makefile | 2 +- drivers/media/video/cx88/Makefile | 2 +- drivers/media/video/em28xx/Makefile | 2 +- drivers/media/video/ivtv/Makefile | 2 +- drivers/media/video/pvrusb2/Makefile | 2 +- drivers/media/video/saa7134/Makefile | 2 +- drivers/media/video/saa7164/Makefile | 2 +- drivers/media/video/tlg2300/Makefile | 2 +- drivers/media/video/tm6000/Makefile | 2 +- drivers/staging/media/as102/Makefile | 2 +- drivers/staging/media/cxd2099/Makefile | 2 +- drivers/staging/media/go7007/Makefile | 2 +- 83 files changed, 12221 insertions(+), 12218 deletions(-) create mode 100644 drivers/media/dvb-core/Kconfig create mode 100644 drivers/media/dvb-core/Makefile create mode 100644 drivers/media/dvb-core/demux.h create mode 100644 drivers/media/dvb-core/dmxdev.c create mode 100644 drivers/media/dvb-core/dmxdev.h create mode 100644 drivers/media/dvb-core/dvb-usb-ids.h create mode 100644 drivers/media/dvb-core/dvb_ca_en50221.c create mode 100644 drivers/media/dvb-core/dvb_ca_en50221.h create mode 100644 drivers/media/dvb-core/dvb_demux.c create mode 100644 drivers/media/dvb-core/dvb_demux.h create mode 100644 drivers/media/dvb-core/dvb_filter.c create mode 100644 drivers/media/dvb-core/dvb_filter.h create mode 100644 drivers/media/dvb-core/dvb_frontend.c create mode 100644 drivers/media/dvb-core/dvb_frontend.h create mode 100644 drivers/media/dvb-core/dvb_math.c create mode 100644 drivers/media/dvb-core/dvb_math.h create mode 100644 drivers/media/dvb-core/dvb_net.c create mode 100644 drivers/media/dvb-core/dvb_net.h create mode 100644 drivers/media/dvb-core/dvb_ringbuffer.c create mode 100644 drivers/media/dvb-core/dvb_ringbuffer.h create mode 100644 drivers/media/dvb-core/dvbdev.c create mode 100644 drivers/media/dvb-core/dvbdev.h delete mode 100644 drivers/media/dvb/dvb-core/Makefile delete mode 100644 drivers/media/dvb/dvb-core/demux.h delete mode 100644 drivers/media/dvb/dvb-core/dmxdev.c delete mode 100644 drivers/media/dvb/dvb-core/dmxdev.h delete mode 100644 drivers/media/dvb/dvb-core/dvb-usb-ids.h delete mode 100644 drivers/media/dvb/dvb-core/dvb_ca_en50221.c delete mode 100644 drivers/media/dvb/dvb-core/dvb_ca_en50221.h delete mode 100644 drivers/media/dvb/dvb-core/dvb_demux.c delete mode 100644 drivers/media/dvb/dvb-core/dvb_demux.h delete mode 100644 drivers/media/dvb/dvb-core/dvb_filter.c delete mode 100644 drivers/media/dvb/dvb-core/dvb_filter.h delete mode 100644 drivers/media/dvb/dvb-core/dvb_frontend.c delete mode 100644 drivers/media/dvb/dvb-core/dvb_frontend.h delete mode 100644 drivers/media/dvb/dvb-core/dvb_math.c delete mode 100644 drivers/media/dvb/dvb-core/dvb_math.h delete mode 100644 drivers/media/dvb/dvb-core/dvb_net.c delete mode 100644 drivers/media/dvb/dvb-core/dvb_net.h delete mode 100644 drivers/media/dvb/dvb-core/dvb_ringbuffer.c delete mode 100644 drivers/media/dvb/dvb-core/dvb_ringbuffer.h delete mode 100644 drivers/media/dvb/dvb-core/dvbdev.c delete mode 100644 drivers/media/dvb/dvb-core/dvbdev.h diff --git a/drivers/media/dvb/firewire/Makefile b/drivers/media/dvb/firewire/Makefile index 357b3aa..f314813 100644 --- a/drivers/media/dvb/firewire/Makefile +++ b/drivers/media/dvb/firewire/Makefile @@ -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