From 45d011031d745d2c9a21c21d289428cb7f88a2d0 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 9 Oct 2008 05:51:22 -0300 Subject: [PATCH] V4L/DVB (9129): zoran: move zoran sources into a zoran subdirectory Prevent the zoran driver sources from cluttering the video directory. This changeset only moves the drivers and it does not fix any of the checkpatch warnings/errors to keep the changeset clean. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/Kconfig | 74 +------------------ drivers/media/video/Makefile | 6 +- drivers/media/video/zoran/Kconfig | 73 ++++++++++++++++++ drivers/media/video/zoran/Makefile | 6 ++ drivers/media/video/{ => zoran}/videocodec.c | 0 drivers/media/video/{ => zoran}/videocodec.h | 0 drivers/media/video/{ => zoran}/zoran.h | 0 drivers/media/video/{ => zoran}/zoran_card.c | 0 drivers/media/video/{ => zoran}/zoran_card.h | 0 .../media/video/{ => zoran}/zoran_device.c | 0 .../media/video/{ => zoran}/zoran_device.h | 0 .../media/video/{ => zoran}/zoran_driver.c | 0 .../media/video/{ => zoran}/zoran_procfs.c | 0 .../media/video/{ => zoran}/zoran_procfs.h | 0 drivers/media/video/{ => zoran}/zr36016.c | 0 drivers/media/video/{ => zoran}/zr36016.h | 0 drivers/media/video/{ => zoran}/zr36050.c | 0 drivers/media/video/{ => zoran}/zr36050.h | 0 drivers/media/video/{ => zoran}/zr36057.h | 0 drivers/media/video/{ => zoran}/zr36060.c | 0 drivers/media/video/{ => zoran}/zr36060.h | 0 21 files changed, 81 insertions(+), 78 deletions(-) create mode 100644 drivers/media/video/zoran/Kconfig create mode 100644 drivers/media/video/zoran/Makefile rename drivers/media/video/{ => zoran}/videocodec.c (100%) rename drivers/media/video/{ => zoran}/videocodec.h (100%) rename drivers/media/video/{ => zoran}/zoran.h (100%) rename drivers/media/video/{ => zoran}/zoran_card.c (100%) rename drivers/media/video/{ => zoran}/zoran_card.h (100%) rename drivers/media/video/{ => zoran}/zoran_device.c (100%) rename drivers/media/video/{ => zoran}/zoran_device.h (100%) rename drivers/media/video/{ => zoran}/zoran_driver.c (100%) rename drivers/media/video/{ => zoran}/zoran_procfs.c (100%) rename drivers/media/video/{ => zoran}/zoran_procfs.h (100%) rename drivers/media/video/{ => zoran}/zr36016.c (100%) rename drivers/media/video/{ => zoran}/zr36016.h (100%) rename drivers/media/video/{ => zoran}/zr36050.c (100%) rename drivers/media/video/{ => zoran}/zr36050.h (100%) rename drivers/media/video/{ => zoran}/zr36057.h (100%) rename drivers/media/video/{ => zoran}/zr36060.c (100%) rename drivers/media/video/{ => zoran}/zr36060.h (100%) diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 2dce16f863bb..47102c2c8250 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -605,79 +605,7 @@ config VIDEO_STRADIS driver for PCI. There is a product page at . -config VIDEO_ZORAN - tristate "Zoran ZR36057/36067 Video For Linux" - depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && VIRT_TO_BUS - help - Say Y for support for MJPEG capture cards based on the Zoran - 36057/36067 PCI controller chipset. This includes the Iomega - Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is - a driver homepage at . For - more information, check . - - To compile this driver as a module, choose M here: the - module will be called zr36067. - -config VIDEO_ZORAN_DC30 - tristate "Pinnacle/Miro DC30(+) support" - depends on VIDEO_ZORAN - select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO - select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO - help - Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback - card. This also supports really old DC10 cards based on the - zr36050 MJPEG codec and zr36016 VFE. - -config VIDEO_ZORAN_ZR36060 - tristate "Zoran ZR36060" - depends on VIDEO_ZORAN - help - Say Y to support Zoran boards based on 36060 chips. - This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33 - and 33 R10 and AverMedia 6 boards. - -config VIDEO_ZORAN_BUZ - tristate "Iomega Buz support" - depends on VIDEO_ZORAN_ZR36060 - select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO - select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO - help - Support for the Iomega Buz MJPEG capture/playback card. - -config VIDEO_ZORAN_DC10 - tristate "Pinnacle/Miro DC10(+) support" - depends on VIDEO_ZORAN_ZR36060 - select VIDEO_SAA7110 if VIDEO_HELPER_CHIPS_AUTO - select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO - help - Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback - card. - -config VIDEO_ZORAN_LML33 - tristate "Linux Media Labs LML33 support" - depends on VIDEO_ZORAN_ZR36060 - select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO - select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO - help - Support for the Linux Media Labs LML33 MJPEG capture/playback - card. - -config VIDEO_ZORAN_LML33R10 - tristate "Linux Media Labs LML33R10 support" - depends on VIDEO_ZORAN_ZR36060 - select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO - select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO - help - support for the Linux Media Labs LML33R10 MJPEG capture/playback - card. - -config VIDEO_ZORAN_AVS6EYES - tristate "AverMedia 6 Eyes support (EXPERIMENTAL)" - depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1 - select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO - select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO - help - Support for the AverMedia 6 Eyes video surveillance card. +source "drivers/media/video/zoran/Kconfig" config VIDEO_MEYE tristate "Sony Vaio Picturebook Motion Eye Video For Linux" diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 28e325725302..16962f3aa157 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -2,8 +2,6 @@ # Makefile for the video capture/playback device drivers. # -zr36067-objs := zoran_procfs.o zoran_device.o \ - zoran_driver.o zoran_card.o tuner-objs := tuner-core.o msp3400-objs := msp3400-driver.o msp3400-kthreads.o @@ -54,9 +52,7 @@ obj-$(CONFIG_VIDEO_BT856) += bt856.o obj-$(CONFIG_VIDEO_BT866) += bt866.o obj-$(CONFIG_VIDEO_KS0127) += ks0127.o -obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o -obj-$(CONFIG_VIDEO_ZORAN_DC30) += zr36050.o zr36016.o -obj-$(CONFIG_VIDEO_ZORAN_ZR36060) += zr36060.o +obj-$(CONFIG_VIDEO_ZORAN) += zoran/ obj-$(CONFIG_VIDEO_PMS) += pms.o obj-$(CONFIG_VIDEO_VINO) += vino.o indycam.o diff --git a/drivers/media/video/zoran/Kconfig b/drivers/media/video/zoran/Kconfig new file mode 100644 index 000000000000..4ea5fa71de89 --- /dev/null +++ b/drivers/media/video/zoran/Kconfig @@ -0,0 +1,73 @@ +config VIDEO_ZORAN + tristate "Zoran ZR36057/36067 Video For Linux" + depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && VIRT_TO_BUS + help + Say Y for support for MJPEG capture cards based on the Zoran + 36057/36067 PCI controller chipset. This includes the Iomega + Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is + a driver homepage at . For + more information, check . + + To compile this driver as a module, choose M here: the + module will be called zr36067. + +config VIDEO_ZORAN_DC30 + tristate "Pinnacle/Miro DC30(+) support" + depends on VIDEO_ZORAN + select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_VPX3220 if VIDEO_HELPER_CHIPS_AUTO + help + Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback + card. This also supports really old DC10 cards based on the + zr36050 MJPEG codec and zr36016 VFE. + +config VIDEO_ZORAN_ZR36060 + tristate "Zoran ZR36060" + depends on VIDEO_ZORAN + help + Say Y to support Zoran boards based on 36060 chips. + This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33 + and 33 R10 and AverMedia 6 boards. + +config VIDEO_ZORAN_BUZ + tristate "Iomega Buz support" + depends on VIDEO_ZORAN_ZR36060 + select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_SAA7185 if VIDEO_HELPER_CHIPS_AUTO + help + Support for the Iomega Buz MJPEG capture/playback card. + +config VIDEO_ZORAN_DC10 + tristate "Pinnacle/Miro DC10(+) support" + depends on VIDEO_ZORAN_ZR36060 + select VIDEO_SAA7110 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_ADV7175 if VIDEO_HELPER_CHIPS_AUTO + help + Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback + card. + +config VIDEO_ZORAN_LML33 + tristate "Linux Media Labs LML33 support" + depends on VIDEO_ZORAN_ZR36060 + select VIDEO_BT819 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO + help + Support for the Linux Media Labs LML33 MJPEG capture/playback + card. + +config VIDEO_ZORAN_LML33R10 + tristate "Linux Media Labs LML33R10 support" + depends on VIDEO_ZORAN_ZR36060 + select VIDEO_SAA7114 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_ADV7170 if VIDEO_HELPER_CHIPS_AUTO + help + support for the Linux Media Labs LML33R10 MJPEG capture/playback + card. + +config VIDEO_ZORAN_AVS6EYES + tristate "AverMedia 6 Eyes support (EXPERIMENTAL)" + depends on VIDEO_ZORAN_ZR36060 && EXPERIMENTAL && VIDEO_V4L1 + select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO + help + Support for the AverMedia 6 Eyes video surveillance card. diff --git a/drivers/media/video/zoran/Makefile b/drivers/media/video/zoran/Makefile new file mode 100644 index 000000000000..44cc13352c88 --- /dev/null +++ b/drivers/media/video/zoran/Makefile @@ -0,0 +1,6 @@ +zr36067-objs := zoran_procfs.o zoran_device.o \ + zoran_driver.o zoran_card.o + +obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o +obj-$(CONFIG_VIDEO_ZORAN_DC30) += zr36050.o zr36016.o +obj-$(CONFIG_VIDEO_ZORAN_ZR36060) += zr36060.o diff --git a/drivers/media/video/videocodec.c b/drivers/media/video/zoran/videocodec.c similarity index 100% rename from drivers/media/video/videocodec.c rename to drivers/media/video/zoran/videocodec.c diff --git a/drivers/media/video/videocodec.h b/drivers/media/video/zoran/videocodec.h similarity index 100% rename from drivers/media/video/videocodec.h rename to drivers/media/video/zoran/videocodec.h diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran/zoran.h similarity index 100% rename from drivers/media/video/zoran.h rename to drivers/media/video/zoran/zoran.h diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran/zoran_card.c similarity index 100% rename from drivers/media/video/zoran_card.c rename to drivers/media/video/zoran/zoran_card.c diff --git a/drivers/media/video/zoran_card.h b/drivers/media/video/zoran/zoran_card.h similarity index 100% rename from drivers/media/video/zoran_card.h rename to drivers/media/video/zoran/zoran_card.h diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran/zoran_device.c similarity index 100% rename from drivers/media/video/zoran_device.c rename to drivers/media/video/zoran/zoran_device.c diff --git a/drivers/media/video/zoran_device.h b/drivers/media/video/zoran/zoran_device.h similarity index 100% rename from drivers/media/video/zoran_device.h rename to drivers/media/video/zoran/zoran_device.h diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c similarity index 100% rename from drivers/media/video/zoran_driver.c rename to drivers/media/video/zoran/zoran_driver.c diff --git a/drivers/media/video/zoran_procfs.c b/drivers/media/video/zoran/zoran_procfs.c similarity index 100% rename from drivers/media/video/zoran_procfs.c rename to drivers/media/video/zoran/zoran_procfs.c diff --git a/drivers/media/video/zoran_procfs.h b/drivers/media/video/zoran/zoran_procfs.h similarity index 100% rename from drivers/media/video/zoran_procfs.h rename to drivers/media/video/zoran/zoran_procfs.h diff --git a/drivers/media/video/zr36016.c b/drivers/media/video/zoran/zr36016.c similarity index 100% rename from drivers/media/video/zr36016.c rename to drivers/media/video/zoran/zr36016.c diff --git a/drivers/media/video/zr36016.h b/drivers/media/video/zoran/zr36016.h similarity index 100% rename from drivers/media/video/zr36016.h rename to drivers/media/video/zoran/zr36016.h diff --git a/drivers/media/video/zr36050.c b/drivers/media/video/zoran/zr36050.c similarity index 100% rename from drivers/media/video/zr36050.c rename to drivers/media/video/zoran/zr36050.c diff --git a/drivers/media/video/zr36050.h b/drivers/media/video/zoran/zr36050.h similarity index 100% rename from drivers/media/video/zr36050.h rename to drivers/media/video/zoran/zr36050.h diff --git a/drivers/media/video/zr36057.h b/drivers/media/video/zoran/zr36057.h similarity index 100% rename from drivers/media/video/zr36057.h rename to drivers/media/video/zoran/zr36057.h diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zoran/zr36060.c similarity index 100% rename from drivers/media/video/zr36060.c rename to drivers/media/video/zoran/zr36060.c diff --git a/drivers/media/video/zr36060.h b/drivers/media/video/zoran/zr36060.h similarity index 100% rename from drivers/media/video/zr36060.h rename to drivers/media/video/zoran/zr36060.h -- GitLab