Skip to contentSkip to conversation

V4L/DVB updates

PATCH New [email protected] 1 participant 7 messages Sep 10, 2006 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

cover V4L/DVB updates

Linus,

Please pull these from master branch at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

It contains the following stuff fixes:

- Fix compilation when V4L1 support is not present
- Restore tuner_ymec_tvf66t5_b_dff_pal_ranges[] to fix UHF switch functionality
- Fix an error when loading bttv driver on PV M4900.
- Fixes an issue with V4L1 and make headers-install
- i2c deps fix on DVB
- Fix I2C dependencies for saa7146 modules

Basically, we have one trivial fix for tuner, one OOPS fix and several fixes at the building system.

Cheers,
Mauro.

V4L/DVB development is hosted at http://linuxtv.org
---

 drivers/media/Kconfig                  |    2 +
 drivers/media/common/saa7146_video.c   |    2 +
 drivers/media/dvb/b2c2/Kconfig         |    1 +
 drivers/media/dvb/bt8xx/Kconfig        |    1 +
 drivers/media/dvb/dvb-usb/Kconfig      |    1 +
 drivers/media/dvb/frontends/Kconfig    |   60 +++++++++++++++++---------------
 drivers/media/dvb/frontends/Makefile   |    2 +
 drivers/media/dvb/pluto2/Kconfig       |    1 +
 drivers/media/dvb/ttpci/Kconfig        |    5 +++
 drivers/media/dvb/ttusb-budget/Kconfig |    3 +-
 drivers/media/video/Kconfig            |    8 ++--
 drivers/media/video/bt8xx/bttv-input.c |    1 +
 drivers/media/video/cx88/Kconfig       |    1 +
 drivers/media/video/saa7134/Kconfig    |    1 +
 drivers/media/video/tuner-types.c      |   10 ++++-
 drivers/media/video/zoran.h            |    2 +
 drivers/media/video/zoran_driver.c     |   22 ++++++------
 include/linux/videodev.h               |    3 +-
 include/linux/videodev2.h              |    2 -
 include/media/v4l2-dev.h               |    7 ++--
 20 files changed, 79 insertions(+), 56 deletions(-)
#1 lore raw

PATCH 1/6 V4L/DVB (4494a): Fix compilation when V4L1 support is not present

From: Mauro Carvalho Chehab <[email protected]>

VIDIOCGMBUF should be compiled only when V4L1 support is selected, since this ioctl is from the obsoleted API.

---

 drivers/media/common/saa7146_video.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/media/common/saa7146_video.c +2 -0
