[linuxtv-commits] [hg:v4l-dvb] gl861: replace non critical msleep(0) with msleep(1) to be on the safe side
The patch number 8015 was added via Antti Palosaari [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: Antti Palosaari [EMAIL PROTECTED] gl861: replace non critical msleep(0) with msleep(1) to be on the safe side - change msleep(0) to msleep(1) Signed-off-by: Antti Palosaari [EMAIL PROTECTED] --- linux/drivers/media/dvb/dvb-usb/gl861.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -r 9662155be9e2 -r ac76d4f500e2 linux/drivers/media/dvb/dvb-usb/gl861.c --- a/linux/drivers/media/dvb/dvb-usb/gl861.c Thu May 29 01:16:31 2008 +0300 +++ b/linux/drivers/media/dvb/dvb-usb/gl861.c Tue Jun 10 14:41:58 2008 +0300 @@ -47,7 +47,7 @@ static int gl861_i2c_msg(struct dvb_usb_ return -EINVAL; } - msleep(0); /* avoid I2C errors */ + msleep(1); /* avoid I2C errors */ return usb_control_msg(d-udev, usb_rcvctrlpipe(d-udev, 0), req, type, value, index, rbuf, rlen, 2000); --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/ac76d4f500e27f0bc519406dd6645d4d2f09293f ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] gl861: coding style fixes
The patch number 8014 was added via Antti Palosaari [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: Antti Palosaari [EMAIL PROTECTED]
gl861: coding style fixes
- coding style fixes raised by checkpatch
Signed-off-by: Antti Palosaari [EMAIL PROTECTED]
---
linux/drivers/media/dvb/dvb-usb/gl861.c | 44
linux/drivers/media/dvb/dvb-usb/gl861.h |2 -
2 files changed, 23 insertions(+), 23 deletions(-)
diff -r d37fc5b42428 -r 9662155be9e2 linux/drivers/media/dvb/dvb-usb/gl861.c
--- a/linux/drivers/media/dvb/dvb-usb/gl861.c Thu May 29 01:04:12 2008 +0300
+++ b/linux/drivers/media/dvb/dvb-usb/gl861.c Thu May 29 01:16:31 2008 +0300
@@ -1,8 +1,8 @@
/* DVB USB compliant linux driver for GL861 USB2.0 devices.
*
* This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
Free
- * Software Foundation, version 2.
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, version 2.
*
* see Documentation/dvb/README.dvb-usb for more information
*/
@@ -13,9 +13,9 @@
/* debug */
static int dvb_usb_gl861_debug;
-module_param_named(debug,dvb_usb_gl861_debug, int, 0644);
-MODULE_PARM_DESC(debug, set debugging level (1=rc (or-able)).
DVB_USB_DEBUG_STATUS);
-
+module_param_named(debug, dvb_usb_gl861_debug, int, 0644);
+MODULE_PARM_DESC(debug, set debugging level (1=rc (or-able)).
+ DVB_USB_DEBUG_STATUS);
DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
static int gl861_i2c_msg(struct dvb_usb_device *d, u8 addr,
@@ -70,7 +70,7 @@ static int gl861_i2c_xfer(struct i2c_ada
/* write/read request */
if (i+1 num (msg[i+1].flags I2C_M_RD)) {
if (gl861_i2c_msg(d, msg[i].addr, msg[i].buf,
- msg[i].len, msg[i+1].buf,
msg[i+1].len) 0)
+ msg[i].len, msg[i+1].buf, msg[i+1].len) 0)
break;
i++;
} else
@@ -102,12 +102,13 @@ static struct zl10353_config gl861_zl103
static int gl861_frontend_attach(struct dvb_usb_adapter *adap)
{
- if ((adap-fe = dvb_attach(zl10353_attach, gl861_zl10353_config,
- adap-dev-i2c_adap)) != NULL) {
- return 0;
- }
-
- return -EIO;
+
+ adap-fe = dvb_attach(zl10353_attach, gl861_zl10353_config,
+ adap-dev-i2c_adap);
+ if (adap-fe == NULL)
+ return -EIO;
+
+ return 0;
}
static struct qt1010_config gl861_qt1010_config = {
@@ -156,7 +157,7 @@ static struct usb_device_id gl861_table
{ USB_DEVICE(USB_VID_ALINK, USB_VID_ALINK_DTU) },
{ } /* Terminating entry */
};
-MODULE_DEVICE_TABLE (usb, gl861_table);
+MODULE_DEVICE_TABLE(usb, gl861_table);
static struct dvb_usb_device_properties gl861_properties = {
.caps = DVB_USB_IS_AN_I2C_ADAPTER,
@@ -180,7 +181,7 @@ static struct dvb_usb_device_properties
}
}
},
- }},
+ } },
.i2c_algo = gl861_i2c_algo,
.num_device_descs = 2,
@@ -199,7 +200,7 @@ static struct dvb_usb_device_properties
};
static struct usb_driver gl861_driver = {
-#if LINUX_VERSION_CODE = KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 15)
.owner = THIS_MODULE,
#endif
.name = dvb_usb_gl861,
@@ -213,12 +214,11 @@ static int __init gl861_module_init(void
{
int ret;
- if ((ret = usb_register(gl861_driver))) {
+ ret = usb_register(gl861_driver);
+ if (ret)
err(usb_register failed. Error number %d, ret);
- return ret;
- }
-
- return 0;
+
+ return ret;
}
static void __exit gl861_module_exit(void)
@@ -227,8 +227,8 @@ static void __exit gl861_module_exit(voi
usb_deregister(gl861_driver);
}
-module_init (gl861_module_init);
-module_exit (gl861_module_exit);
+module_init(gl861_module_init);
+module_exit(gl861_module_exit);
MODULE_AUTHOR(Carl Lundqvist [EMAIL PROTECTED]);
MODULE_DESCRIPTION(Driver MSI Mega Sky 580 DVB-T USB2.0 / GL861);
diff -r d37fc5b42428 -r 9662155be9e2 linux/drivers/media/dvb/dvb-usb/gl861.h
--- a/linux/drivers/media/dvb/dvb-usb/gl861.h Thu May 29 01:04:12 2008 +0300
+++ b/linux/drivers/media/dvb/dvb-usb/gl861.h Thu May 29 01:16:31 2008 +0300
@@ -4,7 +4,7 @@
#define DVB_USB_LOG_PREFIX gl861
#include dvb-usb.h
-#define
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~anttip/v4l-dvb/
The patch number 8016 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://linuxtv.org/hg/~anttip/v4l-dvb/
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/dvb/dvb-usb/gl861.c | 73 ++--
linux/drivers/media/dvb/dvb-usb/gl861.h |2
2 files changed, 34 insertions(+), 41 deletions(-)
diff -r ca65777314d2 -r 2e4200f2c179 linux/drivers/media/dvb/dvb-usb/gl861.c
--- a/linux/drivers/media/dvb/dvb-usb/gl861.c Mon Jun 09 11:59:05 2008 -0300
+++ b/linux/drivers/media/dvb/dvb-usb/gl861.c Tue Jun 10 09:25:04 2008 -0300
@@ -1,8 +1,8 @@
/* DVB USB compliant linux driver for GL861 USB2.0 devices.
*
* This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
Free
- * Software Foundation, version 2.
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, version 2.
*
* see Documentation/dvb/README.dvb-usb for more information
*/
@@ -13,9 +13,9 @@
/* debug */
static int dvb_usb_gl861_debug;
-module_param_named(debug,dvb_usb_gl861_debug, int, 0644);
-MODULE_PARM_DESC(debug, set debugging level (1=rc (or-able)).
DVB_USB_DEBUG_STATUS);
-
+module_param_named(debug, dvb_usb_gl861_debug, int, 0644);
+MODULE_PARM_DESC(debug, set debugging level (1=rc (or-able)).
+ DVB_USB_DEBUG_STATUS);
DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
static int gl861_i2c_msg(struct dvb_usb_device *d, u8 addr,
@@ -47,6 +47,8 @@ static int gl861_i2c_msg(struct dvb_usb_
return -EINVAL;
}
+ msleep(1); /* avoid I2C errors */
+
return usb_control_msg(d-udev, usb_rcvctrlpipe(d-udev, 0), req, type,
value, index, rbuf, rlen, 2000);
}
@@ -68,7 +70,7 @@ static int gl861_i2c_xfer(struct i2c_ada
/* write/read request */
if (i+1 num (msg[i+1].flags I2C_M_RD)) {
if (gl861_i2c_msg(d, msg[i].addr, msg[i].buf,
- msg[i].len, msg[i+1].buf,
msg[i+1].len) 0)
+ msg[i].len, msg[i+1].buf, msg[i+1].len) 0)
break;
i++;
} else
@@ -92,16 +94,6 @@ static struct i2c_algorithm gl861_i2c_al
};
/* Callbacks for DVB USB */
-static int gl861_identify_state(struct usb_device *udev,
- struct dvb_usb_device_properties *props,
- struct dvb_usb_device_description **desc,
- int *cold)
-{
- *cold = 0;
-
- return 0;
-}
-
static struct zl10353_config gl861_zl10353_config = {
.demod_address = 0x0f,
.no_tuner = 1,
@@ -110,12 +102,13 @@ static struct zl10353_config gl861_zl103
static int gl861_frontend_attach(struct dvb_usb_adapter *adap)
{
- if ((adap-fe = dvb_attach(zl10353_attach, gl861_zl10353_config,
- adap-dev-i2c_adap)) != NULL) {
- return 0;
- }
-
- return -EIO;
+
+ adap-fe = dvb_attach(zl10353_attach, gl861_zl10353_config,
+ adap-dev-i2c_adap);
+ if (adap-fe == NULL)
+ return -EIO;
+
+ return 0;
}
static struct qt1010_config gl861_qt1010_config = {
@@ -164,7 +157,7 @@ static struct usb_device_id gl861_table
{ USB_DEVICE(USB_VID_ALINK, USB_VID_ALINK_DTU) },
{ } /* Terminating entry */
};
-MODULE_DEVICE_TABLE (usb, gl861_table);
+MODULE_DEVICE_TABLE(usb, gl861_table);
static struct dvb_usb_device_properties gl861_properties = {
.caps = DVB_USB_IS_AN_I2C_ADAPTER,
@@ -172,7 +165,6 @@ static struct dvb_usb_device_properties
.size_of_priv = 0,
- .identify_state = gl861_identify_state,
.num_adapters = 1,
.adapter = {{
@@ -189,24 +181,26 @@ static struct dvb_usb_device_properties
}
}
},
- }},
+ } },
.i2c_algo = gl861_i2c_algo,
.num_device_descs = 2,
.devices = {
- { MSI Mega Sky 55801 DVB-T USB2.0,
- { gl861_table[0], NULL },
- { NULL },
- },
- { A-LINK DTU DVB-T USB2.0,
- { gl861_table[1], NULL },
- { NULL },
+ {
+ .name = MSI Mega Sky 55801
[linuxtv-commits] [hg:v4l-dvb] gl861: sleep a little to avoid I2C errors
The patch number 8012 was added via Antti Palosaari [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: Antti Palosaari [EMAIL PROTECTED] gl861: sleep a little to avoid I2C errors - add little sleep to avoid I2C errors arising on faster CPUs Signed-off-by: Antti Palosaari [EMAIL PROTECTED] --- linux/drivers/media/dvb/dvb-usb/gl861.c |2 ++ 1 file changed, 2 insertions(+) diff -r 6e037c872133 -r 433bc653c3c1 linux/drivers/media/dvb/dvb-usb/gl861.c --- a/linux/drivers/media/dvb/dvb-usb/gl861.c Wed May 28 06:57:39 2008 +0300 +++ b/linux/drivers/media/dvb/dvb-usb/gl861.c Thu May 29 00:55:06 2008 +0300 @@ -47,6 +47,8 @@ static int gl861_i2c_msg(struct dvb_usb_ return -EINVAL; } + msleep(0); /* avoid I2C errors */ + return usb_control_msg(d-udev, usb_rcvctrlpipe(d-udev, 0), req, type, value, index, rbuf, rlen, 2000); } --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/433bc653c3c1ed8a336514e961a4c6eaa1739956 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] From: Devin Heitmueller [EMAIL PROTECTED]
The patch number 8018 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: Devin Heitmueller [EMAIL PROTECTED]
Add em2860 chip ID
em28xx-cards.c
em28xx-reg.h
- Add em2860 chip ID (seen on Pointnix Intra-Oral Camera)
http://www.pointnix.com/ENG/dental/product_02.asp
Signed-off-by: Devin Heitmueller [EMAIL PROTECTED]
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/em28xx/em28xx-cards.c |3 +++
linux/drivers/media/video/em28xx/em28xx-reg.h |1 +
2 files changed, 4 insertions(+)
diff -r 19a9f61e6c46 -r 1b131c84ed37
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Tue Jun 10 09:34:35
2008 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Tue Jun 10 09:35:42
2008 -0300
@@ -572,6 +572,9 @@ void em28xx_pre_card_setup(struct em28xx
rc = em28xx_read_reg(dev, EM28XX_R0A_CHIPID);
if (rc 0) {
switch (rc) {
+ case CHIP_ID_EM2860:
+ em28xx_info(chip ID is em2860\n);
+ break;
case CHIP_ID_EM2883:
em28xx_info(chip ID is em2882/em2883\n);
dev-wait_after_write = 0;
diff -r 19a9f61e6c46 -r 1b131c84ed37
linux/drivers/media/video/em28xx/em28xx-reg.h
--- a/linux/drivers/media/video/em28xx/em28xx-reg.h Tue Jun 10 09:34:35
2008 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx-reg.h Tue Jun 10 09:35:42
2008 -0300
@@ -84,5 +84,6 @@
/* FIXME: Need to be populated with the other chip ID's */
enum em28xx_chip_id {
+ CHIP_ID_EM2860 = 34,
CHIP_ID_EM2883 = 36,
};
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/1b131c84ed3779f03e620d18b57c4de08ad73497
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] From: Devin Heitmueller [EMAIL PROTECTED]
The patch number 8017 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: Devin Heitmueller [EMAIL PROTECTED]
Ensure em28xx extensions only get run against devs that support them
em28xx-audio.c
em28xx-dvb.c
- Em28xx extensions should ensure they are being only loaded against devices
that support them. Deals with case where there are multiple em28xx
devices, some of which have DVB (or ALSA) support and some do not.
Signed-off-by: Devin Heitmueller [EMAIL PROTECTED]
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/em28xx/em28xx-audio.c | 12
linux/drivers/media/video/em28xx/em28xx-dvb.c | 10 ++
2 files changed, 22 insertions(+)
diff -r 2e4200f2c179 -r 19a9f61e6c46
linux/drivers/media/video/em28xx/em28xx-audio.c
--- a/linux/drivers/media/video/em28xx/em28xx-audio.c Tue Jun 10 09:25:04
2008 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx-audio.c Tue Jun 10 09:34:35
2008 -0300
@@ -486,6 +486,12 @@ static int em28xx_audio_init(struct em28
static int devnr;
int ret, err;
+ if (dev-has_audio_class) {
+ /* This device does not support the extension (in this case
+ the device is expecting the snd-usb-audio module */
+ return 0;
+ }
+
printk(KERN_INFO em28xx-audio.c: probing for em28x1
non standard usbaudio\n);
printk(KERN_INFO em28xx-audio.c: Copyright (C) 2006 Markus
@@ -529,6 +535,12 @@ static int em28xx_audio_fini(struct em28
if (dev == NULL)
return 0;
+ if (dev-has_audio_class) {
+ /* This device does not support the extension (in this case
+ the device is expecting the snd-usb-audio module */
+ return 0;
+ }
+
if (dev-adev) {
snd_card_free(dev-adev-sndcard);
kfree(dev-adev);
diff -r 2e4200f2c179 -r 19a9f61e6c46
linux/drivers/media/video/em28xx/em28xx-dvb.c
--- a/linux/drivers/media/video/em28xx/em28xx-dvb.c Tue Jun 10 09:25:04
2008 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx-dvb.c Tue Jun 10 09:34:35
2008 -0300
@@ -423,6 +423,11 @@ static int dvb_init(struct em28xx *dev)
int result = 0;
struct em28xx_dvb *dvb;
+ if (!dev-has_dvb) {
+ /* This device does not support the extension */
+ return 0;
+ }
+
dvb = kzalloc(sizeof(struct em28xx_dvb), GFP_KERNEL);
if (dvb == NULL) {
@@ -499,6 +504,11 @@ out_free:
static int dvb_fini(struct em28xx *dev)
{
+ if (!dev-has_dvb) {
+ /* This device does not support the extension */
+ return 0;
+ }
+
if (dev-dvb) {
unregister_dvb(dev-dvb);
dev-dvb = NULL;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/19a9f61e6c464acf85d4889b282680bd3820bc5c
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] changeset: 8020:0580af3c9795
The patch number 8020 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: Dmitri Belimov [EMAIL PROTECTED]
changeset: 8020:0580af3c9795
tag: tip
user:Mauro Carvalho Chehab [EMAIL PROTECTED]
date:Tue Jun 10 11:01:57 2008 +
files: linux/drivers/media/video/saa7134/saa7134-empress.c
description:
callbacks function of saa7134_empress
If I try v4l2-ctl --all -d /dev/video1 or v4l2-ctl --streamon -d /dev/video1
modules crashed:
*pde =
Modules linked in: ac battery loop saa7134_empress(F) saa6752hs(F)
tuner_simple(F) tuner_types(F) tea5767(F) tda9887(F) tda8290(F) tea5761(F)
tuner(F) snd_cmipci snd_pcm snd_page_alloc snd_opl3_lib saa7134(F) snd_mpu401
parport_pc parport snd_timer snd_hwdep snd_mpu401_uart floppy rtc psmouse
videodev(F) v4l1_compat(F) compat_ioctl32(F) v4l2_common(F) videobuf_dma_sg(F)
videobuf_core(F) snd_rawmidi snd_seq_device via_ircc pcspkr snd ir_kbd_i2c(F)
irda soundcore ir_common(F) crc_ccitt tveeprom(F) i2c_viapro i2c_core button
via_agp agpgart evdev ext3 jbd mbcache ide_cd_mod cdrom ide_disk 8139cp
via82cxxx ide_core 8139too mii ehci_hcd uhci_hcd usbcore thermal processor fan
EIP is at __mutex_lock_slowpath+0x29/0x7b
DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
Process v4l2-ctl (pid: 2742, ti=ced7e000 task=cf325260 task.ti=ced7e000)
d08e5411 ced7fed4 d0975acb 40045612 cfa86ee0 ffcd
cf2b7000 ced7febc c03858d6 0019 0292 d089e4ec cf37b2a0 d089e4a0
Call Trace:
[c028b52b] mutex_lock+0xa/0xb
[d08e5411] videobuf_streamon+0xf/0x9a [videobuf_core]
[d0975acb] __video_do_ioctl+0x136a/0x2d68 [videodev]
[d088f789] task_end_request+0x40/0x51 [ide_core]
[d088c4aa] ide_intr+0x187/0x192 [ide_core]
[c016a551] mntput_no_expire+0x11/0x64
[c0160b1c] path_walk+0x90/0x98
[d0977738] video_ioctl2+0x173/0x239 [videodev]
[c0140936] filemap_fault+0x202/0x370
[c014930a] __do_fault+0x2c3/0x2fe
[c014ab03] handle_mm_fault+0x22a/0x49f
[c0162737] vfs_ioctl+0x47/0x5d
[c0162992] do_vfs_ioctl+0x245/0x258
[c01629e6] sys_ioctl+0x41/0x5b
[c01036a6] sysenter_past_esp+0x5f/0x85
===
After this fix all of that commands works without problem:
v4l2-ctl --all -d /dev/video1
Driver Info:
Driver name : saa7134
Card type : Beholder BeholdTV M6 Extra
Bus info : PCI::00:0d.0
Driver version: 526
Capabilities : 0x0501
Video Capture
Read/Write
Streaming
Format Video Capture:
Width/Height : 720/576
Pixel Format : MPEG
Field : Any
Bytes per Line: 0
Size Image: 58656
Colorspace: Unknown ()
Video input : 0 (CCIR656)
Video Standard = 0x00ff
PAL-B/B1/G/H/I/D/D1/K
P.S. data from /dev/video1 is not correct :(( .
Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov [EMAIL PROTECTED]
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/saa7134/saa7134-empress.c | 30
1 file changed, 10 insertions(+), 20 deletions(-)
diff -r 17b1cde527df -r e23d786d7fc3
linux/drivers/media/video/saa7134/saa7134-empress.c
--- a/linux/drivers/media/video/saa7134/saa7134-empress.c Tue Jun 10
09:43:58 2008 -0300
+++ b/linux/drivers/media/video/saa7134/saa7134-empress.c Tue Jun 10
11:19:31 2008 -0300
@@ -227,8 +227,7 @@ static int empress_g_fmt_vid_cap(struct
static int empress_g_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
- struct saa7134_fh *fh = priv;
- struct saa7134_dev *dev = fh-dev;
+ struct saa7134_dev *dev = file-private_data;
saa7134_i2c_call_clients(dev, VIDIOC_G_FMT, f);
@@ -241,8 +240,7 @@ static int empress_s_fmt_vid_cap(struct
static int empress_s_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f)
{
- struct saa7134_fh *fh = priv;
- struct saa7134_dev *dev = fh-dev;
+ struct saa7134_dev *dev = file-private_data;
saa7134_i2c_call_clients(dev, VIDIOC_S_FMT, f);
@@ -256,8 +254,7 @@ static int empress_reqbufs(struct file *
static int empress_reqbufs(struct file *file, void *priv,
struct v4l2_requestbuffers *p)
{
- struct saa7134_fh *fh = priv;
- struct saa7134_dev *dev = fh-dev;
+ struct saa7134_dev *dev = file-private_data;
return videobuf_reqbufs(dev-empress_tsq, p);
}
@@ -265,24 +262,21 @@ static int empress_querybuf(struct file
static int empress_querybuf(struct
[linuxtv-commits] [hg:v4l-dvb] Beholder's cards description
The patch number 8021 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]
--
Beholder's cards description
Split the Beholder M6 family to different models. Because M6 hasn`t RDS, M63
has chip with AC3 codec, M6 Extra has other type of HF module.
Add correct data for support MPEG encoder.
Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov [EMAIL PROTECTED]
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/Documentation/video4linux/CARDLIST.saa7134 |4
linux/drivers/media/video/saa7134/saa7134-cards.c | 115 +++---
linux/drivers/media/video/saa7134/saa7134-input.c |2
linux/drivers/media/video/saa7134/saa7134.h |3
4 files changed, 105 insertions(+), 19 deletions(-)
diff -r e23d786d7fc3 -r 2a89445f3b24
linux/Documentation/video4linux/CARDLIST.saa7134
--- a/linux/Documentation/video4linux/CARDLIST.saa7134 Tue Jun 10 11:19:31
2008 -0300
+++ b/linux/Documentation/video4linux/CARDLIST.saa7134 Tue Jun 10 11:22:00
2008 -0300
@@ -128,7 +128,7 @@ 127 - Beholder BeholdTV 507 FM/RDS / Be
127 - Beholder BeholdTV 507 FM/RDS / BeholdTV 509 FM
[:5071,:507B,5ace:5070,5ace:5090]
128 - Beholder BeholdTV Columbus TVFM [:5201]
129 - Beholder BeholdTV 607 / BeholdTV 609
[5ace:6070,5ace:6071,5ace:6072,5ace:6073,5ace:6090,5ace:6091,5ace:6092,5ace:6093]
-130 - Beholder BeholdTV M6 / BeholdTV M6 Extra [5ace:6190,5ace:6193,5ace:6191]
+130 - Beholder BeholdTV M6 [5ace:6190]
131 - Twinhan Hybrid DTV-DVB 3056 PCI [1822:0022]
132 - Genius TVGO AM11MCE
133 - NXP Snake DVB-S reference design
@@ -141,3 +141,5 @@ 140 - Avermedia DVB-S Pro A700
140 - Avermedia DVB-S Pro A700 [1461:a7a1]
141 - Avermedia DVB-S Hybrid+FM A700 [1461:a7a2]
142 - Beholder BeholdTV H6 [5ace:6290]
+143 - Beholder BeholdTV M63[5ace:6191]
+144 - Beholder BeholdTV M6 Extra [5ace:6193]
diff -r e23d786d7fc3 -r 2a89445f3b24
linux/drivers/media/video/saa7134/saa7134-cards.c
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c Tue Jun 10 11:19:31
2008 -0300
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c Tue Jun 10 11:22:00
2008 -0300
@@ -3979,32 +3979,111 @@ struct saa7134_board saa7134_boards[] =
[SAA7134_BOARD_BEHOLD_M6] = {
/* Igor Kuznetsov [EMAIL PROTECTED] */
/* Andrey Melnikoff [EMAIL PROTECTED] */
- .name = Beholder BeholdTV M6 / BeholdTV M6 Extra,
+ /* Beholder Intl. Ltd. Dmitry Belimov [EMAIL PROTECTED] */
+ .name = Beholder BeholdTV M6,
.audio_clock= 0x00187de7,
.tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tda9887_conf = TDA9887_PRESENT,
- .inputs = {{
- .name = name_tv,
- .vmux = 3,
- .amux = TV,
- .tv = 1,
- },{
- .name = name_comp1,
- .vmux = 1,
- .amux = LINE1,
- },{
- .name = name_svideo,
- .vmux = 8,
- .amux = LINE1,
- }},
+ .inputs = { {
+ .name = name_tv,
+ .vmux = 3,
+ .amux = TV,
+ .tv = 1,
+ }, {
+ .name = name_comp1,
+ .vmux = 1,
+ .amux = LINE1,
+ }, {
+ .name = name_svideo,
+ .vmux = 8,
+ .amux = LINE1,
+ } },
.radio = {
.name = name_radio,
.amux = LINE2,
},
.mpeg = SAA7134_MPEG_EMPRESS,
+ .video_out = CCIR656,
+ .vid_port_opts = (SET_T_CODE_POLARITY_NON_INVERTED |
+ SET_CLOCK_NOT_DELAYED |
+ SET_CLOCK_INVERTED |
+ SET_VSYNC_OFF),
+ },
+ [SAA7134_BOARD_BEHOLD_M63] = {
+ /* Igor Kuznetsov [EMAIL PROTECTED] */
+ /* Andrey Melnikoff [EMAIL PROTECTED] */
+ /* Beholder Intl. Ltd. Dmitry Belimov [EMAIL PROTECTED] */
+ .name
[linuxtv-commits] [hg:v4l-dvb] Fix compilation with kernel 2.6.25
The patch number 8025 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]
Fix compilation with kernel 2.6.25
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/mt9m001.c |4
v4l/compat.h|6 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff -r 58b95134acb8 -r 04ddbe145932 linux/drivers/media/video/mt9m001.c
--- a/linux/drivers/media/video/mt9m001.c Tue Jun 10 12:21:49 2008 -0300
+++ b/linux/drivers/media/video/mt9m001.c Tue Jun 10 15:27:29 2008 -0300
@@ -694,11 +694,13 @@ static int mt9m001_remove(struct i2c_cli
return 0;
}
+#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 26)
static const struct i2c_device_id mt9m001_id[] = {
{ mt9m001, 0 },
{ }
};
MODULE_DEVICE_TABLE(i2c, mt9m001_id);
+#endif
static struct i2c_driver mt9m001_i2c_driver = {
.driver = {
@@ -706,7 +708,9 @@ static struct i2c_driver mt9m001_i2c_dri
},
.probe = mt9m001_probe,
.remove = mt9m001_remove,
+#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 26)
.id_table = mt9m001_id,
+#endif
};
static int __init mt9m001_mod_init(void)
diff -r 58b95134acb8 -r 04ddbe145932 v4l/compat.h
--- a/v4l/compat.h Tue Jun 10 12:21:49 2008 -0300
+++ b/v4l/compat.h Tue Jun 10 15:27:29 2008 -0300
@@ -557,7 +557,11 @@ static inline struct proc_dir_entry *pro
}
return e;
}
-
+#endif
+#endif
+
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 6, 26)
+#ifdef CONFIG_PROC_FS
static inline struct proc_dir_entry *proc_create_data(const char *a,
mode_t b, struct proc_dir_entry *c, const struct file_operations *d,
void *f)
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/04ddbe145932c88e64fd1a5991aaea56090d8d8a
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
