The patch number 9134 was added via Mauro Carvalho Chehab [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Mauro Carvalho Chehab [EMAIL PROTECTED]
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-dev
Priority: normal
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/Kconfig |9 +
linux/drivers/media/video/cx18/cx18-driver.c|4
linux/drivers/media/video/cx18/cx18-streams.c | 41 +++---
linux/drivers/media/video/em28xx/em28xx-video.c |8 -
linux/drivers/media/video/ivtv/ivtv-driver.c|6
linux/drivers/media/video/ivtv/ivtv-streams.c | 40 +++---
linux/drivers/media/video/v4l2-dev.c| 100 ++--
linux/include/media/v4l2-dev.h | 12 -
v4l/scripts/make_kconfig.pl |1
9 files changed, 131 insertions(+), 90 deletions(-)
diff -r b064509ec4af -r 9abfea2b7f56 linux/drivers/media/video/Kconfig
--- a/linux/drivers/media/video/Kconfig Sat Oct 04 18:09:41 2008 -0400
+++ b/linux/drivers/media/video/Kconfig Sat Oct 11 12:31:04 2008 -0300
@@ -71,6 +71,15 @@ config VIDEO_ADV_DEBUG
Say Y here to enable advanced debugging functionality on some
V4L devices.
In doubt, say N.
+
+config VIDEO_FIXED_MINOR_RANGES
+ bool Enable old-style fixed minor ranges for video devices
+ default n
+ ---help---
+ Say Y here to enable the old-style fixed-range minor assignments.
+ Only useful if you rely on the old behavior and use mknod instead of
udev.
+
+ When in doubt, say N.
config VIDEO_HELPER_CHIPS_AUTO
bool Autoselect pertinent encoders/decoders and other helper chips
diff -r b064509ec4af -r 9abfea2b7f56
linux/drivers/media/video/cx18/cx18-driver.c
--- a/linux/drivers/media/video/cx18/cx18-driver.c Sat Oct 04 18:09:41
2008 -0400
+++ b/linux/drivers/media/video/cx18/cx18-driver.c Sat Oct 11 12:31:04
2008 -0300
@@ -175,7 +175,7 @@ MODULE_PARM_DESC(enc_pcm_buffers,
Encoder PCM buffers (in MB)\n
\t\t\tDefault: __stringify(CX18_DEFAULT_ENC_PCM_BUFFERS));
-MODULE_PARM_DESC(cx18_first_minor, Set minor assigned to first card);
+MODULE_PARM_DESC(cx18_first_minor, Set kernel number assigned to first card);
MODULE_AUTHOR(Hans Verkuil);
MODULE_DESCRIPTION(CX23418 driver);
@@ -959,7 +959,7 @@ static int module_start(void)
/* Validate parameters */
if (cx18_first_minor 0 || cx18_first_minor = CX18_MAX_CARDS) {
- printk(KERN_ERR cx18: Exiting, ivtv_first_minor must be
between 0 and %d\n,
+ printk(KERN_ERR cx18: Exiting, cx18_first_minor must be
between 0 and %d\n,
CX18_MAX_CARDS - 1);
return -1;
}
diff -r b064509ec4af -r 9abfea2b7f56
linux/drivers/media/video/cx18/cx18-streams.c
--- a/linux/drivers/media/video/cx18/cx18-streams.c Sat Oct 04 18:09:41
2008 -0400
+++ b/linux/drivers/media/video/cx18/cx18-streams.c Sat Oct 11 12:31:04
2008 -0300
@@ -57,7 +57,7 @@ static struct {
static struct {
const char *name;
int vfl_type;
- int minor_offset;
+ int num_offset;
int dma;
enum v4l2_buf_type buf_type;
struct file_operations *fops;
@@ -144,8 +144,8 @@ static int cx18_prep_dev(struct cx18 *cx
{
struct cx18_stream *s = cx-streams[type];
u32 cap = cx-v4l2_cap;
- int minor_offset = cx18_stream_info[type].minor_offset;
- int minor;
+ int num_offset = cx18_stream_info[type].num_offset;
+ int num = cx-num + cx18_first_minor + num_offset;
/* These four fields are always initialized. If v4l2dev == NULL, then
this stream is not in use. In that case no other fields but these
@@ -164,9 +164,6 @@ static int cx18_prep_dev(struct cx18 *cx
!(cap (V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE)))
return 0;
- /* card number + user defined offset + device offset */
- minor = cx-num + cx18_first_minor + minor_offset;
-
/* User explicitly selected 0 buffers for these streams, so don't
create them. */
if (cx18_stream_info[type].dma != PCI_DMA_NONE
@@ -177,7 +174,7 @@ static int cx18_prep_dev(struct cx18 *cx
cx18_stream_init(cx, type);
- if (minor_offset == -1)
+ if (num_offset == -1)
return 0;
/* allocate and initialize the v4l2 video device structure */
@@ -191,7 +188,7 @@ static int cx18_prep_dev(struct cx18 *cx
snprintf(s-v4l2dev-name, sizeof(s-v4l2dev-name), cx18-%d,
cx-num);
-