index 8393d47..7e0cedc 100644
@@ -1190,6 +1190,7 @@ int saa7146_video_do_ioctl(struct inode 
 		}
 		return err;
 	}
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
 	case VIDIOCGMBUF:
 	{
 		struct video_mbuf *mbuf = arg;
@@ -1218,6 +1219,7 @@ int saa7146_video_do_ioctl(struct inode 
 		mutex_unlock(&q->lock);
 		return 0;
 	}
+#endif
 	default:
 		return v4l_compat_translate_ioctl(inode,file,cmd,arg,
 						  saa7146_video_do_ioctl);
#2 lore raw

PATCH 2/6 V4L/DVB (4511): Restore tuner_ymec_tvf66t5_b_dff_pal_ranges[] to fix UHF switch functionality

In reply to [email protected]

From: Hermann Pitton <[email protected]>

The tena_9533_di_pal_ranges use 0x04 instead the original 0x08 for the UHF (range 2) switching. This is wrong and therefore nothing happens. Restore tuner_ymec_tvf66t5_b_dff_pal_ranges[] to make the UHF switch working again.

---

 drivers/media/video/tuner-types.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
drivers/media/video/tuner-types.c +8 -2
index d7eadc2..8b54259 100644
@@ -926,11 +926,17 @@ static struct tuner_params tuner_lg_tdvs
 
 /* ------------ TUNER_YMEC_TVF66T5_B_DFF - Philips PAL ------------ */
 
+static struct tuner_range tuner_ymec_tvf66t5_b_dff_pal_ranges[] = {
+	{ 16 * 160.25 /*MHz*/, 0x8e, 0x01, },
+	{ 16 * 464.25 /*MHz*/, 0x8e, 0x02, },
+	{ 16 * 999.99        , 0x8e, 0x08, },
+};
+
 static struct tuner_params tuner_ymec_tvf66t5_b_dff_params[] = {
 	{
 		.type   = TUNER_PARAM_TYPE_PAL,
-		.ranges = tuner_tena_9533_di_pal_ranges,
-		.count  = ARRAY_SIZE(tuner_tena_9533_di_pal_ranges),
+		.ranges = tuner_ymec_tvf66t5_b_dff_pal_ranges,
+		.count  = ARRAY_SIZE(tuner_ymec_tvf66t5_b_dff_pal_ranges),
 	},
 };
 
#3 lore raw

PATCH 3/6 V4L/DVB (4520): Fix an error when loading bttv driver on PV M4900.

In reply to [email protected]

From: Mauro Carvalho Chehab <[email protected]>

Previously, this were reported:
Ooops: IR config error [card=139]

---

 drivers/media/video/bt8xx/bttv-input.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/media/video/bt8xx/bttv-input.c +1 -0
index b41f81d..933d6db 100644
@@ -303,6 +303,7 @@ int bttv_input_init(struct bttv *btv)
 		ir->mask_keyup   = 0x010000;
 		ir->polling      = 50; // ms
 		break;
+	case BTTV_BOARD_PV_M4900:
 	case BTTV_BOARD_PV_BT878P_9B:
 	case BTTV_BOARD_PV_BT878P_PLUS:
 		ir_codes         = ir_codes_pixelview;
#4 lore raw

PATCH 4/6 V4L/DVB (4605): Fixes an issue with V4L1 and make headers-install

In reply to [email protected]

From: Mauro Carvalho Chehab <[email protected]>

V4L1 support should be disabled when no CONFIG_VIDEO_V4L1_COMPAT is defined, to allow checking for broken V4L2 ports. This is very important during the migration phase for V4L2 API.
However, userspace apps should be capable of using both APIs, since they need to test at runtime, via VIDIOCGCAP ioctl, if V4L1 is supported. So, when __KERNEL__ is not defined, those ioctls and corresponding structs should be visible.
This patch also removes the obsolete defines HAVE_V4L1 and HAVE_V4L2, that where causing some confusion, and were replaced by CONFIG_VIDEO_V4L1_COMPAT and CONFIG_VIDEO_V4L2.

---

 drivers/media/Kconfig              |    2 +-
 drivers/media/video/zoran.h        |    2 +-
 drivers/media/video/zoran_driver.c |   22 +++++++++++-----------
 include/linux/videodev.h           |    3 +--
 include/linux/videodev2.h          |    2 --
 include/media/v4l2-dev.h           |    7 ++++---
 6 files changed, 18 insertions(+), 20 deletions(-)
drivers/media/Kconfig +1 -1
index ef52e6d..ed4aa4e 100644
@@ -53,7 +53,7 @@ config VIDEO_V4L1_COMPAT
 	  If you are unsure as to whether this is required, answer Y.
 
 config VIDEO_V4L2
-	tristate
+	bool
 	default y
 
 source "drivers/media/video/Kconfig"
drivers/media/video/zoran.h +1 -1
index ffcda95..8fb4a34 100644
@@ -267,7 +267,7 @@ struct zoran_v4l_settings {
 };
 
 /* whoops, this one is undeclared if !v4l2 */
-#ifndef HAVE_V4L2
+#ifndef CONFIG_VIDEO_V4L2
 struct v4l2_jpegcompression {
 	int quality;
 	int APPn;
drivers/media/video/zoran_driver.c +11 -11
index d9a5876..5f90db2 100644
@@ -86,7 +86,7 @@ #include "zoran.h"
 #include "zoran_device.h"
 #include "zoran_card.h"
 
-#ifdef HAVE_V4L2
+#ifdef CONFIG_VIDEO_V4L2
 	/* we declare some card type definitions here, they mean
 	 * the same as the v4l1 ZORAN_VID_TYPE above, except it's v4l2 */
 #define ZORAN_V4L2_VID_FLAGS ( \
@@ -103,7 +103,7 @@ const struct zoran_format zoran_formats[
 	{
 		.name = "15-bit RGB",
 		.palette = VIDEO_PALETTE_RGB555,
-#ifdef HAVE_V4L2
+#ifdef CONFIG_VIDEO_V4L2
 #ifdef __LITTLE_ENDIAN
 		.fourcc = V4L2_PIX_FMT_RGB555,
 #else
@@ -117,7 +117,7 @@ #endif
 	}, {
 		.name = "16-bit RGB",
 		.palette = VIDEO_PALETTE_RGB565,
-#ifdef HAVE_V4L2
+#ifdef CONFIG_VIDEO_V4L2
 #ifdef __LITTLE_ENDIAN
 		.fourcc = V4L2_PIX_FMT_RGB565,
 #else
@@ -131,7 +131,7 @@ #endif
 	}, {
 		.name = "24-bit RGB",
 		.palette = VIDEO_PALETTE_RGB24,
-#ifdef HAVE_V4L2
+#ifdef CONFIG_VIDEO_V4L2
 #ifdef __LITTLE_ENDIAN
 		.fourcc = V4L2_PIX_FMT_BGR24,
 #else
@@ -145,7 +145,7 @@ #endif
 	}, {
 		.name = "32-bit RGB",
 		.palette = VIDEO_PALETTE_RGB32,
-#ifdef HAVE_V4L2
+#ifdef CONFIG_VIDEO_V4L2
 #ifdef __LITTLE_ENDIAN
 		.fourcc = V4L2_PIX_FMT_BGR32,
 #else
@@ -159,7 +159,7 @@ #endif
 	}, {
 		.name = "4:2:2, packed, YUYV",
 		.palette = VIDEO_PALETTE_YUV422,
-#ifdef HAVE_V4L2
+#ifdef CONFIG_VIDEO_V4L2
 		.fourcc = V4L2_PIX_FMT_YUYV,
 		.colorspace = V4L2_COLORSPACE_SMPTE170M,
 #endif
@@ -169,7 +169,7 @@ #endif
 	}, {
 		.name = "Hardware-encoded Motion-JPEG",
 		.palette = -1,
-#ifdef HAVE_V4L2
+#ifdef CONFIG_VIDEO_V4L2
 		.fourcc = V4L2_PIX_FMT_MJPEG,
 		.colorspace = V4L2_COLORSPACE_SMPTE170M,
 #endif
@@ -210,7 +210,7 @@ static int lock_norm = 0;	/* 1=Don't cha
 module_param(lock_norm, int, 0);
 MODULE_PARM_DESC(lock_norm, "Users can't change norm");
 
-#ifdef HAVE_V4L2
+#ifdef CONFIG_VIDEO_V4L2
 	/* small helper function for calculating buffersizes for v4l2
 	 * we calculate the nearest higher power-of-two, which
 	 * will be the recommended buffersize */
@@ -1761,7 +1761,7 @@ setup_overlay (struct file *file,
 	return wait_grab_pending(zr);
 }
 
-#ifdef HAVE_V4L2
+#ifdef CONFIG_VIDEO_V4L2
 	/* get the status of a buffer in the clients buffer queue */
 static int
 zoran_v4l2_buffer_status (struct file        *file,
@@ -2676,7 +2676,7 @@ zoran_do_ioctl (struct inode *inode,
 	}
 		break;
 
-#ifdef HAVE_V4L2
+#ifdef CONFIG_VIDEO_V4L2
 
 		/* The new video4linux2 capture interface - much nicer than video4linux1, since
 		 * it allows for integrating the JPEG capturing calls inside standard v4l2
@@ -4689,7 +4689,7 @@ static struct file_operations zoran_fops
 struct video_device zoran_template __devinitdata = {
 	.name = ZORAN_NAME,
 	.type = ZORAN_VID_TYPE,
-#ifdef HAVE_V4L2
+#ifdef CONFIG_VIDEO_V4L2
 	.type2 = ZORAN_V4L2_VID_FLAGS,
 #endif
 	.hardware = ZORAN_HARDWARE,
include/linux/videodev.h +1 -2
index 518c7a3..8dba97a 100644
@@ -14,8 +14,7 @@ #define __LINUX_VIDEODEV_H
 
 #include <linux/videodev2.h>
 
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-#define HAVE_V4L1 1
+#if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)
 
 struct video_capability
 {
include/linux/videodev2.h +0 -2
index b714695..e3715d7 100644
@@ -22,8 +22,6 @@ #define __user
 #endif
 #include <linux/types.h>
 
-#define HAVE_V4L2 1
-
 /*
  * Common stuff for both V4L1 and V4L2
  * Moved from videodev.h
include/media/v4l2-dev.h +4 -3
index 600d61d..810462f 100644
@@ -194,7 +194,7 @@ struct video_device
 
 
 	int (*vidioc_overlay) (struct file *file, void *fh, unsigned int i);
-#ifdef HAVE_V4L1
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
 			/* buffer type is struct vidio_mbuf * */
 	int (*vidiocgmbuf)  (struct file *file, void *fh, struct video_mbuf *p);
 #endif
@@ -335,7 +335,7 @@ extern int video_usercopy(struct inode *
 				      unsigned int cmd, void *arg));
 
 
-#ifdef HAVE_V4L1
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
 #include <linux/mm.h>
 
 extern struct video_device* video_devdata(struct file*);
@@ -357,6 +357,8 @@ video_device_remove_file(struct video_de
 	class_device_remove_file(&vfd->class_dev, attr);
 }
 
+#endif /* CONFIG_VIDEO_V4L1_COMPAT */
+
 #ifdef OBSOLETE_OWNER /* to be removed soon */
 /* helper functions to access driver private data. */
 static inline void *video_get_drvdata(struct video_device *dev)
@@ -372,6 +374,5 @@ #endif
 
 extern int video_exclusive_open(struct inode *inode, struct file *file);
 extern int video_exclusive_release(struct inode *inode, struct file *file);
-#endif /* HAVE_V4L1 */
 
 #endif /* _V4L2_DEV_H */
#5 lore raw

PATCH 5/6 V4L/DVB (4608b): i2c deps fix on DVB

In reply to [email protected]

From: Andrew de Quincey <[email protected]>

Several DVB modules depends on I2C

---

 drivers/media/dvb/b2c2/Kconfig         |    1 +
 drivers/media/dvb/bt8xx/Kconfig        |    1 +
 drivers/media/dvb/dvb-usb/Kconfig      |    1 +
 drivers/media/dvb/frontends/Kconfig    |   60 +++++++++++++++++---------------
 drivers/media/dvb/frontends/Makefile   |    2 +
 drivers/media/dvb/pluto2/Kconfig       |    1 +
 drivers/media/dvb/ttpci/Kconfig        |    5 +++
 drivers/media/dvb/ttusb-budget/Kconfig |    3 +-
 drivers/media/video/cx88/Kconfig       |    1 +
 drivers/media/video/saa7134/Kconfig    |    1 +
 10 files changed, 46 insertions(+), 30 deletions(-)
drivers/media/dvb/b2c2/Kconfig +1 -0
index d7f1fd5..49a06fc 100644
@@ -1,6 +1,7 @@
 config DVB_B2C2_FLEXCOP
 	tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
 	depends on DVB_CORE && I2C
+	select DVB_PLL
 	select DVB_STV0299
 	select DVB_MT352
 	select DVB_MT312
drivers/media/dvb/bt8xx/Kconfig +1 -0
index f394002..7d0ee1a 100644
@@ -1,6 +1,7 @@
 config DVB_BT8XX
 	tristate "BT8xx based PCI cards"
 	depends on DVB_CORE && PCI && I2C && VIDEO_BT848
+	select DVB_PLL
 	select DVB_MT352
 	select DVB_SP887X
 	select DVB_NXT6000
drivers/media/dvb/dvb-usb/Kconfig +1 -0
index 3bc6722..75824b7 100644
@@ -2,6 +2,7 @@ config DVB_USB
 	tristate "Support for various USB DVB devices"
 	depends on DVB_CORE && USB && I2C
 	select FW_LOADER
+	select DVB_PLL
 	help
 	  By enabling this you will be able to choose the various supported
 	  USB1.1 and USB2.0 DVB devices.
drivers/media/dvb/frontends/Kconfig +32 -28

215 lines not on this page · raw message

drivers/media/dvb/frontends/Makefile +1 -1
index 5222245..0e4880b 100644
@@ -4,7 +4,7 @@ #
 
 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
 
-obj-$(CONFIG_DVB_CORE) += dvb-pll.o
+obj-$(CONFIG_DVB_PLL) += dvb-pll.o
 obj-$(CONFIG_DVB_STV0299) += stv0299.o
 obj-$(CONFIG_DVB_SP8870) += sp8870.o
 obj-$(CONFIG_DVB_CX22700) += cx22700.o
drivers/media/dvb/pluto2/Kconfig +1 -0
index 7d8e6e8..9b84b1b 100644
@@ -2,6 +2,7 @@ config DVB_PLUTO2
 	tristate "Pluto2 cards"
 	depends on DVB_CORE && PCI && I2C
 	select I2C_ALGOBIT
+	select DVB_PLL
 	select DVB_TDA1004X
 	help
 	  Support for PCI cards based on the Pluto2 FPGA like the Satelco
drivers/media/dvb/ttpci/Kconfig +5 -0
index 987881f..5fb0975 100644
@@ -3,6 +3,7 @@ config DVB_AV7110
 	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
 	select FW_LOADER
 	select VIDEO_SAA7146_VV
+	select DVB_PLL
 	select DVB_VES1820
 	select DVB_VES1X93
 	select DVB_STV0299
@@ -61,6 +62,7 @@ config DVB_BUDGET
 	tristate "Budget cards"
 	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
 	select VIDEO_SAA7146
+	select DVB_PLL
 	select DVB_STV0299
 	select DVB_VES1X93
 	select DVB_VES1820
@@ -83,6 +85,7 @@ config DVB_BUDGET_CI
 	tristate "Budget cards with onboard CI connector"
 	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
 	select VIDEO_SAA7146
+	select DVB_PLL
 	select DVB_STV0297
 	select DVB_STV0299
 	select DVB_TDA1004X
@@ -104,6 +107,7 @@ config DVB_BUDGET_AV
 	tristate "Budget cards with analog video inputs"
 	depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
 	select VIDEO_SAA7146_VV
+	select DVB_PLL
 	select DVB_STV0299
 	select DVB_TDA1004X
 	select DVB_TDA10021
@@ -122,6 +126,7 @@ config DVB_BUDGET_PATCH
 	tristate "AV7110 cards with Budget Patch"
 	depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1
 	select DVB_AV7110
+	select DVB_PLL
 	select DVB_STV0299
 	select DVB_VES1X93
 	select DVB_TDA8083
drivers/media/dvb/ttusb-budget/Kconfig +2 -1
index 92c7cdc..46a6a60 100644
@@ -1,6 +1,7 @@
 config DVB_TTUSB_BUDGET
 	tristate "Technotrend/Hauppauge Nova-USB devices"
-	depends on DVB_CORE && USB
+	depends on DVB_CORE && USB && I2C
+	select DVB_PLL
 	select DVB_CX22700
 	select DVB_TDA1004X
 	select DVB_VES1820
drivers/media/video/cx88/Kconfig +1 -0
index 80e23ee..7a94e6a 100644
@@ -51,6 +51,7 @@ config VIDEO_CX88_DVB
 	tristate "DVB/ATSC Support for cx2388x based TV cards"
 	depends on VIDEO_CX88 && DVB_CORE
 	select VIDEO_BUF_DVB
+	select DVB_PLL
 	---help---
 	  This adds support for DVB/ATSC cards based on the
 	  Conexant 2388x chip.
drivers/media/video/saa7134/Kconfig +1 -0
index e1c1805..f554316 100644
@@ -40,6 +40,7 @@ config VIDEO_SAA7134_DVB
 	depends on VIDEO_SAA7134 && DVB_CORE
 	select VIDEO_BUF_DVB
 	select FW_LOADER
+	select DVB_PLL
 	---help---
 	  This adds support for DVB cards based on the
 	  Philips saa7134 chip.
#6 lore raw

PATCH 6/6 V4L/DVB (4608c): Fix I2C dependencies for saa7146 modules

In reply to [email protected]

From: Mauro Carvalho Chehab <[email protected]>

---

 drivers/media/video/Kconfig |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/media/video/Kconfig +4 -4
index 732bf1e..94d078b 100644
@@ -260,7 +260,7 @@ source "drivers/media/video/saa7134/Kcon
 
 config VIDEO_MXB
 	tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
-	depends on PCI && VIDEO_V4L1
+	depends on PCI && VIDEO_V4L1 && I2C
 	select VIDEO_SAA7146_VV
 	select VIDEO_TUNER
 	---help---
@@ -272,7 +272,7 @@ config VIDEO_MXB
 
 config VIDEO_DPC
 	tristate "Philips-Semiconductors 'dpc7146 demonstration board'"
-	depends on PCI && VIDEO_V4L1
+	depends on PCI && VIDEO_V4L1 && I2C
 	select VIDEO_SAA7146_VV
 	select VIDEO_V4L2
 	---help---
@@ -287,7 +287,7 @@ config VIDEO_DPC
 
 config VIDEO_HEXIUM_ORION
 	tristate "Hexium HV-PCI6 and Orion frame grabber"
-	depends on PCI && VIDEO_V4L1
+	depends on PCI && VIDEO_V4L1 && I2C
 	select VIDEO_SAA7146_VV
 	select VIDEO_V4L2
 	---help---
@@ -299,7 +299,7 @@ config VIDEO_HEXIUM_ORION
 
 config VIDEO_HEXIUM_GEMINI
 	tristate "Hexium Gemini frame grabber"
-	depends on PCI && VIDEO_V4L1
+	depends on PCI && VIDEO_V4L1 && I2C
 	select VIDEO_SAA7146_VV
 	select VIDEO_V4L2
 	---help---