[linuxtv-commits] [hg:v4l-dvb] em28xx: fix audio output PCM IN selection
The patch number 10228 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
em28xx: fix audio output PCM IN selection
Some em28xx devices use the PCM IN AC 97 PIN for digital audio. However,
currently, the PCM IN selection is not set by the driver. This patch allows
specifying the PCM IN expected output, via board description table.
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/em28xx/em28xx-core.c |9 +++
linux/drivers/media/video/em28xx/em28xx.h | 21 -
2 files changed, 29 insertions(+), 1 deletion(-)
diff -r 0293688d353f -r b09b5128742f
linux/drivers/media/video/em28xx/em28xx-core.c
--- a/linux/drivers/media/video/em28xx/em28xx-core.cMon Jan 12 09:09:08
2009 -0800
+++ b/linux/drivers/media/video/em28xx/em28xx-core.cMon Jan 12 22:50:52
2009 -0200
@@ -453,6 +453,15 @@ int em28xx_audio_analog_set(struct em28x
if (ret 0)
em28xx_warn(couldn't setup AC97 register %d\n,
outputs[i].reg);
+ }
+
+ if (dev-ctl_aoutput EM28XX_AOUT_PCM_IN) {
+ int sel = ac97_return_record_select(dev-ctl_aoutput);
+
+ /* Use the same input for both left and right channels
*/
+ sel |= (sel 8);
+
+ em28xx_write_ac97(dev, AC97_RECORD_SELECT, sel);
}
}
diff -r 0293688d353f -r b09b5128742f linux/drivers/media/video/em28xx/em28xx.h
--- a/linux/drivers/media/video/em28xx/em28xx.h Mon Jan 12 09:09:08 2009 -0800
+++ b/linux/drivers/media/video/em28xx/em28xx.h Mon Jan 12 22:50:52 2009 -0200
@@ -301,12 +301,31 @@ enum em28xx_amux {
};
enum em28xx_aout {
+ /* AC97 outputs */
EM28XX_AOUT_MASTER = 1 0,
EM28XX_AOUT_LINE = 1 1,
EM28XX_AOUT_MONO = 1 2,
EM28XX_AOUT_LFE= 1 3,
EM28XX_AOUT_SURR = 1 4,
-};
+
+ /* PCM IN Mixer - used by AC97_RECORD_SELECT register */
+ EM28XX_AOUT_PCM_IN = 1 7,
+
+ /* Bits 10-8 are used to indicate the PCM IN record select */
+ EM28XX_AOUT_PCM_MIC_PCM = 0 8,
+ EM28XX_AOUT_PCM_CD = 1 8,
+ EM28XX_AOUT_PCM_VIDEO = 2 8,
+ EM28XX_AOUT_PCM_AUX = 3 8,
+ EM28XX_AOUT_PCM_LINE= 4 8,
+ EM28XX_AOUT_PCM_STEREO = 5 8,
+ EM28XX_AOUT_PCM_MONO= 6 8,
+ EM28XX_AOUT_PCM_PHONE = 7 8,
+};
+
+static int ac97_return_record_select(int a_out)
+{
+ return (a_out 0x700) 8;
+}
struct em28xx_reg_seq {
int reg;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/b09b5128742f75bb0ce4375b23feac6c5f560aec
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-saa7134
The patch number 10232 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-saa7134
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/ivtv/ivtv-driver.c |4 +++-
linux/drivers/media/video/v4l2-subdev.c |6 ++
linux/include/media/v4l2-device.h|8
linux/include/media/v4l2-subdev.h|3 +++
4 files changed, 16 insertions(+), 5 deletions(-)
diff -r b09b5128742f -r 1e1c3851abe8
linux/drivers/media/video/ivtv/ivtv-driver.c
--- a/linux/drivers/media/video/ivtv/ivtv-driver.c Mon Jan 12 22:50:52
2009 -0200
+++ b/linux/drivers/media/video/ivtv/ivtv-driver.c Wed Jan 14 01:46:23
2009 -0200
@@ -953,8 +953,10 @@ static int __devinit ivtv_probe(struct p
itv-instance = atomic_inc_return(ivtv_instance) - 1;
retval = v4l2_device_register(dev-dev, itv-device);
- if (retval)
+ if (retval) {
+ kfree(itv);
return retval;
+ }
/* ivtv + PCI ID is a bit of a mouthful, so use
ivtv + instance instead. */
snprintf(itv-device.name, sizeof(itv-device.name),
diff -r b09b5128742f -r 1e1c3851abe8 linux/drivers/media/video/v4l2-subdev.c
--- a/linux/drivers/media/video/v4l2-subdev.c Mon Jan 12 22:50:52 2009 -0200
+++ b/linux/drivers/media/video/v4l2-subdev.c Wed Jan 14 01:46:23 2009 -0200
@@ -33,6 +33,12 @@ int v4l2_subdev_command(struct v4l2_subd
return v4l2_subdev_call(sd, core, g_ctrl, arg);
case VIDIOC_S_CTRL:
return v4l2_subdev_call(sd, core, s_ctrl, arg);
+ case VIDIOC_G_EXT_CTRLS:
+ return v4l2_subdev_call(sd, core, g_ext_ctrls, arg);
+ case VIDIOC_S_EXT_CTRLS:
+ return v4l2_subdev_call(sd, core, s_ext_ctrls, arg);
+ case VIDIOC_TRY_EXT_CTRLS:
+ return v4l2_subdev_call(sd, core, try_ext_ctrls, arg);
case VIDIOC_QUERYMENU:
return v4l2_subdev_call(sd, core, queryctrl, arg);
case VIDIOC_LOG_STATUS:
diff -r b09b5128742f -r 1e1c3851abe8 linux/include/media/v4l2-device.h
--- a/linux/include/media/v4l2-device.h Mon Jan 12 22:50:52 2009 -0200
+++ b/linux/include/media/v4l2-device.h Wed Jan 14 01:46:23 2009 -0200
@@ -94,16 +94,16 @@ void v4l2_device_unregister_subdev(struc
/* Call the specified callback for all subdevs matching grp_id (if 0, then
match them all). Ignore any errors. Note that you cannot add or delete
a subdev while walking the subdevs list. */
-#define v4l2_device_call_all(dev, grp_id, o, f, args...) \
+#define v4l2_device_call_all(dev, grpid, o, f, args...)\
__v4l2_device_call_subdevs(dev, \
- !(grp_id) || sd-grp_id == (grp_id), o, f , ##args)
+ !(grpid) || sd-grp_id == (grpid), o, f , ##args)
/* Call the specified callback for all subdevs matching grp_id (if 0, then
match them all). If the callback returns an error other than 0 or
-ENOIOCTLCMD, then return with that error code. Note that you cannot
add or delete a subdev while walking the subdevs list. */
-#define v4l2_device_call_until_err(dev, grp_id, o, f, args...)
\
+#define v4l2_device_call_until_err(dev, grpid, o, f, args...) \
__v4l2_device_call_subdevs_until_err(dev, \
- !(grp_id) || sd-grp_id == (grp_id), o, f , ##args)
+ !(grpid) || sd-grp_id == (grpid), o, f , ##args)
#endif
diff -r b09b5128742f -r 1e1c3851abe8 linux/include/media/v4l2-subdev.h
--- a/linux/include/media/v4l2-subdev.h Mon Jan 12 22:50:52 2009 -0200
+++ b/linux/include/media/v4l2-subdev.h Wed Jan 14 01:46:23 2009 -0200
@@ -78,6 +78,9 @@ struct v4l2_subdev_core_ops {
int (*queryctrl)(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc);
int (*g_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl);
int (*s_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl);
+ int (*g_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls
*ctrls);
+ int (*s_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls
*ctrls);
+ int (*try_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls
*ctrls);
int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm);
long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg);
#ifdef CONFIG_VIDEO_ADV_DEBUG
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-cx25840
The patch number 10253 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-cx25840
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/Documentation/video4linux/v4l2-framework.txt |6
linux/drivers/media/video/cx25840/cx25840-core.c | 18 +
linux/include/media/cx25840.h | 12
3 files changed, 36 insertions(+)
diff -r aedffebec498 -r 2913087bd96e
linux/Documentation/video4linux/v4l2-framework.txt
--- a/linux/Documentation/video4linux/v4l2-framework.txtSun Jan 18
23:37:59 2009 +0100
+++ b/linux/Documentation/video4linux/v4l2-framework.txtSun Jan 18
22:28:51 2009 -0200
@@ -340,6 +340,12 @@ is called. This will unregister the sub-
is called. This will unregister the sub-device from the bridge driver. It is
safe to call this even if the sub-device was never registered.
+You need to do this because when the bridge driver destroys the i2c adapter
+the remove() callbacks are called of the i2c devices on that adapter.
+After that the corresponding v4l2_subdev structures are invalid, so they
+have to be unregistered first. Calling v4l2_device_unregister_subdev(sd)
+from the remove() callback ensures that this is always done correctly.
+
The bridge driver also has some helper functions it can use:
diff -r aedffebec498 -r 2913087bd96e
linux/drivers/media/video/cx25840/cx25840-core.c
--- a/linux/drivers/media/video/cx25840/cx25840-core.c Sun Jan 18 23:37:59
2009 +0100
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c Sun Jan 18 22:28:51
2009 -0200
@@ -1120,6 +1120,16 @@ static void log_audio_status(struct i2c_
/* --- */
+/* This init operation must be called to load the driver's firmware.
+ Without this the audio standard detection will fail and you will
+ only get mono.
+
+ Since loading the firmware is often problematic when the driver is
+ compiled into the kernel I recommend postponing calling this function
+ until the first open of the video device. Another reason for
+ postponing it is that loading this firmware takes a long time (seconds)
+ due to the slow i2c bus speed. So it will speed up the boot process if
+ you can avoid loading the fw as long as the video device isn't used. */
static int cx25840_init(struct v4l2_subdev *sd, u32 val)
{
struct cx25840_state *state = to_state(sd);
@@ -1401,6 +1411,14 @@ static int cx25840_log_status(struct v4l
static int cx25840_command(struct i2c_client *client, unsigned cmd, void *arg)
{
+ /* ignore this command */
+ if (cmd == TUNER_SET_TYPE_ADDR)
+ return 0;
+
+ /* Old-style drivers rely on initialization on first use, so
+ call the init whenever a command is issued to this driver.
+ New-style drivers using v4l2_subdev should call init explicitly. */
+ cx25840_init(i2c_get_clientdata(client), 0);
return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
}
diff -r aedffebec498 -r 2913087bd96e linux/include/media/cx25840.h
--- a/linux/include/media/cx25840.h Sun Jan 18 23:37:59 2009 +0100
+++ b/linux/include/media/cx25840.h Sun Jan 18 22:28:51 2009 -0200
@@ -20,6 +20,18 @@
#ifndef _CX25840_H_
#define _CX25840_H_
+
+/* Note that the cx25840 driver requires that the bridge driver calls the
+ v4l2_subdev's init operation in order to load the driver's firmware.
+ Without this the audio standard detection will fail and you will
+ only get mono.
+
+ Since loading the firmware is often problematic when the driver is
+ compiled into the kernel I recommend postponing calling this function
+ until the first open of the video device. Another reason for
+ postponing it is that loading this firmware takes a long time (seconds)
+ due to the slow i2c bus speed. So it will speed up the boot process if
+ you can avoid loading the fw as long as the video device isn't used. */
enum cx25840_video_input {
/* Composite video inputs In1-In8 */
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/2913087bd96e84042b0eb5aeaced8b1c182bb4d8
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~dheitmueller/v4l-dvb-em28xx-audio-panic/
The patch number 10262 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~dheitmueller/v4l-dvb-em28xx-audio-panic/
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/em28xx/em28xx-audio.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -r 40e26a21dd9c -r de513684aca2
linux/drivers/media/video/em28xx/em28xx-audio.c
--- a/linux/drivers/media/video/em28xx/em28xx-audio.c Sun Jan 18 23:05:12
2009 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-audio.c Sun Jan 18 23:06:34
2009 -0200
@@ -63,7 +63,7 @@ static int em28xx_isoc_audio_deinit(stru
dprintk(Stopping isoc\n);
for (i = 0; i EM28XX_AUDIO_BUFS; i++) {
- usb_unlink_urb(dev-adev.urb[i]);
+ usb_kill_urb(dev-adev.urb[i]);
usb_free_urb(dev-adev.urb[i]);
dev-adev.urb[i] = NULL;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/de513684aca27da3d48ced2bdc470e4f16b0a30c
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~mcisely/pvrusb2
The patch number 10260 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~mcisely/pvrusb2
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 23 +-
linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 14 ++
linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h |1
linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c |2
linux/drivers/media/video/pvrusb2/pvrusb2-main.c |4 -
5 files changed, 31 insertions(+), 13 deletions(-)
diff -r c908dca358cd -r 40e26a21dd9c
linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.cSun Jan
18 22:59:34 2009 -0200
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.cSun Jan
18 23:05:12 2009 -0200
@@ -32,17 +32,19 @@
#define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__)
-#define OP_STANDARD 0
-#define OP_AUDIOMODE 1
-#define OP_BCSH 2
-#define OP_VOLUME 3
-#define OP_FREQ 4
-#define OP_AUDIORATE 5
-#define OP_CROP 6
-#define OP_SIZE 7
-#define OP_LOG 8
+#define OP_INIT 0 /* MUST come first so it is run first */
+#define OP_STANDARD 1
+#define OP_AUDIOMODE 2
+#define OP_BCSH 3
+#define OP_VOLUME 4
+#define OP_FREQ 5
+#define OP_AUDIORATE 6
+#define OP_CROP 7
+#define OP_SIZE 8
+#define OP_LOG 9
static const struct pvr2_i2c_op * const ops[] = {
+ [OP_INIT] = pvr2_i2c_op_v4l2_init,
[OP_STANDARD] = pvr2_i2c_op_v4l2_standard,
[OP_AUDIOMODE] = pvr2_i2c_op_v4l2_audiomode,
[OP_BCSH] = pvr2_i2c_op_v4l2_bcsh,
@@ -57,7 +59,8 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw
{
int id;
id = cp-client-driver-id;
- cp-ctl_mask = ((1 OP_STANDARD) |
+ cp-ctl_mask = ((1 OP_INIT) |
+ (1 OP_STANDARD) |
(1 OP_AUDIOMODE) |
(1 OP_BCSH) |
(1 OP_VOLUME) |
diff -r c908dca358cd -r 40e26a21dd9c
linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c Sun Jan 18
22:59:34 2009 -0200
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c Sun Jan 18
23:05:12 2009 -0200
@@ -25,6 +25,20 @@
#include linux/videodev2.h
#include media/v4l2-common.h
#include compat.h
+
+static void execute_init(struct pvr2_hdw *hdw)
+{
+ u32 dummy = 0;
+ pvr2_trace(PVR2_TRACE_CHIPS, i2c v4l2 init);
+ pvr2_i2c_core_cmd(hdw, VIDIOC_INT_INIT, dummy);
+}
+
+
+const struct pvr2_i2c_op pvr2_i2c_op_v4l2_init = {
+ .update = execute_init,
+ .name = v4l2_init,
+};
+
static void set_standard(struct pvr2_hdw *hdw)
{
diff -r c908dca358cd -r 40e26a21dd9c
linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h Sun Jan 18
22:59:34 2009 -0200
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h Sun Jan 18
23:05:12 2009 -0200
@@ -24,6 +24,7 @@
#include pvrusb2-i2c-core.h
+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_init;
extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_standard;
extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_radio;
extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_bcsh;
diff -r c908dca358cd -r 40e26a21dd9c
linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c Sun Jan 18
22:59:34 2009 -0200
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c Sun Jan 18
23:05:12 2009 -0200
@@ -838,7 +838,7 @@ int pvr2_i2c_core_check_stale(struct pvr
if (!(msk pm)) continue;
pm = ~msk;
opf = pvr2_i2c_get_op(idx);
- if (!opf) continue;
+ if (!(opf opf-check)) continue;
if (opf-check(hdw)) {
sm |= msk;
}
diff -r c908dca358cd -r 40e26a21dd9c
linux/drivers/media/video/pvrusb2/pvrusb2-main.c
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-main.c Sun Jan 18 22:59:34
2009 -0200
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-main.c Sun Jan 18 23:05:12
2009 -0200
@@ -138,10 +138,10 @@ static int __init pvr_init(void)
ret = usb_register(pvr_driver);
if (ret == 0)
- printk(KERN_INFO KBUILD_MODNAME : DRIVER_VERSION :
+ printk(KERN_INFO pvrusb2: DRIVER_VERSION :
DRIVER_DESC \n);
if (pvrusb2_debug)
-
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-saa7146-2
The patch number 10273 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-saa7146-2 Priority: normal Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/common/saa7146_fops.c | 36 linux/drivers/media/common/saa7146_video.c | 1377 ++--- linux/drivers/media/dvb/ttpci/av7110_v4l.c | 538 linux/drivers/media/dvb/ttpci/budget-av.c | 88 - linux/drivers/media/video/hexium_gemini.c | 292 ++-- linux/drivers/media/video/hexium_orion.c | 103 - linux/drivers/media/video/mxb.c| 703 +- linux/include/media/saa7146_vv.h | 17 8 files changed, 1525 insertions(+), 1629 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/c882586c1a926e25537e9b119113d18aab1c7d67 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
The patch number 10292 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
.hgignore |3 ++-
linux/drivers/media/video/em28xx/em28xx-video.c |7 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff -r 0a855ae09ce1 -r abb4add20e7b .hgignore
--- a/.hgignore Thu Jan 22 20:52:03 2009 -0200
+++ b/.hgignore Thu Jan 22 20:59:21 2009 -0200
@@ -28,6 +28,7 @@ v4l/.myconfig$
v4l/.myconfig$
v4l/.snapshot$
v4l2-apps/lib/.*\.so$
+v4l2-apps/include
v4l2-apps/test/driver-test$
v4l2-apps/test/v4lgrab$
v4l2-apps/test/ioctl-test$
@@ -38,7 +39,7 @@ v4l2-apps/test/pixfmt-test$
v4l2-apps/test/pixfmt-test$
v4l2-apps/util/v4l2-dbg$
v4l2-apps/util/v4l2-chipids.cpp$
-v4l2-apps/util/v4l2-driverids.cpp$
+v4l2-apps/util/v4l2-compliance$
v4l2-apps/util/keycodes/.*
v4l2-apps/util/keytable$
v4l2-apps/util/parse.h$
diff -r 0a855ae09ce1 -r abb4add20e7b
linux/drivers/media/video/em28xx/em28xx-video.c
--- a/linux/drivers/media/video/em28xx/em28xx-video.c Thu Jan 22 20:52:03
2009 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c Thu Jan 22 20:59:21
2009 -0200
@@ -1018,8 +1018,13 @@ static int vidioc_g_ctrl(struct file *fi
if (dev-board.has_msp34xx)
em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl);
- else
+ else {
rc = em28xx_get_ctrl(dev, ctrl);
+ if (rc 0) {
+ em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl);
+ rc = 0;
+ }
+ }
mutex_unlock(dev-lock);
return rc;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/abb4add20e7b9626a4feb48513751541ed2273b1
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~pinchartl/uvcvideo/
The patch number 10297 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~pinchartl/uvcvideo/
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/uvc/uvc_ctrl.c |2
linux/drivers/media/video/uvc/uvc_driver.c | 27 --
linux/drivers/media/video/uvc/uvc_status.c | 16 ---
linux/drivers/media/video/uvc/uvc_v4l2.c | 12 +-
linux/drivers/media/video/uvc/uvc_video.c | 93 +++--
linux/drivers/media/video/uvc/uvcvideo.h |7 -
6 files changed, 81 insertions(+), 76 deletions(-)
diff -r abb4add20e7b -r 14a2ef98f994 linux/drivers/media/video/uvc/uvc_ctrl.c
--- a/linux/drivers/media/video/uvc/uvc_ctrl.c Thu Jan 22 20:59:21 2009 -0200
+++ b/linux/drivers/media/video/uvc/uvc_ctrl.c Thu Jan 22 21:04:48 2009 -0200
@@ -788,7 +788,7 @@ int uvc_query_v4l2_ctrl(struct uvc_video
memset(v4l2_ctrl, 0, sizeof *v4l2_ctrl);
v4l2_ctrl-id = mapping-id;
v4l2_ctrl-type = mapping-v4l2_type;
- strncpy(v4l2_ctrl-name, mapping-name, sizeof v4l2_ctrl-name);
+ strlcpy(v4l2_ctrl-name, mapping-name, sizeof v4l2_ctrl-name);
v4l2_ctrl-flags = 0;
if (!(ctrl-info-flags UVC_CONTROL_SET_CUR))
diff -r abb4add20e7b -r 14a2ef98f994 linux/drivers/media/video/uvc/uvc_driver.c
--- a/linux/drivers/media/video/uvc/uvc_driver.cThu Jan 22 20:59:21
2009 -0200
+++ b/linux/drivers/media/video/uvc/uvc_driver.cThu Jan 22 21:04:48
2009 -0200
@@ -314,7 +314,7 @@ static int uvc_parse_format(struct uvc_d
fmtdesc = uvc_format_by_guid(buffer[5]);
if (fmtdesc != NULL) {
- strncpy(format-name, fmtdesc-name,
+ strlcpy(format-name, fmtdesc-name,
sizeof format-name);
format-fcc = fmtdesc-fcc;
} else {
@@ -345,7 +345,7 @@ static int uvc_parse_format(struct uvc_d
return -EINVAL;
}
- strncpy(format-name, MJPEG, sizeof format-name);
+ strlcpy(format-name, MJPEG, sizeof format-name);
format-fcc = V4L2_PIX_FMT_MJPEG;
format-flags = UVC_FMT_FLAG_COMPRESSED;
format-bpp = 0;
@@ -363,13 +363,13 @@ static int uvc_parse_format(struct uvc_d
switch (buffer[8] 0x7f) {
case 0:
- strncpy(format-name, SD-DV, sizeof format-name);
+ strlcpy(format-name, SD-DV, sizeof format-name);
break;
case 1:
- strncpy(format-name, SDL-DV, sizeof format-name);
+ strlcpy(format-name, SDL-DV, sizeof format-name);
break;
case 2:
- strncpy(format-name, HD-DV, sizeof format-name);
+ strlcpy(format-name, HD-DV, sizeof format-name);
break;
default:
uvc_trace(UVC_TRACE_DESCR, device %d videostreaming
@@ -379,7 +379,7 @@ static int uvc_parse_format(struct uvc_d
return -EINVAL;
}
- strncat(format-name, buffer[8] (1 7) ? 60Hz : 50Hz,
+ strlcat(format-name, buffer[8] (1 7) ? 60Hz : 50Hz,
sizeof format-name);
format-fcc = V4L2_PIX_FMT_DV;
@@ -1526,7 +1526,7 @@ static int uvc_register_video(struct uvc
vdev-minor = -1;
vdev-fops = uvc_fops;
vdev-release = video_device_release;
- strncpy(vdev-name, dev-name, sizeof vdev-name);
+ strlcpy(vdev-name, dev-name, sizeof vdev-name);
/* Set the driver data before calling video_register_device, otherwise
* uvc_v4l2_open might race us.
@@ -1621,7 +1621,7 @@ static int uvc_probe(struct usb_interfac
dev-quirks = id-driver_info | uvc_quirks_param;
if (udev-product != NULL)
- strncpy(dev-name, udev-product, sizeof dev-name);
+ strlcpy(dev-name, udev-product, sizeof dev-name);
else
snprintf(dev-name, sizeof dev-name,
UVC Camera (%04x:%04x),
@@ -1835,6 +1835,15 @@ static struct usb_device_id uvc_ids[] =
.bInterfaceClass = USB_CLASS_VENDOR_SPEC,
.bInterfaceSubClass = 1,
.bInterfaceProtocol = 0 },
+ /* Alcor Micro AU3820 (Future Boy PC USB Webcam) */
+ { .match_flags
[linuxtv-commits] [hg:v4l-dvb] remove err macro from few usb devices
The patch number 10298 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@infradead.org
remove err macro from few usb devices
Patch removes err() macros from few usb devices.
It places pr_err in pvrusb2-v4l2.c, dev_err in dabusb and in usbvision
drivers. Beside placing dev_err, patch defines new s2255_dev_err macro
with S2255_DRIVER_NAME in s2255 module.
Signed-off-by: Alexey Klimov klimov.li...@gmail.com
Acked-by: Thierry Merle thierry.me...@free.fr
Acked-By: Mike Isely is...@pobox.com
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/dabusb.c| 76 ++
linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 12 -
linux/drivers/media/video/s2255drv.c | 38 +++--
linux/drivers/media/video/usbvision/usbvision-core.c | 44 +++--
linux/drivers/media/video/usbvision/usbvision-i2c.c |6
linux/drivers/media/video/usbvision/usbvision-video.c | 36 ++--
6 files changed, 130 insertions(+), 82 deletions(-)
diff -r 14a2ef98f994 -r d0cfae040789 linux/drivers/media/video/dabusb.c
--- a/linux/drivers/media/video/dabusb.cThu Jan 22 21:04:48 2009 -0200
+++ b/linux/drivers/media/video/dabusb.cThu Jan 08 12:13:42 2009 +
@@ -199,17 +199,20 @@ static void dabusb_iso_complete (struct
dst += len;
}
else
- err(dabusb_iso_complete: invalid len
%d, len);
+ dev_err(purb-dev-dev,
+ dabusb_iso_complete: invalid
len %d\n, len);
}
else
dev_warn(purb-dev-dev, dabusb_iso_complete:
corrupted packet status: %d\n, purb-iso_frame_desc[i].status);
if (dst != purb-actual_length)
- err(dst!=purb-actual_length:%d!=%d, dst,
purb-actual_length);
+ dev_err(purb-dev-dev,
+ dst!=purb-actual_length:%d!=%d\n,
+ dst, purb-actual_length);
}
if (atomic_dec_and_test (s-pending_io) !s-remove_pending
s-state != _stopped) {
s-overruns++;
- err(overrun (%d), s-overruns);
+ dev_err(purb-dev-dev, overrun (%d)\n, s-overruns);
}
wake_up (s-wait);
}
@@ -230,13 +233,14 @@ static int dabusb_alloc_buffers (pdabusb
while (transfer_len (s-total_buffer_size 10)) {
b = kzalloc(sizeof (buff_t), GFP_KERNEL);
if (!b) {
- err(kzalloc(sizeof(buff_t))==NULL);
+ dev_err(s-usbdev-dev,
+ kzalloc(sizeof(buff_t))==NULL\n);
goto err;
}
b-s = s;
b-purb = usb_alloc_urb(packets, GFP_KERNEL);
if (!b-purb) {
- err(usb_alloc_urb == NULL);
+ dev_err(s-usbdev-dev, usb_alloc_urb == NULL\n);
kfree (b);
goto err;
}
@@ -245,7 +249,8 @@ static int dabusb_alloc_buffers (pdabusb
if (!b-purb-transfer_buffer) {
kfree (b-purb);
kfree (b);
- err(kmalloc(%d)==NULL, transfer_buffer_length);
+ dev_err(s-usbdev-dev,
+ kmalloc(%d)==NULL\n, transfer_buffer_length);
goto err;
}
@@ -289,10 +294,11 @@ static int dabusb_bulk (pdabusb_t s, pbu
ret=usb_bulk_msg(s-usbdev, pipe, pb-data, pb-size, actual_length,
100);
if(ret0) {
- err(dabusb: usb_bulk_msg failed(%d),ret);
+ dev_err(s-usbdev-dev,
+ usb_bulk_msg failed(%d)\n, ret);
if (usb_set_interface (s-usbdev, _DABUSB_IF, 1) 0) {
- err(set_interface failed);
+ dev_err(s-usbdev-dev, set_interface failed\n);
return -EINVAL;
}
@@ -301,7 +307,7 @@ static int dabusb_bulk (pdabusb_t s, pbu
if( ret == -EPIPE ) {
dev_warn(s-usbdev-dev, CLEAR_FEATURE request to remove
STALL condition.\n);
if(usb_clear_halt(s-usbdev, usb_pipeendpoint(pipe)))
- err(request failed);
+
[linuxtv-commits] [hg:v4l-dvb] Reverting changeset 10298. It were committed with a wrong From: meta-tag
The patch number 10300 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
Reverting changeset 10298. It were committed with a wrong From: meta-tag
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/dabusb.c| 76 +++---
linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 12 -
linux/drivers/media/video/s2255drv.c | 38 +
linux/drivers/media/video/usbvision/usbvision-core.c | 44 ++---
linux/drivers/media/video/usbvision/usbvision-i2c.c |6
linux/drivers/media/video/usbvision/usbvision-video.c | 36 +---
6 files changed, 82 insertions(+), 130 deletions(-)
diff -r d0cfae040789 -r fee99c8e6568 linux/drivers/media/video/dabusb.c
--- a/linux/drivers/media/video/dabusb.cThu Jan 08 12:13:42 2009 +
+++ b/linux/drivers/media/video/dabusb.cFri Jan 23 00:29:03 2009 -0200
@@ -199,20 +199,17 @@ static void dabusb_iso_complete (struct
dst += len;
}
else
- dev_err(purb-dev-dev,
- dabusb_iso_complete: invalid
len %d\n, len);
+ err(dabusb_iso_complete: invalid len
%d, len);
}
else
dev_warn(purb-dev-dev, dabusb_iso_complete:
corrupted packet status: %d\n, purb-iso_frame_desc[i].status);
if (dst != purb-actual_length)
- dev_err(purb-dev-dev,
- dst!=purb-actual_length:%d!=%d\n,
- dst, purb-actual_length);
+ err(dst!=purb-actual_length:%d!=%d, dst,
purb-actual_length);
}
if (atomic_dec_and_test (s-pending_io) !s-remove_pending
s-state != _stopped) {
s-overruns++;
- dev_err(purb-dev-dev, overrun (%d)\n, s-overruns);
+ err(overrun (%d), s-overruns);
}
wake_up (s-wait);
}
@@ -233,14 +230,13 @@ static int dabusb_alloc_buffers (pdabusb
while (transfer_len (s-total_buffer_size 10)) {
b = kzalloc(sizeof (buff_t), GFP_KERNEL);
if (!b) {
- dev_err(s-usbdev-dev,
- kzalloc(sizeof(buff_t))==NULL\n);
+ err(kzalloc(sizeof(buff_t))==NULL);
goto err;
}
b-s = s;
b-purb = usb_alloc_urb(packets, GFP_KERNEL);
if (!b-purb) {
- dev_err(s-usbdev-dev, usb_alloc_urb == NULL\n);
+ err(usb_alloc_urb == NULL);
kfree (b);
goto err;
}
@@ -249,8 +245,7 @@ static int dabusb_alloc_buffers (pdabusb
if (!b-purb-transfer_buffer) {
kfree (b-purb);
kfree (b);
- dev_err(s-usbdev-dev,
- kmalloc(%d)==NULL\n, transfer_buffer_length);
+ err(kmalloc(%d)==NULL, transfer_buffer_length);
goto err;
}
@@ -294,11 +289,10 @@ static int dabusb_bulk (pdabusb_t s, pbu
ret=usb_bulk_msg(s-usbdev, pipe, pb-data, pb-size, actual_length,
100);
if(ret0) {
- dev_err(s-usbdev-dev,
- usb_bulk_msg failed(%d)\n, ret);
+ err(dabusb: usb_bulk_msg failed(%d),ret);
if (usb_set_interface (s-usbdev, _DABUSB_IF, 1) 0) {
- dev_err(s-usbdev-dev, set_interface failed\n);
+ err(set_interface failed);
return -EINVAL;
}
@@ -307,7 +301,7 @@ static int dabusb_bulk (pdabusb_t s, pbu
if( ret == -EPIPE ) {
dev_warn(s-usbdev-dev, CLEAR_FEATURE request to remove
STALL condition.\n);
if(usb_clear_halt(s-usbdev, usb_pipeendpoint(pipe)))
- dev_err(s-usbdev-dev, request failed\n);
+ err(request failed);
}
pb-size = actual_length;
@@ -325,8 +319,7 @@ static int dabusb_writemem (pdabusb_t s,
unsigned char *transfer_buffer = kmalloc (len, GFP_KERNEL);
if (!transfer_buffer) {
- dev_err(s-usbdev-dev,
- dabusb_writemem: kmalloc(%d)
[linuxtv-commits] [hg:v4l-dvb] merge backout
The patch number 10301 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge backout
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/dabusb.c| 76 +++---
linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 12 -
linux/drivers/media/video/s2255drv.c | 38 +
linux/drivers/media/video/usbvision/usbvision-core.c | 44 ++---
linux/drivers/media/video/usbvision/usbvision-i2c.c |6
linux/drivers/media/video/usbvision/usbvision-video.c | 36 +---
6 files changed, 82 insertions(+), 130 deletions(-)
diff -r 20ff2a972cf5 -r 049609f8ebad linux/drivers/media/video/dabusb.c
--- a/linux/drivers/media/video/dabusb.cFri Jan 23 00:07:26 2009 -0200
+++ b/linux/drivers/media/video/dabusb.cFri Jan 23 00:29:34 2009 -0200
@@ -199,20 +199,17 @@ static void dabusb_iso_complete (struct
dst += len;
}
else
- dev_err(purb-dev-dev,
- dabusb_iso_complete: invalid
len %d\n, len);
+ err(dabusb_iso_complete: invalid len
%d, len);
}
else
dev_warn(purb-dev-dev, dabusb_iso_complete:
corrupted packet status: %d\n, purb-iso_frame_desc[i].status);
if (dst != purb-actual_length)
- dev_err(purb-dev-dev,
- dst!=purb-actual_length:%d!=%d\n,
- dst, purb-actual_length);
+ err(dst!=purb-actual_length:%d!=%d, dst,
purb-actual_length);
}
if (atomic_dec_and_test (s-pending_io) !s-remove_pending
s-state != _stopped) {
s-overruns++;
- dev_err(purb-dev-dev, overrun (%d)\n, s-overruns);
+ err(overrun (%d), s-overruns);
}
wake_up (s-wait);
}
@@ -233,14 +230,13 @@ static int dabusb_alloc_buffers (pdabusb
while (transfer_len (s-total_buffer_size 10)) {
b = kzalloc(sizeof (buff_t), GFP_KERNEL);
if (!b) {
- dev_err(s-usbdev-dev,
- kzalloc(sizeof(buff_t))==NULL\n);
+ err(kzalloc(sizeof(buff_t))==NULL);
goto err;
}
b-s = s;
b-purb = usb_alloc_urb(packets, GFP_KERNEL);
if (!b-purb) {
- dev_err(s-usbdev-dev, usb_alloc_urb == NULL\n);
+ err(usb_alloc_urb == NULL);
kfree (b);
goto err;
}
@@ -249,8 +245,7 @@ static int dabusb_alloc_buffers (pdabusb
if (!b-purb-transfer_buffer) {
kfree (b-purb);
kfree (b);
- dev_err(s-usbdev-dev,
- kmalloc(%d)==NULL\n, transfer_buffer_length);
+ err(kmalloc(%d)==NULL, transfer_buffer_length);
goto err;
}
@@ -294,11 +289,10 @@ static int dabusb_bulk (pdabusb_t s, pbu
ret=usb_bulk_msg(s-usbdev, pipe, pb-data, pb-size, actual_length,
100);
if(ret0) {
- dev_err(s-usbdev-dev,
- usb_bulk_msg failed(%d)\n, ret);
+ err(dabusb: usb_bulk_msg failed(%d),ret);
if (usb_set_interface (s-usbdev, _DABUSB_IF, 1) 0) {
- dev_err(s-usbdev-dev, set_interface failed\n);
+ err(set_interface failed);
return -EINVAL;
}
@@ -307,7 +301,7 @@ static int dabusb_bulk (pdabusb_t s, pbu
if( ret == -EPIPE ) {
dev_warn(s-usbdev-dev, CLEAR_FEATURE request to remove
STALL condition.\n);
if(usb_clear_halt(s-usbdev, usb_pipeendpoint(pipe)))
- dev_err(s-usbdev-dev, request failed\n);
+ err(request failed);
}
pb-size = actual_length;
@@ -325,8 +319,7 @@ static int dabusb_writemem (pdabusb_t s,
unsigned char *transfer_buffer = kmalloc (len, GFP_KERNEL);
if (!transfer_buffer) {
- dev_err(s-usbdev-dev,
- dabusb_writemem: kmalloc(%d) failed.\n, len);
+
[linuxtv-commits] [hg:v4l-dvb] v4l2_sysfs_path: replace bus path by sysfs path
The patch number 10311 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
v4l2_sysfs_path: replace bus path by sysfs path
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
v4l2-apps/util/v4l2_sysfs_path.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -r 6e636c8969e8 -r c96c6e9eeb08 v4l2-apps/util/v4l2_sysfs_path.c
--- a/v4l2-apps/util/v4l2_sysfs_path.c Tue Jan 27 21:47:39 2009 -0200
+++ b/v4l2-apps/util/v4l2_sysfs_path.c Tue Jan 27 21:56:31 2009 -0200
@@ -149,7 +149,7 @@ int main(void)
printf(bus info = %s\n, drv.cap.bus_info);
path = obtain_bus_sysfs_path((char *)drv.cap.bus_info);
if (path) {
- printf(bus path = %s\n, path);
+ printf(sysfs path = %s\n, path);
free(path);
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/c96c6e9eeb08c2aae66bb1dadfdbbc7f5f4afc0a
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-saa7146
The patch number 10315 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-saa7146
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/common/saa7146_fops.c|7 +--
linux/drivers/media/video/cx25840/cx25840-core.c |2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff -r 92603e53d49e -r 8038735d2781 linux/drivers/media/common/saa7146_fops.c
--- a/linux/drivers/media/common/saa7146_fops.c Tue Jan 27 22:16:53 2009 -0200
+++ b/linux/drivers/media/common/saa7146_fops.c Tue Jan 27 22:30:35 2009 -0200
@@ -512,6 +512,7 @@ int saa7146_register_device(struct video
struct saa7146_vv *vv = dev-vv_data;
struct video_device *vfd;
int err;
+ int i;
DEB_EE((dev:%p, name:'%s', type:%d\n,dev,name,type));
@@ -521,9 +522,11 @@ int saa7146_register_device(struct video
return -ENOMEM;
vfd-fops = video_fops;
- vfd-ioctl_ops = dev-ext_vv_data ? dev-ext_vv_data-ops :
- saa7146_video_ioctl_ops;
+ vfd-ioctl_ops = dev-ext_vv_data-ops;
vfd-release = video_device_release;
+ vfd-tvnorms = 0;
+ for (i = 0; i dev-ext_vv_data-num_stds; i++)
+ vfd-tvnorms |= dev-ext_vv_data-stds[i].id;
strlcpy(vfd-name, name, sizeof(vfd-name));
video_set_drvdata(vfd, dev);
diff -r 92603e53d49e -r 8038735d2781
linux/drivers/media/video/cx25840/cx25840-core.c
--- a/linux/drivers/media/video/cx25840/cx25840-core.c Tue Jan 27 22:16:53
2009 -0200
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c Tue Jan 27 22:30:35
2009 -0200
@@ -1412,7 +1412,7 @@ static int cx25840_command(struct i2c_cl
static int cx25840_command(struct i2c_client *client, unsigned cmd, void *arg)
{
/* ignore this command */
- if (cmd == TUNER_SET_TYPE_ADDR)
+ if (cmd == TUNER_SET_TYPE_ADDR || cmd == TUNER_SET_CONFIG)
return 0;
/* Old-style drivers rely on initialization on first use, so
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/8038735d2781464dadbf328f6318874683d3c1a0
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~dougsland/radios
The patch number 10318 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~dougsland/radios
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/radio/dsbr100.c |4 +++-
linux/drivers/media/radio/radio-mr800.c | 16 +---
2 files changed, 12 insertions(+), 8 deletions(-)
diff -r 8038735d2781 -r d87cf08379e0 linux/drivers/media/radio/dsbr100.c
--- a/linux/drivers/media/radio/dsbr100.c Tue Jan 27 22:30:35 2009 -0200
+++ b/linux/drivers/media/radio/dsbr100.c Tue Jan 27 22:35:28 2009 -0200
@@ -393,9 +393,11 @@ static int vidioc_querycap(struct file *
static int vidioc_querycap(struct file *file, void *priv,
struct v4l2_capability *v)
{
+ struct dsbr100_device *radio = video_drvdata(file);
+
strlcpy(v-driver, dsbr100, sizeof(v-driver));
strlcpy(v-card, D-Link R-100 USB FM Radio, sizeof(v-card));
- sprintf(v-bus_info, USB);
+ usb_make_path(radio-usbdev, v-bus_info, sizeof(v-bus_info));
v-version = RADIO_VERSION;
v-capabilities = V4L2_CAP_TUNER;
return 0;
diff -r 8038735d2781 -r d87cf08379e0 linux/drivers/media/radio/radio-mr800.c
--- a/linux/drivers/media/radio/radio-mr800.c Tue Jan 27 22:30:35 2009 -0200
+++ b/linux/drivers/media/radio/radio-mr800.c Tue Jan 27 22:35:28 2009 -0200
@@ -197,9 +197,9 @@ static int amradio_start(struct amradio_
return retval;
}
+ radio-muted = 0;
+
mutex_unlock(radio-lock);
-
- radio-muted = 0;
return retval;
}
@@ -233,9 +233,9 @@ static int amradio_stop(struct amradio_d
return retval;
}
+ radio-muted = 1;
+
mutex_unlock(radio-lock);
-
- radio-muted = 1;
return retval;
}
@@ -287,9 +287,9 @@ static int amradio_setfreq(struct amradi
return retval;
}
+ radio-stereo = 0;
+
mutex_unlock(radio-lock);
-
- radio-stereo = 0;
return retval;
}
@@ -316,9 +316,11 @@ static int vidioc_querycap(struct file *
static int vidioc_querycap(struct file *file, void *priv,
struct v4l2_capability *v)
{
+ struct amradio_device *radio = video_drvdata(file);
+
strlcpy(v-driver, radio-mr800, sizeof(v-driver));
strlcpy(v-card, AverMedia MR 800 USB FM Radio, sizeof(v-card));
- sprintf(v-bus_info, USB);
+ usb_make_path(radio-usbdev, v-bus_info, sizeof(v-bus_info));
v-version = RADIO_VERSION;
v-capabilities = V4L2_CAP_TUNER;
return 0;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/d87cf08379e0ed850ffbabfac7d7da0f337379e8
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~dheitmueller/dib0700-pbfixes/
The patch number 10322 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~dheitmueller/dib0700-pbfixes/
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/dvb/dvb-usb/dib0700_core.c|3
linux/drivers/media/dvb/dvb-usb/dib0700_devices.c | 43 +++---
2 files changed, 37 insertions(+), 9 deletions(-)
diff -r d87cf08379e0 -r bb3adf352e10
linux/drivers/media/dvb/dvb-usb/dib0700_core.c
--- a/linux/drivers/media/dvb/dvb-usb/dib0700_core.cTue Jan 27 22:35:28
2009 -0200
+++ b/linux/drivers/media/dvb/dvb-usb/dib0700_core.cTue Jan 27 22:38:07
2009 -0200
@@ -211,7 +211,8 @@ static int dib0700_i2c_xfer_legacy(struc
/* special thing in the current firmware: when length
is zero the read-failed */
if ((len = dib0700_ctrl_rd(d, buf, msg[i].len + 2,
msg[i+1].buf, msg[i+1].len)) = 0) {
- deb_info(I2C read failed on address %x\n,
msg[i].addr);
+ deb_info(I2C read failed on address 0x%02x\n,
+msg[i].addr);
break;
}
diff -r d87cf08379e0 -r bb3adf352e10
linux/drivers/media/dvb/dvb-usb/dib0700_devices.c
--- a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c Tue Jan 27 22:35:28
2009 -0200
+++ b/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c Tue Jan 27 22:38:07
2009 -0200
@@ -262,7 +262,12 @@ static int stk7700P2_frontend_attach(str
msleep(10);
dib0700_set_gpio(adap-dev, GPIO10, GPIO_OUT, 1);
msleep(10);
-
dib7000p_i2c_enumeration(adap-dev-i2c_adap,1,18,stk7700d_dib7000p_mt2266_config);
+ if (dib7000p_i2c_enumeration(adap-dev-i2c_adap, 1, 18,
+stk7700d_dib7000p_mt2266_config)
+ != 0) {
+ err(%s: dib7000p_i2c_enumeration failed. Cannot
continue\n, __func__);
+ return -ENODEV;
+ }
}
adap-fe = dvb_attach(dib7000p_attach,
adap-dev-i2c_adap,0x80+(adap-id 1),
@@ -284,7 +289,12 @@ static int stk7700d_frontend_attach(stru
dib0700_set_gpio(adap-dev, GPIO10, GPIO_OUT, 1);
msleep(10);
dib0700_set_gpio(adap-dev, GPIO0, GPIO_OUT, 1);
-
dib7000p_i2c_enumeration(adap-dev-i2c_adap,2,18,stk7700d_dib7000p_mt2266_config);
+ if (dib7000p_i2c_enumeration(adap-dev-i2c_adap, 2, 18,
+stk7700d_dib7000p_mt2266_config)
+ != 0) {
+ err(%s: dib7000p_i2c_enumeration failed. Cannot
continue\n, __func__);
+ return -ENODEV;
+ }
}
adap-fe = dvb_attach(dib7000p_attach,
adap-dev-i2c_adap,0x80+(adap-id 1),
@@ -421,8 +431,12 @@ static int stk7700ph_frontend_attach(str
dib0700_set_gpio(adap-dev, GPIO0, GPIO_OUT, 1);
msleep(10);
- dib7000p_i2c_enumeration(adap-dev-i2c_adap, 1, 18,
- stk7700ph_dib7700_xc3028_config);
+ if (dib7000p_i2c_enumeration(adap-dev-i2c_adap, 1, 18,
+stk7700ph_dib7700_xc3028_config) != 0) {
+ err(%s: dib7000p_i2c_enumeration failed. Cannot continue\n,
+ __func__);
+ return -ENODEV;
+ }
adap-fe = dvb_attach(dib7000p_attach, adap-dev-i2c_adap, 0x80,
stk7700ph_dib7700_xc3028_config);
@@ -1187,8 +1201,12 @@ static int stk7070p_frontend_attach(stru
msleep(10);
dib0700_set_gpio(adap-dev, GPIO0, GPIO_OUT, 1);
- dib7000p_i2c_enumeration(adap-dev-i2c_adap, 1, 18,
- dib7070p_dib7000p_config);
+ if (dib7000p_i2c_enumeration(adap-dev-i2c_adap, 1, 18,
+dib7070p_dib7000p_config) != 0) {
+ err(%s: dib7000p_i2c_enumeration failed. Cannot continue\n,
+ __func__);
+ return -ENODEV;
+ }
adap-fe = dvb_attach(dib7000p_attach, adap-dev-i2c_adap, 0x80,
dib7070p_dib7000p_config);
@@ -1244,7 +1262,12 @@ static int stk7070pd_frontend_attach0(st
msleep(10);
dib0700_set_gpio(adap-dev, GPIO0, GPIO_OUT, 1);
- dib7000p_i2c_enumeration(adap-dev-i2c_adap, 2, 18,
stk7070pd_dib7000p_config);
+ if (dib7000p_i2c_enumeration(adap-dev-i2c_adap, 2, 18,
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~dougsland/em28xx/
The patch number 10328 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~dougsland/em28xx/
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/Documentation/video4linux/CARDLIST.em28xx |1
linux/drivers/media/video/em28xx/em28xx-audio.c | 33 +++-
linux/drivers/media/video/em28xx/em28xx-cards.c | 26 +++-
linux/drivers/media/video/em28xx/em28xx-core.c |7 ++-
linux/drivers/media/video/em28xx/em28xx.h |1
5 files changed, 54 insertions(+), 14 deletions(-)
diff -r bb3adf352e10 -r 0fa5b943cee9
linux/Documentation/video4linux/CARDLIST.em28xx
--- a/linux/Documentation/video4linux/CARDLIST.em28xx Tue Jan 27 22:38:07
2009 -0200
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx Tue Jan 27 22:41:52
2009 -0200
@@ -58,3 +58,4 @@
58 - Compro VideoMate ForYou/Stereo (em2820/em2840) [185b:2041]
60 - Hauppauge WinTV HVR 850 (em2883)[2040:651f]
61 - Pixelview PlayTV Box 4 USB 2.0 (em2820/em2840)
+ 62 - Gadmei TVR200(em2820/em2840)
diff -r bb3adf352e10 -r 0fa5b943cee9
linux/drivers/media/video/em28xx/em28xx-audio.c
--- a/linux/drivers/media/video/em28xx/em28xx-audio.c Tue Jan 27 22:38:07
2009 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-audio.c Tue Jan 27 22:41:52
2009 -0200
@@ -62,15 +62,19 @@ static int em28xx_isoc_audio_deinit(stru
int i;
dprintk(Stopping isoc\n);
- for (i = 0; i EM28XX_AUDIO_BUFS; i++) {
- usb_kill_urb(dev-adev.urb[i]);
+ for (i = 0; i dev-isoc_ctl.num_bufs; i++) {
+ if (!irqs_disabled())
+ usb_kill_urb(dev-adev.urb[i]);
+ else
+ usb_unlink_urb(dev-adev.urb[i]);
usb_free_urb(dev-adev.urb[i]);
dev-adev.urb[i] = NULL;
- kfree(dev-adev.transfer_buffer[i]);
- dev-adev.transfer_buffer[i] = NULL;
- }
-
+ kfree(dev-adev.transfer_buffer[i]);
+ dev-adev.transfer_buffer[i] = NULL;
+ }
+
+ dev-isoc_ctl.num_bufs = 0;
return 0;
}
@@ -175,6 +179,8 @@ static int em28xx_init_audio_isoc(struct
dprintk(Starting isoc transfers\n);
+ dev-isoc_ctl.num_bufs = 0;
+
for (i = 0; i EM28XX_AUDIO_BUFS; i++) {
struct urb *urb;
int j, k;
@@ -216,10 +222,19 @@ static int em28xx_init_audio_isoc(struct
for (i = 0; i EM28XX_AUDIO_BUFS; i++) {
errCode = usb_submit_urb(dev-adev.urb[i], GFP_ATOMIC);
if (errCode) {
- em28xx_isoc_audio_deinit(dev);
+ if (dev-isoc_ctl.num_bufs == 0) {
+ usb_free_urb(dev-adev.urb[i]);
+ dev-adev.urb[i] = NULL;
+ kfree(dev-adev.transfer_buffer[i]);
+ dev-adev.transfer_buffer[i] = NULL;
+ } else
+ em28xx_isoc_audio_deinit(dev);
return errCode;
}
+ mutex_lock(dev-lock);
+ dev-isoc_ctl.num_bufs++;
+ mutex_unlock(dev-lock);
}
return 0;
@@ -467,9 +482,9 @@ static snd_pcm_uframes_t snd_em28xx_capt
snd_pcm_uframes_t hwptr_done;
dev = snd_pcm_substream_chip(substream);
- spin_lock_irqsave(dev-adev.slock, flags);
+ spin_lock_irqsave(dev-adev.slock, flags);
hwptr_done = dev-adev.hwptr_done_capture;
- spin_unlock_irqrestore(dev-adev.slock, flags);
+ spin_unlock_irqrestore(dev-adev.slock, flags);
return hwptr_done;
}
diff -r bb3adf352e10 -r 0fa5b943cee9
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Tue Jan 27 22:38:07
2009 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Tue Jan 27 22:41:52
2009 -0200
@@ -187,6 +187,25 @@ struct em28xx_board em28xx_boards[] = {
.tda9887_conf = TDA9887_PRESENT,
.decoder = EM28XX_SAA711X,
.input= { {
+ .type = EM28XX_VMUX_COMPOSITE1,
+ .vmux = SAA7115_COMPOSITE0,
+ .amux = EM28XX_AMUX_LINE_IN,
+ }, {
+ .type = EM28XX_VMUX_SVIDEO,
+ .vmux = SAA7115_SVIDEO3,
+
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~jfrancois/gspca/
The patch number 10390 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://linuxtv.org/hg/~jfrancois/gspca/ Priority: normal Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/Documentation/video4linux/gspca.txt|2 linux/drivers/media/video/gspca/Kconfig |9 linux/drivers/media/video/gspca/Makefile | 98 - linux/drivers/media/video/gspca/conex.c | 15 linux/drivers/media/video/gspca/etoms.c | 36 linux/drivers/media/video/gspca/finepix.c| 12 linux/drivers/media/video/gspca/gspca.c | 56 linux/drivers/media/video/gspca/gspca.h | 13 linux/drivers/media/video/gspca/jpeg.h | 317 ++- linux/drivers/media/video/gspca/m5602/m5602_core.c |7 linux/drivers/media/video/gspca/mars.c | 511 +++--- linux/drivers/media/video/gspca/mr97310a.c | 378 linux/drivers/media/video/gspca/ov519.c |7 linux/drivers/media/video/gspca/ov534.c | 10 linux/drivers/media/video/gspca/pac207.c |8 linux/drivers/media/video/gspca/pac7311.c|7 linux/drivers/media/video/gspca/sonixb.c |7 linux/drivers/media/video/gspca/sonixj.c | 503 +++-- linux/drivers/media/video/gspca/spca500.c| 48 linux/drivers/media/video/gspca/spca501.c| 45 linux/drivers/media/video/gspca/spca505.c| 616 +++ linux/drivers/media/video/gspca/spca506.c| 57 linux/drivers/media/video/gspca/spca508.c| 141 - linux/drivers/media/video/gspca/spca561.c| 184 -- linux/drivers/media/video/gspca/stk014.c | 22 linux/drivers/media/video/gspca/stv06xx/stv06xx.c|7 linux/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | 76 linux/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h | 65 linux/drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c | 169 +- linux/drivers/media/video/gspca/stv06xx/stv06xx_pb0100.h | 152 - linux/drivers/media/video/gspca/stv06xx/stv06xx_sensor.h |8 linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c | 161 + linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 58 linux/drivers/media/video/gspca/sunplus.c| 73 linux/drivers/media/video/gspca/t613.c | 572 +++--- linux/drivers/media/video/gspca/tv8532.c | 506 ++ linux/drivers/media/video/gspca/vc032x.c |7 linux/drivers/media/video/gspca/zc3xx.c | 840 +- linux/drivers/media/video/zc0301/zc0301_sensor.h |8 linux/include/linux/videodev2.h |1 40 files changed, 3007 insertions(+), 2805 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/43dbc8ebb5a21c8991df5e5ead54b724c0dc18f4 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] KWorld ATSC 115 all static
The patch number 10394 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@infradead.org
KWorld ATSC 115 all static
saa7134: Fix tuner access on Kworld ATSC110
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/saa7134/saa7134-cards.c | 46 +-
linux/drivers/media/video/saa7134/saa7134.h | 23 +--
2 files changed, 49 insertions(+), 20 deletions(-)
diff -r d3bfc53d0b67 -r e47fcbc3150c
linux/drivers/media/video/saa7134/saa7134-cards.c
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c Sun Jan 18 23:31:26
2009 +
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c Mon Jan 19 11:01:24
2009 +
@@ -5994,6 +5994,32 @@ static void hauppauge_eeprom(struct saa7
}
/* --- */
+
+static void nxt200x_gate_ctrl(struct saa7134_dev *dev, int open)
+{
+ /* enable tuner */
+ int i;
+ static const u8 buffer [][2] = {
+ { 0x10, 0x12 },
+ { 0x13, 0x04 },
+ { 0x16, 0x00 },
+ { 0x14, 0x04 },
+ { 0x17, 0x00 },
+ };
+
+ dev-i2c_client.addr = 0x0a;
+
+ /* FIXME: don't know how to close the i2c gate on NXT200x */
+ if (!open)
+ return;
+
+ for (i = 0; i ARRAY_SIZE(buffer); i++)
+ if (2 != i2c_master_send(dev-i2c_client,
+buffer[i][0], ARRAY_SIZE(buffer[0])))
+ printk(KERN_WARNING
+ %s: Unable to enable tuner(%i).\n,
+ dev-name, i);
+}
int saa7134_board_init1(struct saa7134_dev *dev)
{
@@ -6192,6 +6218,10 @@ int saa7134_board_init1(struct saa7134_d
are supported for now.\n,
dev-name, card(dev).name, dev-name);
break;
+ case SAA7134_BOARD_ADS_INSTANT_HDTV_PCI:
+ case SAA7134_BOARD_KWORLD_ATSC110:
+ dev-gate_ctrl = nxt200x_gate_ctrl;
+ break;
}
return 0;
}
@@ -6453,22 +6483,6 @@ int saa7134_board_init2(struct saa7134_d
i2c_transfer(dev-i2c_adap, msg, 1);
break;
}
- case SAA7134_BOARD_ADS_INSTANT_HDTV_PCI:
- case SAA7134_BOARD_KWORLD_ATSC110:
- {
- /* enable tuner */
- int i;
- static const u8 buffer [] = { 0x10, 0x12, 0x13, 0x04, 0x16,
- 0x00, 0x14, 0x04, 0x17, 0x00 };
- dev-i2c_client.addr = 0x0a;
- for (i = 0; i 5; i++)
- if (2 != i2c_master_send(dev-i2c_client,
-buffer[i*2], 2))
- printk(KERN_WARNING
- %s: Unable to enable tuner(%i).\n,
- dev-name, i);
- break;
- }
case SAA7134_BOARD_VIDEOMATE_DVBT_200:
case SAA7134_BOARD_VIDEOMATE_DVBT_200A:
/* The T200 and the T200A share the same pci id. Consequently,
diff -r d3bfc53d0b67 -r e47fcbc3150c linux/drivers/media/video/saa7134/saa7134.h
--- a/linux/drivers/media/video/saa7134/saa7134.h Sun Jan 18 23:31:26
2009 +
+++ b/linux/drivers/media/video/saa7134/saa7134.h Mon Jan 19 11:01:24
2009 +
@@ -594,6 +594,7 @@ struct saa7134_dev {
int (*original_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t
voltage);
int (*original_set_high_voltage)(struct dvb_frontend *fe, long arg);
#endif
+ void (*gate_ctrl)(struct saa7134_dev *dev, int open);
};
/* --- */
@@ -623,10 +624,24 @@ struct saa7134_dev {
V4L2_STD_PAL_60)
#define GRP_EMPRESS (1)
-#define saa_call_all(dev, o, f, args...) \
- v4l2_device_call_all((dev)-v4l2_dev, 0, o, f , ##args)
-#define saa_call_empress(dev, o, f, args...) \
- v4l2_device_call_until_err((dev)-v4l2_dev, GRP_EMPRESS, o, f , ##args)
+#define saa_call_all(dev, o, f, args...) do { \
+ if (dev-gate_ctrl) \
+ dev-gate_ctrl(dev, 1); \
+ v4l2_device_call_all((dev)-v4l2_dev, 0, o, f ,
[linuxtv-commits] [hg:v4l-dvb] v4l2-device.c: Fix compilation with older kernels
The patch number 10396 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
v4l2-device.c: Fix compilation with older kernels
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/v4l2-device.c |1 +
1 file changed, 1 insertion(+)
diff -r 2391166e560a -r b26e0f8ee6f6 linux/drivers/media/video/v4l2-device.c
--- a/linux/drivers/media/video/v4l2-device.c Sun Jan 25 23:00:16 2009 +
+++ b/linux/drivers/media/video/v4l2-device.c Thu Jan 29 08:02:15 2009 -0200
@@ -23,6 +23,7 @@
#include linux/i2c.h
#include linux/videodev2.h
#include media/v4l2-device.h
+#include compat.h
int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev)
{
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/b26e0f8ee6f6ad2ba4cee029fa13f4ea2e095722
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] gspca: version.h is needed in order to compile upstream
The patch number 10399 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com gspca: version.h is needed in order to compile upstream drivers/media/video/gspca/gspca.c: In function ?vidioc_querycap?: drivers/media/video/gspca/gspca.c:963: error: implicit declaration of function ?KERNEL_VERSION? kernel-sync: CC: Jean-Francois Moine moin...@free.fr Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/video/gspca/gspca.c |1 + 1 file changed, 1 insertion(+) diff -r 23342e1b986b -r eeabded8c293 linux/drivers/media/video/gspca/gspca.c --- a/linux/drivers/media/video/gspca/gspca.c Wed Jan 07 10:01:01 2009 +0100 +++ b/linux/drivers/media/video/gspca/gspca.c Thu Jan 29 09:30:59 2009 -0200 @@ -21,6 +21,7 @@ #define MODULE_NAME gspca #include linux/init.h +#include linux/version.h #include linux/fs.h #include linux/vmalloc.h #include linux/sched.h --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/eeabded8c293da15b52c61f747a30b3df8679ac9 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] saa7134-core: remove oss option, since saa7134-oss doesn't exist anymore
The patch number 10404 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com saa7134-core: remove oss option, since saa7134-oss doesn't exist anymore Priority: normal Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/video/saa7134/saa7134-core.c |6 -- 1 file changed, 6 deletions(-) diff -r 1b4ac3e8b854 -r 060a5560c0d5 linux/drivers/media/video/saa7134/saa7134-core.c --- a/linux/drivers/media/video/saa7134/saa7134-core.c Sat Jan 31 09:09:33 2009 -0200 +++ b/linux/drivers/media/video/saa7134/saa7134-core.c Sat Jan 31 09:10:49 2009 -0200 @@ -58,10 +58,6 @@ module_param(alsa, int, 0644); module_param(alsa, int, 0644); MODULE_PARM_DESC(alsa,enable ALSA DMA sound [dmasound]); -static unsigned int oss; -module_param(oss, int, 0644); -MODULE_PARM_DESC(oss,enable OSS DMA sound [dmasound]); - static unsigned int latency = UNSET; module_param(latency, int, 0444); MODULE_PARM_DESC(latency,pci latency timer); @@ -203,8 +199,6 @@ static void request_module_async(struct request_module(saa7134-dvb); if (alsa) request_module(saa7134-alsa); - if (oss) - request_module(saa7134-oss); } static void request_submodules(struct saa7134_dev *dev) --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/060a5560c0d5c03e3e903e656c6b823976861078 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] saa7134-alsa: saa7130 doesn't support digital audio
The patch number 10403 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
saa7134-alsa: saa7130 doesn't support digital audio
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/saa7134/saa7134-alsa.c |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff -r 3541eb5b56f7 -r 1b4ac3e8b854
linux/drivers/media/video/saa7134/saa7134-alsa.c
--- a/linux/drivers/media/video/saa7134/saa7134-alsa.c Thu Jan 29 10:57:25
2009 -0200
+++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c Sat Jan 31 09:09:33
2009 -0200
@@ -1094,7 +1094,11 @@ static int saa7134_alsa_init(void)
list_for_each(list,saa7134_devlist) {
dev = list_entry(list, struct saa7134_dev, devlist);
- alsa_device_init(dev);
+ if (dev-pci-device == PCI_DEVICE_ID_PHILIPS_SAA7130)
+ printk(KERN_INFO %s/alsa: %s doesn't support digital
audio\n,
+ dev-name, saa7134_boards[dev-board].name);
+ else
+ alsa_device_init(dev);
}
if (dev == NULL)
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/1b4ac3e8b854566ebf02a11613d310e5595c5a31
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~mkrufky/fixes
The patch number 10418 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~mkrufky/fixes
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/dvb/dvb-usb/dib0700_core.c |7 +++
linux/drivers/media/dvb/siano/sms-cards.c |2 ++
linux/drivers/media/video/tveeprom.c |5 +
3 files changed, 14 insertions(+)
diff -r 812031aad01b -r 1dce9d4e2179
linux/drivers/media/dvb/dvb-usb/dib0700_core.c
--- a/linux/drivers/media/dvb/dvb-usb/dib0700_core.cSun Feb 01 10:30:28
2009 -0200
+++ b/linux/drivers/media/dvb/dvb-usb/dib0700_core.cSun Feb 01 11:40:27
2009 -0200
@@ -158,6 +158,10 @@ static int dib0700_i2c_xfer_new(struct i
err(i2c read error (status = %d)\n, result);
break;
}
+
+ deb_data( );
+ debug_dump(msg[i].buf, msg[i].len, deb_data);
+
} else {
/* Write request */
buf[0] = REQUEST_NEW_I2C_WRITE;
@@ -168,6 +172,9 @@ static int dib0700_i2c_xfer_new(struct i
buf[3] = ((gen_mode6)0xC0) | ((bus_mode4)0x30);
/* The Actual i2c payload */
memcpy(buf[4], msg[i].buf, msg[i].len);
+
+ deb_data( );
+ debug_dump(buf, msg[i].len + 4, deb_data);
result = usb_control_msg(d-udev,
usb_sndctrlpipe(d-udev, 0),
diff -r 812031aad01b -r 1dce9d4e2179 linux/drivers/media/dvb/siano/sms-cards.c
--- a/linux/drivers/media/dvb/siano/sms-cards.c Sun Feb 01 10:30:28 2009 -0200
+++ b/linux/drivers/media/dvb/siano/sms-cards.c Sun Feb 01 11:40:27 2009 -0200
@@ -46,6 +46,8 @@ struct usb_device_id smsusb_id_table[] =
.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
{ USB_DEVICE(0x2040, 0x2010),
.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
+ { USB_DEVICE(0x2040, 0x2011),
+ .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
{ USB_DEVICE(0x2040, 0x2019),
.driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
{ USB_DEVICE(0x2040, 0x5500),
diff -r 812031aad01b -r 1dce9d4e2179 linux/drivers/media/video/tveeprom.c
--- a/linux/drivers/media/video/tveeprom.c Sun Feb 01 10:30:28 2009 -0200
+++ b/linux/drivers/media/video/tveeprom.c Sun Feb 01 11:40:27 2009 -0200
@@ -263,6 +263,11 @@ hauppauge_tuner[] =
{ TUNER_PHILIPS_TDA8290,Philips 18271_8295},
/* 150-159 */
{ TUNER_ABSENT, Xceive XC5000},
+ { TUNER_ABSENT, Xceive XC3028L},
+ { TUNER_ABSENT, NXP 18271C2_716x},
+ { TUNER_ABSENT, Xceive XC4000},
+ { TUNER_ABSENT, Dibcom 7070},
+ { TUNER_PHILIPS_TDA8290,NXP 18271C2},
};
/* Use V4L2_IDENT_AMBIGUOUS for those audio 'chips' that are
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/1dce9d4e217903e664a25663ca8747a42cf76dc1
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
The patch number 10410 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/cs53l32a.c |1 -
linux/drivers/media/video/cx18/cx18-av-core.c|2 +-
linux/drivers/media/video/cx25840/cx25840-core.c |2 +-
linux/drivers/media/video/gspca/t613.c |2 +-
linux/drivers/media/video/m52790.c |1 -
linux/drivers/media/video/saa5246a.c |1 -
linux/drivers/media/video/saa5249.c |1 -
linux/drivers/media/video/saa7115.c |2 +-
linux/drivers/media/video/saa717x.c |3 +--
linux/drivers/media/video/tda7432.c |1 -
linux/drivers/media/video/tda9840.c |1 -
linux/drivers/media/video/tda9875.c |1 -
linux/drivers/media/video/tea6415c.c |1 -
linux/drivers/media/video/tea6420.c |1 -
linux/drivers/media/video/tlv320aic23b.c |1 -
linux/drivers/media/video/tvmixer.c |1 -
linux/drivers/media/video/tvp5150.c |1 -
linux/drivers/media/video/upd64031a.c|1 -
linux/drivers/media/video/upd64083.c |1 -
linux/drivers/media/video/vp27smpx.c |1 -
linux/drivers/media/video/wm8739.c |1 -
v4l/versions.txt |4
22 files changed, 9 insertions(+), 22 deletions(-)
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/cs53l32a.c
--- a/linux/drivers/media/video/cs53l32a.c Sat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/cs53l32a.c Sun Feb 01 10:24:06 2009 -0200
@@ -225,7 +225,6 @@ MODULE_DEVICE_TABLE(i2c, cs53l32a_id);
#endif
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = cs53l32a,
- .driverid = I2C_DRIVERID_CS53L32A,
.command = cs53l32a_command,
.remove = cs53l32a_remove,
.probe = cs53l32a_probe,
diff -r 138cb0226301 -r afc6afc946c7
linux/drivers/media/video/cx18/cx18-av-core.c
--- a/linux/drivers/media/video/cx18/cx18-av-core.c Sat Jan 31 09:14:24
2009 -0200
+++ b/linux/drivers/media/video/cx18/cx18-av-core.c Sun Feb 01 10:24:06
2009 -0200
@@ -548,7 +548,7 @@ static int set_v4lctrl(struct cx18 *cx,
break;
case V4L2_CID_HUE:
- if (ctrl-value -127 || ctrl-value 127) {
+ if (ctrl-value -128 || ctrl-value 127) {
CX18_ERR(invalid hue setting %d\n, ctrl-value);
return -ERANGE;
}
diff -r 138cb0226301 -r afc6afc946c7
linux/drivers/media/video/cx25840/cx25840-core.c
--- a/linux/drivers/media/video/cx25840/cx25840-core.c Sat Jan 31 09:14:24
2009 -0200
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c Sun Feb 01 10:24:06
2009 -0200
@@ -782,7 +782,7 @@ static int cx25840_s_ctrl(struct v4l2_su
break;
case V4L2_CID_HUE:
- if (ctrl-value -127 || ctrl-value 127) {
+ if (ctrl-value -128 || ctrl-value 127) {
v4l_err(client, invalid hue setting %d\n,
ctrl-value);
return -ERANGE;
}
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/gspca/t613.c
--- a/linux/drivers/media/video/gspca/t613.cSat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/gspca/t613.cSun Feb 01 10:24:06 2009 -0200
@@ -635,7 +635,7 @@ static int sd_init(struct gspca_dev *gsp
struct sd *sd = (struct sd *) gspca_dev;
int i;
u16 sensor_id;
- u8 test_byte;
+ u8 test_byte = 0;
u16 reg80, reg8e;
static const u8 read_indexs[] =
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/m52790.c
--- a/linux/drivers/media/video/m52790.cSat Jan 31 09:14:24 2009 -0200
+++ b/linux/drivers/media/video/m52790.cSun Feb 01 10:24:06 2009 -0200
@@ -222,7 +222,6 @@ MODULE_DEVICE_TABLE(i2c, m52790_id);
#endif
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = m52790,
- .driverid = I2C_DRIVERID_M52790,
.command = m52790_command,
.probe = m52790_probe,
.remove = m52790_remove,
diff -r 138cb0226301 -r afc6afc946c7 linux/drivers/media/video/saa5246a.c
--- a/linux/drivers/media/video/saa5246a.c Sat Jan 31 09:14:24 2009 -0200
+++
[linuxtv-commits] [hg:v4l-dvb] merge: http://mercurial.intuxication.org/hg/v4l-dvb-commits/v4l-dvb-commits
The patch number 10414 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://mercurial.intuxication.org/hg/v4l-dvb-commits/v4l-dvb-commits Priority: normal Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/dvb/frontends/cx24116.c |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff -r 43954c68b63d -r 812031aad01b linux/drivers/media/dvb/frontends/cx24116.c --- a/linux/drivers/media/dvb/frontends/cx24116.c Sun Feb 01 10:28:20 2009 -0200 +++ b/linux/drivers/media/dvb/frontends/cx24116.c Sun Feb 01 10:30:28 2009 -0200 @@ -1184,7 +1184,12 @@ static int cx24116_initfe(struct dvb_fro if (ret != 0) return ret; - return cx24116_diseqc_init(fe); + ret = cx24116_diseqc_init(fe); + if (ret != 0) + return ret; + + /* HVR-4000 needs this */ + return cx24116_set_voltage(fe, SEC_VOLTAGE_13); } /* --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/812031aad01b4348d5a69a65a7db69ab4a8d294f ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~awalls/cx18
The patch number 10438 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~awalls/cx18
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/cx18/cx18-audio.c |3 -
linux/drivers/media/video/cx18/cx18-av-core.c | 40 +++---
linux/drivers/media/video/cx18/cx18-av-firmware.c |3 -
linux/drivers/media/video/cx18/cx18-driver.c | 15 -
linux/drivers/media/video/cx18/cx18-driver.h |1
5 files changed, 49 insertions(+), 13 deletions(-)
diff -r 71e5a36634ea -r d6afd8b02051 linux/drivers/media/video/cx18/cx18-audio.c
--- a/linux/drivers/media/video/cx18/cx18-audio.c Mon Feb 02 10:33:31
2009 +0100
+++ b/linux/drivers/media/video/cx18/cx18-audio.c Mon Feb 09 15:15:17
2009 -0200
@@ -64,8 +64,7 @@ int cx18_audio_set_io(struct cx18 *cx)
val = cx18_read_reg(cx, CX18_AUDIO_ENABLE) ~0x30;
val |= (audio_input CX18_AV_AUDIO_SERIAL2) ? 0x20 :
(audio_input 4);
- cx18_write_reg(cx, val | 0xb00, CX18_AUDIO_ENABLE);
- cx18_vapi(cx, CX18_APU_RESETAI, 1, 0);
+ cx18_write_reg_expect(cx, val | 0xb00, CX18_AUDIO_ENABLE, val, 0x30);
return 0;
}
diff -r 71e5a36634ea -r d6afd8b02051
linux/drivers/media/video/cx18/cx18-av-core.c
--- a/linux/drivers/media/video/cx18/cx18-av-core.c Mon Feb 02 10:33:31
2009 +0100
+++ b/linux/drivers/media/video/cx18/cx18-av-core.c Mon Feb 09 15:15:17
2009 -0200
@@ -680,19 +680,45 @@ static int set_v4lfmt(struct cx18 *cx, s
/* --- */
+static int valid_av_cmd(unsigned int cmd)
+{
+ switch (cmd) {
+ /* All commands supported by cx18_av_cmd() */
+ case VIDIOC_INT_DECODE_VBI_LINE:
+ case VIDIOC_INT_AUDIO_CLOCK_FREQ:
+ case VIDIOC_STREAMON:
+ case VIDIOC_STREAMOFF:
+ case VIDIOC_LOG_STATUS:
+ case VIDIOC_G_CTRL:
+ case VIDIOC_S_CTRL:
+ case VIDIOC_QUERYCTRL:
+ case VIDIOC_G_STD:
+ case VIDIOC_S_STD:
+ case AUDC_SET_RADIO:
+ case VIDIOC_INT_G_VIDEO_ROUTING:
+ case VIDIOC_INT_S_VIDEO_ROUTING:
+ case VIDIOC_INT_G_AUDIO_ROUTING:
+ case VIDIOC_INT_S_AUDIO_ROUTING:
+ case VIDIOC_S_FREQUENCY:
+ case VIDIOC_G_TUNER:
+ case VIDIOC_S_TUNER:
+ case VIDIOC_G_FMT:
+ case VIDIOC_S_FMT:
+ case VIDIOC_INT_RESET:
+ return 1;
+ default:
+ return 0;
+ }
+ return 0;
+}
+
int cx18_av_cmd(struct cx18 *cx, unsigned int cmd, void *arg)
{
struct cx18_av_state *state = cx-av_state;
struct v4l2_tuner *vt = arg;
struct v4l2_routing *route = arg;
- /* ignore these commands */
- switch (cmd) {
- case TUNER_SET_TYPE_ADDR:
- return 0;
- }
-
- if (!state-is_initialized) {
+ if (!state-is_initialized valid_av_cmd(cmd)) {
CX18_DEBUG_INFO(cmd %08x triggered fw load\n, cmd);
/* initialize on first use */
state-is_initialized = 1;
diff -r 71e5a36634ea -r d6afd8b02051
linux/drivers/media/video/cx18/cx18-av-firmware.c
--- a/linux/drivers/media/video/cx18/cx18-av-firmware.c Mon Feb 02 10:33:31
2009 +0100
+++ b/linux/drivers/media/video/cx18/cx18-av-firmware.c Mon Feb 09 15:15:17
2009 -0200
@@ -131,7 +131,8 @@ int cx18_av_loadfw(struct cx18 *cx)
v = cx18_read_reg(cx, CX18_AUDIO_ENABLE);
/* If bit 11 is 1, clear bit 10 */
if (v 0x800)
- cx18_write_reg(cx, v 0xFBFF, CX18_AUDIO_ENABLE);
+ cx18_write_reg_expect(cx, v 0xFBFF, CX18_AUDIO_ENABLE,
+ 0, 0x400);
/* Enable WW auto audio standard detection */
v = cx18_av_read4(cx, CXADEC_STD_DET_CTL);
diff -r 71e5a36634ea -r d6afd8b02051
linux/drivers/media/video/cx18/cx18-driver.c
--- a/linux/drivers/media/video/cx18/cx18-driver.c Mon Feb 02 10:33:31
2009 +0100
+++ b/linux/drivers/media/video/cx18/cx18-driver.c Mon Feb 09 15:15:17
2009 -0200
@@ -563,8 +563,6 @@ static int __devinit cx18_init_struct1(s
mutex_init(cx-epu2apu_mb_lock);
mutex_init(cx-epu2cpu_mb_lock);
- spin_lock_init(cx-lock);
-
cx-work_queue = create_singlethread_workqueue(cx-name);
if (cx-work_queue == NULL) {
CX18_ERR(Unable to create work hander thread\n);
@@ -1085,6 +1083,19 @@ int cx18_init_on_first_open(struct cx18
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~anttip/mc44s803/
The patch number 10454 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~anttip/mc44s803/
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/common/tuners/Kconfig |8
linux/drivers/media/common/tuners/Makefile|1
linux/drivers/media/common/tuners/mc44s803.c | 371 ++
linux/drivers/media/common/tuners/mc44s803.h | 46 +
linux/drivers/media/common/tuners/mc44s803_priv.h | 208 +++
linux/drivers/media/dvb/dvb-usb/Kconfig |1
linux/drivers/media/dvb/dvb-usb/af9015.c | 40 +
7 files changed, 662 insertions(+), 13 deletions(-)
diff -r 18c79168ec6c -r 40d6f7e3a34e linux/drivers/media/common/tuners/Kconfig
--- a/linux/drivers/media/common/tuners/Kconfig Mon Feb 09 15:38:11 2009 -0200
+++ b/linux/drivers/media/common/tuners/Kconfig Mon Feb 09 15:44:51 2009 -0200
@@ -29,6 +29,7 @@ config MEDIA_TUNER
select MEDIA_TUNER_TEA5767 if !MEDIA_TUNER_CUSTOMIZE
select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
select MEDIA_TUNER_TDA9887 if !MEDIA_TUNER_CUSTOMIZE
+ select MEDIA_TUNER_MC44S803 if !MEDIA_TUNER_CUSTOMIZE
menuconfig MEDIA_TUNER_CUSTOMIZE
bool Customize analog and hybrid tuner modules to build
@@ -164,4 +165,11 @@ config MEDIA_TUNER_MXL5007T
help
A driver for the silicon tuner MxL5007T from MaxLinear.
+config MEDIA_TUNER_MC44S803
+ tristate Freescale MC44S803 Low Power CMOS Broadband tuners
+ depends on VIDEO_MEDIA I2C
+ default m if DVB_FE_CUSTOMISE
+ help
+ Say Y here to support the Freescale MC44S803 based tuners
+
endif # MEDIA_TUNER_CUSTOMIZE
diff -r 18c79168ec6c -r 40d6f7e3a34e linux/drivers/media/common/tuners/Makefile
--- a/linux/drivers/media/common/tuners/MakefileMon Feb 09 15:38:11
2009 -0200
+++ b/linux/drivers/media/common/tuners/MakefileMon Feb 09 15:44:51
2009 -0200
@@ -22,6 +22,7 @@ obj-$(CONFIG_MEDIA_TUNER_MT2131) += mt21
obj-$(CONFIG_MEDIA_TUNER_MT2131) += mt2131.o
obj-$(CONFIG_MEDIA_TUNER_MXL5005S) += mxl5005s.o
obj-$(CONFIG_MEDIA_TUNER_MXL5007T) += mxl5007t.o
+obj-$(CONFIG_MEDIA_TUNER_MC44S803) += mc44s803.o
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
diff -r 18c79168ec6c -r 40d6f7e3a34e
linux/drivers/media/common/tuners/mc44s803.c
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/linux/drivers/media/common/tuners/mc44s803.c Mon Feb 09 15:44:51
2009 -0200
@@ -0,0 +1,371 @@
+/*
+ * Driver for Freescale MC44S803 Low Power CMOS Broadband Tuner
+ *
+ * Copyright (c) 2009 Jochen Friedrich joc...@scram.de
+ *
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.=
+ */
+
+#include linux/module.h
+#include linux/delay.h
+#include linux/dvb/frontend.h
+#include linux/i2c.h
+
+#include dvb_frontend.h
+
+#include mc44s803.h
+#include mc44s803_priv.h
+
+#define mc_printk(level, format, arg...) \
+ printk(level mc44s803: format , ## arg)
+
+/* Writes a single register */
+static int mc44s803_writereg(struct mc44s803_priv *priv, u32 val)
+{
+ u8 buf[3];
+ struct i2c_msg msg = {
+ .addr = priv-cfg-i2c_address, .flags = 0, .buf = buf, .len = 3
+ };
+
+ buf[0] = (val 0xff) 16;
+ buf[1] = (val 0xff00) 8;
+ buf[2] = (val 0xff);
+
+ if (i2c_transfer(priv-i2c, msg, 1) != 1) {
+ mc_printk(KERN_WARNING, I2C write failed\n);
+ return -EREMOTEIO;
+ }
+ return 0;
+}
+
+/* Reads a single register */
+static int mc44s803_readreg(struct mc44s803_priv *priv, u8 reg, u32 *val)
+{
+ u32 wval;
+ u8 buf[3];
+ int ret;
+ struct i2c_msg msg[] = {
+ { .addr = priv-cfg-i2c_address, .flags = I2C_M_RD,
+ .buf = buf, .len = 3 },
+ };
+
+
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~dougsland/radios
The patch number 10466 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~dougsland/radios
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/radio/dsbr100.c |6
linux/drivers/media/radio/radio-mr800.c | 249 +++
linux/drivers/media/radio/radio-si470x.c |4
3 files changed, 174 insertions(+), 85 deletions(-)
diff -r 40d6f7e3a34e -r 709ff4f98293 linux/drivers/media/radio/dsbr100.c
--- a/linux/drivers/media/radio/dsbr100.c Mon Feb 09 15:44:51 2009 -0200
+++ b/linux/drivers/media/radio/dsbr100.c Mon Feb 09 19:08:43 2009 -0200
@@ -455,7 +455,10 @@ static int vidioc_s_frequency(struct fil
if (radio-removed)
return -EIO;
+ mutex_lock(radio-lock);
radio-curfreq = f-frequency;
+ mutex_unlock(radio-lock);
+
retval = dsbr100_setfreq(radio, radio-curfreq);
if (retval 0)
dev_warn(radio-usbdev-dev, Set frequency failed\n);
@@ -606,7 +609,10 @@ static int usb_dsbr100_close(struct file
if (!radio)
return -ENODEV;
+ mutex_lock(radio-lock);
radio-users = 0;
+ mutex_unlock(radio-lock);
+
if (!radio-removed) {
retval = dsbr100_stop(radio);
if (retval 0) {
diff -r 40d6f7e3a34e -r 709ff4f98293 linux/drivers/media/radio/radio-mr800.c
--- a/linux/drivers/media/radio/radio-mr800.c Mon Feb 09 15:44:51 2009 -0200
+++ b/linux/drivers/media/radio/radio-mr800.c Mon Feb 09 19:08:43 2009 -0200
@@ -22,7 +22,7 @@
*/
/*
- * Big thanks to authors of dsbr100.c and radio-si470x.c
+ * Big thanks to authors and contributors of dsbr100.c and radio-si470x.c
*
* When work was looked pretty good, i discover this:
* http://av-usbradio.sourceforge.net/index.php
@@ -30,18 +30,23 @@
* Latest release of theirs project was in 2005.
* Probably, this driver could be improved trough using their
* achievements (specifications given).
- * So, we have smth to begin with.
+ * Also, Faidon Liambotis parav...@debian.org wrote nice driver for this
radio
+ * in 2007. He allowed to use his driver to improve current mr800 radio driver.
+ * http://kerneltrap.org/mailarchive/linux-usb-devel/2007/10/11/342492
*
- * History:
* Version 0.01: First working version.
* It's required to blacklist AverMedia USB Radio
* in usbhid/hid-quirks.c
+ * Version 0.10: A lot of cleanups and fixes: unpluging the device,
+ * few mutex locks were added, codinstyle issues, etc.
+ * Added stereo support. Thanks to
+ * Douglas Schilling Landgraf dougsl...@gmail.com and
+ * David Ellingsworth da...@identd.dyndns.org
+ * for discussion, help and support.
*
* Many things to do:
* - Correct power managment of device (suspend resume)
- * - Make x86 independance (little-endian and big-endian stuff)
* - Add code for scanning and smooth tuning
- * - Checked and add stereomono stuff
* - Add code for sensitivity value
* - Correct mistakes
* - In Japan another FREQ_MIN and FREQ_MAX
@@ -63,8 +68,8 @@
/* driver and module definitions */
#define DRIVER_AUTHOR Alexey Klimov klimov.li...@gmail.com
#define DRIVER_DESC AverMedia MR 800 USB FM radio driver
-#define DRIVER_VERSION 0.01
-#define RADIO_VERSION KERNEL_VERSION(0, 0, 1)
+#define DRIVER_VERSION 0.10
+#define RADIO_VERSION KERNEL_VERSION(0, 1, 0)
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
@@ -87,6 +92,22 @@ devices, that would be 76 and 91. */
#define FREQ_MIN 87.5
#define FREQ_MAX 108.0
#define FREQ_MUL 16000
+
+/*
+ * Commands that device should understand
+ * List isnt full and will be updated with implementation of new functions
+ */
+#define AMRADIO_SET_FREQ 0xa4
+#define AMRADIO_SET_MUTE 0xab
+#define AMRADIO_SET_MONO 0xae
+
+/* Comfortable defines for amradio_set_mute */
+#define AMRADIO_START 0x00
+#define AMRADIO_STOP 0x01
+
+/* Comfortable defines for amradio_set_stereo */
+#define WANT_STEREO0x00
+#define WANT_MONO 0x01
/* module parameter */
static int radio_nr = -1;
@@ -172,11 +193,15 @@ static struct usb_driver usb_amradio_dri
.supports_autosuspend = 0,
};
-/* switch on radio. Send 8 bytes to device. */
-static int amradio_start(struct amradio_device *radio)
+/* switch on/off the radio. Send 8
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-spec
The patch number 10495 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-spec Priority: normal Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- .hgignore |6 README.patches | 61 ++--- 2 files changed, 39 insertions(+), 28 deletions(-) diff -r e3896c8892a5 -r d76f0c9b75fd .hgignore --- a/.hgignore Tue Feb 10 01:31:47 2009 +0100 +++ b/.hgignore Tue Feb 10 04:47:31 2009 -0200 @@ -63,3 +63,9 @@ v4l2-spec/v4l2$ v4l2-spec/v4l2$ v4l2-spec/v4l2.pdf$ v4l2-spec/videodev2.h.sgml$ +v4l/firmware/cpia2/stv0672_vp4.bin +v4l/firmware/dabusb/bitstream.bin +v4l/firmware/dabusb/firmware.fw +v4l/firmware/ihex2fw +v4l/firmware/ttusb-budget/dspbootcode.bin +v4l/firmware/vicam/firmware.fw diff -r e3896c8892a5 -r d76f0c9b75fd README.patches --- a/README.patchesTue Feb 10 01:31:47 2009 +0100 +++ b/README.patchesTue Feb 10 04:47:31 2009 -0200 @@ -1,5 +1,5 @@ Mauro Carvalho Chehab mchehab at infrad Mauro Carvalho Chehab mchehab at infradead dot org - Updated on 2009 January 8 + Updated on 2009 February 9 This file describes the general procedures used by the LinuxTV team (*) and by the v4l-dvb community. @@ -255,30 +255,35 @@ g) Another kernel's practice that is agr Reviewed-by: My Name myem...@mysite.com This is particularly important for Kernel to userspace ABI changes. -h) If the patch also affects other parts of kernel (like Alsa -or i2c), it is required that, when submitting upstream, the patch -also goes to the maintainers of that subsystem. To do this, the -developer shall copy the interested parties. - -At mercurial tree, this can be handled automatically by the LinuxTV -scripts, by using the cc: meta tag, together with the Signed-off-by -lines. Something like: +h) If the patch also affects other parts of kernel (like Alsa + or i2c), it is required that, when submitting upstream, the patch + also goes to the maintainers of that subsystem. To do this, the + developer shall copy the interested parties. + + At mercurial tree, this can be handled automatically by the LinuxTV + scripts, by using the cc: meta tag, together with the Signed-off-by + lines. Something like: CC: someotherkerneldevelo...@someplace Signed-off-by: nowhere nowh...@noplace.org -This way, when a patch arrives mercurial hg tree, a mailbomb script -will copy the proper interested parties. - -When submitting a patch via e-mail, it is better to copy all interested -parties directly, by adding them as cc's to the email itself. - -Please note that those changes generally require ack from the -other subsystem maintainers. So, the best practice is to first ask -for their acks, then commit to the development tree or send the -patch via email with their Acked-by: already included. - -i) Sometimes, mainstream changes affect the v4l-dvb tree, and mast be + This way, when a patch arrives mercurial hg tree, a mailbomb script + will copy the proper interested parties. + + When submitting a patch via e-mail, it is better to copy all interested + parties directly, by adding them as cc's to the email itself. + + Please note that those changes generally require ack from the + other subsystem maintainers. So, the best practice is to first ask + for their acks, then commit to the development tree or send the + patch via email with their Acked-by: already included. + +i) If the patch modifies the include/linux/videodev2.h file, then you + must also run 'make spec' to verify that the V4L2 specification + document still builds. Of course, any changes you make to the public + V4L2 API must be documented anyway. + +j) Sometimes, mainstream changes affect the v4l-dvb tree, and mast be backported to the v4l-dvb tree. This kind of commit to the mercurial tree should follow the rules above and should also have the line: @@ -286,7 +291,7 @@ i) Sometimes, mainstream changes affect Patches with this line will not be submitted upstream. -j) Sometimes it is necessary to introduce some testing code inside a +k) Sometimes it is necessary to introduce some testing code inside a module or remove parts that are not yet finished. Also, compatibility tests may be required to provide backporting. @@ -319,8 +324,8 @@ j) Sometimes it is necessary to introduc #include
[linuxtv-commits] [hg:v4l-dvb] saa7134: Cleanup: remove unused waitqueue from struct
The patch number 10508 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
saa7134: Cleanup: remove unused waitqueue from struct
The waitqueue is never used. So, let's just remove it.
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/saa7134/saa7134.h |1 -
1 file changed, 1 deletion(-)
diff -r ec84c420abdd -r f6f68026eb83 linux/drivers/media/video/saa7134/saa7134.h
--- a/linux/drivers/media/video/saa7134/saa7134.h Sun Feb 08 10:33:15
2009 -0200
+++ b/linux/drivers/media/video/saa7134/saa7134.h Mon Feb 09 06:29:54
2009 -0200
@@ -447,7 +447,6 @@ struct saa7134_dmasound {
unsigned int bufsize;
struct saa7134_pgtable pt;
struct videobuf_dmabuf dma;
- wait_queue_head_t wq;
unsigned int dma_blk;
unsigned int read_offset;
unsigned int read_count;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/f6f68026eb839ea2e17ac1999b07536fb84ebe72
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] saa7134: move tuner init code to saa7134-cards
The patch number 10506 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
saa7134: move tuner init code to saa7134-cards
On certain devices, before opening a tuner, we need to open the tuner
gate via i2c.
This patch just moves the tuner probing code to the same place where
such i2c commands are handled, to make easier to fix this trouble on
later patches.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/saa7134/saa7134-cards.c | 24 ++
linux/drivers/media/video/saa7134/saa7134-core.c | 24 --
2 files changed, 24 insertions(+), 24 deletions(-)
diff -r aa153b84d997 -r 5bad8b1eec7b
linux/drivers/media/video/saa7134/saa7134-cards.c
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c Sun Feb 08 09:42:29
2009 -0200
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c Sun Feb 08 09:50:50
2009 -0200
@@ -6300,6 +6300,30 @@ int saa7134_board_init2(struct saa7134_d
unsigned char buf;
int board;
+ /* initialize hardware #2 */
+ if (TUNER_ABSENT != dev-tuner_type) {
+ int has_demod = (dev-tda9887_conf TDA9887_PRESENT);
+
+ /* Note: radio tuner address is always filled in,
+ so we do not need to probe for a radio tuner device. */
+ if (dev-radio_type != UNSET)
+ v4l2_i2c_new_subdev(dev-i2c_adap,
+ tuner, tuner, dev-radio_addr);
+ if (has_demod)
+ v4l2_i2c_new_probed_subdev(dev-i2c_adap, tuner,
+ tuner, v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+ if (dev-tuner_addr == ADDR_UNSET) {
+ enum v4l2_i2c_tuner_type type =
+ has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
+
+ v4l2_i2c_new_probed_subdev(dev-i2c_adap, tuner,
+ tuner, v4l2_i2c_tuner_addrs(type));
+ } else {
+ v4l2_i2c_new_subdev(dev-i2c_adap,
+ tuner, tuner, dev-tuner_addr);
+ }
+ }
+
switch (dev-board) {
case SAA7134_BOARD_BMK_MPEX_NOTUNER:
case SAA7134_BOARD_BMK_MPEX_TUNER:
diff -r aa153b84d997 -r 5bad8b1eec7b
linux/drivers/media/video/saa7134/saa7134-core.c
--- a/linux/drivers/media/video/saa7134/saa7134-core.c Sun Feb 08 09:42:29
2009 -0200
+++ b/linux/drivers/media/video/saa7134/saa7134-core.c Sun Feb 08 09:50:50
2009 -0200
@@ -1034,30 +1034,6 @@ static int __devinit saa7134_initdev(str
/* wait a bit, register i2c bus */
msleep(100);
saa7134_i2c_register(dev);
-
- /* initialize hardware #2 */
- if (TUNER_ABSENT != dev-tuner_type) {
- int has_demod = (dev-tda9887_conf TDA9887_PRESENT);
-
- /* Note: radio tuner address is always filled in,
- so we do not need to probe for a radio tuner device. */
- if (dev-radio_type != UNSET)
- v4l2_i2c_new_subdev(dev-i2c_adap,
- tuner, tuner, dev-radio_addr);
- if (has_demod)
- v4l2_i2c_new_probed_subdev(dev-i2c_adap, tuner,
- tuner, v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
- if (dev-tuner_addr == ADDR_UNSET) {
- enum v4l2_i2c_tuner_type type =
- has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
-
- v4l2_i2c_new_probed_subdev(dev-i2c_adap, tuner,
- tuner, v4l2_i2c_tuner_addrs(type));
- } else {
- v4l2_i2c_new_subdev(dev-i2c_adap,
- tuner, tuner, dev-tuner_addr);
- }
- }
saa7134_board_init2(dev);
saa7134_hwinit2(dev);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/5bad8b1eec7b8d353487997baeb627468c3898a0
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] saa7134-video: two int controls lack a step
The patch number 10509 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
saa7134-video: two int controls lack a step
Fix two broken controls where a step weren't specified. Without a step,
userspace apps won't allow to adjust such controls.
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/saa7134/saa7134-video.c |2 ++
1 file changed, 2 insertions(+)
diff -r f6f68026eb83 -r e0f2b5e6929d
linux/drivers/media/video/saa7134/saa7134-video.c
--- a/linux/drivers/media/video/saa7134/saa7134-video.c Mon Feb 09 06:29:54
2009 -0200
+++ b/linux/drivers/media/video/saa7134/saa7134-video.c Mon Feb 09 06:33:54
2009 -0200
@@ -452,6 +452,7 @@ static const struct v4l2_queryctrl video
.name = y offset odd field,
.minimum = 0,
.maximum = 128,
+ .step = 1,
.default_value = 0,
.type = V4L2_CTRL_TYPE_INTEGER,
},{
@@ -459,6 +460,7 @@ static const struct v4l2_queryctrl video
.name = y offset even field,
.minimum = 0,
.maximum = 128,
+ .step = 1,
.default_value = 0,
.type = V4L2_CTRL_TYPE_INTEGER,
},{
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/e0f2b5e6929d48e031e9e115af684de45269a910
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] tda8290: Print an error if i2c_gate is not provided
The patch number 10505 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
tda8290: Print an error if i2c_gate is not provided
While here, be sure that gate will be kept disabled if an error occurs.
Priority: normal
CC: Michael Krufky mkru...@linuxtv.org
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/common/tuners/tda8290.c |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff -r 8424b48ea1c6 -r aa153b84d997 linux/drivers/media/common/tuners/tda8290.c
--- a/linux/drivers/media/common/tuners/tda8290.c Sun Feb 08 09:34:43
2009 -0200
+++ b/linux/drivers/media/common/tuners/tda8290.c Sun Feb 08 09:42:29
2009 -0200
@@ -589,8 +589,11 @@ static int tda829x_find_tuner(struct dvb
u8 data;
struct i2c_msg msg = { .flags = I2C_M_RD, .buf = data, .len = 1 };
- if (NULL == analog_ops-i2c_gate_ctrl)
+ if (!analog_ops-i2c_gate_ctrl) {
+ printk(KERN_ERR tda8290: no gate control were provided!\n);
+
return -EINVAL;
+ }
analog_ops-i2c_gate_ctrl(fe, 1);
@@ -638,6 +641,7 @@ static int tda829x_find_tuner(struct dvb
if (ret != 1) {
tuner_warn(tuner access failed!\n);
+ analog_ops-i2c_gate_ctrl(fe, 0);
return -EREMOTEIO;
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/aa153b84d997be729628a7db4f11a931b9f10882
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] saa7134: get rid of KBL
The patch number 10511 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
saa7134: get rid of KBL
KBL is not needed on saa7134, so, let's remove it.
However, we should take some care to avoid opening the module while
initializing it. This issue exists with newer udev's that opens a device
as soon as the driver is registered. So, a proper lock is needed on
open.
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/saa7134/saa7134-core.c | 44 +++---
linux/drivers/media/video/saa7134/saa7134-video.c | 14 ++--
linux/drivers/media/video/saa7134/saa7134.h |1
3 files changed, 30 insertions(+), 29 deletions(-)
diff -r 6ed5d5452f23 -r b5a71208a190
linux/drivers/media/video/saa7134/saa7134-core.c
--- a/linux/drivers/media/video/saa7134/saa7134-core.c Mon Feb 09 13:03:46
2009 -0200
+++ b/linux/drivers/media/video/saa7134/saa7134-core.c Mon Feb 09 13:27:03
2009 -0200
@@ -86,8 +86,10 @@ MODULE_PARM_DESC(tuner,tuner type)
MODULE_PARM_DESC(tuner,tuner type);
MODULE_PARM_DESC(card, card type);
-static DEFINE_MUTEX(devlist_lock);
+DEFINE_MUTEX(saa7134_devlist_lock);
+EXPORT_SYMBOL(saa7134_devlist_lock);
LIST_HEAD(saa7134_devlist);
+EXPORT_SYMBOL(saa7134_devlist);
static LIST_HEAD(mops_list);
static unsigned int saa7134_devcount;
@@ -1052,6 +1054,18 @@ static int __devinit saa7134_initdev(str
v4l2_prio_init(dev-prio);
+ mutex_lock(saa7134_devlist_lock);
+ list_for_each_entry(mops, mops_list, next)
+ mpeg_ops_attach(mops, dev);
+ list_add_tail(dev-devlist, saa7134_devlist);
+ mutex_unlock(saa7134_devlist_lock);
+
+ /* check for signal */
+ saa7134_irq_video_signalchange(dev);
+
+ if (TUNER_ABSENT != dev-tuner_type)
+ saa_call_all(dev, core, s_standby, 0);
+
/* register v4l devices */
if (saa7134_no_overlay 0)
printk(KERN_INFO %s: Overlay support disabled.\n, dev-name);
@@ -1089,21 +1103,8 @@ static int __devinit saa7134_initdev(str
/* everything worked */
saa7134_devcount++;
- mutex_lock(devlist_lock);
- list_for_each_entry(mops, mops_list, next)
- mpeg_ops_attach(mops, dev);
- list_add_tail(dev-devlist,saa7134_devlist);
- mutex_unlock(devlist_lock);
-
- /* check for signal */
- saa7134_irq_video_signalchange(dev);
-
- if (saa7134_dmasound_init !dev-dmasound.priv_data) {
+ if (saa7134_dmasound_init !dev-dmasound.priv_data)
saa7134_dmasound_init(dev);
- }
-
- if (TUNER_ABSENT != dev-tuner_type)
- saa_call_all(dev, core, s_standby, 0);
return 0;
@@ -1154,11 +1155,11 @@ static void __devexit saa7134_finidev(st
saa7134_hwfini(dev);
/* unregister */
- mutex_lock(devlist_lock);
+ mutex_lock(saa7134_devlist_lock);
list_del(dev-devlist);
list_for_each_entry(mops, mops_list, next)
mpeg_ops_detach(mops, dev);
- mutex_unlock(devlist_lock);
+ mutex_unlock(saa7134_devlist_lock);
saa7134_devcount--;
saa7134_i2c_unregister(dev);
@@ -1321,11 +1322,11 @@ int saa7134_ts_register(struct saa7134_m
{
struct saa7134_dev *dev;
- mutex_lock(devlist_lock);
+ mutex_lock(saa7134_devlist_lock);
list_for_each_entry(dev, saa7134_devlist, devlist)
mpeg_ops_attach(ops, dev);
list_add_tail(ops-next,mops_list);
- mutex_unlock(devlist_lock);
+ mutex_unlock(saa7134_devlist_lock);
return 0;
}
@@ -1333,11 +1334,11 @@ void saa7134_ts_unregister(struct saa713
{
struct saa7134_dev *dev;
- mutex_lock(devlist_lock);
+ mutex_lock(saa7134_devlist_lock);
list_del(ops-next);
list_for_each_entry(dev, saa7134_devlist, devlist)
mpeg_ops_detach(ops, dev);
- mutex_unlock(devlist_lock);
+ mutex_unlock(saa7134_devlist_lock);
}
EXPORT_SYMBOL(saa7134_ts_register);
@@ -1381,7 +1382,6 @@ module_exit(saa7134_fini);
/* --- */
EXPORT_SYMBOL(saa7134_set_gpio);
-EXPORT_SYMBOL(saa7134_devlist);
EXPORT_SYMBOL(saa7134_boards);
/* - for the DMA sound modules --- */
diff -r 6ed5d5452f23 -r b5a71208a190
linux/drivers/media/video/saa7134/saa7134-video.c
--- a/linux/drivers/media/video/saa7134/saa7134-video.c Mon Feb 09 13:03:46
2009 -0200
+++
[linuxtv-commits] [hg:v4l-dvb] Adds IR table for the IR provided with this board and includes it at
The patch number 10515 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
Adds IR table for the IR provided with this board and includes it at
Kaiomy entry.
Thanks to Peter Senna Tschudin peter.se...@gmail.com for borrow me one
of those devices.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/common/ir-keymaps.c | 49
linux/drivers/media/video/em28xx/em28xx-cards.c |1
linux/include/media/ir-common.h |1
3 files changed, 51 insertions(+)
diff -r 74fd56daf383 -r 844767f3721e linux/drivers/media/common/ir-keymaps.c
--- a/linux/drivers/media/common/ir-keymaps.c Wed Feb 11 15:13:20 2009 -0200
+++ b/linux/drivers/media/common/ir-keymaps.c Wed Feb 11 15:15:14 2009 -0200
@@ -2502,6 +2502,55 @@ IR_KEYTAB_TYPE ir_codes_kworld_plus_tv_a
};
EXPORT_SYMBOL_GPL(ir_codes_kworld_plus_tv_analog);
+/* Kaiomy TVnPC U2
+ Mauro Carvalho Chehab mche...@infradead.org
+ */
+IR_KEYTAB_TYPE ir_codes_kaiomy[IR_KEYTAB_SIZE] = {
+ [0x43] = KEY_POWER2,
+ [0x01] = KEY_LIST,
+ [0x0b] = KEY_ZOOM,
+ [0x03] = KEY_POWER,
+
+ [0x04] = KEY_1,
+ [0x08] = KEY_2,
+ [0x02] = KEY_3,
+
+ [0x0f] = KEY_4,
+ [0x05] = KEY_5,
+ [0x06] = KEY_6,
+
+ [0x0c] = KEY_7,
+ [0x0d] = KEY_8,
+ [0x0a] = KEY_9,
+
+ [0x11] = KEY_0,
+
+ [0x09] = KEY_CHANNELUP,
+ [0x07] = KEY_CHANNELDOWN,
+
+ [0x0e] = KEY_VOLUMEUP,
+ [0x13] = KEY_VOLUMEDOWN,
+
+ [0x10] = KEY_HOME,
+ [0x12] = KEY_ENTER,
+
+ [0x14] = KEY_RECORD,
+ [0x15] = KEY_STOP,
+ [0x16] = KEY_PLAY,
+ [0x17] = KEY_MUTE,
+
+ [0x18] = KEY_UP,
+ [0x19] = KEY_DOWN,
+ [0x1a] = KEY_LEFT,
+ [0x1b] = KEY_RIGHT,
+
+ [0x1c] = KEY_RED,
+ [0x1d] = KEY_GREEN,
+ [0x1e] = KEY_YELLOW,
+ [0x1f] = KEY_BLUE,
+};
+EXPORT_SYMBOL_GPL(ir_codes_kaiomy);
+
IR_KEYTAB_TYPE ir_codes_avermedia_a16d[IR_KEYTAB_SIZE] = {
[0x20] = KEY_LIST,
[0x00] = KEY_POWER,
diff -r 74fd56daf383 -r 844767f3721e
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Wed Feb 11 15:13:20
2009 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Wed Feb 11 15:15:14
2009 -0200
@@ -1325,6 +1325,7 @@ struct em28xx_board em28xx_boards[] = {
.mts_firmware = 1,
.decoder = EM28XX_TVP5150,
.tuner_gpio = default_tuner_gpio,
+ .ir_codes = ir_codes_kaiomy,
.input = { {
.type = EM28XX_VMUX_TELEVISION,
.vmux = TVP5150_COMPOSITE0,
diff -r 74fd56daf383 -r 844767f3721e linux/include/media/ir-common.h
--- a/linux/include/media/ir-common.h Wed Feb 11 15:13:20 2009 -0200
+++ b/linux/include/media/ir-common.h Wed Feb 11 15:15:14 2009 -0200
@@ -159,6 +159,7 @@ extern IR_KEYTAB_TYPE ir_codes_msi_tvany
extern IR_KEYTAB_TYPE ir_codes_msi_tvanywhere_plus[IR_KEYTAB_SIZE];
extern IR_KEYTAB_TYPE ir_codes_ati_tv_wonder_hd_600[IR_KEYTAB_SIZE];
extern IR_KEYTAB_TYPE ir_codes_kworld_plus_tv_analog[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_kaiomy[IR_KEYTAB_SIZE];
#endif
/*
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/844767f3721e2d0690491dd7586ae7056e305a45
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] em28xx: Add support for Easy Cap Capture DC-60
The patch number 10516 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
em28xx: Add support for Easy Cap Capture DC-60
Thanks to Peter Senna Tschudin peter.se...@gmail.com for borrow me one
of those devices.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/Documentation/video4linux/CARDLIST.em28xx |3 +-
linux/drivers/media/video/em28xx/em28xx-cards.c | 21 +++-
linux/drivers/media/video/em28xx/em28xx.h |3 +-
3 files changed, 24 insertions(+), 3 deletions(-)
diff -r 844767f3721e -r b07848302e6c
linux/Documentation/video4linux/CARDLIST.em28xx
--- a/linux/Documentation/video4linux/CARDLIST.em28xx Wed Feb 11 15:15:14
2009 -0200
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx Wed Feb 11 15:18:36
2009 -0200
@@ -57,6 +57,7 @@
57 - Kworld PlusTV HD Hybrid 330 (em2883)[eb1a:a316]
58 - Compro VideoMate ForYou/Stereo (em2820/em2840) [185b:2041]
60 - Hauppauge WinTV HVR 850 (em2883)[2040:651f]
- 61 - Kaiomy TVnPC U2 (em2860)[eb1a:e303]
61 - Pixelview PlayTV Box 4 USB 2.0 (em2820/em2840)
62 - Gadmei TVR200(em2820/em2840)
+ 63 - Kaiomy TVnPC U2 (em2860)[eb1a:e303]
+ 64 - Easy Cap Capture DC-60 (em2860)
diff -r 844767f3721e -r b07848302e6c
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Wed Feb 11 15:15:14
2009 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Wed Feb 11 15:18:36
2009 -0200
@@ -1344,7 +1344,22 @@ struct em28xx_board em28xx_boards[] = {
.type = EM28XX_RADIO,
.amux = EM28XX_AMUX_LINE_IN,
}
- }
+ },
+ [EM2860_BOARD_EASYCAP] = {
+ .name = Easy Cap Capture DC-60,
+ .vchannels= 2,
+ .tuner_type = TUNER_ABSENT,
+ .decoder = EM28XX_SAA711X,
+ .input = { {
+ .type = EM28XX_VMUX_COMPOSITE1,
+ .vmux = SAA7115_COMPOSITE0,
+ .amux = EM28XX_AMUX_LINE_IN,
+ }, {
+ .type = EM28XX_VMUX_SVIDEO,
+ .vmux = SAA7115_SVIDEO3,
+ .amux = EM28XX_AMUX_LINE_IN,
+ } },
+ },
};
const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
@@ -1637,6 +1652,10 @@ void em28xx_pre_card_setup(struct em28xx
em28xx_write_regs(dev, 0x08, \x6b, 1);
break;
+ case EM2860_BOARD_EASYCAP:
+ em28xx_write_regs(dev, 0x08, \xf8, 1);
+ break;
+
}
em28xx_gpio_set(dev, dev-board.tuner_gpio);
diff -r 844767f3721e -r b07848302e6c linux/drivers/media/video/em28xx/em28xx.h
--- a/linux/drivers/media/video/em28xx/em28xx.h Wed Feb 11 15:15:14 2009 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx.h Wed Feb 11 15:18:36 2009 -0200
@@ -100,7 +100,8 @@
#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 60
#define EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB261
#define EM2820_BOARD_GADMEI_TVR200 62
-#define EM2860_BOARD_KAIOMY_TVNPC_U2 61
+#define EM2860_BOARD_KAIOMY_TVNPC_U2 63
+#define EM2860_BOARD_EASYCAP 64
/* Limits minimum and default number of buffers */
#define EM28XX_MIN_BUF 4
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/b07848302e6c4edd282e1b6d2d4ea52687a764bf
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] em28xx: Add support for Kaiomy TVnPC U2 stick
The patch number 10514 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
em28xx: Add support for Kaiomy TVnPC U2 stick
Thanks to Peter Senna Tschudin peter.se...@gmail.com for borrow me one
of those devices.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/Documentation/video4linux/CARDLIST.em28xx |1
linux/drivers/media/video/em28xx/em28xx-cards.c | 43
linux/drivers/media/video/em28xx/em28xx.h |1
3 files changed, 45 insertions(+)
diff -r 960985ba30c6 -r 74fd56daf383
linux/Documentation/video4linux/CARDLIST.em28xx
--- a/linux/Documentation/video4linux/CARDLIST.em28xx Tue Feb 10 21:31:59
2009 +0100
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx Wed Feb 11 15:13:20
2009 -0200
@@ -57,5 +57,6 @@
57 - Kworld PlusTV HD Hybrid 330 (em2883)[eb1a:a316]
58 - Compro VideoMate ForYou/Stereo (em2820/em2840) [185b:2041]
60 - Hauppauge WinTV HVR 850 (em2883)[2040:651f]
+ 61 - Kaiomy TVnPC U2 (em2860)[eb1a:e303]
61 - Pixelview PlayTV Box 4 USB 2.0 (em2820/em2840)
62 - Gadmei TVR200(em2820/em2840)
diff -r 960985ba30c6 -r 74fd56daf383
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Tue Feb 10 21:31:59
2009 +0100
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Wed Feb 11 15:13:20
2009 -0200
@@ -1317,6 +1317,33 @@ struct em28xx_board em28xx_boards[] = {
.amux = EM28XX_AMUX_LINE_IN,
} },
},
+ [EM2860_BOARD_KAIOMY_TVNPC_U2] = {
+ .name = Kaiomy TVnPC U2,
+ .vchannels= 3,
+ .tuner_type = TUNER_XC2028,
+ .tuner_addr = 0x61,
+ .mts_firmware = 1,
+ .decoder = EM28XX_TVP5150,
+ .tuner_gpio = default_tuner_gpio,
+ .input = { {
+ .type = EM28XX_VMUX_TELEVISION,
+ .vmux = TVP5150_COMPOSITE0,
+ .amux = EM28XX_AMUX_VIDEO,
+
+ }, {
+ .type = EM28XX_VMUX_COMPOSITE1,
+ .vmux = TVP5150_COMPOSITE1,
+ .amux = EM28XX_AMUX_LINE_IN,
+ }, {
+ .type = EM28XX_VMUX_SVIDEO,
+ .vmux = TVP5150_SVIDEO,
+ .amux = EM28XX_AMUX_LINE_IN,
+ } },
+ .radio = {
+ .type = EM28XX_RADIO,
+ .amux = EM28XX_AMUX_LINE_IN,
+ }
+ }
};
const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
@@ -1344,6 +1371,8 @@ struct usb_device_id em28xx_id_table []
.driver_info = EM2820_BOARD_UNKNOWN },
{ USB_DEVICE(0xeb1a, 0xe300),
.driver_info = EM2861_BOARD_KWORLD_PVRTV_300U },
+ { USB_DEVICE(0xeb1a, 0xe303),
+ .driver_info = EM2860_BOARD_KAIOMY_TVNPC_U2 },
{ USB_DEVICE(0xeb1a, 0xe305),
.driver_info = EM2880_BOARD_KWORLD_DVB_305U },
{ USB_DEVICE(0xeb1a, 0xe310),
@@ -1593,6 +1622,20 @@ void em28xx_pre_card_setup(struct em28xx
/* enables audio for that devices */
em28xx_write_reg(dev, EM28XX_R08_GPIO, 0xfd);
break;
+
+ case EM2860_BOARD_KAIOMY_TVNPC_U2:
+ em28xx_write_regs(dev, EM28XX_R0F_XCLK, \x07, 1);
+ em28xx_write_regs(dev, EM28XX_R06_I2C_CLK, \x40, 1);
+ em28xx_write_regs(dev, 0x0d, \x42, 1);
+ em28xx_write_regs(dev, 0x08, \xfd, 1);
+ msleep(10);
+ em28xx_write_regs(dev, 0x08, \xff, 1);
+ msleep(10);
+ em28xx_write_regs(dev, 0x08, \x7f, 1);
+ msleep(10);
+ em28xx_write_regs(dev, 0x08, \x6b, 1);
+
+ break;
}
em28xx_gpio_set(dev, dev-board.tuner_gpio);
diff -r 960985ba30c6 -r 74fd56daf383 linux/drivers/media/video/em28xx/em28xx.h
--- a/linux/drivers/media/video/em28xx/em28xx.h Tue Feb 10 21:31:59 2009 +0100
+++ b/linux/drivers/media/video/em28xx/em28xx.h Wed Feb 11 15:13:20 2009 -0200
@@ -100,6 +100,7 @@
#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 60
#define EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB261
#define
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~dougsland/v4l2-em28xx
The patch number 10526 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~dougsland/v4l2-em28xx
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/Documentation/video4linux/CARDLIST.em28xx |2
linux/drivers/media/video/em28xx/em28xx-audio.c | 86
linux/drivers/media/video/em28xx/em28xx-cards.c | 26 ++--
linux/drivers/media/video/em28xx/em28xx-core.c | 32 -
linux/drivers/media/video/em28xx/em28xx-i2c.c |6 -
linux/drivers/media/video/em28xx/em28xx-video.c | 43
linux/drivers/media/video/em28xx/em28xx.h | 12 +-
7 files changed, 119 insertions(+), 88 deletions(-)
diff -r b07848302e6c -r b7d4dc653623
linux/Documentation/video4linux/CARDLIST.em28xx
--- a/linux/Documentation/video4linux/CARDLIST.em28xx Wed Feb 11 15:18:36
2009 -0200
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx Thu Feb 12 08:17:46
2009 -0200
@@ -7,7 +7,7 @@
6 - Terratec Cinergy 200 USB (em2800)
7 - Leadtek Winfast USB II (em2800)[0413:6023]
8 - Kworld USB2800 (em2800)
- 9 - Pinnacle Dazzle DVC 90/DVC 100 (em2820/em2840)
[2304:0207,2304:021a]
+ 9 - Pinnacle Dazzle DVC 90/DVC 100/DVC 101 (em2820/em2840)
[2304:0207,2304:021a]
10 - Hauppauge WinTV HVR 900 (em2880)[2040:6500]
11 - Terratec Hybrid XS (em2880)[0ccd:0042]
12 - Kworld PVR TV 2800 RF(em2820/em2840)
diff -r b07848302e6c -r b7d4dc653623
linux/drivers/media/video/em28xx/em28xx-audio.c
--- a/linux/drivers/media/video/em28xx/em28xx-audio.c Wed Feb 11 15:18:36
2009 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-audio.c Thu Feb 12 08:17:46
2009 -0200
@@ -57,16 +57,17 @@ MODULE_PARM_DESC(debug, activates debug
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
-static int em28xx_isoc_audio_deinit(struct em28xx *dev)
+static int em28xx_deinit_isoc_audio(struct em28xx *dev)
{
int i;
dprintk(Stopping isoc\n);
- for (i = 0; i dev-isoc_ctl.num_bufs; i++) {
+ for (i = 0; i EM28XX_AUDIO_BUFS; i++) {
if (!irqs_disabled())
usb_kill_urb(dev-adev.urb[i]);
else
usb_unlink_urb(dev-adev.urb[i]);
+
usb_free_urb(dev-adev.urb[i]);
dev-adev.urb[i] = NULL;
@@ -74,7 +75,6 @@ static int em28xx_isoc_audio_deinit(stru
dev-adev.transfer_buffer[i] = NULL;
}
- dev-isoc_ctl.num_bufs = 0;
return 0;
}
@@ -101,6 +101,20 @@ static void em28xx_audio_isocirq(struct
struct snd_pcm_substream *substream;
struct snd_pcm_runtime *runtime;
#endif
+
+ switch (urb-status) {
+ case 0: /* success */
+ case -ETIMEDOUT:/* NAK */
+ break;
+ case -ECONNRESET: /* kill */
+ case -ENOENT:
+ case -ESHUTDOWN:
+ return;
+ default:/* error */
+ dprintk(urb completition error %d.\n, urb-status);
+ break;
+ }
+
if (dev-adev.capture_pcm_substream) {
substream = dev-adev.capture_pcm_substream;
runtime = substream-runtime;
@@ -160,9 +174,6 @@ static void em28xx_audio_isocirq(struct
}
urb-status = 0;
- if (dev-adev.shutdown)
- return;
-
status = usb_submit_urb(urb, GFP_ATOMIC);
if (status 0) {
em28xx_errdev(resubmit of audio urb failed (error=%i)\n,
@@ -178,8 +189,6 @@ static int em28xx_init_audio_isoc(struct
EM28XX_AUDIO_MAX_PACKET_SIZE;
dprintk(Starting isoc transfers\n);
-
- dev-isoc_ctl.num_bufs = 0;
for (i = 0; i EM28XX_AUDIO_BUFS; i++) {
struct urb *urb;
@@ -222,19 +231,9 @@ static int em28xx_init_audio_isoc(struct
for (i = 0; i EM28XX_AUDIO_BUFS; i++) {
errCode = usb_submit_urb(dev-adev.urb[i], GFP_ATOMIC);
if (errCode) {
- if (dev-isoc_ctl.num_bufs == 0) {
- usb_free_urb(dev-adev.urb[i]);
- dev-adev.urb[i] = NULL;
- kfree(dev-adev.transfer_buffer[i]);
- dev-adev.transfer_buffer[i] = NULL;
- } else
- em28xx_isoc_audio_deinit(dev);
-
[linuxtv-commits] [hg:v4l-dvb] tuner: fix TUV1236D analog/digital setup
The patch number 10527 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
tuner: fix TUV1236D analog/digital setup
As reported by David Engel da...@istwok.net, ATSC115 doesn't work
fine with mythtv. This software opens both analog and dvb interfaces of
saa7134.
What happens is that some tuner commands are going to the wrong place,
as shown at the logs:
Feb 12 20:37:48 opus kernel: tuner-simple 1-0061: using tuner params #0 (ntsc)
Feb 12 20:37:48 opus kernel: tuner-simple 1-0061: freq = 67.25 (1076), range =
0, config = 0xce, cb = 0x01
Feb 12 20:37:48 opus kernel: tuner-simple 1-0061: Freq= 67.25 MHz, V_IF=45.75
MHz, Offset=0.00 MHz, div=1808
Feb 12 20:37:48 opus kernel: tuner 1-0061: tv freq set to 67.25
Feb 12 20:37:48 opus kernel: tuner-simple 1-000a: using tuner params #0 (ntsc)
Feb 12 20:37:48 opus kernel: tuner-simple 1-000a: freq = 67.25 (1076), range =
0, config = 0xce, cb = 0x01
Feb 12 20:37:48 opus kernel: tuner-simple 1-000a: Freq= 67.25 MHz, V_IF=45.75
MHz, Offset=0.00 MHz, div=1808
Feb 12 20:37:48 opus kernel: tuner-simple 1-000a: tv 0x07 0x10 0xce 0x01
Feb 12 20:37:48 opus kernel: tuner-simple 1-0061: tv 0x07 0x10 0xce 0x01
This happens due to a hack at TUV1236D analog setup, where it replaces
tuner address, at 0x61 for 0x0a, in order to save a few memory bytes.
The code assumes that nobody else would try to access the tuner during
that setup, but the point is that there's no lock to protect such
access. So, this opens the possibility of race conditions to happen.
Instead of hacking tuner address, this patch uses a temporary var with
the proper tuner value to be used during the setup. This should save
the issue, although we should consider to write some analog/digital
lock at saa7134 driver.
Priority: high
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/common/tuners/tuner-simple.c | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff -r b7d4dc653623 -r 34ec729ed1a7
linux/drivers/media/common/tuners/tuner-simple.c
--- a/linux/drivers/media/common/tuners/tuner-simple.c Thu Feb 12 08:17:46
2009 -0200
+++ b/linux/drivers/media/common/tuners/tuner-simple.c Fri Feb 13 09:24:34
2009 -0200
@@ -325,7 +325,6 @@ static int simple_std_setup(struct dvb_f
u8 *config, u8 *cb)
{
struct tuner_simple_priv *priv = fe-tuner_priv;
- u8 tuneraddr;
int rc;
/* tv norm specific stuff for multi-norm tuners */
@@ -394,6 +393,7 @@ static int simple_std_setup(struct dvb_f
case TUNER_PHILIPS_TUV1236D:
{
+ struct tuner_i2c_props i2c = priv-i2c_props;
/* 0x40 - ATSC antenna input 1 */
/* 0x48 - ATSC antenna input 2 */
/* 0x00 - NTSC antenna input 1 */
@@ -405,17 +405,15 @@ static int simple_std_setup(struct dvb_f
buffer[1] = 0x04;
}
/* set to the correct mode (analog or digital) */
- tuneraddr = priv-i2c_props.addr;
- priv-i2c_props.addr = 0x0a;
- rc = tuner_i2c_xfer_send(priv-i2c_props, buffer[0], 2);
+ i2c.addr = 0x0a;
+ rc = tuner_i2c_xfer_send(i2c, buffer[0], 2);
if (2 != rc)
tuner_warn(i2c i/o error: rc == %d
(should be 2)\n, rc);
- rc = tuner_i2c_xfer_send(priv-i2c_props, buffer[2], 2);
+ rc = tuner_i2c_xfer_send(i2c, buffer[2], 2);
if (2 != rc)
tuner_warn(i2c i/o error: rc == %d
(should be 2)\n, rc);
- priv-i2c_props.addr = tuneraddr;
break;
}
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/34ec729ed1a776bd2afaf9433302126e1b65bdfb
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-rds
The patch number 10541 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-rds
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/cx2341x.c |2
linux/drivers/media/video/saa6588.c | 209 +-
linux/include/media/v4l2-chip-ident.h |3
3 files changed, 114 insertions(+), 100 deletions(-)
diff -r 597ef8287239 -r 9a8fa2bd8bd7 linux/drivers/media/video/cx2341x.c
--- a/linux/drivers/media/video/cx2341x.c Fri Feb 13 11:31:03 2009 -0200
+++ b/linux/drivers/media/video/cx2341x.c Fri Feb 13 11:35:32 2009 -0200
@@ -46,12 +46,12 @@ const u32 cx2341x_mpeg_ctrls[] = {
V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ,
V4L2_CID_MPEG_AUDIO_ENCODING,
V4L2_CID_MPEG_AUDIO_L2_BITRATE,
- V4L2_CID_MPEG_AUDIO_AC3_BITRATE,
V4L2_CID_MPEG_AUDIO_MODE,
V4L2_CID_MPEG_AUDIO_MODE_EXTENSION,
V4L2_CID_MPEG_AUDIO_EMPHASIS,
V4L2_CID_MPEG_AUDIO_CRC,
V4L2_CID_MPEG_AUDIO_MUTE,
+ V4L2_CID_MPEG_AUDIO_AC3_BITRATE,
V4L2_CID_MPEG_VIDEO_ENCODING,
V4L2_CID_MPEG_VIDEO_ASPECT,
V4L2_CID_MPEG_VIDEO_B_FRAMES,
diff -r 597ef8287239 -r 9a8fa2bd8bd7 linux/drivers/media/video/saa6588.c
--- a/linux/drivers/media/video/saa6588.c Fri Feb 13 11:31:03 2009 -0200
+++ b/linux/drivers/media/video/saa6588.c Fri Feb 13 11:35:32 2009 -0200
@@ -32,6 +32,9 @@
#include asm/uaccess.h
#include media/rds.h
+#include media/v4l2-device.h
+#include media/v4l2-chip-ident.h
+#include media/v4l2-i2c-drv-legacy.h
#include compat.h
/* Addresses to scan */
@@ -73,7 +76,7 @@ MODULE_LICENSE(GPL);
#define dprintk if (debug) printk
struct saa6588 {
- struct i2c_client client;
+ struct v4l2_subdev sd;
struct work_struct work;
struct timer_list timer;
spinlock_t lock;
@@ -87,8 +90,10 @@ struct saa6588 {
int data_available_for_read;
};
-static struct i2c_driver driver;
-static struct i2c_client client_template;
+static inline struct saa6588 *to_saa6588(struct v4l2_subdev *sd)
+{
+ return container_of(sd, struct saa6588, sd);
+}
/* -- */
@@ -259,6 +264,7 @@ static void block_to_buf(struct saa6588
static void saa6588_i2c_poll(struct saa6588 *s)
{
+ struct i2c_client *client = v4l2_get_subdevdata(s-sd);
unsigned long flags;
unsigned char tmpbuf[6];
unsigned char blocknum;
@@ -266,7 +272,7 @@ static void saa6588_i2c_poll(struct saa6
/* Although we only need 3 bytes, we have to read at least 6.
SAA6588 returns garbage otherwise */
- if (6 != i2c_master_recv(s-client, tmpbuf[0], 6)) {
+ if (6 != i2c_master_recv(client, tmpbuf[0], 6)) {
if (debug 1)
dprintk(PREFIX read error!\n);
return;
@@ -342,6 +348,7 @@ static void saa6588_work(struct work_str
static int saa6588_configure(struct saa6588 *s)
{
+ struct i2c_client *client = v4l2_get_subdevdata(s-sd);
unsigned char buf[3];
int rc;
@@ -389,7 +396,8 @@ static int saa6588_configure(struct saa6
dprintk(PREFIX writing: 0w=0x%02x 1w=0x%02x 2w=0x%02x\n,
buf[0], buf[1], buf[2]);
- if (3 != (rc = i2c_master_send(s-client, buf, 3)))
+ rc = i2c_master_send(client, buf, 3);
+ if (rc != 3)
printk(PREFIX i2c i/o error: rc == %d (should be 3)\n, rc);
return 0;
@@ -397,38 +405,101 @@ static int saa6588_configure(struct saa6
/* -- */
-static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
+static long saa6588_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
+{
+ struct saa6588 *s = to_saa6588(sd);
+ struct rds_command *a = arg;
+
+ switch (cmd) {
+ /* --- open() for /dev/radio --- */
+ case RDS_CMD_OPEN:
+ a-result = 0; /* return error if chip doesn't work ??? */
+ break;
+ /* --- close() for /dev/radio --- */
+ case RDS_CMD_CLOSE:
+ s-data_available_for_read = 1;
+ wake_up_interruptible(s-read_queue);
+ a-result = 0;
+ break;
+ /* --- read() for /dev/radio --- */
+ case RDS_CMD_READ:
+ read_from_buf(s, a);
+ break;
+ /* --- poll() for
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
The patch number 10543 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/v4l2-subdev.c |4
linux/include/media/v4l2-common.h |3 +++
linux/include/media/v4l2-subdev.h |2 ++
3 files changed, 9 insertions(+)
diff -r 9a8fa2bd8bd7 -r 84cbcf049b92 linux/drivers/media/video/v4l2-subdev.c
--- a/linux/drivers/media/video/v4l2-subdev.c Fri Feb 13 11:35:32 2009 -0200
+++ b/linux/drivers/media/video/v4l2-subdev.c Fri Feb 13 18:19:36 2009 -0200
@@ -104,6 +104,10 @@ int v4l2_subdev_command(struct v4l2_subd
return v4l2_subdev_call(sd, video, g_fmt, arg);
case VIDIOC_INT_S_STD_OUTPUT:
return v4l2_subdev_call(sd, video, s_std_output, *(v4l2_std_id
*)arg);
+ case VIDIOC_QUERYSTD:
+ return v4l2_subdev_call(sd, video, querystd, arg);
+ case VIDIOC_INT_G_INPUT_STATUS:
+ return v4l2_subdev_call(sd, video, g_input_status, arg);
case VIDIOC_STREAMON:
return v4l2_subdev_call(sd, video, s_stream, 1);
case VIDIOC_STREAMOFF:
diff -r 9a8fa2bd8bd7 -r 84cbcf049b92 linux/include/media/v4l2-common.h
--- a/linux/include/media/v4l2-common.h Fri Feb 13 11:35:32 2009 -0200
+++ b/linux/include/media/v4l2-common.h Fri Feb 13 18:19:36 2009 -0200
@@ -297,4 +297,7 @@ struct v4l2_crystal_freq {
a v4l2_gpio struct if a direction is also needed. */
#define VIDIOC_INT_S_GPIO _IOW('d', 117, u32)
+/* Get input status. Same as the status field in the v4l2_input struct. */
+#define VIDIOC_INT_G_INPUT_STATUS _IOR('d', 118, u32)
+
#endif /* V4L2_COMMON_H_ */
diff -r 9a8fa2bd8bd7 -r 84cbcf049b92 linux/include/media/v4l2-subdev.h
--- a/linux/include/media/v4l2-subdev.h Fri Feb 13 11:35:32 2009 -0200
+++ b/linux/include/media/v4l2-subdev.h Fri Feb 13 18:19:36 2009 -0200
@@ -115,6 +115,8 @@ struct v4l2_subdev_video_ops {
int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data
*vbi_data);
int (*g_sliced_vbi_cap)(struct v4l2_subdev *sd, struct
v4l2_sliced_vbi_cap *cap);
int (*s_std_output)(struct v4l2_subdev *sd, v4l2_std_id std);
+ int (*querystd)(struct v4l2_subdev *sd, v4l2_std_id *std);
+ int (*g_input_status)(struct v4l2_subdev *sd, u32 *status);
int (*s_stream)(struct v4l2_subdev *sd, int enable);
int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
int (*g_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/84cbcf049b92c9caffe00bde5ccdaa36e7e4c8bc
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-rds
The patch number 10545 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-rds
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/cx18/cx18-controls.c |1 +
linux/drivers/media/video/cx2341x.c |1 +
linux/drivers/media/video/cx23885/cx23885-video.c |1 +
linux/drivers/media/video/cx88/cx88-video.c |1 +
linux/drivers/media/video/ivtv/ivtv-controls.c |1 +
linux/drivers/media/video/saa7134/saa7134-empress.c |2 ++
linux/drivers/media/video/v4l2-common.c |2 +-
linux/include/media/v4l2-common.h |5 +
8 files changed, 13 insertions(+), 1 deletion(-)
diff -r 84cbcf049b92 -r 136dc4d0e38a
linux/drivers/media/video/cx18/cx18-controls.c
--- a/linux/drivers/media/video/cx18/cx18-controls.cFri Feb 13 18:19:36
2009 -0200
+++ b/linux/drivers/media/video/cx18/cx18-controls.cFri Feb 13 18:21:14
2009 -0200
@@ -30,6 +30,7 @@
#include cx18-mailbox.h
#include cx18-controls.h
+/* Must be sorted from low to high control ID! */
static const u32 user_ctrls[] = {
V4L2_CID_USER_CLASS,
V4L2_CID_BRIGHTNESS,
diff -r 84cbcf049b92 -r 136dc4d0e38a linux/drivers/media/video/cx2341x.c
--- a/linux/drivers/media/video/cx2341x.c Fri Feb 13 18:19:36 2009 -0200
+++ b/linux/drivers/media/video/cx2341x.c Fri Feb 13 18:21:14 2009 -0200
@@ -39,6 +39,7 @@ module_param(debug, int, 0644);
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, Debug level (0-1));
+/* Must be sorted from low to high control ID! */
const u32 cx2341x_mpeg_ctrls[] = {
V4L2_CID_MPEG_CLASS,
V4L2_CID_MPEG_STREAM_TYPE,
diff -r 84cbcf049b92 -r 136dc4d0e38a
linux/drivers/media/video/cx23885/cx23885-video.c
--- a/linux/drivers/media/video/cx23885/cx23885-video.c Fri Feb 13 18:19:36
2009 -0200
+++ b/linux/drivers/media/video/cx23885/cx23885-video.c Fri Feb 13 18:21:14
2009 -0200
@@ -276,6 +276,7 @@ static struct cx23885_ctrl cx23885_ctls[
};
static const int CX23885_CTLS = ARRAY_SIZE(cx23885_ctls);
+/* Must be sorted from low to high control ID! */
static const u32 cx23885_user_ctrls[] = {
V4L2_CID_USER_CLASS,
V4L2_CID_BRIGHTNESS,
diff -r 84cbcf049b92 -r 136dc4d0e38a linux/drivers/media/video/cx88/cx88-video.c
--- a/linux/drivers/media/video/cx88/cx88-video.c Fri Feb 13 18:19:36
2009 -0200
+++ b/linux/drivers/media/video/cx88/cx88-video.c Fri Feb 13 18:21:14
2009 -0200
@@ -299,6 +299,7 @@ static struct cx88_ctrl cx8800_ctls[] =
};
static const int CX8800_CTLS = ARRAY_SIZE(cx8800_ctls);
+/* Must be sorted from low to high control ID! */
const u32 cx88_user_ctrls[] = {
V4L2_CID_USER_CLASS,
V4L2_CID_BRIGHTNESS,
diff -r 84cbcf049b92 -r 136dc4d0e38a
linux/drivers/media/video/ivtv/ivtv-controls.c
--- a/linux/drivers/media/video/ivtv/ivtv-controls.cFri Feb 13 18:19:36
2009 -0200
+++ b/linux/drivers/media/video/ivtv/ivtv-controls.cFri Feb 13 18:21:14
2009 -0200
@@ -26,6 +26,7 @@
#include ivtv-mailbox.h
#include ivtv-controls.h
+/* Must be sorted from low to high control ID! */
static const u32 user_ctrls[] = {
V4L2_CID_USER_CLASS,
V4L2_CID_BRIGHTNESS,
diff -r 84cbcf049b92 -r 136dc4d0e38a
linux/drivers/media/video/saa7134/saa7134-empress.c
--- a/linux/drivers/media/video/saa7134/saa7134-empress.c Fri Feb 13
18:19:36 2009 -0200
+++ b/linux/drivers/media/video/saa7134/saa7134-empress.c Fri Feb 13
18:21:14 2009 -0200
@@ -352,6 +352,7 @@ static int empress_queryctrl(struct file
static int empress_queryctrl(struct file *file, void *priv,
struct v4l2_queryctrl *c)
{
+ /* Must be sorted from low to high control ID! */
static const u32 user_ctrls[] = {
V4L2_CID_USER_CLASS,
V4L2_CID_BRIGHTNESS,
@@ -364,6 +365,7 @@ static int empress_queryctrl(struct file
0
};
+ /* Must be sorted from low to high control ID! */
static const u32 mpeg_ctrls[] = {
V4L2_CID_MPEG_CLASS,
V4L2_CID_MPEG_STREAM_TYPE,
diff -r 84cbcf049b92 -r 136dc4d0e38a linux/drivers/media/video/v4l2-common.c
--- a/linux/drivers/media/video/v4l2-common.c Fri Feb 13 18:19:36 2009 -0200
+++ b/linux/drivers/media/video/v4l2-common.c Fri Feb 13 18:21:14 2009 -0200
@@ -750,7 +750,7 @@ EXPORT_SYMBOL(v4l2_ctrl_query_menu_valid
/* ctrl_classes points to an array of u32 pointers, the last
[linuxtv-commits] [hg:v4l-dvb] displays a line syntax for tree merge
The patch number 10546 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com displays a line syntax for tree merge This is useful to do a cut-and-paste if all patches are ok Priority: normal Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- hgimport |3 +++ 1 file changed, 3 insertions(+) diff -r 136dc4d0e38a -r 20c490751ac4 hgimport --- a/hgimport Fri Feb 13 18:21:14 2009 -0200 +++ b/hgimport Fri Feb 13 18:29:23 2009 -0200 @@ -104,3 +104,6 @@ done echo To cherry pick all files, you can do something like: echo for i in $TMP/*.patch; do ./mailimport \$i; done +echo To merge it, the better is to do: +echo hg pull $1; hg merge hg commit make hg push + --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/20c490751ac49f1aff80307407ca01bfd20650a9 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-lib
The patch number 10553 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-lib Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- .hgignore | 12 v4l2-apps/Makefile |3 v4l2-apps/lib/COPYING.LIB | 510 -- v4l2-apps/lib/Makefile | 33 v4l2-apps/lib/TODO | 81 v4l2-apps/lib/frequencies.c | 1502 -- v4l2-apps/lib/libv4l/COPYING.LIB| 510 -- v4l2-apps/lib/libv4l/ChangeLog | 247 - v4l2-apps/lib/libv4l/Makefile | 16 v4l2-apps/lib/libv4l/README | 141 v4l2-apps/lib/libv4l/README.multi-threading | 12 v4l2-apps/lib/libv4l/TODO | 12 v4l2-apps/lib/libv4l/include/libv4l1.h | 73 v4l2-apps/lib/libv4l/include/libv4l2.h | 110 v4l2-apps/lib/libv4l/include/libv4lconvert.h| 88 v4l2-apps/lib/libv4l/libv4l1/Makefile | 83 v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h | 83 v4l2-apps/lib/libv4l/libv4l1/libv4l1.c | 837 --- v4l2-apps/lib/libv4l/libv4l1/log.c | 145 v4l2-apps/lib/libv4l/libv4l1/v4l1compat.c | 127 v4l2-apps/lib/libv4l/libv4l2/Makefile | 82 v4l2-apps/lib/libv4l/libv4l2/libv4l2-priv.h | 95 v4l2-apps/lib/libv4l/libv4l2/libv4l2.c | 1145 v4l2-apps/lib/libv4l/libv4l2/log.c | 148 v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c | 166 v4l2-apps/lib/libv4l/libv4lconvert/Makefile | 70 v4l2-apps/lib/libv4l/libv4lconvert/bayer.c | 613 -- v4l2-apps/lib/libv4l/libv4lconvert/flip.c | 107 v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c | 286 - v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert-priv.h | 166 v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert.c | 737 -- v4l2-apps/lib/libv4l/libv4lconvert/pac207.c | 418 - v4l2-apps/lib/libv4l/libv4lconvert/rgbyuv.c | 316 - v4l2-apps/lib/libv4l/libv4lconvert/sn9c10x.c| 287 - v4l2-apps/lib/libv4l/libv4lconvert/spca501.c| 126 v4l2-apps/lib/libv4l/libv4lconvert/spca561-decompress.c | 1003 v4l2-apps/lib/libv4l/libv4lconvert/tinyjpeg-internal.h | 121 v4l2-apps/lib/libv4l/libv4lconvert/tinyjpeg.c | 2463 -- v4l2-apps/lib/libv4l/libv4lconvert/tinyjpeg.h | 74 v4l2-apps/lib/v4l2.h| 45 v4l2-apps/lib/v4l2_driver.c | 804 --- v4l2-apps/lib/v4l2_driver.h | 81 v4l2-apps/libv4l/COPYING.LIB| 510 ++ v4l2-apps/libv4l/ChangeLog | 247 + v4l2-apps/libv4l/Makefile | 16 v4l2-apps/libv4l/README | 141 v4l2-apps/libv4l/README.multi-threading | 12 v4l2-apps/libv4l/TODO | 12 v4l2-apps/libv4l/include/libv4l1.h | 73 v4l2-apps/libv4l/include/libv4l2.h | 110 v4l2-apps/libv4l/include/libv4lconvert.h| 88 v4l2-apps/libv4l/libv4l1/Makefile | 83 v4l2-apps/libv4l/libv4l1/libv4l1-priv.h | 83 v4l2-apps/libv4l/libv4l1/libv4l1.c | 837 +++ v4l2-apps/libv4l/libv4l1/log.c | 145 v4l2-apps/libv4l/libv4l1/v4l1compat.c | 127 v4l2-apps/libv4l/libv4l2/Makefile | 82 v4l2-apps/libv4l/libv4l2/libv4l2-priv.h | 95 v4l2-apps/libv4l/libv4l2/libv4l2.c | 1145 v4l2-apps/libv4l/libv4l2/log.c | 148 v4l2-apps/libv4l/libv4l2/v4l2convert.c | 166 v4l2-apps/libv4l/libv4lconvert/Makefile | 70 v4l2-apps/libv4l/libv4lconvert/bayer.c | 613 ++ v4l2-apps/libv4l/libv4lconvert/flip.c | 107 v4l2-apps/libv4l/libv4lconvert/jidctflt.c | 286 + v4l2-apps/libv4l/libv4lconvert/libv4lconvert-priv.h | 166
[linuxtv-commits] [hg:v4l-dvb] hgimport: only merge if pull returns without any error
The patch number 10554 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com hgimport: only merge if pull returns without any error Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- hgimport |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -r e53bc92415bc -r a86bbf918942 hgimport --- a/hgimport Fri Feb 13 18:29:48 2009 -0200 +++ b/hgimport Fri Feb 13 18:30:45 2009 -0200 @@ -105,5 +105,4 @@ echo To cherry pick all files, you can d echo To cherry pick all files, you can do something like: echo for i in $TMP/*.patch; do ./mailimport \$i; done echo To merge it, the better is to do: -echo hg pull $1; hg merge hg commit make hg push - +echo hg pull $1 hg merge hg commit make hg push --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/a86bbf918942ef80bb1b014576caa5217cc6351b ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~dougsland/em28xx/
The patch number 10557 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~dougsland/em28xx/
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/Documentation/video4linux/CARDLIST.em28xx |2 +-
linux/drivers/media/video/em28xx/em28xx-audio.c | 10 ++
linux/drivers/media/video/em28xx/em28xx-cards.c |2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff -r a86bbf918942 -r 5a1a09b5abc1
linux/Documentation/video4linux/CARDLIST.em28xx
--- a/linux/Documentation/video4linux/CARDLIST.em28xx Fri Feb 13 18:30:45
2009 -0200
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx Fri Feb 13 18:33:35
2009 -0200
@@ -7,7 +7,7 @@
6 - Terratec Cinergy 200 USB (em2800)
7 - Leadtek Winfast USB II (em2800)[0413:6023]
8 - Kworld USB2800 (em2800)
- 9 - Pinnacle Dazzle DVC 90/DVC 100/DVC 101 (em2820/em2840)
[2304:0207,2304:021a]
+ 9 - Pinnacle Dazzle DVC 90/DVC 100/DVC 101/DVC 107 (em2820/em2840)
[2304:0207,2304:021a]
10 - Hauppauge WinTV HVR 900 (em2880)[2040:6500]
11 - Terratec Hybrid XS (em2880)[0ccd:0042]
12 - Kworld PVR TV 2800 RF(em2820/em2840)
diff -r a86bbf918942 -r 5a1a09b5abc1
linux/drivers/media/video/em28xx/em28xx-audio.c
--- a/linux/drivers/media/video/em28xx/em28xx-audio.c Fri Feb 13 18:30:45
2009 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-audio.c Fri Feb 13 18:33:35
2009 -0200
@@ -246,10 +246,12 @@ static int em28xx_cmd(struct em28xx *dev
switch (cmd) {
case EM28XX_CAPTURE_STREAM_EN:
- if (dev-adev.capture_stream == STREAM_OFF arg ==
EM28XX_START_AUDIO) {
+ if (dev-adev.capture_stream == STREAM_OFF
+ arg == EM28XX_START_AUDIO) {
dev-adev.capture_stream = STREAM_ON;
em28xx_init_audio_isoc(dev);
- } else if (dev-adev.capture_stream == STREAM_ON arg ==
EM28XX_STOP_AUDIO) {
+ } else if (dev-adev.capture_stream == STREAM_ON
+ arg == EM28XX_STOP_AUDIO) {
dev-adev.capture_stream = STREAM_OFF;
em28xx_deinit_isoc_audio(dev);
} else {
@@ -448,8 +450,8 @@ static int snd_em28xx_capture_trigger(st
struct em28xx *dev = snd_pcm_substream_chip(substream);
int retval;
- dprintk(Should %s capture\n, (cmd == SNDRV_PCM_TRIGGER_START)?
- start: stop);
+ dprintk(Should %s capture\n, (cmd == SNDRV_PCM_TRIGGER_START) ?
+ start : stop);
spin_lock(dev-adev.slock);
switch (cmd) {
diff -r a86bbf918942 -r 5a1a09b5abc1
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Fri Feb 13 18:30:45
2009 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Fri Feb 13 18:33:35
2009 -0200
@@ -957,7 +957,7 @@ struct em28xx_board em28xx_boards[] = {
} },
},
[EM2820_BOARD_PINNACLE_DVC_90] = {
- .name = Pinnacle Dazzle DVC 90/DVC 100/DVC 101,
+ .name = Pinnacle Dazzle DVC 90/DVC 100/DVC 101/DVC
107,
.tuner_type = TUNER_ABSENT, /* capture only board */
.decoder = EM28XX_SAA711X,
.input= { {
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/5a1a09b5abc1752c05282e82d02033e1128e7ad0
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~tap/bttv
The patch number 10569 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://linuxtv.org/hg/~tap/bttv Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/video/bt8xx/bttv-cards.c | 1417 +++--- linux/drivers/media/video/bt8xx/bttv-driver.c | 90 - linux/drivers/media/video/bt8xx/bttv-i2c.c|6 linux/drivers/media/video/bt8xx/bttv-if.c | 18 linux/drivers/media/video/bt8xx/bttv-risc.c |4 linux/drivers/media/video/bt8xx/bttv-vbi.c|2 linux/drivers/media/video/bt8xx/bttv.h| 80 - linux/drivers/media/video/bt8xx/bttvp.h | 19 8 files changed, 685 insertions(+), 951 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/647466b79930f1f5109c66a2e86898f14a58236a ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] v4l2-framework: documments videobuf usage on drivers
The patch number 10570 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com v4l2-framework: documments videobuf usage on drivers Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/Documentation/video4linux/v4l2-framework.txt | 92 - 1 file changed, 91 insertions(+), 1 deletion(-) diff -r 647466b79930 -r 6f4cff0e7f16 linux/Documentation/video4linux/v4l2-framework.txt --- a/linux/Documentation/video4linux/v4l2-framework.txtFri Feb 13 20:13:17 2009 -0200 +++ b/linux/Documentation/video4linux/v4l2-framework.txtSat Feb 14 08:29:07 2009 -0200 @@ -47,7 +47,9 @@ 3) Creating V4L2 device nodes (/dev/vide 3) Creating V4L2 device nodes (/dev/videoX, /dev/vbiX, /dev/radioX and /dev/vtxX) and keeping track of device-node specific data. -4) Filehandle-specific structs containing per-filehandle data. +4) Filehandle-specific structs containing per-filehandle data; + +5) video buffer handling. This is a rough schematic of how it all relates: @@ -525,3 +527,91 @@ You can go from a video_device struct to You can go from a video_device struct to the v4l2_device struct using: struct v4l2_device *v4l2_dev = vdev-v4l2_dev; + +video buffer helper functions +- + +The v4l2 core API provides a standard method for dealing with video +buffers. Those methods allow a driver to implement read(), mmap() and +overlay() on a consistent way. + +There are currently methods for using video buffers on devices that +supports DMA with scatter/gather method (videobuf-dma-sg), DMA with +linear access (videobuf-dma-contig), and vmalloced buffers, mostly +used on USB drivers (videobuf-vmalloc). + +Any driver using videobuf should provide operations (callbacks) for +four handlers: + +ops-buf_setup - calculates the size of the video buffers and avoid they + to waste more than some maximum limit of RAM; +ops-buf_prepare - fills the video buffer structs and calls + videobuf_iolock() to alloc and prepare mmaped memory; +ops-buf_queue - advices the driver that another buffer were + requested (by read() or by QBUF); +ops-buf_release - frees any buffer that were allocated. + +In order to use it, the driver need to have a code (generally called at +interrupt context) that will properly handle the buffer request lists, +announcing that a new buffer were filled. + +The irq handling code should handle the videobuf task lists, in order +to advice videobuf that a new frame were filled, in order to honor to a +request. The code is generally like this one: +if (list_empty(dma_q-active)) + return; + +buf = list_entry(dma_q-active.next, struct vbuffer, vb.queue); + +if (!waitqueue_active(buf-vb.done)) + return; + + /* Some logic to handle the buf may be needed here */ + +list_del(buf-vb.queue); +do_gettimeofday(buf-vb.ts); +wake_up(buf-vb.done); + +Those are the videobuffer functions used on drivers, implemented on +videobuf-core: + +- videobuf_queue_core_init() + Initializes the videobuf infrastructure. This function should be + called before any other videobuf function. + +- videobuf_iolock() + Prepares the videobuf memory for the proper method (read, mmap, overlay). + +- videobuf_queue_is_busy() + Checks if a videobuf is streaming. + +- videobuf_queue_cancel() + Stops video handling. + +- videobuf_mmap_free() + frees mmap buffers. + +- videobuf_stop() + Stops video handling, ends mmap and frees mmap and other buffers. + +- V4L2 api functions. Those functions correspond to VIDIOC_foo ioctls: + videobuf_reqbufs(), videobuf_querybuf(), videobuf_qbuf(), + videobuf_dqbuf(), videobuf_streamon(), videobuf_streamoff(). + +- V4L1 api function (corresponds to VIDIOCMBUF ioctl): + videobuf_cgmbuf() + This function is used to provide backward compatibility with V4L1 + API. + +- Some help functions for read()/poll() operations: + videobuf_read_stream() + For continuous stream read() + videobuf_read_one() + For snapshot read() + videobuf_poll_stream() + polling help function + +The better way to understand it is to take a look at vivi driver. One +of the main reasons for vivi is to be a videobuf usage example. the +vivi_thread_tick() does the task that the IRQ callback would do on PCI +drivers (or the irq callback on USB). --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/6f4cff0e7f16c015d39bd2b818cba27c371fda11
[linuxtv-commits] [hg:v4l-dvb] v4l2-framework.txt: Fixes the videobuf init functions
The patch number 10571 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com v4l2-framework.txt: Fixes the videobuf init functions Documents the driver usage functions, instead of the generic one used by the videobuf specific handlers. Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/Documentation/video4linux/v4l2-framework.txt | 18 ++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff -r 6f4cff0e7f16 -r 12a10f808bfd linux/Documentation/video4linux/v4l2-framework.txt --- a/linux/Documentation/video4linux/v4l2-framework.txtSat Feb 14 08:29:07 2009 -0200 +++ b/linux/Documentation/video4linux/v4l2-framework.txtSat Feb 14 08:51:28 2009 -0200 @@ -575,9 +575,21 @@ Those are the videobuffer functions used Those are the videobuffer functions used on drivers, implemented on videobuf-core: -- videobuf_queue_core_init() - Initializes the videobuf infrastructure. This function should be - called before any other videobuf function. +- Videobuf init functions + videobuf_queue_sg_init() + Initializes the videobuf infrastructure. This function should be + called before any other videobuf function on drivers that uses DMA + Scatter/Gather buffers. + + videobuf_queue_dma_contig_init + Initializes the videobuf infrastructure. This function should be + called before any other videobuf function on drivers that need DMA + contiguous buffers. + + videobuf_queue_vmalloc_init() + Initializes the videobuf infrastructure. This function should be + called before any other videobuf function on USB (and other drivers) + that need a vmalloced type of videobuf. - videobuf_iolock() Prepares the videobuf memory for the proper method (read, mmap, overlay). --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/12a10f808bfdd6d1f73bac536cb174e9973cf7e1 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] Revert changeset aa3e5cc1d833
The patch number 10572 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
Revert changeset aa3e5cc1d833
On Mon, 02 Feb 2009, Hartmut wrote:
This change set is wrong. The affected functions cannot be called from
an interrupt context, because they may process large buffers. In this
case, interrupts are disabled for a long time. Functions, like
dvb_dmx_swfilter_packets(), could be called only from a tasklet.
This change set does hide some strong design bugs in dm1105.c and
au0828-dvb.c.
Please revert this change set and do fix the bugs in dm1105.c and
au0828-dvb.c (and other files).
On Sun, 15 Feb 2009, Oliver Endriss wrote:
This changeset _must_ be reverted! It breaks all kernels since 2.6.27
for applications which use DVB and require a low interrupt latency.
It is a very bad idea to call the demuxer to process data buffers with
interrupts disabled!
On Mon, 16 Feb 2009, Trent Piepho wrote:
I agree, this is bad. The demuxer is far too much work to be done with
IRQs off. IMHO, even doing it under a spin-lock is excessive. It should
be a mutex. Drivers should use a work-queue to feed the demuxer.
Thank you for testing this changeset and discovering the issues on it.
Priority: high
CC: Trent Piepho xy...@speakeasy.org
CC: Hartmut e9h...@googlemail.com
CC: Oliver Endriss o.endr...@gmx.de
CC: Andreas Oberritter o...@linuxtv.org
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/dvb/dvb-core/dmxdev.c| 16 +++-
linux/drivers/media/dvb/dvb-core/dvb_demux.c | 16 ++--
2 files changed, 13 insertions(+), 19 deletions(-)
diff -r 12a10f808bfd -r 27aeed05d596 linux/drivers/media/dvb/dvb-core/dmxdev.c
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.c Sat Feb 14 08:51:28 2009 -0200
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c Mon Feb 16 15:27:44 2009 -0300
@@ -364,16 +364,15 @@ static int dvb_dmxdev_section_callback(c
enum dmx_success success)
{
struct dmxdev_filter *dmxdevfilter = filter-priv;
- unsigned long flags;
int ret;
if (dmxdevfilter-buffer.error) {
wake_up(dmxdevfilter-buffer.queue);
return 0;
}
- spin_lock_irqsave(dmxdevfilter-dev-lock, flags);
+ spin_lock(dmxdevfilter-dev-lock);
if (dmxdevfilter-state != DMXDEV_STATE_GO) {
- spin_unlock_irqrestore(dmxdevfilter-dev-lock, flags);
+ spin_unlock(dmxdevfilter-dev-lock);
return 0;
}
del_timer(dmxdevfilter-timer);
@@ -392,7 +391,7 @@ static int dvb_dmxdev_section_callback(c
}
if (dmxdevfilter-params.sec.flags DMX_ONESHOT)
dmxdevfilter-state = DMXDEV_STATE_DONE;
- spin_unlock_irqrestore(dmxdevfilter-dev-lock, flags);
+ spin_unlock(dmxdevfilter-dev-lock);
wake_up(dmxdevfilter-buffer.queue);
return 0;
}
@@ -404,12 +403,11 @@ static int dvb_dmxdev_ts_callback(const
{
struct dmxdev_filter *dmxdevfilter = feed-priv;
struct dvb_ringbuffer *buffer;
- unsigned long flags;
int ret;
- spin_lock_irqsave(dmxdevfilter-dev-lock, flags);
+ spin_lock(dmxdevfilter-dev-lock);
if (dmxdevfilter-params.pes.output == DMX_OUT_DECODER) {
- spin_unlock_irqrestore(dmxdevfilter-dev-lock, flags);
+ spin_unlock(dmxdevfilter-dev-lock);
return 0;
}
@@ -419,7 +417,7 @@ static int dvb_dmxdev_ts_callback(const
else
buffer = dmxdevfilter-dev-dvr_buffer;
if (buffer-error) {
- spin_unlock_irqrestore(dmxdevfilter-dev-lock, flags);
+ spin_unlock(dmxdevfilter-dev-lock);
wake_up(buffer-queue);
return 0;
}
@@ -430,7 +428,7 @@ static int dvb_dmxdev_ts_callback(const
dvb_ringbuffer_flush(buffer);
buffer-error = ret;
}
- spin_unlock_irqrestore(dmxdevfilter-dev-lock, flags);
+ spin_unlock(dmxdevfilter-dev-lock);
wake_up(buffer-queue);
return 0;
}
diff -r 12a10f808bfd -r 27aeed05d596
linux/drivers/media/dvb/dvb-core/dvb_demux.c
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.c Sat Feb 14 08:51:28
2009 -0200
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.c Mon Feb 16 15:27:44
2009 -0300
@@ -399,9 +399,7 @@ void dvb_dmx_swfilter_packets(struct dvb
void dvb_dmx_swfilter_packets(struct dvb_demux *demux, const u8 *buf,
size_t count)
[linuxtv-commits] [hg:v4l-dvb] v4l2-framework.txt: Whitespace clenups
The patch number 10573 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com v4l2-framework.txt: Whitespace clenups Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/Documentation/video4linux/v4l2-framework.txt | 52 ++--- 1 file changed, 26 insertions(+), 26 deletions(-) diff -r 27aeed05d596 -r b73e7bdad8c4 linux/Documentation/video4linux/v4l2-framework.txt --- a/linux/Documentation/video4linux/v4l2-framework.txtMon Feb 16 15:27:44 2009 -0300 +++ b/linux/Documentation/video4linux/v4l2-framework.txtMon Feb 16 15:54:29 2009 -0300 @@ -531,11 +531,11 @@ video buffer helper functions video buffer helper functions - -The v4l2 core API provides a standard method for dealing with video -buffers. Those methods allow a driver to implement read(), mmap() and +The v4l2 core API provides a standard method for dealing with video +buffers. Those methods allow a driver to implement read(), mmap() and overlay() on a consistent way. -There are currently methods for using video buffers on devices that +There are currently methods for using video buffers on devices that supports DMA with scatter/gather method (videobuf-dma-sg), DMA with linear access (videobuf-dma-contig), and vmalloced buffers, mostly used on USB drivers (videobuf-vmalloc). @@ -544,50 +544,50 @@ four handlers: four handlers: ops-buf_setup - calculates the size of the video buffers and avoid they - to waste more than some maximum limit of RAM; + to waste more than some maximum limit of RAM; ops-buf_prepare - fills the video buffer structs and calls videobuf_iolock() to alloc and prepare mmaped memory; ops-buf_queue - advices the driver that another buffer were - requested (by read() or by QBUF); + requested (by read() or by QBUF); ops-buf_release - frees any buffer that were allocated. In order to use it, the driver need to have a code (generally called at interrupt context) that will properly handle the buffer request lists, announcing that a new buffer were filled. -The irq handling code should handle the videobuf task lists, in order -to advice videobuf that a new frame were filled, in order to honor to a +The irq handling code should handle the videobuf task lists, in order +to advice videobuf that a new frame were filled, in order to honor to a request. The code is generally like this one: -if (list_empty(dma_q-active)) + if (list_empty(dma_q-active)) return; -buf = list_entry(dma_q-active.next, struct vbuffer, vb.queue); - -if (!waitqueue_active(buf-vb.done)) + buf = list_entry(dma_q-active.next, struct vbuffer, vb.queue); + + if (!waitqueue_active(buf-vb.done)) return; /* Some logic to handle the buf may be needed here */ -list_del(buf-vb.queue); -do_gettimeofday(buf-vb.ts); -wake_up(buf-vb.done); - -Those are the videobuffer functions used on drivers, implemented on + list_del(buf-vb.queue); + do_gettimeofday(buf-vb.ts); + wake_up(buf-vb.done); + +Those are the videobuffer functions used on drivers, implemented on videobuf-core: - Videobuf init functions videobuf_queue_sg_init() - Initializes the videobuf infrastructure. This function should be - called before any other videobuf function on drivers that uses DMA + Initializes the videobuf infrastructure. This function should be + called before any other videobuf function on drivers that uses DMA Scatter/Gather buffers. videobuf_queue_dma_contig_init - Initializes the videobuf infrastructure. This function should be - called before any other videobuf function on drivers that need DMA + Initializes the videobuf infrastructure. This function should be + called before any other videobuf function on drivers that need DMA contiguous buffers. videobuf_queue_vmalloc_init() - Initializes the videobuf infrastructure. This function should be + Initializes the videobuf infrastructure. This function should be called before any other videobuf function on USB (and other drivers) that need a vmalloced type of videobuf. @@ -607,12 +607,12 @@ videobuf-core: Stops video handling, ends mmap and frees mmap and other buffers. - V4L2 api functions. Those functions correspond to VIDIOC_foo ioctls: - videobuf_reqbufs(), videobuf_querybuf(),
[linuxtv-commits] [hg:v4l-dvb] Add dvb API docs at hgignore
The patch number 10615 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com Add dvb API docs at hgignore In order to compile dvb API, it is needed to have tetex-latex and Xfig packages. This patch adds the generated docs at hgignore. Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- .hgignore | 12 1 file changed, 12 insertions(+) diff -r 447b99dd4468 -r a7ea3df69673 .hgignore --- a/.hgignore Mon Feb 16 21:33:33 2009 -0300 +++ b/.hgignore Mon Feb 16 21:38:08 2009 -0300 @@ -24,6 +24,7 @@ v4l/Modules.symvers$ v4l/Modules.symvers$ v4l/Module.symvers$ v4l/modules.order$ +v4l/Module.markers$ v4l/config-compat.h$ v4l/.myconfig$ v4l/.snapshot$ @@ -73,3 +74,14 @@ v4l/firmware/ihex2fw v4l/firmware/ihex2fw v4l/firmware/ttusb-budget/dspbootcode.bin v4l/firmware/vicam/firmware.fw +dvb-spec/dvbapi/dvbapi.aux +dvb-spec/dvbapi/dvbapi.bbl +dvb-spec/dvbapi/dvbapi.blg +dvb-spec/dvbapi/dvbapi.dvi +dvb-spec/dvbapi/dvbapi.log +dvb-spec/dvbapi/dvbapi.out +dvb-spec/dvbapi/dvbapi.pdf +dvb-spec/dvbapi/dvbapi.ps +dvb-spec/dvbapi/dvbapi.toc +dvb-spec/dvbapi/dvbstb.ps +dvb-spec/dvbapi/dvbstb.pst --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/a7ea3df69673855e7cab399631025e9426a5674c ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] Merge new struct
The patch number 10613 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com Merge new struct Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- dvb-spec/README.CABLE |5 dvb-spec/README.EON|7 dvb-spec/channel | 104 +++ dvb-spec/dvbapi/LICENSE| 355 +++ dvb-spec/dvbapi/Makefile | 30 dvb-spec/dvbapi/audio.tex | 442 ++ dvb-spec/dvbapi/bibsection.sty | 29 dvb-spec/dvbapi/ca.tex | 127 dvb-spec/dvbapi/cimlogo.psi| 122 +++ dvb-spec/dvbapi/demux.tex | 392 dvb-spec/dvbapi/devices.tex| 12 dvb-spec/dvbapi/dvbapi.tex | 170 + dvb-spec/dvbapi/dvbstb.fig | 59 + dvb-spec/dvbapi/examples.tex | 366 +++ dvb-spec/dvbapi/fdl.tex| 367 dvb-spec/dvbapi/fig2pstex |6 dvb-spec/dvbapi/frontend.tex | 630 dvb-spec/dvbapi/getbb | 12 dvb-spec/dvbapi/intro.tex | 183 + dvb-spec/dvbapi/kdapi.tex | 1007 + dvb-spec/dvbapi/sec.tex| 282 + dvb-spec/dvbapi/title.tex | 31 + dvb-spec/dvbapi/video.tex | 686 ++ 23 files changed, 5424 insertions(+) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/b165e221e31306227c07a8a8ecdaf73799b18912 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] Merge dvb spec at master
The patch number 10614 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com Merge dvb spec at master Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- .hgtags |9 dvb-spec/HOWTO-use-the-demux-api| 207 +++ dvb-spec/HOWTO-use-the-frontend-api | 204 +++ dvb-spec/README.CABLE | 10 dvb-spec/README.valgrind| 13 dvb-spec/channel| 104 --- dvb-spec/dvbapi/.cvsignore | 14 dvb-spec/dvbapi/Makefile| 15 dvb-spec/dvbapi/audio.tex | 112 ++-- dvb-spec/dvbapi/ca.tex |4 dvb-spec/dvbapi/demux.tex | 197 --- dvb-spec/dvbapi/devices.tex |6 dvb-spec/dvbapi/dvbapi.tex |4 dvb-spec/dvbapi/examples.tex| 46 - dvb-spec/dvbapi/frontend.tex| 774 ++-- dvb-spec/dvbapi/intro.tex | 117 +--- dvb-spec/dvbapi/kdapi.tex |9 dvb-spec/dvbapi/net.tex | 19 dvb-spec/dvbapi/sec.tex | 282 -- dvb-spec/dvbapi/title.tex | 13 dvb-spec/dvbapi/video.tex | 169 +++--- dvb-spec/valgrind-1.0.4.diff| 357 dvb-spec/valgrind-1.9.4.diff| 356 dvb-spec/valgrind-20030716.diff | 361 + 24 files changed, 2315 insertions(+), 1087 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/447b99dd4468cf8f05ae5045c939053068edefa5 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~jfrancois/v4l-dvb/
The patch number 10624 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~jfrancois/v4l-dvb/
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/gspca/gspca.c| 104 +++--
linux/drivers/media/video/gspca/mr97310a.c |2
linux/drivers/media/video/gspca/sonixj.c |2
linux/drivers/media/video/gspca/spca505.c |8 -
linux/drivers/media/video/gspca/vc032x.c |5 -
5 files changed, 86 insertions(+), 35 deletions(-)
diff -r a241c3751468 -r ebeb61a8b5b0 linux/drivers/media/video/gspca/gspca.c
--- a/linux/drivers/media/video/gspca/gspca.c Tue Jan 27 06:02:41 2009 +
+++ b/linux/drivers/media/video/gspca/gspca.c Mon Feb 16 22:42:34 2009 -0300
@@ -136,11 +136,13 @@ static void fill_frame(struct gspca_dev
cam_pkt_op pkt_scan;
if (urb-status != 0) {
+ if (urb-status == -ESHUTDOWN)
+ return; /* disconnection */
#ifdef CONFIG_PM
if (!gspca_dev-frozen)
#endif
PDEBUG(D_ERR|D_PACK, urb status: %d, urb-status);
- return; /* disconnection ? */
+ return;
}
pkt_scan = gspca_dev-sd_desc-pkt_scan;
for (i = 0; i urb-number_of_packets; i++) {
@@ -220,6 +222,8 @@ static void bulk_irq(struct urb *urb)
switch (urb-status) {
case 0:
break;
+ case -ESHUTDOWN:
+ return; /* disconnection */
case -ECONNRESET:
urb-status = 0;
break;
@@ -228,7 +232,7 @@ static void bulk_irq(struct urb *urb)
if (!gspca_dev-frozen)
#endif
PDEBUG(D_ERR|D_PACK, urb status: %d, urb-status);
- return; /* disconnection ? */
+ return;
}
/* check the availability of the frame buffer */
@@ -435,8 +439,7 @@ static void destroy_urbs(struct gspca_de
break;
gspca_dev-urb[i] = NULL;
- if (!gspca_dev-present)
- usb_kill_urb(urb);
+ usb_kill_urb(urb);
if (urb-transfer_buffer != NULL)
usb_buffer_free(gspca_dev-dev,
urb-transfer_buffer_length,
@@ -604,6 +607,11 @@ static int gspca_init_transfer(struct gs
if (mutex_lock_interruptible(gspca_dev-usb_lock))
return -ERESTARTSYS;
+ if (!gspca_dev-present) {
+ ret = -ENODEV;
+ goto out;
+ }
+
/* set the higher alternate setting and
* loop until urb submit succeeds */
gspca_dev-alt = gspca_dev-nbalt;
@@ -673,12 +681,14 @@ static void gspca_stream_off(struct gspc
static void gspca_stream_off(struct gspca_dev *gspca_dev)
{
gspca_dev-streaming = 0;
- if (gspca_dev-present
-gspca_dev-sd_desc-stopN)
- gspca_dev-sd_desc-stopN(gspca_dev);
- destroy_urbs(gspca_dev);
- if (gspca_dev-present)
+ if (gspca_dev-present) {
+ if (gspca_dev-sd_desc-stopN)
+ gspca_dev-sd_desc-stopN(gspca_dev);
+ destroy_urbs(gspca_dev);
gspca_set_alt0(gspca_dev);
+ }
+
+ /* always call stop0 to free the subdriver's resources */
if (gspca_dev-sd_desc-stop0)
gspca_dev-sd_desc-stop0(gspca_dev);
PDEBUG(D_STREAM, stream off OK);
@@ -960,8 +970,17 @@ static int vidioc_querycap(struct file *
struct v4l2_capability *cap)
{
struct gspca_dev *gspca_dev = priv;
+ int ret;
memset(cap, 0, sizeof *cap);
+
+ /* protect the access to the usb device */
+ if (mutex_lock_interruptible(gspca_dev-usb_lock))
+ return -ERESTARTSYS;
+ if (!gspca_dev-present) {
+ ret = -ENODEV;
+ goto out;
+ }
strncpy(cap-driver, gspca_dev-sd_desc-name, sizeof cap-driver);
if (gspca_dev-dev-product != NULL) {
strncpy(cap-card, gspca_dev-dev-product,
@@ -977,7 +996,10 @@ static int vidioc_querycap(struct file *
cap-capabilities = V4L2_CAP_VIDEO_CAPTURE
| V4L2_CAP_STREAMING
| V4L2_CAP_READWRITE;
- return 0;
+ ret = 0;
+out:
+ mutex_unlock(gspca_dev-usb_lock);
+ return ret;
}
static int vidioc_queryctrl(struct file *file, void
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~jfrancois/v4l-dvb/
The patch number 10640 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~jfrancois/v4l-dvb/
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/gspca/Kconfig |9
linux/drivers/media/video/gspca/Makefile |2
linux/drivers/media/video/gspca/sonixj.c | 47 +-
linux/drivers/media/video/gspca/sq905.c | 438 +++
linux/drivers/media/video/gspca/t613.c |8
5 files changed, 490 insertions(+), 14 deletions(-)
diff -r b6a05e457df3 -r 4f6c3f9efa58 linux/drivers/media/video/gspca/Kconfig
--- a/linux/drivers/media/video/gspca/Kconfig Tue Feb 17 10:11:12 2009 -0300
+++ b/linux/drivers/media/video/gspca/Kconfig Tue Feb 17 23:32:03 2009 -0300
@@ -176,6 +176,15 @@ config USB_GSPCA_SPCA561
To compile this driver as a module, choose M here: the
module will be called gspca_spca561.
+config USB_GSPCA_SQ905
+ tristate SQ Technologies SQ905 based USB Camera Driver
+ depends on VIDEO_V4L2 USB_GSPCA
+ help
+ Say Y here if you want support for cameras based on the SQ905 chip.
+
+ To compile this driver as a module, choose M here: the
+ module will be called gspca_sq905.
+
config USB_GSPCA_STK014
tristate Syntek DV4000 (STK014) USB Camera Driver
depends on VIDEO_V4L2 USB_GSPCA
diff -r b6a05e457df3 -r 4f6c3f9efa58 linux/drivers/media/video/gspca/Makefile
--- a/linux/drivers/media/video/gspca/Makefile Tue Feb 17 10:11:12 2009 -0300
+++ b/linux/drivers/media/video/gspca/Makefile Tue Feb 17 23:32:03 2009 -0300
@@ -16,6 +16,7 @@ obj-$(CONFIG_USB_GSPCA_SPCA506) += gspc
obj-$(CONFIG_USB_GSPCA_SPCA506) += gspca_spca506.o
obj-$(CONFIG_USB_GSPCA_SPCA508) += gspca_spca508.o
obj-$(CONFIG_USB_GSPCA_SPCA561) += gspca_spca561.o
+obj-$(CONFIG_USB_GSPCA_SQ905)+= gspca_sq905.o
obj-$(CONFIG_USB_GSPCA_SUNPLUS) += gspca_sunplus.o
obj-$(CONFIG_USB_GSPCA_STK014) += gspca_stk014.o
obj-$(CONFIG_USB_GSPCA_T613) += gspca_t613.o
@@ -41,6 +42,7 @@ gspca_spca506-objs := spca506.o
gspca_spca506-objs := spca506.o
gspca_spca508-objs := spca508.o
gspca_spca561-objs := spca561.o
+gspca_sq905-objs:= sq905.o
gspca_stk014-objs := stk014.o
gspca_sunplus-objs := sunplus.o
gspca_t613-objs := t613.o
diff -r b6a05e457df3 -r 4f6c3f9efa58 linux/drivers/media/video/gspca/sonixj.c
--- a/linux/drivers/media/video/gspca/sonixj.c Tue Feb 17 10:11:12 2009 -0300
+++ b/linux/drivers/media/video/gspca/sonixj.c Tue Feb 17 23:32:03 2009 -0300
@@ -45,7 +45,7 @@ struct sd {
u8 blue;
u8 red;
u8 gamma;
- u8 vflip; /* ov7630 only */
+ u8 vflip; /* ov7630/ov7648 only */
u8 infrared;/* mt9v111 only */
s8 ag_cnt;
@@ -192,7 +192,7 @@ static struct ctrl sd_ctrls[] = {
.set = sd_setautogain,
.get = sd_getautogain,
},
-/* ov7630 only */
+/* ov7630/ov7648 only */
#define VFLIP_IDX 6
{
{
@@ -202,7 +202,7 @@ static struct ctrl sd_ctrls[] = {
.minimum = 0,
.maximum = 1,
.step= 1,
-#define VFLIP_DEF 1
+#define VFLIP_DEF 0/* vflip def = 1 for ov7630 */
.default_value = VFLIP_DEF,
},
.set = sd_setvflip,
@@ -235,16 +235,16 @@ static __u32 ctrl_dis[] = {
(1 INFRARED_IDX) | (1 VFLIP_IDX),
/* SENSOR_MO4000 2 */
#if 1
- 0,
+ (1 VFLIP_IDX),
#else
- (1 AUTOGAIN_IDX),
+ (1 AUTOGAIN_IDX) | (1 VFLIP_IDX),
#endif
/* SENSOR_MT9V111 3 */
(1 INFRARED_IDX) | (1 VFLIP_IDX),
/* SENSOR_OM6802 4 */
(1 AUTOGAIN_IDX) | (1 INFRARED_IDX),
/* SENSOR_OV7630 5 */
- (1 AUTOGAIN_IDX) | (1 INFRARED_IDX) | (1 VFLIP_IDX),
+ (1 INFRARED_IDX),
/* SENSOR_OV7648 6 */
(1 AUTOGAIN_IDX) | (1 INFRARED_IDX) | (1 VFLIP_IDX),
/* SENSOR_OV7660 7 */
@@ -677,7 +677,8 @@ static const u8 ov7648_sensor_init[][8]
{0xb1, 0x21, 0x2d, 0x85, 0x00, 0x00, 0x00, 0x10},
/*...*/
/* {0xa1, 0x21, 0x12, 0x08, 0x00, 0x00, 0x00, 0x10}, jfm done */
-/* {0xa1, 0x21, 0x75, 0x06, 0x00, 0x00, 0x00, 0x10}, jfm done */
+/*
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
The patch number 10648 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/Documentation/video4linux/v4l2-framework.txt | 12
linux/drivers/media/video/v4l2-dev.c | 25 -
linux/drivers/media/video/v4l2-device.c| 47 +
linux/drivers/media/video/vivi.c | 323 ++---
linux/include/media/v4l2-device.h | 31 -
linux/include/media/v4l2-subdev.h |4
6 files changed, 232 insertions(+), 210 deletions(-)
diff -r 4f6c3f9efa58 -r e471b963bef6
linux/Documentation/video4linux/v4l2-framework.txt
--- a/linux/Documentation/video4linux/v4l2-framework.txtTue Feb 17
23:32:03 2009 -0300
+++ b/linux/Documentation/video4linux/v4l2-framework.txtTue Feb 17
23:44:45 2009 -0300
@@ -84,12 +84,14 @@ You must register the device instance:
v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev);
Registration will initialize the v4l2_device struct and link dev-driver_data
-to v4l2_dev. Registration will also set v4l2_dev-name to a value derived from
-dev (driver name followed by the bus_id, to be precise). You may change the
-name after registration if you want.
+to v4l2_dev. If v4l2_dev-name is empty then it will be set to a value derived
+from dev (driver name followed by the bus_id, to be precise). If you set it
+up before calling v4l2_device_register then it will be untouched. If dev is
+NULL, then you *must* setup v4l2_dev-name before calling v4l2_device_register.
The first 'dev' argument is normally the struct device pointer of a pci_dev,
-usb_device or platform_device.
+usb_device or platform_device. It is rare for dev to be NULL, but it happens
+with ISA devices, for example.
You unregister with:
@@ -266,7 +268,7 @@ errors (except -ENOIOCTLCMD) occured, th
The second argument to both calls is a group ID. If 0, then all subdevs are
called. If non-zero, then only those whose group ID match that value will
-be called. Before a bridge driver registers a subdev it can set subdev-grp_id
+be called. Before a bridge driver registers a subdev it can set sd-grp_id
to whatever value it wants (it's 0 by default). This value is owned by the
bridge driver and the sub-device driver will never modify or use it.
diff -r 4f6c3f9efa58 -r e471b963bef6 linux/drivers/media/video/v4l2-dev.c
--- a/linux/drivers/media/video/v4l2-dev.c Tue Feb 17 23:32:03 2009 -0300
+++ b/linux/drivers/media/video/v4l2-dev.c Tue Feb 17 23:44:45 2009 -0300
@@ -326,37 +326,38 @@ static const struct file_operations v4l2
*/
static int get_index(struct video_device *vdev, int num)
{
- u32 used = 0;
- const int max_index = sizeof(used) * 8 - 1;
+ /* This can be static since this function is called with the global
+ videodev_lock held. */
+ static DECLARE_BITMAP(used, VIDEO_NUM_DEVICES);
int i;
- /* Currently a single v4l driver instance cannot create more than
- 32 devices.
- Increase to u64 or an array of u32 if more are needed. */
- if (num max_index) {
+ if (num = VIDEO_NUM_DEVICES) {
printk(KERN_ERR videodev: %s num is too large\n, __func__);
return -EINVAL;
}
- /* Some drivers do not set the parent. In that case always return 0. */
+ /* Some drivers do not set the parent. In that case always return
+ num or 0. */
if (vdev-parent == NULL)
- return 0;
+ return num = 0 ? num : 0;
+
+ bitmap_zero(used, VIDEO_NUM_DEVICES);
for (i = 0; i VIDEO_NUM_DEVICES; i++) {
if (video_device[i] != NULL
video_device[i]-parent == vdev-parent) {
- used |= 1 video_device[i]-index;
+ set_bit(video_device[i]-index, used);
}
}
if (num = 0) {
- if (used (1 num))
+ if (test_bit(num, used))
return -ENFILE;
return num;
}
- i = ffz(used);
- return i max_index ? -ENFILE : i;
+ i = find_first_zero_bit(used, VIDEO_NUM_DEVICES);
+ return i == VIDEO_NUM_DEVICES ? -ENFILE : i;
}
int video_register_device(struct video_device *vdev, int type, int nr)
diff -r 4f6c3f9efa58 -r e471b963bef6 linux/drivers/media/video/v4l2-device.c
---
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~pinchartl/uvcvideo/
The patch number 10653 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~pinchartl/uvcvideo/
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/uvc/uvc_driver.c |9 +++
linux/drivers/media/video/uvc/uvc_video.c | 58 +
linux/drivers/media/video/uvc/uvcvideo.h |1
3 files changed, 58 insertions(+), 10 deletions(-)
diff -r 52e440f3fbda -r 359d95e1d541 linux/drivers/media/video/uvc/uvc_driver.c
--- a/linux/drivers/media/video/uvc/uvc_driver.cTue Feb 17 13:46:22
2009 +
+++ b/linux/drivers/media/video/uvc/uvc_driver.cWed Feb 18 09:49:37
2009 -0300
@@ -1863,6 +1863,15 @@ static struct usb_device_id uvc_ids[] =
.bInterfaceSubClass = 1,
.bInterfaceProtocol = 0,
.driver_info = UVC_QUIRK_STREAM_NO_FID },
+ /* ViMicro */
+ { .match_flags = USB_DEVICE_ID_MATCH_VENDOR
+ | USB_DEVICE_ID_MATCH_INT_INFO,
+ .idVendor = 0x0ac8,
+ .idProduct= 0x,
+ .bInterfaceClass = USB_CLASS_VIDEO,
+ .bInterfaceSubClass = 1,
+ .bInterfaceProtocol = 0,
+ .driver_info = UVC_QUIRK_FIX_BANDWIDTH },
/* MT6227 */
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
| USB_DEVICE_ID_MATCH_INT_INFO,
diff -r 52e440f3fbda -r 359d95e1d541 linux/drivers/media/video/uvc/uvc_video.c
--- a/linux/drivers/media/video/uvc/uvc_video.c Tue Feb 17 13:46:22 2009 +
+++ b/linux/drivers/media/video/uvc/uvc_video.c Wed Feb 18 09:49:37 2009 -0300
@@ -61,7 +61,7 @@ int uvc_query_ctrl(struct uvc_device *de
return 0;
}
-static void uvc_fixup_buffer_size(struct uvc_video_device *video,
+static void uvc_fixup_video_ctrl(struct uvc_video_device *video,
struct uvc_streaming_control *ctrl)
{
struct uvc_format *format;
@@ -84,6 +84,31 @@ static void uvc_fixup_buffer_size(struct
video-dev-uvc_version 0x0110))
ctrl-dwMaxVideoFrameSize =
frame-dwMaxVideoFrameBufferSize;
+
+ if (video-dev-quirks UVC_QUIRK_FIX_BANDWIDTH
+ video-streaming-intf-num_altsetting 1) {
+ u32 interval;
+ u32 bandwidth;
+
+ interval = (ctrl-dwFrameInterval 10)
+? ctrl-dwFrameInterval
+: frame-dwFrameInterval[0];
+
+ /* Compute a bandwidth estimation by multiplying the frame
+* size by the number of video frames per second, divide the
+* result by the number of USB frames (or micro-frames for
+* high-speed devices) per second and add the UVC header size
+* (assumed to be 12 bytes long).
+*/
+ bandwidth = frame-wWidth * frame-wHeight / 8 * format-bpp;
+ bandwidth *= 1000 / interval + 1;
+ bandwidth /= 1000;
+ if (video-dev-udev-speed == USB_SPEED_HIGH)
+ bandwidth /= 8;
+ bandwidth += 12;
+
+ ctrl-dwMaxPayloadTransferSize = bandwidth;
+ }
}
static int uvc_get_video_ctrl(struct uvc_video_device *video,
@@ -158,10 +183,11 @@ static int uvc_get_video_ctrl(struct uvc
ctrl-bMaxVersion = 0;
}
- /* Some broken devices return a null or wrong dwMaxVideoFrameSize.
-* Try to get the value from the format and frame descriptors.
-*/
- uvc_fixup_buffer_size(video, ctrl);
+ /* Some broken devices return null or wrong dwMaxVideoFrameSize and
+* dwMaxPayloadTransferSize fields. Try to get the value from the
+* format and frame descriptors.
+*/
+ uvc_fixup_video_ctrl(video, ctrl);
ret = 0;
out:
@@ -540,6 +566,9 @@ static void uvc_video_decode_bulk(struct
u8 *mem;
int len, ret;
+ if (urb-actual_length == 0)
+ return;
+
mem = urb-transfer_buffer;
len = urb-actual_length;
video-bulk.payload_size += len;
@@ -1030,11 +1059,20 @@ int uvc_video_init(struct uvc_video_devi
*/
usb_set_interface(video-dev-udev, video-streaming-intfnum, 0);
- /* Some webcams don't suport GET_DEF requests on the probe control. We
-* fall back to GET_CUR if GET_DEF fails.
-*/
- if ((ret = uvc_get_video_ctrl(video, probe, 1, GET_DEF)) 0
-
[linuxtv-commits] [hg:v4l-dvb] em28xx: VideoMate For You USB TV box requires tvaudio
The patch number 10654 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
em28xx: VideoMate For You USB TV box requires tvaudio
As reported by Vitaly Wool vi...@embeddedalley.com:
about half a year ago I posted the patch that basically enabled Compro
VideoMate For You USB TV box support.
The main problem is I couldn't get the sound working.
So I kind of decomposed the box and found out the audio decoder chip
used there was Philips TDA9874A. As far as I can see, it's not supported
within the em28xx suite although it is for other TV tuner drivers.
A tvaudio modprobing confirms that tda9874a chip is accessible via i2c:
tvaudio: TV audio decoder + audio/video mux driver
tvaudio: known chips: tda9840, tda9873h, tda9874h/a, tda9850, tda9855, tea6300,
tea6320, tea6420, tda8425, pic16c54 (PV951), ta8874z
tvaudio' 1-0058: chip found @ 0xb0
tvaudio' 1-0058: tvaudio': chip_read2: reg254=0x11
tvaudio' 1-0058: tvaudio': chip_read2: reg255=0x2
tvaudio' 1-0058: tda9874a_checkit(): DIC=0x11, SIC=0x2.
tvaudio' 1-0058: found tda9874a.
tvaudio' 1-0058: tda9874h/a found @ 0xb0 (em28xx #0)
tvaudio' 1-0058: tda9874h/a: chip_write: reg0=0x0
tvaudio' 1-0058: tda9874h/a: chip_write: reg1=0xc0
tvaudio' 1-0058: tda9874h/a: chip_write: reg2=0x2
tvaudio' 1-0058: tda9874h/a: chip_write: reg11=0x80
tvaudio' 1-0058: tda9874h/a: chip_write: reg12=0x0
tvaudio' 1-0058: tda9874h/a: chip_write: reg13=0x0
tvaudio' 1-0058: tda9874h/a: chip_write: reg14=0x1
tvaudio' 1-0058: tda9874h/a: chip_write: reg15=0x0
tvaudio' 1-0058: tda9874h/a: chip_write: reg16=0x14
tvaudio' 1-0058: tda9874h/a: chip_write: reg17=0x50
tvaudio' 1-0058: tda9874h/a: chip_write: reg18=0xf9
tvaudio' 1-0058: tda9874h/a: chip_write: reg19=0x80
tvaudio' 1-0058: tda9874h/a: chip_write: reg20=0x80
tvaudio' 1-0058: tda9874h/a: chip_write: reg24=0x80
tvaudio' 1-0058: tda9874h/a: chip_write: reg255=0x0
tvaudio' 1-0058: tda9874a_setup(): A2, B/G [0x00].
tvaudio' 1-0058: tda9874h/a: thread started]
This patch automatically loads tvaudio when needed (currently, only
with this board).
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/em28xx/em28xx-cards.c |3 +++
linux/drivers/media/video/em28xx/em28xx.h |6 ++
2 files changed, 9 insertions(+)
diff -r 359d95e1d541 -r a1e426060311
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Wed Feb 18 09:49:37
2009 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Wed Feb 25 09:06:13
2009 -0300
@@ -1309,6 +1309,7 @@ struct em28xx_board em28xx_boards[] = {
.tuner_type = TUNER_LG_PAL_NEW_TAPC,
.tda9887_conf = TDA9887_PRESENT,
.decoder = EM28XX_TVP5150,
+ .adecoder = EM28XX_TVAUDIO,
.input= { {
.type = EM28XX_VMUX_TELEVISION,
.vmux = TVP5150_COMPOSITE0,
@@ -1986,6 +1987,8 @@ void em28xx_card_setup(struct em28xx *de
request_module(tvp5150);
if (dev-board.tuner_type != TUNER_ABSENT)
request_module(tuner);
+ if (dev-board.adecoder == EM28XX_TVAUDIO)
+ request_module(tvaudio);
#endif
em28xx_config_tuner(dev);
diff -r 359d95e1d541 -r a1e426060311 linux/drivers/media/video/em28xx/em28xx.h
--- a/linux/drivers/media/video/em28xx/em28xx.h Wed Feb 18 09:49:37 2009 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx.h Wed Feb 25 09:06:13 2009 -0300
@@ -358,6 +358,11 @@ enum em28xx_decoder {
EM28XX_SAA711X,
};
+enum em28xx_adecoder {
+ EM28XX_NOADECODER = 0,
+ EM28XX_TVAUDIO,
+};
+
struct em28xx_board {
char *name;
int vchannels;
@@ -383,6 +388,7 @@ struct em28xx_board {
unsigned char xclk, i2c_speed;
enum em28xx_decoder decoder;
+ enum em28xx_adecoder adecoder;
struct em28xx_input input[MAX_EM28XX_INPUT];
struct em28xx_input radio;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/a1e4260603116cc6520491b827f64d5f07b338fb
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] sq905 require 2.6.20 or upper
The patch number 10656 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com sq905 require 2.6.20 or upper Priority: normal Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- v4l/versions.txt |2 ++ 1 file changed, 2 insertions(+) diff -r cd9e8bddf66a -r 5a19a327f5dd v4l/versions.txt --- a/v4l/versions.txt Mon Jan 12 10:17:43 2009 +0100 +++ b/v4l/versions.txt Mon Feb 23 12:36:38 2009 -0300 @@ -37,6 +37,8 @@ USB_GSPCA_FINEPIX USB_GSPCA_FINEPIX # uses linux/hid.h and struct delayed_work USB_SI470X +# due to INIT_WORK changes +USB_GSPCA_SQ905 [2.6.19] #This driver were developed at kernel 2.6.19, requiring vmalloc_user/remap_vmalloc_range --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/5a19a327f5dd531fe2ddb24098df5fcafd5ad191 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] Add dvb spec rules at the makefile
The patch number 10660 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com Add dvb spec rules at the makefile Priority: normal Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- INSTALL |8 v4l/Makefile |8 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff -r 18f48713ac1e -r a5697d649706 INSTALL --- a/INSTALL Thu Feb 19 16:41:56 2009 + +++ b/INSTALL Thu Feb 26 11:35:36 2009 -0300 @@ -44,6 +44,14 @@ firmware - Create the firmware files tha Notice: Only a very few firmwares are currently here firmware_install- Install firmware files under /lib/firmware + +== +Documentation rules: +v4l2-spec - Creates V4L2 API specification + +dvb-spec - Creates DVB API specification + +spec - Creates both V4L and DVB API specification === Module selection rules: diff -r 18f48713ac1e -r a5697d649706 v4l/Makefile --- a/v4l/Makefile Thu Feb 19 16:41:56 2009 + +++ b/v4l/Makefile Thu Feb 26 11:35:36 2009 -0300 @@ -48,8 +48,13 @@ firmware:: firmware:: $(MAKE) -C firmware -spec:: +v4l2-spec:: $(MAKE) -C ../v4l2-spec + +dvb-spec:: + $(MAKE) -C ../dvb-spec/dvbapi + +spec:: v4l2-spec dvb-spec apps:: $(MAKE) -C ../v4l2-apps @@ -288,6 +293,7 @@ clean:: config-compat.h Module.symvers Module.markers modules.order $(MAKE) -C firmware $@ $(MAKE) -C ../v4l2-spec $@ + $(MAKE) -C ../dvb-spec/dvbapi $@ $(MAKE) -C ../v4l2-apps $@ distclean:: clean --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/a5697d64970680bf8f78ad0941232deb16ce1653 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 10677 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb Priority: normal Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/arch/arm/plat-mxc/include/mach/mx3_camera.h | 52 linux/arch/sh/boards/board-ap325rxa.c | 526 ++ linux/arch/sh/boards/mach-migor/setup.c | 579 ++ linux/drivers/media/video/Kconfig |7 linux/drivers/media/video/Makefile|5 linux/drivers/media/video/mt9m001.c |2 linux/drivers/media/video/mt9m111.c |8 linux/drivers/media/video/mt9t031.c | 139 + linux/drivers/media/video/mt9v022.c |2 linux/drivers/media/video/mx3_camera.c| 1183 ++ linux/drivers/media/video/ov772x.c| 293 ++- linux/drivers/media/video/pxa_camera.c| 31 linux/drivers/media/video/sh_mobile_ceu_camera.c | 62 linux/drivers/media/video/tw9910.c|4 linux/include/media/ov772x.h |5 linux/include/media/sh_mobile_ceu.h |5 linux/include/media/soc_camera.h | 10 17 files changed, 2709 insertions(+), 204 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/818c8b74e975a817d1199d25a140a8810bfa2ebe ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] Move parse-sniffusb2.pl to the right dir
The patch number 10678 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
Move parse-sniffusb2.pl to the right dir
As pointed by Cityk, this file were at the wrong place.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
v4l2-apps/test/parse-sniffusb2.pl | 84 --
v4l2-apps/util/parse-sniffusb2.pl | 84 ++
2 files changed, 84 insertions(+), 84 deletions(-)
diff -r 818c8b74e975 -r 5c818cbf881e v4l2-apps/test/parse-sniffusb2.pl
--- a/v4l2-apps/test/parse-sniffusb2.pl Thu Feb 26 14:47:44 2009 -0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +
@@ -1,84 +0,0 @@
-#!/usr/bin/perl
-#
-# Author: Franklin Meng fmeng2...@yahoo.com
-# Parser for USB snoops captured from SniffUSB 2.0.
-#
-
-use strict;
-use warnings;
-use Data::Dumper;
-
-foreach my $curfile (@ARGV) {
- parsefile($curfile);
- #we can only process 1 file
- exit;
-}
-
-sub parsefile {
- my $curfile = shift;
- my $SetupPacket ='';
- my $preS = '';
- my $TransferBuffer ='';
- my $preT = '';
- my $Direction ='';
- my $preD = '';
- my @tmpsplit;
- my $t=0;
- my $s=0;
-
- open(FD, $curfile) || die(Error: $!\n);
-
- while(FD) {
- chomp;
- if($t==1 /^\s+\d{8}/) {
-# print $_ . \n;
- @tmpsplit = split(/\:\s/,$_);
- $TransferBuffer = $TransferBuffer . $tmpsplit[1] . ;
- } elsif($s==1 /^\s+\d{8}/) {
-# print $_ . \n;
- @tmpsplit = split(/\:\s/,$_);
- $SetupPacket = $SetupPacket . $tmpsplit[1] ;
- } else {
- $t=0;
- $s=0;
- }
- if(/[]{3}/){
- #print out last packet if valid
- if($SetupPacket) {
- if($preT) {
- print $SetupPacket $preD $preT\n;
-
- } else {
- print $SetupPacket $Direction
$TransferBuffer\n;
- }
- }
-# print $SetupPacket $Direction $TransferBuffer\n;
- #clear variables
- $preT = $TransferBuffer;
- $TransferBuffer = '';
- $preS = $SetupPacket;
- $SetupPacket = '';
- $preD = $Direction;
- $t = 0;
- $s = 0;
- # get direction
- @tmpsplit = split(/\s+/, $_);
- $Direction = $tmpsplit[2];
-# print $_ . \n;
- } elsif(/TransferBufferMDL/) {
- $t = 1
- } elsif(/SetupPacket/) {
- $s = 1;
- }
- }
- #print last packet
-# print $SetupPacket $Direction $TransferBuffer\n;
- if($SetupPacket) {
- if($preT) {
- print $SetupPacket $preD $preT\n;
- } else {
- print $SetupPacket $Direction $TransferBuffer\n;
- }
- }
-}
-
diff -r 818c8b74e975 -r 5c818cbf881e v4l2-apps/util/parse-sniffusb2.pl
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/v4l2-apps/util/parse-sniffusb2.pl Thu Feb 26 15:30:48 2009 -0300
@@ -0,0 +1,84 @@
+#!/usr/bin/perl
+#
+# Author: Franklin Meng fmeng2...@yahoo.com
+# Parser for USB snoops captured from SniffUSB 2.0.
+#
+
+use strict;
+use warnings;
+use Data::Dumper;
+
+foreach my $curfile (@ARGV) {
+ parsefile($curfile);
+ #we can only process 1 file
+ exit;
+}
+
+sub parsefile {
+ my $curfile = shift;
+ my $SetupPacket ='';
+ my $preS = '';
+ my $TransferBuffer ='';
+ my $preT = '';
+ my $Direction ='';
+ my $preD = '';
+ my @tmpsplit;
+ my $t=0;
+ my $s=0;
+
+ open(FD, $curfile) || die(Error: $!\n);
+
+ while(FD) {
+ chomp;
+ if($t==1 /^\s+\d{8}/) {
+# print $_ . \n;
+ @tmpsplit = split(/\:\s/,$_);
+ $TransferBuffer = $TransferBuffer . $tmpsplit[1] . ;
+ } elsif($s==1 /^\s+\d{8}/) {
+# print $_ . \n;
+ @tmpsplit =
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~jfrancois/v4l-dvb/
The patch number 10682 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~jfrancois/v4l-dvb/
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/gspca/sonixj.c |2 -
linux/drivers/media/video/gspca/zc3xx.c | 17 ---
linux/drivers/media/video/sn9c102/sn9c102_devtable.h |2 +
3 files changed, 10 insertions(+), 11 deletions(-)
diff -r 5c818cbf881e -r aacca3f9c580 linux/drivers/media/video/gspca/sonixj.c
--- a/linux/drivers/media/video/gspca/sonixj.c Thu Feb 26 15:30:48 2009 -0300
+++ b/linux/drivers/media/video/gspca/sonixj.c Thu Feb 26 15:35:40 2009 -0300
@@ -2199,9 +2199,9 @@ static const __devinitdata struct usb_de
{USB_DEVICE(0x0c45, 0x613a), BSI(SN9C120, OV7648, 0x21)},
#if !defined CONFIG_USB_SN9C102 !defined CONFIG_USB_SN9C102_MODULE
{USB_DEVICE(0x0c45, 0x613b), BSI(SN9C120, OV7660, 0x21)},
+#endif
{USB_DEVICE(0x0c45, 0x613c), BSI(SN9C120, HV7131R, 0x11)},
/* {USB_DEVICE(0x0c45, 0x613e), BSI(SN9C120, OV7630, 0x??)}, */
-#endif
{USB_DEVICE(0x0c45, 0x6143), BSI(SN9C120, SP80708, 0x18)},
{}
};
diff -r 5c818cbf881e -r aacca3f9c580 linux/drivers/media/video/gspca/zc3xx.c
--- a/linux/drivers/media/video/gspca/zc3xx.c Thu Feb 26 15:30:48 2009 -0300
+++ b/linux/drivers/media/video/gspca/zc3xx.c Thu Feb 26 15:35:40 2009 -0300
@@ -7016,7 +7016,7 @@ static int zcxx_probeSensor(struct gspca
static int zcxx_probeSensor(struct gspca_dev *gspca_dev)
{
struct sd *sd = (struct sd *) gspca_dev;
- int sensor, sensor2;
+ int sensor;
switch (sd-sensor) {
case SENSOR_MC501CB:
@@ -7031,16 +7031,9 @@ static int zcxx_probeSensor(struct gspca
break;
}
sensor = vga_2wr_probe(gspca_dev);
- if (sensor = 0) {
- if (sensor 0x7600)
- return sensor;
- /* next probe is needed for OmniVision ? */
- }
- sensor2 = vga_3wr_probe(gspca_dev);
- if (sensor2 = 0
-sensor = 0)
+ if (sensor = 0)
return sensor;
- return sensor2;
+ return vga_3wr_probe(gspca_dev);
}
/* this function is called at probe time */
@@ -7177,6 +7170,10 @@ static int sd_config(struct gspca_dev *g
PDEBUG(D_PROBE, Find Sensor OV7620);
sd-sensor = SENSOR_OV7620;
break;
+ case 0x7631:
+ PDEBUG(D_PROBE, Find Sensor OV7630C);
+ sd-sensor = SENSOR_OV7630C;
+ break;
case 0x7648:
PDEBUG(D_PROBE, Find Sensor OV7648);
sd-sensor = SENSOR_OV7620; /* same sensor (?) */
diff -r 5c818cbf881e -r aacca3f9c580
linux/drivers/media/video/sn9c102/sn9c102_devtable.h
--- a/linux/drivers/media/video/sn9c102/sn9c102_devtable.h Thu Feb 26
15:30:48 2009 -0300
+++ b/linux/drivers/media/video/sn9c102/sn9c102_devtable.h Thu Feb 26
15:35:40 2009 -0300
@@ -123,7 +123,9 @@ static const struct usb_device_id sn9c10
{ SN9C102_USB_DEVICE(0x0c45, 0x613a, BRIDGE_SN9C120), },
#endif
{ SN9C102_USB_DEVICE(0x0c45, 0x613b, BRIDGE_SN9C120), },
+#if !defined CONFIG_USB_GSPCA !defined CONFIG_USB_GSPCA_MODULE
{ SN9C102_USB_DEVICE(0x0c45, 0x613c, BRIDGE_SN9C120), },
+#endif
{ SN9C102_USB_DEVICE(0x0c45, 0x613e, BRIDGE_SN9C120), },
{ }
};
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/aacca3f9c5805be8dc7b16a262dd793df26d65cd
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
The patch number 10690 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/v4l2-common.c | 43 +++-
linux/include/linux/videodev2.h |1
v4l/scripts/make_config_compat.pl |7 +
v4l2-apps/util/v4l2-ctl.cpp | 123 +++-
v4l2-spec/compat.sgml | 11 ++
v4l2-spec/controls.sgml | 33 +++---
v4l2-spec/vidioc-queryctrl.sgml | 15 ++
7 files changed, 209 insertions(+), 24 deletions(-)
diff -r aacca3f9c580 -r f546b826a749 linux/drivers/media/video/v4l2-common.c
--- a/linux/drivers/media/video/v4l2-common.c Thu Feb 26 15:35:40 2009 -0300
+++ b/linux/drivers/media/video/v4l2-common.c Thu Feb 26 15:41:03 2009 -0300
@@ -333,6 +333,12 @@ const char **v4l2_ctrl_get_menu(u32 id)
Manual Mode,
Shutter Priority Mode,
Aperture Priority Mode,
+ NULL
+ };
+ static const char *colorfx[] = {
+ None,
+ Black White,
+ Sepia,
NULL
};
@@ -371,6 +377,8 @@ const char **v4l2_ctrl_get_menu(u32 id)
return camera_power_line_frequency;
case V4L2_CID_EXPOSURE_AUTO:
return camera_exposure_auto;
+ case V4L2_CID_COLORFX:
+ return colorfx;
default:
return NULL;
}
@@ -383,16 +391,16 @@ const char *v4l2_ctrl_get_name(u32 id)
switch (id) {
/* USER controls */
case V4L2_CID_USER_CLASS: return User Controls;
- case V4L2_CID_AUDIO_VOLUME: return Volume;
- case V4L2_CID_AUDIO_MUTE: return Mute;
- case V4L2_CID_AUDIO_BALANCE:return Balance;
- case V4L2_CID_AUDIO_BASS: return Bass;
- case V4L2_CID_AUDIO_TREBLE: return Treble;
- case V4L2_CID_AUDIO_LOUDNESS: return Loudness;
case V4L2_CID_BRIGHTNESS: return Brightness;
case V4L2_CID_CONTRAST: return Contrast;
case V4L2_CID_SATURATION: return Saturation;
case V4L2_CID_HUE: return Hue;
+ case V4L2_CID_AUDIO_VOLUME: return Volume;
+ case V4L2_CID_AUDIO_BALANCE:return Balance;
+ case V4L2_CID_AUDIO_BASS: return Bass;
+ case V4L2_CID_AUDIO_TREBLE: return Treble;
+ case V4L2_CID_AUDIO_MUTE: return Mute;
+ case V4L2_CID_AUDIO_LOUDNESS: return Loudness;
case V4L2_CID_BLACK_LEVEL: return Black Level;
case V4L2_CID_AUTO_WHITE_BALANCE: return White Balance,
Automatic;
case V4L2_CID_DO_WHITE_BALANCE: return Do White Balance;
@@ -413,6 +421,7 @@ const char *v4l2_ctrl_get_name(u32 id)
case V4L2_CID_BACKLIGHT_COMPENSATION: return Backlight Compensation;
case V4L2_CID_CHROMA_AGC: return Chroma AGC;
case V4L2_CID_COLOR_KILLER: return Color Killer;
+ case V4L2_CID_COLORFX: return Color Effects;
/* MPEG controls */
case V4L2_CID_MPEG_CLASS: return MPEG Encoder Controls;
@@ -491,15 +500,24 @@ int v4l2_ctrl_query_fill(struct v4l2_que
case V4L2_CID_HFLIP:
case V4L2_CID_VFLIP:
case V4L2_CID_HUE_AUTO:
+ case V4L2_CID_CHROMA_AGC:
+ case V4L2_CID_COLOR_KILLER:
case V4L2_CID_MPEG_AUDIO_MUTE:
case V4L2_CID_MPEG_VIDEO_MUTE:
case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:
case V4L2_CID_MPEG_VIDEO_PULLDOWN:
case V4L2_CID_EXPOSURE_AUTO_PRIORITY:
+ case V4L2_CID_FOCUS_AUTO:
case V4L2_CID_PRIVACY:
qctrl-type = V4L2_CTRL_TYPE_BOOLEAN;
min = 0;
max = step = 1;
+ break;
+ case V4L2_CID_PAN_RESET:
+ case V4L2_CID_TILT_RESET:
+ qctrl-type = V4L2_CTRL_TYPE_BUTTON;
+ qctrl-flags |= V4L2_CTRL_FLAG_WRITE_ONLY;
+ min = max = step = def = 0;
break;
case V4L2_CID_POWER_LINE_FREQUENCY:
case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
@@ -518,6 +536,7 @@ int v4l2_ctrl_query_fill(struct v4l2_que
case V4L2_CID_MPEG_STREAM_TYPE:
case
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-usbvision
The patch number 10693 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-usbvision
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/usbvision/usbvision-core.c |2
linux/drivers/media/video/usbvision/usbvision-i2c.c | 153 ++
linux/drivers/media/video/usbvision/usbvision-video.c | 63 +---
linux/drivers/media/video/usbvision/usbvision.h |8
linux/drivers/media/video/v4l2-common.c |9
linux/include/media/v4l2-common.h |2
6 files changed, 89 insertions(+), 148 deletions(-)
diff -r f546b826a749 -r a169633cd720
linux/drivers/media/video/usbvision/usbvision-core.c
--- a/linux/drivers/media/video/usbvision/usbvision-core.c Thu Feb 26
15:41:03 2009 -0300
+++ b/linux/drivers/media/video/usbvision/usbvision-core.c Thu Feb 26
16:31:15 2009 -0300
@@ -2654,7 +2654,7 @@ int usbvision_muxsel(struct usb_usbvisio
}
route.input = mode[channel];
route.output = 0;
- call_i2c_clients(usbvision, VIDIOC_INT_S_VIDEO_ROUTING,route);
+ call_all(usbvision, video, s_routing, route);
usbvision_set_audio(usbvision, audio[channel]);
return 0;
}
diff -r f546b826a749 -r a169633cd720
linux/drivers/media/video/usbvision/usbvision-i2c.c
--- a/linux/drivers/media/video/usbvision/usbvision-i2c.c Thu Feb 26
15:41:03 2009 -0300
+++ b/linux/drivers/media/video/usbvision/usbvision-i2c.c Thu Feb 26
16:31:15 2009 -0300
@@ -206,72 +206,78 @@ static struct i2c_algorithm usbvision_al
};
-/*
- * registering functions to load algorithms at runtime
- */
-static int usbvision_i2c_usb_add_bus(struct i2c_adapter *adap)
-{
- PDEBUG(DBG_I2C, I2C debugging is enabled [i2c]);
- PDEBUG(DBG_I2C, ALGO debugging is enabled [i2c]);
-
- /* register new adapter to i2c module... */
-
- adap-algo = usbvision_algo;
-
- adap-timeout = 100;/* default values, should */
- adap-retries = 3; /* be replaced by defines */
-
- i2c_add_adapter(adap);
-
- PDEBUG(DBG_I2C,i2c bus for %s registered, adap-name);
-
- return 0;
-}
-
/* --- */
/* usbvision specific I2C functions*/
/* --- */
static struct i2c_adapter i2c_adap_template;
-static struct i2c_client i2c_client_template;
int usbvision_i2c_register(struct usb_usbvision *usbvision)
{
+ static unsigned short saa711x_addrs[] = {
+ 0x4a 1, 0x48 1, /* SAA7111, SAA7111A and SAA7113 */
+ 0x42 1, 0x40 1, /* SAA7114, SAA7115 and SAA7118 */
+ I2C_CLIENT_END };
+
memcpy(usbvision-i2c_adap, i2c_adap_template,
sizeof(struct i2c_adapter));
- memcpy(usbvision-i2c_client, i2c_client_template,
- sizeof(struct i2c_client));
sprintf(usbvision-i2c_adap.name + strlen(usbvision-i2c_adap.name),
#%d, usbvision-vdev-num);
PDEBUG(DBG_I2C,Adaptername: %s, usbvision-i2c_adap.name);
usbvision-i2c_adap.dev.parent = usbvision-dev-dev;
- i2c_set_adapdata(usbvision-i2c_adap, usbvision);
- i2c_set_clientdata(usbvision-i2c_client, usbvision);
-
- usbvision-i2c_client.adapter = usbvision-i2c_adap;
+ i2c_set_adapdata(usbvision-i2c_adap, usbvision-v4l2_dev);
if (usbvision_write_reg(usbvision, USBVISION_SER_MODE,
USBVISION_IIC_LRNACK) 0) {
printk(KERN_ERR usbvision_register: can't write reg\n);
return -EBUSY;
}
-#ifdef CONFIG_MODULES
+ PDEBUG(DBG_I2C, I2C debugging is enabled [i2c]);
+ PDEBUG(DBG_I2C, ALGO debugging is enabled [i2c]);
+
+ /* register new adapter to i2c module... */
+
+ usbvision-i2c_adap.algo = usbvision_algo;
+
+ usbvision-i2c_adap.timeout = 100; /* default values, should
*/
+ usbvision-i2c_adap.retries = 3;/* be replaced by defines
*/
+
+ i2c_add_adapter(usbvision-i2c_adap);
+
+ PDEBUG(DBG_I2C, i2c bus for %s registered, usbvision-i2c_adap.name);
+
/* Request the load of the i2c modules we need */
switch (usbvision_device_data[usbvision-DevModel].Codec) {
case CODEC_SAA7113:
- request_module(saa7115);
+ case CODEC_SAA7111:
+
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~pb/v4l-dvb/
The patch number 10697 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://linuxtv.org/hg/~pb/v4l-dvb/ Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/Documentation/dvb/README.flexcop | 205 --- linux/Documentation/dvb/technisat.txt| 34 +- linux/drivers/media/dvb/b2c2/flexcop-hw-filter.c |1 linux/drivers/media/dvb/b2c2/flexcop-pci.c | 77 +++-- linux/drivers/media/dvb/b2c2/flexcop.c |3 5 files changed, 76 insertions(+), 244 deletions(-) diff -r a169633cd720 -r f88e18becfe7 linux/Documentation/dvb/README.flexcop --- a/linux/Documentation/dvb/README.flexcopThu Feb 26 16:31:15 2009 -0300 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,205 +0,0 @@ -This README escorted the skystar2-driver rewriting procedure. It describes the -state of the new flexcop-driver set and some internals are written down here -too. - -This document hopefully describes things about the flexcop and its -device-offsprings. Goal was to write an easy-to-write and easy-to-read set of -drivers based on the skystar2.c and other information. - -Remark: flexcop-pci.c was a copy of skystar2.c, but every line has been -touched and rewritten. - -History News -== - 2005-04-01 - correct USB ISOC transfers (thanks to Vadim Catana) - - - - -General coding processing -= - -We should proceed as follows (as long as no one complains): - -0) Think before start writing code! - -1) rewriting the skystar2.c with the help of the flexcop register descriptions -and splitting up the files to a pci-bus-part and a flexcop-part. -The new driver will be called b2c2-flexcop-pci.ko/b2c2-flexcop-usb.ko for the -device-specific part and b2c2-flexcop.ko for the common flexcop-functions. - -2) Search for errors in the leftover of flexcop-pci.c (compare with pluto2.c -and other pci drivers) - -3) make some beautification (see 'Improvements when rewriting (refactoring) is -done') - -4) Testing the new driver and maybe substitute the skystar2.c with it, to reach -a wider tester audience. - -5) creating an usb-bus-part using the already written flexcop code for the pci -card. - -Idea: create a kernel-object for the flexcop and export all important -functions. This option saves kernel-memory, but maybe a lot of functions have -to be exported to kernel namespace. - - -Current situation -= - -0) Done :) -1) Done (some minor issues left) -2) Done -3) Not ready yet, more information is necessary -4) next to be done (see the table below) -5) USB driver is working (yes, there are some minor issues) - -What seems to be ready? - -1) Rewriting -1a) i2c is cut off from the flexcop-pci.c and seems to work -1b) moved tuner and demod stuff from flexcop-pci.c to flexcop-tuner-fe.c -1c) moved lnb and diseqc stuff from flexcop-pci.c to flexcop-tuner-fe.c -1e) eeprom (reading MAC address) -1d) sram (no dynamic sll size detection (commented out) (using default as JJ told me)) -1f) misc. register accesses for reading parameters (e.g. resetting, revision) -1g) pid/mac filter (flexcop-hw-filter.c) -1i) dvb-stuff initialization in flexcop.c (done) -1h) dma stuff (now just using the size-irq, instead of all-together, to be done) -1j) remove flexcop initialization from flexcop-pci.c completely (done) -1l) use a well working dma IRQ method (done, see 'Known bugs and problems and TODO') -1k) cleanup flexcop-files (remove unused EXPORT_SYMBOLs, make static from -non-static where possible, moved code to proper places) - -2) Search for errors in the leftover of flexcop-pci.c (partially done) -5a) add MAC address reading -5c) feeding of ISOC data to the software demux (format of the isochronous data -and speed optimization, no real error) (thanks to Vadim Catana) - -What to do in the near future? --- -(no special order here) - -5) USB driver -5b) optimize isoc-transfer (submitting/killing isoc URBs when transfer is starting) - -Testing changes - -O = item is working -P = item is partially working -X = item is not working -N = item does not apply here -empty field = item need to be examined - - | PCI | USB -item | mt352 | nxt2002 | stv0299 | mt312 | mt352 | nxt2002 | stv0299 | mt312 +---+-+-+---+---+-+-+--- -1a)| O | | | | N | N | N | N
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-fill-std
The patch number 10699 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-fill-std
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/cx18/cx18-av-core.c |7
linux/drivers/media/video/cx2341x.c | 110 +++--
linux/drivers/media/video/cx25840/cx25840-core.c|7
linux/drivers/media/video/msp3400-driver.c | 26 +-
linux/drivers/media/video/saa7115.c |4
linux/drivers/media/video/saa7134/saa6752hs.c | 12 -
linux/drivers/media/video/saa7134/saa7134-empress.c |2
linux/drivers/media/video/tda7432.c |6
linux/drivers/media/video/tda9875.c |3
linux/drivers/media/video/tvaudio.c | 19 -
linux/drivers/media/video/tvp514x.c |5
linux/drivers/media/video/v4l2-common.c | 142
linux/include/media/v4l2-common.h |1
13 files changed, 143 insertions(+), 201 deletions(-)
diff -r f88e18becfe7 -r 158339754843
linux/drivers/media/video/cx18/cx18-av-core.c
--- a/linux/drivers/media/video/cx18/cx18-av-core.c Thu Feb 26 16:35:44
2009 -0300
+++ b/linux/drivers/media/video/cx18/cx18-av-core.c Thu Feb 26 18:27:06
2009 -0300
@@ -788,10 +788,12 @@ int cx18_av_cmd(struct cx18 *cx, unsigne
switch (qc-id) {
case V4L2_CID_BRIGHTNESS:
+ return v4l2_ctrl_query_fill(qc, 0, 255, 1, 128);
case V4L2_CID_CONTRAST:
case V4L2_CID_SATURATION:
+ return v4l2_ctrl_query_fill(qc, 0, 127, 1, 64);
case V4L2_CID_HUE:
- return v4l2_ctrl_query_fill_std(qc);
+ return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);
default:
break;
}
@@ -801,10 +803,11 @@ int cx18_av_cmd(struct cx18 *cx, unsigne
return v4l2_ctrl_query_fill(qc, 0, 65535,
65535 / 100, state-default_volume);
case V4L2_CID_AUDIO_MUTE:
+ return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0);
case V4L2_CID_AUDIO_BALANCE:
case V4L2_CID_AUDIO_BASS:
case V4L2_CID_AUDIO_TREBLE:
- return v4l2_ctrl_query_fill_std(qc);
+ return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100,
32768);
default:
return -EINVAL;
}
diff -r f88e18becfe7 -r 158339754843 linux/drivers/media/video/cx2341x.c
--- a/linux/drivers/media/video/cx2341x.c Thu Feb 26 16:35:44 2009 -0300
+++ b/linux/drivers/media/video/cx2341x.c Thu Feb 26 18:27:06 2009 -0300
@@ -501,6 +501,29 @@ int cx2341x_ctrl_query(const struct cx23
int err;
switch (qctrl-id) {
+ case V4L2_CID_MPEG_STREAM_TYPE:
+ return v4l2_ctrl_query_fill(qctrl,
+ V4L2_MPEG_STREAM_TYPE_MPEG2_PS,
+ V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD, 1,
+ V4L2_MPEG_STREAM_TYPE_MPEG2_PS);
+
+ case V4L2_CID_MPEG_STREAM_VBI_FMT:
+ if (params-capabilities CX2341X_CAP_HAS_SLICED_VBI)
+ return v4l2_ctrl_query_fill(qctrl,
+ V4L2_MPEG_STREAM_VBI_FMT_NONE,
+ V4L2_MPEG_STREAM_VBI_FMT_IVTV, 1,
+ V4L2_MPEG_STREAM_VBI_FMT_NONE);
+ return cx2341x_ctrl_query_fill(qctrl,
+ V4L2_MPEG_STREAM_VBI_FMT_NONE,
+ V4L2_MPEG_STREAM_VBI_FMT_NONE, 1,
+ default_params.stream_vbi_fmt);
+
+ case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
+ return v4l2_ctrl_query_fill(qctrl,
+ V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100,
+ V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000, 1,
+ V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000);
+
case V4L2_CID_MPEG_AUDIO_ENCODING:
if (params-capabilities CX2341X_CAP_HAS_AC3) {
/*
@@ -532,9 +555,36 @@ int cx2341x_ctrl_query(const struct cx23
qctrl-flags |= V4L2_CTRL_FLAG_INACTIVE;
return 0;
- case V4L2_CID_MPEG_AUDIO_L1_BITRATE:
- case
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-zoran
The patch number 10734 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-zoran Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/common/tuners/mt20xx.c |2 linux/drivers/media/common/tuners/tda8290.c|2 linux/drivers/media/common/tuners/tea5761.c|2 linux/drivers/media/common/tuners/tea5767.c|2 linux/drivers/media/video/Kconfig | 32 linux/drivers/media/video/Makefile |2 linux/drivers/media/video/adv7170.c| 406 - linux/drivers/media/video/adv7175.c| 385 - linux/drivers/media/video/bt819.c | 574 +- linux/drivers/media/video/bt856.c | 352 - linux/drivers/media/video/bt866.c | 309 - linux/drivers/media/video/ks0127.c | 721 +-- linux/drivers/media/video/ks0127.h |2 linux/drivers/media/video/saa6588.c|2 linux/drivers/media/video/saa7110.c| 545 +- linux/drivers/media/video/saa7111.c| 497 -- linux/drivers/media/video/saa7114.c| 1073 linux/drivers/media/video/saa7115.c| 54 linux/drivers/media/video/saa7127.c|1 linux/drivers/media/video/saa7185.c| 288 - linux/drivers/media/video/tvaudio.c|2 linux/drivers/media/video/tvmixer.c|2 linux/drivers/media/video/vpx3220.c| 600 +- linux/drivers/media/video/zoran/Kconfig|8 linux/drivers/media/video/zoran/videocodec.h | 11 linux/drivers/media/video/zoran/zoran.h| 40 linux/drivers/media/video/zoran/zoran_card.c | 425 - linux/drivers/media/video/zoran/zoran_card.h |3 linux/drivers/media/video/zoran/zoran_device.c | 553 +- linux/drivers/media/video/zoran/zoran_device.h | 15 linux/drivers/media/video/zoran/zoran_driver.c | 3861 ++--- linux/drivers/media/video/zoran/zoran_procfs.c |2 linux/drivers/media/video/zoran/zr36016.c |5 linux/drivers/media/video/zoran/zr36050.c |4 linux/drivers/media/video/zoran/zr36060.c |4 linux/include/media/v4l2-chip-ident.h | 34 linux/include/sound/tea575x-tuner.h|2 37 files changed, 3994 insertions(+), 6828 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/de025cad45f9a86ba59d946888702d1d6c00d842 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] tea575x-tuner.h: It still needs V4L1 API
The patch number 10735 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com tea575x-tuner.h: It still needs V4L1 API Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/include/sound/tea575x-tuner.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -r de025cad45f9 -r 2b6f18a40bb6 linux/include/sound/tea575x-tuner.h --- a/linux/include/sound/tea575x-tuner.h Thu Feb 26 21:02:33 2009 -0300 +++ b/linux/include/sound/tea575x-tuner.h Thu Feb 26 21:16:31 2009 -0300 @@ -23,7 +23,7 @@ */ #include compat.h -#include linux/videodev2.h +#include linux/videodev.h #include media/v4l2-dev.h #if LINUX_VERSION_CODE = KERNEL_VERSION(2,6,17) --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/2b6f18a40bb69b03c0ef6f1c03c023b869ab3634 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] v4l2-common: Fix a merge conflict bad solved
The patch number 10736 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com v4l2-common: Fix a merge conflict bad solved Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/video/v4l2-common.c |3 --- 1 file changed, 3 deletions(-) diff -r 2b6f18a40bb6 -r d25029dea583 linux/drivers/media/video/v4l2-common.c --- a/linux/drivers/media/video/v4l2-common.c Thu Feb 26 21:16:31 2009 -0300 +++ b/linux/drivers/media/video/v4l2-common.c Thu Feb 26 21:16:57 2009 -0300 @@ -589,9 +589,6 @@ int v4l2_ctrl_query_fill(struct v4l2_que } EXPORT_SYMBOL(v4l2_ctrl_query_fill); - case V4L2_CID_CAMERA_CLASS: - case V4L2_CID_COLORFX: - return v4l2_ctrl_query_fill(qctrl, 0, 1, 1, 0); /* Fill in a struct v4l2_querymenu based on the struct v4l2_queryctrl and the menu. The qctrl pointer may be NULL, in which case it is ignored. If menu_items is NULL, then the menu items are retrieved using --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/d25029dea583c2d9734d64ab9e2fa90f487ae76d ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] saa7110: get rid of the legacy v4l2_ctrl_query_fill_std()
The patch number 10737 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com saa7110: get rid of the legacy v4l2_ctrl_query_fill_std() Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/video/saa7110.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -r d25029dea583 -r 8926747f2ebe linux/drivers/media/video/saa7110.c --- a/linux/drivers/media/video/saa7110.c Thu Feb 26 21:16:57 2009 -0300 +++ b/linux/drivers/media/video/saa7110.c Thu Feb 26 21:17:37 2009 -0300 @@ -339,7 +339,7 @@ static int saa7110_queryctrl(struct v4l2 case V4L2_CID_CONTRAST: case V4L2_CID_SATURATION: case V4L2_CID_HUE: - return v4l2_ctrl_query_fill_std(qc); + return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0); default: return -EINVAL; } --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/8926747f2ebe7d03b204fc580b75a4b6b4811a09 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] Get rid of video_decoder.h header were uneeded
The patch number 10738 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
Get rid of video_decoder.h header were uneeded
Now, just a few modules are still dependent of this legacy header:
$ grep -l DECODER_ `find linux/drivers/media/ -name '*.[ch]' -exec grep -l
video_decoder '{}' \;`
linux/drivers/media/video/v4l2-ioctl.c
linux/drivers/media/video/indycam.c
linux/drivers/media/video/saa7191.c
linux/drivers/media/video/vino.c
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/tvp5150.c |1 -
linux/drivers/media/video/usbvision/usbvision-core.c |1 -
linux/drivers/media/video/usbvision/usbvision-video.c |1 -
3 files changed, 3 deletions(-)
diff -r 8926747f2ebe -r bf8a791c786f linux/drivers/media/video/tvp5150.c
--- a/linux/drivers/media/video/tvp5150.c Thu Feb 26 21:17:37 2009 -0300
+++ b/linux/drivers/media/video/tvp5150.c Thu Feb 26 21:22:18 2009 -0300
@@ -9,7 +9,6 @@
#include compat.h
#include linux/videodev2.h
#include linux/delay.h
-#include linux/video_decoder.h
#include media/v4l2-device.h
#include media/tvp5150.h
#include media/v4l2-i2c-drv-legacy.h
diff -r 8926747f2ebe -r bf8a791c786f
linux/drivers/media/video/usbvision/usbvision-core.c
--- a/linux/drivers/media/video/usbvision/usbvision-core.c Thu Feb 26
21:17:37 2009 -0300
+++ b/linux/drivers/media/video/usbvision/usbvision-core.c Thu Feb 26
21:22:18 2009 -0300
@@ -36,7 +36,6 @@
#include linux/spinlock.h
#include asm/io.h
#include linux/videodev2.h
-#include linux/video_decoder.h
#include linux/i2c.h
#include media/saa7115.h
diff -r 8926747f2ebe -r bf8a791c786f
linux/drivers/media/video/usbvision/usbvision-video.c
--- a/linux/drivers/media/video/usbvision/usbvision-video.c Thu Feb 26
21:17:37 2009 -0300
+++ b/linux/drivers/media/video/usbvision/usbvision-video.c Thu Feb 26
21:22:18 2009 -0300
@@ -59,7 +59,6 @@
#include linux/spinlock.h
#include asm/io.h
#include linux/videodev2.h
-#include linux/video_decoder.h
#include linux/i2c.h
#include media/saa7115.h
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/bf8a791c786f7842815a223de41927bc574f1fcd
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://mercurial.intuxication.org/hg/v4l-dvb-commits
The patch number 10745 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://mercurial.intuxication.org/hg/v4l-dvb-commits
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/common/ir-keymaps.c | 38 +++
linux/drivers/media/dvb/dm1105/dm1105.c | 241 ++--
linux/include/media/ir-common.h |1
3 files changed, 146 insertions(+), 134 deletions(-)
diff -r 90b0940b0550 -r 51664b7471a2 linux/drivers/media/common/ir-keymaps.c
--- a/linux/drivers/media/common/ir-keymaps.c Thu Feb 26 21:59:12 2009 -0300
+++ b/linux/drivers/media/common/ir-keymaps.c Thu Feb 26 22:01:51 2009 -0300
@@ -2762,3 +2762,41 @@ IR_KEYTAB_TYPE ir_codes_ati_tv_wonder_hd
};
EXPORT_SYMBOL_GPL(ir_codes_ati_tv_wonder_hd_600);
+
+/* DVBWorld remotes
+ Igor M. Liplianin liplia...@me.by
+ */
+IR_KEYTAB_TYPE ir_codes_dm1105_nec[IR_KEYTAB_SIZE] = {
+ [0x0a] = KEY_Q, /*power*/
+ [0x0c] = KEY_M, /*mute*/
+ [0x11] = KEY_1,
+ [0x12] = KEY_2,
+ [0x13] = KEY_3,
+ [0x14] = KEY_4,
+ [0x15] = KEY_5,
+ [0x16] = KEY_6,
+ [0x17] = KEY_7,
+ [0x18] = KEY_8,
+ [0x19] = KEY_9,
+ [0x10] = KEY_0,
+ [0x1c] = KEY_PAGEUP,/*ch+*/
+ [0x0f] = KEY_PAGEDOWN, /*ch-*/
+ [0x1a] = KEY_O, /*vol+*/
+ [0x0e] = KEY_Z, /*vol-*/
+ [0x04] = KEY_R, /*rec*/
+ [0x09] = KEY_D, /*fav*/
+ [0x08] = KEY_BACKSPACE, /*rewind*/
+ [0x07] = KEY_A, /*fast*/
+ [0x0b] = KEY_P, /*pause*/
+ [0x02] = KEY_ESC, /*cancel*/
+ [0x03] = KEY_G, /*tab*/
+ [0x00] = KEY_UP,/*up*/
+ [0x1f] = KEY_ENTER, /*ok*/
+ [0x01] = KEY_DOWN, /*down*/
+ [0x05] = KEY_C, /*cap*/
+ [0x06] = KEY_S, /*stop*/
+ [0x40] = KEY_F, /*full*/
+ [0x1e] = KEY_W, /*tvmode*/
+ [0x1b] = KEY_B, /*recall*/
+};
+EXPORT_SYMBOL_GPL(ir_codes_dm1105_nec);
diff -r 90b0940b0550 -r 51664b7471a2 linux/drivers/media/dvb/dm1105/dm1105.c
--- a/linux/drivers/media/dvb/dm1105/dm1105.c Thu Feb 26 21:59:12 2009 -0300
+++ b/linux/drivers/media/dvb/dm1105/dm1105.c Thu Feb 26 22:01:51 2009 -0300
@@ -156,46 +156,12 @@ MODULE_PARM_DESC(ir_debug, enable debug
DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
-static u16 ir_codes_dm1105_nec[128] = {
- [0x0a] = KEY_Q, /*power*/
- [0x0c] = KEY_M, /*mute*/
- [0x11] = KEY_1,
- [0x12] = KEY_2,
- [0x13] = KEY_3,
- [0x14] = KEY_4,
- [0x15] = KEY_5,
- [0x16] = KEY_6,
- [0x17] = KEY_7,
- [0x18] = KEY_8,
- [0x19] = KEY_9,
- [0x10] = KEY_0,
- [0x1c] = KEY_PAGEUP,/*ch+*/
- [0x0f] = KEY_PAGEDOWN, /*ch-*/
- [0x1a] = KEY_O, /*vol+*/
- [0x0e] = KEY_Z, /*vol-*/
- [0x04] = KEY_R, /*rec*/
- [0x09] = KEY_D, /*fav*/
- [0x08] = KEY_BACKSPACE, /*rewind*/
- [0x07] = KEY_A, /*fast*/
- [0x0b] = KEY_P, /*pause*/
- [0x02] = KEY_ESC, /*cancel*/
- [0x03] = KEY_G, /*tab*/
- [0x00] = KEY_UP,/*up*/
- [0x1f] = KEY_ENTER, /*ok*/
- [0x01] = KEY_DOWN, /*down*/
- [0x05] = KEY_C, /*cap*/
- [0x06] = KEY_S, /*stop*/
- [0x40] = KEY_F, /*full*/
- [0x1e] = KEY_W, /*tvmode*/
- [0x1b] = KEY_B, /*recall*/
-};
-
/* infrared remote control */
struct infrared {
- u16 key_map[128];
struct input_dev*input_dev;
+ struct ir_input_state ir;
charinput_phys[32];
- struct tasklet_struct ir_tasklet;
+ struct work_struct work;
u32 ir_command;
};
@@ -220,10 +186,14 @@ struct dm1105dvb {
/* i2c */
struct i2c_adapter i2c_adap;
+ /* irq */
+ struct work_struct work;
+
/* dma */
dma_addr_t dma_addr;
unsigned char *ts_buf;
u32 wrp;
+ u32 nextwrp;
u32 buffer_size;
unsigned intPacketErrorCount;
unsigned int dmarst;
@@ -232,8 +202,6 @@ struct dm1105dvb {
};
#define dm_io_mem(reg) ((unsigned long)(dm1105dvb-io_mem[reg]))
-
-static struct dm1105dvb *dm1105dvb_local;
static int dm1105_i2c_xfer(struct i2c_adapter *i2c_adap,
struct i2c_msg *msgs, int num)
@@ -410,28 +378,72 @@ static
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~mkrufky/sms1xxx
The patch number 10754 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~mkrufky/sms1xxx
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/dvb/siano/Makefile |4
linux/drivers/media/dvb/siano/sms-cards.c | 100 +++-
linux/drivers/media/dvb/siano/sms-cards.h |5
linux/drivers/media/dvb/siano/smscoreapi.c | 124 +
linux/drivers/media/dvb/siano/smscoreapi.h | 42 +--
linux/drivers/media/dvb/siano/smsdvb.c | 66 +--
linux/drivers/media/dvb/siano/smsusb.c | 73 +++-
7 files changed, 286 insertions(+), 128 deletions(-)
diff -r 51664b7471a2 -r 008f357fb0fa linux/drivers/media/dvb/siano/Makefile
--- a/linux/drivers/media/dvb/siano/MakefileThu Feb 26 22:01:51 2009 -0300
+++ b/linux/drivers/media/dvb/siano/MakefileThu Feb 26 22:04:49 2009 -0300
@@ -1,6 +1,8 @@ sms1xxx-objs := smscoreapi.o smsusb.o sm
-sms1xxx-objs := smscoreapi.o smsusb.o smsdvb.o sms-cards.o
+sms1xxx-objs := smscoreapi.o sms-cards.o
obj-$(CONFIG_DVB_SIANO_SMS1XXX) += sms1xxx.o
+obj-$(CONFIG_DVB_SIANO_SMS1XXX) += smsusb.o
+obj-$(CONFIG_DVB_SIANO_SMS1XXX) += smsdvb.o
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
diff -r 51664b7471a2 -r 008f357fb0fa linux/drivers/media/dvb/siano/sms-cards.c
--- a/linux/drivers/media/dvb/siano/sms-cards.c Thu Feb 26 22:01:51 2009 -0300
+++ b/linux/drivers/media/dvb/siano/sms-cards.c Thu Feb 26 22:04:49 2009 -0300
@@ -19,53 +19,6 @@
#include sms-cards.h
-struct usb_device_id smsusb_id_table[] = {
-#ifdef CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS
- { USB_DEVICE(0x187f, 0x0010),
- .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
- { USB_DEVICE(0x187f, 0x0100),
- .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
- { USB_DEVICE(0x187f, 0x0200),
- .driver_info = SMS1XXX_BOARD_SIANO_NOVA_A },
- { USB_DEVICE(0x187f, 0x0201),
- .driver_info = SMS1XXX_BOARD_SIANO_NOVA_B },
- { USB_DEVICE(0x187f, 0x0300),
- .driver_info = SMS1XXX_BOARD_SIANO_VEGA },
-#endif
- { USB_DEVICE(0x2040, 0x1700),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT },
- { USB_DEVICE(0x2040, 0x1800),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A },
- { USB_DEVICE(0x2040, 0x1801),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B },
- { USB_DEVICE(0x2040, 0x2000),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
- { USB_DEVICE(0x2040, 0x2009),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2 },
- { USB_DEVICE(0x2040, 0x200a),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
- { USB_DEVICE(0x2040, 0x2010),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
- { USB_DEVICE(0x2040, 0x2011),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
- { USB_DEVICE(0x2040, 0x2019),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD },
- { USB_DEVICE(0x2040, 0x5500),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
- { USB_DEVICE(0x2040, 0x5510),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
- { USB_DEVICE(0x2040, 0x5520),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
- { USB_DEVICE(0x2040, 0x5530),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
- { USB_DEVICE(0x2040, 0x5580),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
- { USB_DEVICE(0x2040, 0x5590),
- .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM },
- { } /* Terminating entry */
-};
-MODULE_DEVICE_TABLE(usb, smsusb_id_table);
-
static struct sms_board sms_boards[] = {
[SMS_BOARD_UNKNOWN] = {
.name = Unknown board,
@@ -117,6 +70,7 @@ static struct sms_board sms_boards[] = {
.type = SMS_NOVA_B0,
.fw[DEVICE_MODE_DVBT_BDA] = sms1xxx-hcw-55xxx-dvbt-02.fw,
.lna_ctrl = 29,
+ .rf_switch = 17,
},
[SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2] = {
.name = Hauppauge WinTV MiniCard,
@@ -132,6 +86,7 @@ struct sms_board *sms_get_board(int id)
return sms_boards[id];
}
+EXPORT_SYMBOL_GPL(sms_get_board);
static int sms_set_gpio(struct smscore_device_t *coredev, int pin, int enable)
{
@@ -184,6 +139,7 @@ int
[linuxtv-commits] [hg:v4l-dvb] cx18: Fix compilation and remove the obsoleted v4l2_ctrl_query_fill_std() call
The patch number 10766 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
cx18: Fix compilation and remove the obsoleted v4l2_ctrl_query_fill_std() call
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/cx18/cx18-av-core.c |9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff -r 731f3b883502 -r 5fb7c4aeefe4
linux/drivers/media/video/cx18/cx18-av-core.c
--- a/linux/drivers/media/video/cx18/cx18-av-core.c Thu Feb 26 22:19:36
2009 -0300
+++ b/linux/drivers/media/video/cx18/cx18-av-core.c Thu Feb 26 22:23:37
2009 -0300
@@ -812,7 +812,7 @@ static int cx18_av_queryctrl(struct v4l2
case V4L2_CID_CONTRAST:
case V4L2_CID_SATURATION:
case V4L2_CID_HUE:
- return v4l2_ctrl_query_fill_std(qc);
+ return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);
default:
break;
}
@@ -825,7 +825,7 @@ static int cx18_av_queryctrl(struct v4l2
case V4L2_CID_AUDIO_BALANCE:
case V4L2_CID_AUDIO_BASS:
case V4L2_CID_AUDIO_TREBLE:
- return v4l2_ctrl_query_fill_std(qc);
+ return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);
default:
return -EINVAL;
}
@@ -924,11 +924,6 @@ static int cx18_av_s_stream(struct v4l2_
} else {
cx18_av_write(cx, 0x115, 0x00);
cx18_av_write(cx, 0x116, 0x00);
- return v4l2_ctrl_query_fill(qc, 0, 255, 1, 128);
- return v4l2_ctrl_query_fill(qc, 0, 127, 1, 64);
- return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);
- return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0);
- return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100,
32768);
}
return 0;
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/5fb7c4aeefe495d4a66fbe7127ce8de11a19ad1d
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~awalls/cx18
The patch number 10765 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://linuxtv.org/hg/~awalls/cx18 Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/video/cx18/cx18-audio.c | 50 linux/drivers/media/video/cx18/cx18-audio.h |2 linux/drivers/media/video/cx18/cx18-av-core.c | 805 -- linux/drivers/media/video/cx18/cx18-av-core.h | 16 linux/drivers/media/video/cx18/cx18-av-firmware.c |7 linux/drivers/media/video/cx18/cx18-cards.c | 42 linux/drivers/media/video/cx18/cx18-cards.h | 15 linux/drivers/media/video/cx18/cx18-controls.c| 25 linux/drivers/media/video/cx18/cx18-driver.c | 248 ++-- linux/drivers/media/video/cx18/cx18-driver.h | 100 + linux/drivers/media/video/cx18/cx18-fileops.c | 41 linux/drivers/media/video/cx18/cx18-firmware.c| 18 linux/drivers/media/video/cx18/cx18-gpio.c| 361 -- linux/drivers/media/video/cx18/cx18-gpio.h| 10 linux/drivers/media/video/cx18/cx18-i2c.c | 333 + linux/drivers/media/video/cx18/cx18-i2c.h |5 linux/drivers/media/video/cx18/cx18-ioctl.c | 115 +- linux/drivers/media/video/cx18/cx18-streams.c | 12 linux/drivers/media/video/cx18/cx18-vbi.c |3 linux/drivers/media/video/cx18/cx18-version.h |4 linux/drivers/media/video/cx18/cx18-video.c |3 linux/include/media/v4l2-chip-ident.h |3 22 files changed, 1183 insertions(+), 1035 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/731f3b883502ec6fa522b2c0a2b94eee56971fcb ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] cx18 and saa7110: remove the fake v4l2_ctrl_query_fill calls for the proper ones
The patch number 10768 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
cx18 and saa7110: remove the fake v4l2_ctrl_query_fill calls for the proper ones
During the patch merge, I've added a temporary fix for v4l2_ctrl_query_fill(),
just to avoid the tree breakage. Replace those for the proper values.
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/cx18/cx18-av-core.c |5 -
linux/drivers/media/video/saa7110.c |2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
diff -r 85a2b117175e -r 60389ff5e931
linux/drivers/media/video/cx18/cx18-av-core.c
--- a/linux/drivers/media/video/cx18/cx18-av-core.c Fri Feb 27 00:06:40
2009 -0300
+++ b/linux/drivers/media/video/cx18/cx18-av-core.c Fri Feb 27 00:08:39
2009 -0300
@@ -809,8 +809,10 @@ static int cx18_av_queryctrl(struct v4l2
switch (qc-id) {
case V4L2_CID_BRIGHTNESS:
+ return v4l2_ctrl_query_fill(qc, 0, 255, 1, 128);
case V4L2_CID_CONTRAST:
case V4L2_CID_SATURATION:
+ return v4l2_ctrl_query_fill(qc, 0, 127, 1, 64);
case V4L2_CID_HUE:
return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);
default:
@@ -822,10 +824,11 @@ static int cx18_av_queryctrl(struct v4l2
return v4l2_ctrl_query_fill(qc, 0, 65535,
65535 / 100, state-default_volume);
case V4L2_CID_AUDIO_MUTE:
+ return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0);
case V4L2_CID_AUDIO_BALANCE:
case V4L2_CID_AUDIO_BASS:
case V4L2_CID_AUDIO_TREBLE:
- return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);
+ return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768);
default:
return -EINVAL;
}
diff -r 85a2b117175e -r 60389ff5e931 linux/drivers/media/video/saa7110.c
--- a/linux/drivers/media/video/saa7110.c Fri Feb 27 00:06:40 2009 -0300
+++ b/linux/drivers/media/video/saa7110.c Fri Feb 27 00:08:39 2009 -0300
@@ -336,8 +336,10 @@ static int saa7110_queryctrl(struct v4l2
{
switch (qc-id) {
case V4L2_CID_BRIGHTNESS:
+ return v4l2_ctrl_query_fill(qc, 0, 255, 1, 128);
case V4L2_CID_CONTRAST:
case V4L2_CID_SATURATION:
+ return v4l2_ctrl_query_fill(qc, 0, 127, 1, 64);
case V4L2_CID_HUE:
return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);
default:
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/60389ff5e931badca90047921435bf273d9446c2
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] siano: Remove duplicated var declaration
The patch number 10767 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
siano: Remove duplicated var declaration
The same var were declared into three different modules:
drivers/media/dvb/siano/smsusb.o: In function `get_order':
/home/v4l/tokernel/wrk/devel/include/asm-generic/page.h:10: multiple definition
of `sms_dbg'
drivers/media/dvb/siano/sms1xxx.o:/home/v4l/tokernel/wrk/devel/include/asm-generic/page.h:10:
first defined here
drivers/media/dvb/siano/smsdvb.o: In function `get_order':
/home/v4l/tokernel/wrk/devel/include/asm-generic/page.h:10: multiple definition
of `sms_dbg'
drivers/media/dvb/siano/sms1xxx.o:/home/v4l/tokernel/wrk/devel/include/asm-generic/page.h:10:
first defined here
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/dvb/siano/smsdvb.c |4
linux/drivers/media/dvb/siano/smsusb.c |4
2 files changed, 8 deletions(-)
diff -r 5fb7c4aeefe4 -r 85a2b117175e linux/drivers/media/dvb/siano/smsdvb.c
--- a/linux/drivers/media/dvb/siano/smsdvb.cThu Feb 26 22:23:37 2009 -0300
+++ b/linux/drivers/media/dvb/siano/smsdvb.cFri Feb 27 00:06:40 2009 -0300
@@ -49,10 +49,6 @@ struct smsdvb_client_t {
static struct list_head g_smsdvb_clients;
static struct mutex g_smsdvb_clientslock;
-
-int sms_dbg;
-module_param_named(debug, sms_dbg, int, 0644);
-MODULE_PARM_DESC(debug, set debug level (info=1, adv=2 (or-able)));
static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
{
diff -r 5fb7c4aeefe4 -r 85a2b117175e linux/drivers/media/dvb/siano/smsusb.c
--- a/linux/drivers/media/dvb/siano/smsusb.cThu Feb 26 22:23:37 2009 -0300
+++ b/linux/drivers/media/dvb/siano/smsusb.cFri Feb 27 00:06:40 2009 -0300
@@ -26,10 +26,6 @@
#include smscoreapi.h
#include sms-cards.h
-
-int sms_dbg;
-module_param_named(debug, sms_dbg, int, 0644);
-MODULE_PARM_DESC(debug, set debug level (info=1, adv=2 (or-able)));
#define USB1_BUFFER_SIZE 0x1000
#define USB2_BUFFER_SIZE 0x4000
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/85a2b117175ef94b6ca712bbe11eaadca99acf8c
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] Update dependencies of the modules converted to V4L2
The patch number 10769 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com Update dependencies of the modules converted to V4L2 Several modules were converted to V4L2 API. Update their dependencies on Kconfig. Priority: normal Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/video/Kconfig | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff -r 60389ff5e931 -r bacf8080411c linux/drivers/media/video/Kconfig --- a/linux/drivers/media/video/Kconfig Fri Feb 27 00:08:39 2009 -0300 +++ b/linux/drivers/media/video/Kconfig Fri Feb 27 09:32:31 2009 -0300 @@ -253,7 +253,7 @@ comment Video decoders config VIDEO_BT819 tristate BT819A VideoStream decoder - depends on VIDEO_V4L1 I2C + depends on VIDEO_V4L2 I2C ---help--- Support for BT819A video decoder. @@ -262,7 +262,7 @@ config VIDEO_BT819 config VIDEO_BT856 tristate BT856 VideoStream decoder - depends on VIDEO_V4L1 I2C + depends on VIDEO_V4L2 I2C ---help--- Support for BT856 video decoder. @@ -271,7 +271,7 @@ config VIDEO_BT856 config VIDEO_BT866 tristate BT866 VideoStream decoder - depends on VIDEO_V4L1 I2C + depends on VIDEO_V4L2 I2C ---help--- Support for BT866 video decoder. @@ -280,7 +280,7 @@ config VIDEO_BT866 config VIDEO_KS0127 tristate KS0127 video decoder - depends on VIDEO_V4L1 I2C + depends on VIDEO_V4L2 I2C ---help--- Support for KS0127 video decoder. @@ -363,7 +363,7 @@ config VIDEO_TVP5150 config VIDEO_VPX3220 tristate vpx3220a, vpx3216b vpx3214c video decoders - depends on VIDEO_V4L1 I2C + depends on VIDEO_V4L2 I2C ---help--- Support for VPX322x video decoders. @@ -401,7 +401,7 @@ config VIDEO_SAA7127 config VIDEO_SAA7185 tristate Philips SAA7185 video encoder - depends on VIDEO_V4L1 I2C + depends on VIDEO_V4L2 I2C ---help--- Support for the Philips SAA7185 video encoder. @@ -410,7 +410,7 @@ config VIDEO_SAA7185 config VIDEO_ADV7170 tristate Analog Devices ADV7170 video encoder - depends on VIDEO_V4L1 I2C + depends on VIDEO_V4L2 I2C ---help--- Support for the Analog Devices ADV7170 video encoder driver @@ -419,7 +419,7 @@ config VIDEO_ADV7170 config VIDEO_ADV7175 tristate Analog Devices ADV7175 video encoder - depends on VIDEO_V4L1 I2C + depends on VIDEO_V4L2 I2C ---help--- Support for the Analog Devices ADV7175 video encoder driver --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/bacf8080411caace0c814593dbf26df824d6c6a7 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] backport firedtv into V4L/DVB tree
The patch number 10770 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com backport firedtv into V4L/DVB tree kernel-sync: Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/dvb/Kconfig |4 linux/drivers/media/dvb/Makefile|2 linux/drivers/media/dvb/firewire/Kconfig| 22 linux/drivers/media/dvb/firewire/Makefile |8 linux/drivers/media/dvb/firewire/firedtv-1394.c | 285 +++ linux/drivers/media/dvb/firewire/firedtv-avc.c | 1315 linux/drivers/media/dvb/firewire/firedtv-ci.c | 260 +++ linux/drivers/media/dvb/firewire/firedtv-dvb.c | 364 linux/drivers/media/dvb/firewire/firedtv-fe.c | 247 +++ linux/drivers/media/dvb/firewire/firedtv-rc.c | 190 ++ linux/drivers/media/dvb/firewire/firedtv.h | 182 ++ 11 files changed, 2879 insertions(+) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/b338640f0f676736bd5a3db9ce64609f28adbf8c ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] tea575x-tuner: convert it to V4L2 API
The patch number 10771 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
tea575x-tuner: convert it to V4L2 API
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/include/sound/tea575x-tuner.h | 22 -
linux/sound/i2c/other/tea575x-tuner.c | 346 --
2 files changed, 224 insertions(+), 144 deletions(-)
diff -r b338640f0f67 -r 378d905783b1 linux/include/sound/tea575x-tuner.h
--- a/linux/include/sound/tea575x-tuner.h Fri Feb 27 09:48:16 2009 -0300
+++ b/linux/include/sound/tea575x-tuner.h Fri Feb 27 11:51:24 2009 -0300
@@ -23,24 +23,16 @@
*/
#include compat.h
-#include linux/videodev.h
+#include linux/videodev2.h
#include media/v4l2-dev.h
+#include media/v4l2-ioctl.h
-#if LINUX_VERSION_CODE = KERNEL_VERSION(2,6,17)
-typedef struct snd_tea575x tea575x_t;
-#else
struct snd_tea575x;
-#endif
struct snd_tea575x_ops {
-#if LINUX_VERSION_CODE = KERNEL_VERSION(2,6,17)
- void (*write)(tea575x_t *tea, unsigned int val);
- unsigned int (*read)(tea575x_t *tea);
-#else
void (*write)(struct snd_tea575x *tea, unsigned int val);
unsigned int (*read)(struct snd_tea575x *tea);
void (*mute)(struct snd_tea575x *tea, unsigned int mute);
-#endif
};
struct snd_tea575x {
@@ -49,11 +41,10 @@ struct snd_tea575x {
#else
struct snd_card *card;
#endif
- struct video_device vd; /* video device */
- struct v4l2_file_operations fops;
+ struct video_device *vd;/* video device */
int dev_nr; /* requested device number + 1 */
- int vd_registered; /* video device is registered */
int tea5759;/* 5759 chip is present */
+ int mute; /* Device is muted? */
unsigned int freq_fixup;/* crystal onboard */
unsigned int val; /* hw value */
unsigned long freq; /* frequency */
@@ -62,12 +53,7 @@ struct snd_tea575x {
void *private_data;
};
-#if LINUX_VERSION_CODE = KERNEL_VERSION(2,6,17)
-void snd_tea575x_init(tea575x_t *tea);
-void snd_tea575x_exit(tea575x_t *tea);
-#else
void snd_tea575x_init(struct snd_tea575x *tea);
void snd_tea575x_exit(struct snd_tea575x *tea);
-#endif
#endif /* __SOUND_TEA575X_TUNER_H */
diff -r b338640f0f67 -r 378d905783b1 linux/sound/i2c/other/tea575x-tuner.c
--- a/linux/sound/i2c/other/tea575x-tuner.c Fri Feb 27 09:48:16 2009 -0300
+++ b/linux/sound/i2c/other/tea575x-tuner.c Fri Feb 27 11:51:24 2009 -0300
@@ -31,6 +31,13 @@ MODULE_AUTHOR(Jaroslav Kysela pe...@pe
MODULE_AUTHOR(Jaroslav Kysela pe...@perex.cz);
MODULE_DESCRIPTION(Routines for control of TEA5757/5759 Philips AM/FM radio
tuner chips);
MODULE_LICENSE(GPL);
+
+static int radio_nr = -1;
+module_param(radio_nr, int, 0);
+
+#define RADIO_VERSION KERNEL_VERSION(0,0,2)
+#define FREQ_LO 87*16000
+#define FREQ_HI108*16000
/*
* definitions
@@ -54,6 +61,17 @@ MODULE_LICENSE(GPL);
#define TEA575X_BIT_DUMMY (115) /* buffer */
#define TEA575X_BIT_FREQ_MASK 0x7fff
+static struct v4l2_queryctrl radio_qctrl[] = {
+ {
+ .id= V4L2_CID_AUDIO_MUTE,
+ .name = Mute,
+ .minimum = 0,
+ .maximum = 1,
+ .default_value = 1,
+ .type = V4L2_CTRL_TYPE_BOOLEAN,
+ }
+};
+
/*
* lowlevel part
*/
@@ -89,124 +107,195 @@ static void snd_tea575x_set_freq(struct
* Linux Video interface
*/
-static long snd_tea575x_ioctl(struct file *file,
-unsigned int cmd, unsigned long data)
-{
-#if LINUX_VERSION_CODE = KERNEL_VERSION(2,6,17)
- tea575x_t *tea = video_drvdata(file);
-#else
- struct snd_tea575x *tea = video_drvdata(file);
-#endif
- void __user *arg = (void __user *)data;
-
- switch(cmd) {
- case VIDIOCGCAP:
- {
- struct video_capability v;
- v.type = VID_TYPE_TUNER;
- v.channels = 1;
- v.audios = 1;
- /* No we don't do pictures */
- v.maxwidth = 0;
- v.maxheight = 0;
- v.minwidth = 0;
- v.minheight = 0;
- strcpy(v.name, tea-tea5759 ? TEA5759 : TEA5757);
- if (copy_to_user(arg,v,sizeof(v)))
-
[linuxtv-commits] [hg:v4l-dvb] Fix a Kconfig bug when compiling with kernels older than 2.6.22.
The patch number 10774 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
Fix a Kconfig bug when compiling with kernels older than 2.6.22.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
v4l/Makefile |5 +
v4l/scripts/fix_kconfig.pl | 21 +
2 files changed, 26 insertions(+)
diff -r 42939ed67101 -r eb7c91180360 v4l/Makefile
--- a/v4l/Makefile Fri Feb 27 15:37:08 2009 -0300
+++ b/v4l/Makefile Fri Feb 27 15:45:28 2009 -0300
@@ -361,18 +361,23 @@ endif
xconfig:: $(QCONF) $(obj)/Kconfig
$(QCONF) $(obj)/Kconfig
+ ./scripts/fix_kconfig.pl
gconfig:: $(GCONF) $(obj)/Kconfig
$(GCONF) $(obj)/Kconfig
+ ./scripts/fix_kconfig.pl
config:: $(CONF) $(obj)/Kconfig
$(CONF) $(obj)/Kconfig
+ ./scripts/fix_kconfig.pl
menuconfig:: $(MCONF) lxdialog $(obj)/Kconfig
$(MCONF) $(obj)/Kconfig
+ ./scripts/fix_kconfig.pl
allyesconfig allmodconfig:: $(obj)/.version
./scripts/make_kconfig.pl $(OUTDIR) $(SRCDIR) 1
+ ./scripts/fix_kconfig.pl
# rule to build kernel conf programs
KMAKEVARS := config-targets=1 mixed-targets=0 dot-config=0 SRCDIR=$(SRCDIR)
diff -r 42939ed67101 -r eb7c91180360 v4l/scripts/fix_kconfig.pl
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/v4l/scripts/fix_kconfig.plFri Feb 27 15:45:28 2009 -0300
@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+use strict;
+
+my $need_changes = 0;
+my $out;
+
+open IN,.config;
+while (IN) {
+ if (s/CONFIG_VIDEO_CX88_MPEG=y/CONFIG_VIDEO_CX88_MPEG=m/) {
+ $need_changes=1;
+ $out .= $_;
+ }
+}
+close IN;
+
+if ($need_changes) {
+ printf(There's a known bug with the building system with this kernel.
Working around.\n);
+ open OUT, .config;
+ print OUT $out;
+ close OUT;
+}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/eb7c9118036016d05376cc99208fda9085b07bcf
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] Remove obsolete drivers: firesat (from v4l_experimental) and btaudio
The patch number 10773 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com Remove obsolete drivers: firesat (from v4l_experimental) and btaudio firesat were reworked and committed as firedtv. We don't need to keep the experimental version of it. btaudio can also be removed, since OSS audio is deprecated. The driver were already removed upstream. Priority: normal Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/sound/oss/btaudio.c | 1156 -- v4l/Kconfig.sound | 26 v4l/Makefile.sound| 11 v4l_experimental/firesat/Kconfig | 11 v4l_experimental/firesat/Makefile | 11 v4l_experimental/firesat/avc_api.c| 953 - v4l_experimental/firesat/avc_api.h| 435 - v4l_experimental/firesat/cmp.c| 176 --- v4l_experimental/firesat/cmp.h|9 v4l_experimental/firesat/firesat-ci.c | 124 -- v4l_experimental/firesat/firesat-ci.h |9 v4l_experimental/firesat/firesat-rc.c | 83 - v4l_experimental/firesat/firesat-rc.h |9 v4l_experimental/firesat/firesat.c| 917 v4l_experimental/firesat/firesat.h| 72 - 15 files changed, 4002 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/42939ed67101346b73cc71c91a21e659a55517da ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] tea575x-tuner.c: fix some CodingStyle troubles on the previous patch
The patch number 10775 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
tea575x-tuner.c: fix some CodingStyle troubles on the previous patch
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/sound/i2c/other/tea575x-tuner.c | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
diff -r eb7c91180360 -r 836f7b686839 linux/sound/i2c/other/tea575x-tuner.c
--- a/linux/sound/i2c/other/tea575x-tuner.c Fri Feb 27 15:45:28 2009 -0300
+++ b/linux/sound/i2c/other/tea575x-tuner.c Fri Feb 27 16:05:38 2009 -0300
@@ -35,9 +35,9 @@ static int radio_nr = -1;
static int radio_nr = -1;
module_param(radio_nr, int, 0);
-#define RADIO_VERSION KERNEL_VERSION(0,0,2)
-#define FREQ_LO 87*16000
-#define FREQ_HI108*16000
+#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
+#define FREQ_LO (87 * 16000)
+#define FREQ_HI(108 * 16000)
/*
* definitions
@@ -312,7 +312,8 @@ void snd_tea575x_init(struct snd_tea575x
val = tea-ops-read(tea);
if (val == 0x1ff || val == 0) {
- snd_printk(KERN_ERR tea575x-tuner: Cannot find TEA575x
chip\n);
+ snd_printk(KERN_ERR
+ tea575x-tuner: Cannot find TEA575x chip\n);
return;
}
@@ -328,14 +329,16 @@ void snd_tea575x_init(struct snd_tea575x
memcpy(tea575x_radio_inst, tea575x_radio, sizeof(tea575x_radio));
- strcpy(tea575x_radio.name, tea-tea5759 ? TEA5759 radio : TEA5757
radio);
+ strcpy(tea575x_radio.name, tea-tea5759 ?
+ TEA5759 radio : TEA5757 radio);
video_set_drvdata(tea575x_radio_inst, tea);
- retval = video_register_device(tea575x_radio_inst, VFL_TYPE_RADIO,
radio_nr);
+ retval = video_register_device(tea575x_radio_inst,
+ VFL_TYPE_RADIO, radio_nr);
if (retval) {
printk(KERN_ERR tea575x-tuner: can't register video
device!\n);
- kfree (tea575x_radio_inst);
+ kfree(tea575x_radio_inst);
return;
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/836f7b686839309d8ee6a21acc89b2dfe8a2d13e
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] tea575x-tuner.c: now, it needs linux/version.h
The patch number 10776 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com tea575x-tuner.c: now, it needs linux/version.h Priority: normal Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/sound/i2c/other/tea575x-tuner.c |1 + 1 file changed, 1 insertion(+) diff -r 836f7b686839 -r c0244e1ae780 linux/sound/i2c/other/tea575x-tuner.c --- a/linux/sound/i2c/other/tea575x-tuner.c Fri Feb 27 16:05:38 2009 -0300 +++ b/linux/sound/i2c/other/tea575x-tuner.c Fri Feb 27 16:11:10 2009 -0300 @@ -24,6 +24,7 @@ #include linux/delay.h #include linux/interrupt.h #include linux/init.h +#include linux/version.h #include compat.h #include sound/core.h #include sound/tea575x-tuner.h --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/c0244e1ae7809eda1878e2e8ecadd7427c3c8a0d ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~mkrufky/mxl5007t
The patch number 10785 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~mkrufky/mxl5007t
Priority: normal
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/common/tuners/mxl5007t.c | 451 ++-
1 file changed, 149 insertions(+), 302 deletions(-)
diff -r c770b20d15c6 -r 91f9c6c451f7
linux/drivers/media/common/tuners/mxl5007t.c
--- a/linux/drivers/media/common/tuners/mxl5007t.c Fri Feb 27 21:29:59
2009 -0300
+++ b/linux/drivers/media/common/tuners/mxl5007t.c Mon Mar 02 09:39:13
2009 -0300
@@ -1,7 +1,7 @@
/*
* mxl5007t.c - driver for the MaxLinear MxL5007T silicon tuner
*
- * Copyright (C) 2008 Michael Krufky mkru...@linuxtv.org
+ * Copyright (C) 2008, 2009 Michael Krufky mkru...@linuxtv.org
*
* 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
@@ -67,22 +67,17 @@ MODULE_PARM_DESC(debug, set debug level
#define MHz 100
enum mxl5007t_mode {
- MxL_MODE_OTA_DVBT_ATSC=0,
- MxL_MODE_OTA_NTSC_PAL_GH =1,
- MxL_MODE_OTA_PAL_IB =2,
- MxL_MODE_OTA_PAL_D_SECAM_KL =3,
- MxL_MODE_OTA_ISDBT=4,
- MxL_MODE_CABLE_DIGITAL= 0x10,
- MxL_MODE_CABLE_NTSC_PAL_GH= 0x11,
- MxL_MODE_CABLE_PAL_IB = 0x12,
- MxL_MODE_CABLE_PAL_D_SECAM_KL = 0x13,
- MxL_MODE_CABLE_SCTE40 = 0x14,
+ MxL_MODE_ISDBT =0,
+ MxL_MODE_DVBT =1,
+ MxL_MODE_ATSC =2,
+ MxL_MODE_CABLE = 0x10,
};
enum mxl5007t_chip_version {
MxL_UNKNOWN_ID = 0x00,
MxL_5007_V1_F1 = 0x11,
MxL_5007_V1_F2 = 0x12,
+ MxL_5007_V4= 0x14,
MxL_5007_V2_100_F1 = 0x21,
MxL_5007_V2_100_F2 = 0x22,
MxL_5007_V2_200_F1 = 0x23,
@@ -97,67 +92,61 @@ struct reg_pair_t {
/* - */
static struct reg_pair_t init_tab[] = {
- { 0x0b, 0x44 }, /* XTAL */
- { 0x0c, 0x60 }, /* IF */
- { 0x10, 0x00 }, /* MISC */
- { 0x12, 0xca }, /* IDAC */
- { 0x16, 0x90 }, /* MODE */
- { 0x32, 0x38 }, /* MODE Analog/Digital */
- { 0xd8, 0x18 }, /* CLK_OUT_ENABLE */
- { 0x2c, 0x34 }, /* OVERRIDE */
- { 0x4d, 0x40 }, /* OVERRIDE */
- { 0x7f, 0x02 }, /* OVERRIDE */
- { 0x9a, 0x52 }, /* OVERRIDE */
- { 0x48, 0x5a }, /* OVERRIDE */
- { 0x76, 0x1a }, /* OVERRIDE */
- { 0x6a, 0x48 }, /* OVERRIDE */
- { 0x64, 0x28 }, /* OVERRIDE */
- { 0x66, 0xe6 }, /* OVERRIDE */
- { 0x35, 0x0e }, /* OVERRIDE */
- { 0x7e, 0x01 }, /* OVERRIDE */
- { 0x83, 0x00 }, /* OVERRIDE */
- { 0x04, 0x0b }, /* OVERRIDE */
- { 0x05, 0x01 }, /* TOP_MASTER_ENABLE */
+ { 0x02, 0x06 },
+ { 0x03, 0x48 },
+ { 0x05, 0x04 },
+ { 0x06, 0x10 },
+ { 0x2e, 0x15 }, /* OVERRIDE */
+ { 0x30, 0x10 }, /* OVERRIDE */
+ { 0x45, 0x58 }, /* OVERRIDE */
+ { 0x48, 0x19 }, /* OVERRIDE */
+ { 0x52, 0x03 }, /* OVERRIDE */
+ { 0x53, 0x44 }, /* OVERRIDE */
+ { 0x6a, 0x4b }, /* OVERRIDE */
+ { 0x76, 0x00 }, /* OVERRIDE */
+ { 0x78, 0x18 }, /* OVERRIDE */
+ { 0x7a, 0x17 }, /* OVERRIDE */
+ { 0x85, 0x06 }, /* OVERRIDE */
+ { 0x01, 0x01 }, /* TOP_MASTER_ENABLE */
{ 0, 0 }
};
static struct reg_pair_t init_tab_cable[] = {
- { 0x0b, 0x44 }, /* XTAL */
- { 0x0c, 0x60 }, /* IF */
- { 0x10, 0x00 }, /* MISC */
- { 0x12, 0xca }, /* IDAC */
- { 0x16, 0x90 }, /* MODE */
- { 0x32, 0x38 }, /* MODE A/D */
- { 0x71, 0x3f }, /* TOP1 */
- { 0x72, 0x3f }, /* TOP2 */
- { 0x74, 0x3f }, /* TOP3 */
- { 0xd8, 0x18 }, /* CLK_OUT_ENABLE */
- { 0x2c, 0x34 }, /* OVERRIDE */
- { 0x4d, 0x40 }, /* OVERRIDE */
- { 0x7f, 0x02 }, /* OVERRIDE */
- { 0x9a, 0x52 }, /* OVERRIDE */
- { 0x48, 0x5a }, /* OVERRIDE */
- { 0x76, 0x1a }, /* OVERRIDE */
- { 0x6a, 0x48 }, /* OVERRIDE */
- { 0x64, 0x28 }, /* OVERRIDE */
- { 0x66, 0xe6 }, /* OVERRIDE */
- { 0x35, 0x0e }, /* OVERRIDE */
- { 0x7e, 0x01 }, /* OVERRIDE */
- { 0x04, 0x0b }, /* OVERRIDE */
- { 0x68, 0xb4 }, /* OVERRIDE */
- { 0x36, 0x00 }, /* OVERRIDE */
- { 0x05, 0x01 }, /* TOP_MASTER_ENABLE */
+ { 0x02, 0x06 },
[linuxtv-commits] [hg:v4l-dvb] checkpatch.pl: Updates it to the latest version
The patch number 10786 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com checkpatch.pl: Updates it to the latest version kernel-sync: Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- v4l/scripts/checkpatch.pl | 592 +++--- 1 file changed, 436 insertions(+), 156 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/c1318037610eee479d05db24cabc65a4313e6429 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~tap/v4l-dvb
The patch number 10795 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~tap/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/dvb/b2c2/flexcop-pci.c|4
linux/drivers/media/dvb/dvb-usb/dvb-usb.h |4
linux/drivers/media/radio/radio-si470x.c |4
linux/drivers/media/video/cx88/cx88.h |1 -
linux/drivers/media/video/em28xx/em28xx.h |4
linux/drivers/media/video/meye.c |4
linux/drivers/media/video/stk-webcam.c|8 +---
linux/drivers/media/video/usbvision/usbvision-video.c |3 ---
linux/drivers/media/video/v4l2-dev.c |7 +++
linux/drivers/media/video/v4l2-ioctl.c|5 +
linux/drivers/media/video/zoran/zoran_driver.c|7 +--
v4l/compat.h |8
12 files changed, 18 insertions(+), 41 deletions(-)
diff -r 1b20206ceca3 -r ca7e5497e099 linux/drivers/media/dvb/b2c2/flexcop-pci.c
--- a/linux/drivers/media/dvb/b2c2/flexcop-pci.cTue Mar 03 21:32:23
2009 -0300
+++ b/linux/drivers/media/dvb/b2c2/flexcop-pci.cTue Mar 03 21:34:27
2009 -0300
@@ -67,11 +67,7 @@ struct flexcop_pci {
unsigned long last_irq;
-#if LINUX_VERSION_CODE KERNEL_VERSION(2,6,20)
- struct work_struct irq_check_work;
-#else
struct delayed_work irq_check_work;
-#endif
struct flexcop_device *fc_dev;
};
diff -r 1b20206ceca3 -r ca7e5497e099 linux/drivers/media/dvb/dvb-usb/dvb-usb.h
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h Tue Mar 03 21:32:23 2009 -0300
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h Tue Mar 03 21:34:27 2009 -0300
@@ -364,11 +364,7 @@ struct dvb_usb_device {
/* remote control */
struct input_dev *rc_input_dev;
char rc_phys[64];
-#if LINUX_VERSION_CODE KERNEL_VERSION(2,6,20)
- struct work_struct rc_query_work;
-#else
struct delayed_work rc_query_work;
-#endif
u32 last_event;
int last_state;
diff -r 1b20206ceca3 -r ca7e5497e099 linux/drivers/media/radio/radio-si470x.c
--- a/linux/drivers/media/radio/radio-si470x.c Tue Mar 03 21:32:23 2009 -0300
+++ b/linux/drivers/media/radio/radio-si470x.c Tue Mar 03 21:34:27 2009 -0300
@@ -459,11 +459,7 @@ struct si470x_device {
unsigned short registers[RADIO_REGISTER_NUM];
/* RDS receive buffer */
-#if LINUX_VERSION_CODE KERNEL_VERSION(2, 6, 20)
- struct work_struct work;
-#else
struct delayed_work work;
-#endif
wait_queue_head_t read_queue;
struct mutex lock; /* buffer locking */
unsigned char *buffer; /* size is always multiple of three */
diff -r 1b20206ceca3 -r ca7e5497e099 linux/drivers/media/video/cx88/cx88.h
--- a/linux/drivers/media/video/cx88/cx88.h Tue Mar 03 21:32:23 2009 -0300
+++ b/linux/drivers/media/video/cx88/cx88.h Tue Mar 03 21:34:27 2009 -0300
@@ -306,7 +306,6 @@ struct cx88_dmaqueue {
struct btcx_riscmemstopper;
u32count;
};
-struct cx88_core;
struct cx88_core {
struct list_head devlist;
diff -r 1b20206ceca3 -r ca7e5497e099 linux/drivers/media/video/em28xx/em28xx.h
--- a/linux/drivers/media/video/em28xx/em28xx.h Tue Mar 03 21:32:23 2009 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx.h Tue Mar 03 21:34:27 2009 -0300
@@ -571,11 +571,7 @@ struct em28xx {
/* Snapshot button */
char snapshot_button_path[30]; /* path of the input dev */
struct input_dev *sbutton_input_dev;
-#if LINUX_VERSION_CODE KERNEL_VERSION(2, 6, 20)
- struct work_struct sbutton_query_work;
-#else
struct delayed_work sbutton_query_work;
-#endif
struct em28xx_dvb *dvb;
};
diff -r 1b20206ceca3 -r ca7e5497e099 linux/drivers/media/video/meye.c
--- a/linux/drivers/media/video/meye.c Tue Mar 03 21:32:23 2009 -0300
+++ b/linux/drivers/media/video/meye.c Tue Mar 03 21:34:27 2009 -0300
@@ -1451,10 +1451,6 @@ static int vidioc_querybuf(struct file *
if (index 0 || index = gbuffers)
return -EINVAL;
- memset(buf, 0, sizeof(*buf));
-
- buf-type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- buf-index = index;
buf-bytesused = meye.grab_buffer[index].size;
buf-flags = V4L2_BUF_FLAG_MAPPED;
diff -r 1b20206ceca3 -r ca7e5497e099 linux/drivers/media/video/stk-webcam.c
---
[linuxtv-commits] [hg:v4l-dvb] stv6110: remove a wrong include file
The patch number 10807 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com stv6110: remove a wrong include file For sure a frontend doesn't need to include cx23885.h header. Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/dvb/frontends/stv6110.c |1 - 1 file changed, 1 deletion(-) diff -r e0647ec90c17 -r 8ebe62795b47 linux/drivers/media/dvb/frontends/stv6110.c --- a/linux/drivers/media/dvb/frontends/stv6110.c Tue Mar 03 22:01:22 2009 -0300 +++ b/linux/drivers/media/dvb/frontends/stv6110.c Tue Mar 03 23:05:45 2009 -0300 @@ -28,7 +28,6 @@ #include linux/types.h #include stv6110.h -#include cx23885.h static int debug; --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/8ebe62795b47138013782fbce6700dbc81734585 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://udev.netup.ru/hg/v4l-dvb-netup
The patch number 10809 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://udev.netup.ru/hg/v4l-dvb-netup
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/dvb/frontends/lnbp21.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -r 8ebe62795b47 -r 9264bc18af23 linux/drivers/media/dvb/frontends/lnbp21.c
--- a/linux/drivers/media/dvb/frontends/lnbp21.cTue Mar 03 23:05:45
2009 -0300
+++ b/linux/drivers/media/dvb/frontends/lnbp21.cWed Mar 04 14:22:49
2009 -0300
@@ -138,7 +138,7 @@ static struct dvb_frontend *lnbx2x_attac
return fe;
}
-struct dvb_frontend *lnbp24_attach(struct dvb_frontend *fe,
+struct dvb_frontend *lnbh24_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, u8 override_set,
u8 override_clear, u8 i2c_addr)
{
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/9264bc18af23fe4b9c649de0ce7bdd74547f2dee
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~tap/v4l-dvb
The patch number 10821 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~tap/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/common/saa7146_video.c| 15
linux/drivers/media/video/bt8xx/bttv-driver.c | 19 -
linux/drivers/media/video/cx88/cx88-video.c |8
linux/drivers/media/video/gspca/gspca.c |4
linux/drivers/media/video/meye.c | 12
linux/drivers/media/video/stk-webcam.c|6
linux/drivers/media/video/usbvision/usbvision-video.c |7
linux/drivers/media/video/v4l2-ioctl.c| 168 --
linux/include/media/v4l2-ioctl.h |1
v4l/scripts/fix_kconfig.pl| 10
10 files changed, 94 insertions(+), 156 deletions(-)
diff -r 9264bc18af23 -r 4b288a26993d linux/drivers/media/common/saa7146_video.c
--- a/linux/drivers/media/common/saa7146_video.cWed Mar 04 14:22:49
2009 -0300
+++ b/linux/drivers/media/common/saa7146_video.cWed Mar 04 14:35:16
2009 -0300
@@ -577,11 +577,6 @@ static int vidioc_enum_fmt_vid_cap(struc
return 0;
}
-static int vidioc_enum_fmt_vid_overlay(struct file *file, void *fh, struct
v4l2_fmtdesc *f)
-{
- return vidioc_enum_fmt_vid_cap(file, fh, f);
-}
-
static int vidioc_queryctrl(struct file *file, void *fh, struct v4l2_queryctrl
*c)
{
const struct v4l2_queryctrl *ctrl;
@@ -726,12 +721,14 @@ static int vidioc_g_parm(struct file *fi
static int vidioc_g_parm(struct file *file, void *fh,
struct v4l2_streamparm *parm)
{
+ struct saa7146_dev *dev = ((struct saa7146_fh *)fh)-dev;
+ struct saa7146_vv *vv = dev-vv_data;
+
if (parm-type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL;
parm-parm.capture.readbuffers = 1;
- /* fixme: only for PAL! */
- parm-parm.capture.timeperframe.numerator = 1;
- parm-parm.capture.timeperframe.denominator = 25;
+ v4l2_video_std_frame_period(vv-standard-id,
+ parm-parm.capture.timeperframe);
return 0;
}
@@ -1165,7 +1162,7 @@ const struct v4l2_ioctl_ops saa7146_vide
const struct v4l2_ioctl_ops saa7146_video_ioctl_ops = {
.vidioc_querycap = vidioc_querycap,
.vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
- .vidioc_enum_fmt_vid_overlay = vidioc_enum_fmt_vid_overlay,
+ .vidioc_enum_fmt_vid_overlay = vidioc_enum_fmt_vid_cap,
.vidioc_g_fmt_vid_cap= vidioc_g_fmt_vid_cap,
.vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
.vidioc_s_fmt_vid_cap= vidioc_s_fmt_vid_cap,
diff -r 9264bc18af23 -r 4b288a26993d
linux/drivers/media/video/bt8xx/bttv-driver.c
--- a/linux/drivers/media/video/bt8xx/bttv-driver.c Wed Mar 04 14:22:49
2009 -0300
+++ b/linux/drivers/media/video/bt8xx/bttv-driver.c Wed Mar 04 14:35:16
2009 -0300
@@ -1922,16 +1922,11 @@ static int bttv_enum_input(struct file *
{
struct bttv_fh *fh = priv;
struct bttv *btv = fh-btv;
- unsigned int n;
-
- n = i-index;
-
- if (n = bttv_tvcards[btv-c.type].video_inputs)
+ int n;
+
+ if (i-index = bttv_tvcards[btv-c.type].video_inputs)
return -EINVAL;
- memset(i, 0, sizeof(*i));
-
- i-index= n;
i-type = V4L2_INPUT_TYPE_CAMERA;
i-audioset = 1;
@@ -2960,13 +2955,11 @@ static int bttv_g_parm(struct file *file
{
struct bttv_fh *fh = f;
struct bttv *btv = fh-btv;
- struct v4l2_standard s;
if (parm-type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL;
- v4l2_video_std_construct(s, bttv_tvnorms[btv-tvnorm].v4l2_id,
-bttv_tvnorms[btv-tvnorm].name);
- parm-parm.capture.timeperframe = s.frameperiod;
+ v4l2_video_std_frame_period(bttv_tvnorms[btv-tvnorm].v4l2_id,
+ parm-parm.capture.timeperframe);
return 0;
}
@@ -2982,7 +2975,6 @@ static int bttv_g_tuner(struct file *fil
return -EINVAL;
mutex_lock(btv-lock);
- memset(t, 0, sizeof(*t));
t-rxsubchans = V4L2_TUNER_SUB_MONO;
bttv_call_i2c_clients(btv, VIDIOC_G_TUNER, t);
strcpy(t-name, Television);
@@ -3525,7 +3517,6 @@ static int radio_g_tuner(struct file *fi
if (0 != t-index)
return -EINVAL;
[linuxtv-commits] [hg:v4l-dvb] dib0700: Fixes the usb_id_table
The patch number 10831 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
dib0700: Fixes the usb_id_table
As noticed by Pascal Terjan pter...@mandriva.com:
The merge seems wrong:
+/* 45 */{ USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_PD378S) },
+ { dib0700_usb_id_table[44], NULL },
Should be 45
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/dvb/dvb-usb/dib0700_devices.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -r 4bead296b0be -r d1e268001ce0
linux/drivers/media/dvb/dvb-usb/dib0700_devices.c
--- a/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c Wed Mar 04 16:57:04
2009 +
+++ b/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c Wed Mar 04 18:12:38
2009 -0300
@@ -1659,7 +1659,7 @@ struct dvb_usb_device_properties dib0700
{ NULL },
},
{ Yuan PD378S,
- { dib0700_usb_id_table[44], NULL },
+ { dib0700_usb_id_table[45], NULL },
{ NULL },
},
},
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/d1e268001ce0331b78b5ea283eadab2205137a91
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] Kconfig: Add some missing selects for a required frontends
The patch number 10835 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com Kconfig: Add some missing selects for a required frontends Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/dvb/dvb-usb/Kconfig |1 + linux/drivers/media/video/cx23885/Kconfig |2 ++ linux/drivers/media/video/saa7134/Kconfig |1 + 3 files changed, 4 insertions(+) diff -r 277d533e87cd -r 37cf346278b2 linux/drivers/media/dvb/dvb-usb/Kconfig --- a/linux/drivers/media/dvb/dvb-usb/Kconfig Thu Mar 05 16:19:14 2009 -0300 +++ b/linux/drivers/media/dvb/dvb-usb/Kconfig Fri Mar 06 08:06:24 2009 -0300 @@ -108,6 +108,7 @@ config DVB_USB_CXUSB select DVB_MT352 if !DVB_FE_CUSTOMISE select DVB_ZL10353 if !DVB_FE_CUSTOMISE select DVB_DIB7000P if !DVB_FE_CUSTOMISE + select DVB_LGS8GL5 if !DVB_FE_CUSTOMISE select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE diff -r 277d533e87cd -r 37cf346278b2 linux/drivers/media/video/cx23885/Kconfig --- a/linux/drivers/media/video/cx23885/Kconfig Thu Mar 05 16:19:14 2009 -0300 +++ b/linux/drivers/media/video/cx23885/Kconfig Fri Mar 06 08:06:24 2009 -0300 @@ -17,6 +17,8 @@ config VIDEO_CX23885 select DVB_ZL10353 if !DVB_FE_CUSTOMISE select DVB_TDA10048 if !DVB_FE_CUSTOMIZE select DVB_LNBP21 if !DVB_FE_CUSTOMIZE + select DVB_STV6110 if !DVB_FE_CUSTOMIZE + select DVB_STV0900 if !DVB_FE_CUSTOMIZE select MEDIA_TUNER_MT2131 if !MEDIA_TUNER_CUSTOMIZE select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE diff -r 277d533e87cd -r 37cf346278b2 linux/drivers/media/video/saa7134/Kconfig --- a/linux/drivers/media/video/saa7134/Kconfig Thu Mar 05 16:19:14 2009 -0300 +++ b/linux/drivers/media/video/saa7134/Kconfig Fri Mar 06 08:06:24 2009 -0300 @@ -35,6 +35,7 @@ config VIDEO_SAA7134_DVB select DVB_TDA10086 if !DVB_FE_CUSTOMISE select DVB_TDA826X if !DVB_FE_CUSTOMISE select DVB_ISL6421 if !DVB_FE_CUSTOMISE + select DVB_ISL6405 if !DVB_FE_CUSTOMISE select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE select DVB_ZL10036 if !DVB_FE_CUSTOMISE --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/37cf346278b2228f6c9ce5912c049826e990fab9 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] zoran: auto-select bt866 for AverMedia 6 Eyes
The patch number 10834 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com zoran: auto-select bt866 for AverMedia 6 Eyes AFAIK, the bt866 is only seen on AverMedia 6 Eyes. However, no module selects it. Adds a proper select for this driver. Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/video/zoran/Kconfig |1 + 1 file changed, 1 insertion(+) diff -r ef0aaa237fa4 -r 277d533e87cd linux/drivers/media/video/zoran/Kconfig --- a/linux/drivers/media/video/zoran/Kconfig Wed Mar 04 14:27:52 2009 +0300 +++ b/linux/drivers/media/video/zoran/Kconfig Thu Mar 05 16:19:14 2009 -0300 @@ -68,6 +68,7 @@ config VIDEO_ZORAN_AVS6EYES tristate AverMedia 6 Eyes support (EXPERIMENTAL) depends on VIDEO_ZORAN_ZR36060 EXPERIMENTAL select VIDEO_BT856 if VIDEO_HELPER_CHIPS_AUTO + select VIDEO_BT866 if VIDEO_HELPER_CHIPS_AUTO select VIDEO_KS0127 if VIDEO_HELPER_CHIPS_AUTO help Support for the AverMedia 6 Eyes video surveillance card. --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/277d533e87cdf38adaa1ad1aa6d2dfaf4e8f3acc ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] Kconfig: replace DVB_FE_CUSTOMIZE to DVB_FE_CUSTOMISE
The patch number 10836 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com Kconfig: replace DVB_FE_CUSTOMIZE to DVB_FE_CUSTOMISE The name of the option is DVB_FE_CUSTOMISE. However, on a few places, a wrong name were used, due to a typo (DVB_FE_CUSTOMIZE). Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/video/au0828/Kconfig |2 +- linux/drivers/media/video/cx23885/Kconfig |8 linux/drivers/media/video/pvrusb2/Kconfig |2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff -r 37cf346278b2 -r 6f1afb4c6fab linux/drivers/media/video/au0828/Kconfig --- a/linux/drivers/media/video/au0828/Kconfig Fri Mar 06 08:06:24 2009 -0300 +++ b/linux/drivers/media/video/au0828/Kconfig Fri Mar 06 08:25:35 2009 -0300 @@ -4,7 +4,7 @@ config VIDEO_AU0828 depends on I2C INPUT DVB_CORE USB select I2C_ALGOBIT select VIDEO_TVEEPROM - select DVB_AU8522 if !DVB_FE_CUSTOMIZE + select DVB_AU8522 if !DVB_FE_CUSTOMISE select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE select MEDIA_TUNER_MXL5007T if !DVB_FE_CUSTOMIZE select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE diff -r 37cf346278b2 -r 6f1afb4c6fab linux/drivers/media/video/cx23885/Kconfig --- a/linux/drivers/media/video/cx23885/Kconfig Fri Mar 06 08:06:24 2009 -0300 +++ b/linux/drivers/media/video/cx23885/Kconfig Fri Mar 06 08:25:35 2009 -0300 @@ -15,10 +15,10 @@ config VIDEO_CX23885 select DVB_S5H1411 if !DVB_FE_CUSTOMISE select DVB_LGDT330X if !DVB_FE_CUSTOMISE select DVB_ZL10353 if !DVB_FE_CUSTOMISE - select DVB_TDA10048 if !DVB_FE_CUSTOMIZE - select DVB_LNBP21 if !DVB_FE_CUSTOMIZE - select DVB_STV6110 if !DVB_FE_CUSTOMIZE - select DVB_STV0900 if !DVB_FE_CUSTOMIZE + select DVB_TDA10048 if !DVB_FE_CUSTOMISE + select DVB_LNBP21 if !DVB_FE_CUSTOMISE + select DVB_STV6110 if !DVB_FE_CUSTOMISE + select DVB_STV0900 if !DVB_FE_CUSTOMISE select MEDIA_TUNER_MT2131 if !MEDIA_TUNER_CUSTOMIZE select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE diff -r 37cf346278b2 -r 6f1afb4c6fab linux/drivers/media/video/pvrusb2/Kconfig --- a/linux/drivers/media/video/pvrusb2/Kconfig Fri Mar 06 08:06:24 2009 -0300 +++ b/linux/drivers/media/video/pvrusb2/Kconfig Fri Mar 06 08:25:35 2009 -0300 @@ -40,7 +40,7 @@ config VIDEO_PVRUSB2_DVB select DVB_LGDT330X if !DVB_FE_CUSTOMISE select DVB_S5H1409 if !DVB_FE_CUSTOMISE select DVB_S5H1411 if !DVB_FE_CUSTOMISE - select DVB_TDA10048 if !DVB_FE_CUSTOMIZE + select DVB_TDA10048 if !DVB_FE_CUSTOMISE select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/6f1afb4c6fabb8a90589aba5dca432672c5a01e9 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] Kconfig: only open the customise menu if selected
The patch number 10837 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com Kconfig: only open the customise menu if selected Instead of asking a lot of questions for the poor users, let's just hide the frontend customise menu, if the user doesn't want to customise. Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/dvb/frontends/Kconfig | 20 +--- 1 file changed, 13 insertions(+), 7 deletions(-) diff -r 6f1afb4c6fab -r 6bd427caa0cb linux/drivers/media/dvb/frontends/Kconfig --- a/linux/drivers/media/dvb/frontends/Kconfig Fri Mar 06 08:25:35 2009 -0300 +++ b/linux/drivers/media/dvb/frontends/Kconfig Fri Mar 06 08:31:39 2009 -0300 @@ -1,16 +1,20 @@ menu Customise DVB Frontends -menu Customise DVB Frontends - depends on DVB_CORE - config DVB_FE_CUSTOMISE bool Customise the frontend modules to build + depends on DVB_CORE default N help - This allows the user to deselect frontend drivers unnecessary - for their hardware from the build. Use this option with care - as deselecting frontends which are in fact necessary will result - in DVB devices which cannot be tuned due to lack of driver support. + This allows the user to select/deselect frontend drivers for their + hardware from the build. + + Use this option with care as deselecting frontends which are in fact + necessary will result in DVB devices which cannot be tuned due to lack + of driver support. If unsure say N. + +if DVB_FE_CUSTOMISE + +menu Customise DVB Frontends comment Multistandard (satellite) frontends depends on DVB_CORE @@ -507,3 +511,5 @@ config DVB_AF9013 help Say Y when you want to support this frontend. endmenu + +endif --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/6bd427caa0cb5f73e060cfb43d73dedf4cdf2d02 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] get rid of the other occurrences of DVB_FE_CUSTOMIZE typo
The patch number 10838 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com get rid of the other occurrences of DVB_FE_CUSTOMIZE typo Priority: normal Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/video/au0828/Kconfig |6 +++--- linux/drivers/media/video/cx23885/Kconfig |8 linux/drivers/media/video/pvrusb2/Kconfig |4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff -r 6bd427caa0cb -r e31e2a9f470e linux/drivers/media/video/au0828/Kconfig --- a/linux/drivers/media/video/au0828/Kconfig Fri Mar 06 08:31:39 2009 -0300 +++ b/linux/drivers/media/video/au0828/Kconfig Sun Mar 08 08:02:53 2009 -0300 @@ -5,9 +5,9 @@ config VIDEO_AU0828 select I2C_ALGOBIT select VIDEO_TVEEPROM select DVB_AU8522 if !DVB_FE_CUSTOMISE - select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE - select MEDIA_TUNER_MXL5007T if !DVB_FE_CUSTOMIZE - select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE + select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE + select MEDIA_TUNER_MXL5007T if !DVB_FE_CUSTOMISE + select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE ---help--- This is a video4linux driver for Auvitek's USB device. diff -r 6bd427caa0cb -r e31e2a9f470e linux/drivers/media/video/cx23885/Kconfig --- a/linux/drivers/media/video/cx23885/Kconfig Fri Mar 06 08:31:39 2009 -0300 +++ b/linux/drivers/media/video/cx23885/Kconfig Sun Mar 08 08:02:53 2009 -0300 @@ -20,10 +20,10 @@ config VIDEO_CX23885 select DVB_STV6110 if !DVB_FE_CUSTOMISE select DVB_STV0900 if !DVB_FE_CUSTOMISE select MEDIA_TUNER_MT2131 if !MEDIA_TUNER_CUSTOMIZE - select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE - select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE - select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE - select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE + select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE + select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMISE + select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE + select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE ---help--- This is a video4linux driver for Conexant 23885 based TV cards. diff -r 6bd427caa0cb -r e31e2a9f470e linux/drivers/media/video/pvrusb2/Kconfig --- a/linux/drivers/media/video/pvrusb2/Kconfig Fri Mar 06 08:31:39 2009 -0300 +++ b/linux/drivers/media/video/pvrusb2/Kconfig Sun Mar 08 08:02:53 2009 -0300 @@ -41,9 +41,9 @@ config VIDEO_PVRUSB2_DVB select DVB_S5H1409 if !DVB_FE_CUSTOMISE select DVB_S5H1411 if !DVB_FE_CUSTOMISE select DVB_TDA10048 if !DVB_FE_CUSTOMISE - select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE + select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE - select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE + select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMISE ---help--- This option enables a DVB interface for the pvrusb2 driver. --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/e31e2a9f470e21fcc2c3bcb3acc75344ac5c556c ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] Improve script to automatically adjust the Kconfig files
The patch number 10841 was added via Mauro Carvalho Chehab mche...@redhat.com
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:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
Improve script to automatically adjust the Kconfig files
There are still some more hacking to do, in order to use this automatically,
since
more logic is needed for dibcom and av7110 stuff.
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
v4l/scripts/fix_dvb_customise.pl | 89 ---
1 file changed, 83 insertions(+), 6 deletions(-)
diff -r e2c92027e556 -r eca111e0372e v4l/scripts/fix_dvb_customise.pl
--- a/v4l/scripts/fix_dvb_customise.pl Sun Mar 08 12:55:29 2009 -0300
+++ b/v4l/scripts/fix_dvb_customise.pl Sun Mar 08 13:10:43 2009 -0300
@@ -110,10 +110,6 @@ sub get_header_deps()
print $_ foreach %header_deps;
print \n;
}
-
-print Header deps for av7110.h: ;
-print $_ foreach $header_deps{av7110.h};
-print \n;
}
@@ -161,6 +157,8 @@ sub parse_makefiles()
# Seeks files for header
#
+my %select;
+
sub found_ref($$)
{
my $file = shift;
@@ -170,7 +168,7 @@ sub found_ref($$)
$name =~ s|.*/||;
$name =~ s/flexcop-fe-tuner.c/b2c2-flexcop/;
- $name =~ s/av7110.c/av7110/;
+ $name =~ s/av7110.c/av7110.h/;
if (defined ($header_deps{$name})) {
$name = $header_deps{$name};
@@ -182,7 +180,17 @@ sub found_ref($$)
foreach my $n (@files) {
if (defined($driver_config{$n})) {
my $ref = $driver_config{$n};
- printf $ref needs %s\n, $header;
+ printf $ref needs %s\n, $header if ($debug);
+
+ if ($ref =~ m/(PVRUSB2|CX23885|CX88|EM28XX|SAA3134)/) {
+ $ref .=_DVB;
+ }
+
+ if (!defined($select{$ref})) {
+ $select{$ref} = $header;
+ } else {
+ $select{$ref} .= . $header;
+ }
$found = 1;
}
}
@@ -215,6 +223,74 @@ sub parse_headers()
}
}
close IN;
+}
+
+
+# Rewrite Kconfig's
+#
+
+sub parse_kconfigs()
+{
+ my $file = $File::Find::name;
+ my $conf;
+ my $out = ;
+ my $tmp = ;
+ my $all_sels;
+
+ return if !($file =~ m/Kconfig$/);
+ return if ($file =~ m|drivers/media/dvb/frontends/|);
+
+ open IN, $file or die Can't open $file\n;
+ while (IN) {
+ if (m/^config\s([A-Za-z_\-\d]+)/) {
+ $out .= $tmp;
+ if (defined($select{$1})) {
+ $conf = $select{$1};
+ $all_sels = . $conf. ;
+ $tmp = $_;
+
+ printf $file: rewriting headers for $1. It
should select: %s\n, $all_sels if ($debug);
+ } else {
+ $conf = ;
+ $out .= $_;
+ $tmp = ;
+ }
+ next;
+ }
+ if (!$conf) {
+ $out .= $_;
+ next;
+ }
+
+ if (m/^\s*select\s+([A-Za-z_\-\d]+)/) {
+ my $op = $1;
+
+ if (!$all_sels =~ m/\s($op)\s/) {
+ # Drops line
+ printf $file: droppingg line $_\n;
+
+ next;
+ } else {
+ $all_sels =~ s/\s($op)\s/ /;
+ }
+ }
+ if (m/^[\s\-]*help/) {
+ my @sel = split(/\s/, $all_sels);
+ foreach my $s (@sel) {
+ if ($s ne ) {
+ printf $file: Adding select for $s\n;
+ $tmp .= \tselect $s if
!DVB_FE_CUSTOMISE\n;
+ }
+ }
+ }
+ $tmp .= $_;
+ }
+ close IN;
+
+ $out .=$tmp;
+ open OUT, $file or die Can't open $file\n;
+ print OUT $out;
+ close OUT;
}
#
@@ -255,3 +331,4 @@ foreach my $fe (keys %$FEs) {
find({wanted = \parse_makefiles, no_chdir = 1}, $SRC);
find({wanted = \parse_headers, no_chdir = 1}, $SRC);
[linuxtv-commits] [hg:v4l-dvb] Adds some missing frontend select for saa7134 and dvb-usb
The patch number 10842 was added via Mauro Carvalho Chehab mche...@redhat.com 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: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com Adds some missing frontend select for saa7134 and dvb-usb Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/dvb/dvb-usb/Kconfig |1 + linux/drivers/media/video/saa7134/Kconfig |2 ++ 2 files changed, 3 insertions(+) diff -r eca111e0372e -r 2ce922452ffd linux/drivers/media/dvb/dvb-usb/Kconfig --- a/linux/drivers/media/dvb/dvb-usb/Kconfig Sun Mar 08 13:10:43 2009 -0300 +++ b/linux/drivers/media/dvb/dvb-usb/Kconfig Sun Mar 08 13:11:31 2009 -0300 @@ -96,6 +96,7 @@ config DVB_USB_UMT_010 select DVB_PLL if !DVB_FE_CUSTOMISE select DVB_DIB3000MC select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE + select DVB_MT352 if !DVB_FE_CUSTOMISE help Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver. diff -r eca111e0372e -r 2ce922452ffd linux/drivers/media/video/saa7134/Kconfig --- a/linux/drivers/media/video/saa7134/Kconfig Sun Mar 08 13:10:43 2009 -0300 +++ b/linux/drivers/media/video/saa7134/Kconfig Sun Mar 08 13:11:31 2009 -0300 @@ -40,6 +40,8 @@ config VIDEO_SAA7134_DVB select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE select DVB_ZL10036 if !DVB_FE_CUSTOMISE select DVB_MT312 if !DVB_FE_CUSTOMISE + select DVB_LNBP21 if !DVB_FE_CUSTOMISE + select DVB_ZL10353 if !DVB_FE_CUSTOMISE ---help--- This adds support for DVB cards based on the Philips saa7134 chip. --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/2ce922452ffdb859ac9e0b5a6f0346a7eb74ca24 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
