[linuxtv-commits] [hg:v4l-dvb] s2255drv: add missing header
The patch number 8504 was added via Hans Verkuil [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Hans Verkuil [EMAIL PROTECTED] s2255drv: add missing header Signed-off-by: Hans Verkuil [EMAIL PROTECTED] --- linux/drivers/media/video/s2255drv.c |1 + 1 file changed, 1 insertion(+) diff -r 1cd705dcc929 -r a3d6b67b2484 linux/drivers/media/video/s2255drv.c --- a/linux/drivers/media/video/s2255drv.c Sat Jul 26 14:45:09 2008 -0300 +++ b/linux/drivers/media/video/s2255drv.c Sun Jul 27 11:30:21 2008 +0200 @@ -47,6 +47,7 @@ #include linux/mutex.h #include linux/videodev2.h #include linux/version.h +#include linux/mm.h #include media/videobuf-vmalloc.h #include media/v4l2-common.h #include media/v4l2-ioctl.h --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/a3d6b67b24843a8752a15baa8b6e252f3f31f888 ___ 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-empress
The patch number 8508 was added via Mauro Carvalho Chehab [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Mauro Carvalho Chehab [EMAIL PROTECTED]
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-empress
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/saa7134/saa7134-empress.c | 32 +---
linux/drivers/media/video/saa7134/saa7134-video.c | 46
linux/drivers/media/video/saa7134/saa7134.h |6 -
v4l2-apps/util/v4l2-ctl.cpp |8 +-
4 files changed, 62 insertions(+), 30 deletions(-)
diff -r a3d6b67b2484 -r c279c49e81e7
linux/drivers/media/video/saa7134/saa7134-empress.c
--- a/linux/drivers/media/video/saa7134/saa7134-empress.c Sun Jul 27
11:30:21 2008 +0200
+++ b/linux/drivers/media/video/saa7134/saa7134-empress.c Sun Jul 27
08:21:28 2008 -0300
@@ -89,14 +89,14 @@ static int ts_open(struct inode *inode,
err = -EBUSY;
if (!mutex_trylock(dev-empress_tsq.vb_lock))
goto done;
- if (dev-empress_users)
+ if (atomic_read(dev-empress_users))
goto done_up;
/* Unmute audio */
saa_writeb(SAA7134_AUDIO_MUTE_CTRL,
saa_readb(SAA7134_AUDIO_MUTE_CTRL) ~(1 6));
- dev-empress_users++;
+ atomic_inc(dev-empress_users);
file-private_data = dev;
err = 0;
@@ -110,8 +110,6 @@ static int ts_release(struct inode *inod
{
struct saa7134_dev *dev = file-private_data;
- mutex_lock(dev-empress_tsq.vb_lock);
-
videobuf_stop(dev-empress_tsq);
videobuf_mmap_free(dev-empress_tsq);
@@ -122,9 +120,7 @@ static int ts_release(struct inode *inod
saa_writeb(SAA7134_AUDIO_MUTE_CTRL,
saa_readb(SAA7134_AUDIO_MUTE_CTRL) | (1 6));
- dev-empress_users--;
-
- mutex_unlock(dev-empress_tsq.vb_lock);
+ atomic_dec(dev-empress_users);
return 0;
}
@@ -331,6 +327,22 @@ static int empress_g_ext_ctrls(struct fi
if (ctrls-ctrl_class != V4L2_CTRL_CLASS_MPEG)
return -EINVAL;
return saa7134_i2c_call_saa6752(dev, VIDIOC_G_EXT_CTRLS, ctrls);
+}
+
+static int empress_g_ctrl(struct file *file, void *priv,
+ struct v4l2_control *c)
+{
+ struct saa7134_dev *dev = file-private_data;
+
+ return saa7134_g_ctrl_internal(dev, NULL, c);
+}
+
+static int empress_s_ctrl(struct file *file, void *priv,
+ struct v4l2_control *c)
+{
+ struct saa7134_dev *dev = file-private_data;
+
+ return saa7134_s_ctrl_internal(dev, NULL, c);
}
static int empress_queryctrl(struct file *file, void *priv,
@@ -419,8 +431,8 @@ static const struct v4l2_ioctl_ops ts_io
.vidioc_queryctrl = empress_queryctrl,
.vidioc_querymenu = empress_querymenu,
- .vidioc_g_ctrl = saa7134_g_ctrl,
- .vidioc_s_ctrl = saa7134_s_ctrl,
+ .vidioc_g_ctrl = empress_g_ctrl,
+ .vidioc_s_ctrl = empress_s_ctrl,
};
/* --- */
@@ -455,7 +467,7 @@ static void empress_signal_update(struct
ts_reset_encoder(dev);
} else {
dprintk(video signal acquired\n);
- if (dev-empress_users)
+ if (atomic_read(dev-empress_users))
ts_init_encoder(dev);
}
}
diff -r a3d6b67b2484 -r c279c49e81e7
linux/drivers/media/video/saa7134/saa7134-video.c
--- a/linux/drivers/media/video/saa7134/saa7134-video.c Sun Jul 27 11:30:21
2008 +0200
+++ b/linux/drivers/media/video/saa7134/saa7134-video.c Sun Jul 27 08:21:28
2008 -0300
@@ -1112,10 +1112,8 @@ static struct videobuf_queue_ops video_q
/* -- */
-int saa7134_g_ctrl(struct file *file, void *priv, struct v4l2_control *c)
-{
- struct saa7134_fh *fh = priv;
- struct saa7134_dev *dev = fh-dev;
+int saa7134_g_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh,
struct v4l2_control *c)
+{
const struct v4l2_queryctrl* ctrl;
ctrl = ctrl_by_id(c-id);
@@ -1160,20 +1158,31 @@ int saa7134_g_ctrl(struct file *file, vo
}
return 0;
}
-EXPORT_SYMBOL_GPL(saa7134_g_ctrl);
-
-int saa7134_s_ctrl(struct file *file, void *f, struct v4l2_control *c)
+EXPORT_SYMBOL_GPL(saa7134_g_ctrl_internal);
+
+static int saa7134_g_ctrl(struct file *file, void *priv, struct v4l2_control
*c)
+{
+ struct saa7134_fh *fh = priv;
+
+
[linuxtv-commits] [hg:v4l-dvb] empress: fix control handling oops
The patch number 8506 was added via Hans Verkuil [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Hans Verkuil [EMAIL PROTECTED]
empress: fix control handling oops
Signed-off-by: Hans Verkuil [EMAIL PROTECTED]
---
linux/drivers/media/video/saa7134/saa7134-empress.c | 20 -
linux/drivers/media/video/saa7134/saa7134-video.c | 46
linux/drivers/media/video/saa7134/saa7134.h |4 -
3 files changed, 51 insertions(+), 19 deletions(-)
diff -r 36481120006f -r 4c60de4ef756
linux/drivers/media/video/saa7134/saa7134-empress.c
--- a/linux/drivers/media/video/saa7134/saa7134-empress.c Sat Jul 26
14:01:24 2008 +0200
+++ b/linux/drivers/media/video/saa7134/saa7134-empress.c Sat Jul 26
14:04:06 2008 +0200
@@ -329,6 +329,22 @@ static int empress_g_ext_ctrls(struct fi
return saa7134_i2c_call_saa6752(dev, VIDIOC_G_EXT_CTRLS, ctrls);
}
+static int empress_g_ctrl(struct file *file, void *priv,
+ struct v4l2_control *c)
+{
+ struct saa7134_dev *dev = file-private_data;
+
+ return saa7134_g_ctrl_internal(dev, NULL, c);
+}
+
+static int empress_s_ctrl(struct file *file, void *priv,
+ struct v4l2_control *c)
+{
+ struct saa7134_dev *dev = file-private_data;
+
+ return saa7134_s_ctrl_internal(dev, NULL, c);
+}
+
static int empress_queryctrl(struct file *file, void *priv,
struct v4l2_queryctrl *c)
{
@@ -415,8 +431,8 @@ static const struct v4l2_ioctl_ops ts_io
.vidioc_queryctrl = empress_queryctrl,
.vidioc_querymenu = empress_querymenu,
- .vidioc_g_ctrl = saa7134_g_ctrl,
- .vidioc_s_ctrl = saa7134_s_ctrl,
+ .vidioc_g_ctrl = empress_g_ctrl,
+ .vidioc_s_ctrl = empress_s_ctrl,
};
/* --- */
diff -r 36481120006f -r 4c60de4ef756
linux/drivers/media/video/saa7134/saa7134-video.c
--- a/linux/drivers/media/video/saa7134/saa7134-video.c Sat Jul 26 14:01:24
2008 +0200
+++ b/linux/drivers/media/video/saa7134/saa7134-video.c Sat Jul 26 14:04:06
2008 +0200
@@ -1112,10 +1112,8 @@ static struct videobuf_queue_ops video_q
/* -- */
-int saa7134_g_ctrl(struct file *file, void *priv, struct v4l2_control *c)
-{
- struct saa7134_fh *fh = priv;
- struct saa7134_dev *dev = fh-dev;
+int saa7134_g_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh,
struct v4l2_control *c)
+{
const struct v4l2_queryctrl* ctrl;
ctrl = ctrl_by_id(c-id);
@@ -1160,20 +1158,31 @@ int saa7134_g_ctrl(struct file *file, vo
}
return 0;
}
-EXPORT_SYMBOL_GPL(saa7134_g_ctrl);
-
-int saa7134_s_ctrl(struct file *file, void *f, struct v4l2_control *c)
+EXPORT_SYMBOL_GPL(saa7134_g_ctrl_internal);
+
+static int saa7134_g_ctrl(struct file *file, void *priv, struct v4l2_control
*c)
+{
+ struct saa7134_fh *fh = priv;
+
+ return saa7134_g_ctrl_internal(fh-dev, fh, c);
+}
+
+int saa7134_s_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh,
struct v4l2_control *c)
{
const struct v4l2_queryctrl* ctrl;
- struct saa7134_fh *fh = f;
- struct saa7134_dev *dev = fh-dev;
unsigned long flags;
int restart_overlay = 0;
- int err = -EINVAL;
-
- err = v4l2_prio_check(dev-prio, fh-prio);
- if (0 != err)
- return err;
+ int err;
+
+ /* When called from the empress code fh == NULL.
+ That needs to be fixed somehow, but for now this is
+ good enough. */
+ if (fh) {
+ err = v4l2_prio_check(dev-prio, fh-prio);
+ if (0 != err)
+ return err;
+ }
+ err = -EINVAL;
mutex_lock(dev-lock);
@@ -1274,7 +1283,14 @@ error:
mutex_unlock(dev-lock);
return err;
}
-EXPORT_SYMBOL_GPL(saa7134_s_ctrl);
+EXPORT_SYMBOL_GPL(saa7134_s_ctrl_internal);
+
+static int saa7134_s_ctrl(struct file *file, void *f, struct v4l2_control *c)
+{
+ struct saa7134_fh *fh = f;
+
+ return saa7134_s_ctrl_internal(fh-dev, fh, c);
+}
/* -- */
diff -r 36481120006f -r 4c60de4ef756 linux/drivers/media/video/saa7134/saa7134.h
--- a/linux/drivers/media/video/saa7134/saa7134.h Sat Jul 26 14:01:24
2008 +0200
+++ b/linux/drivers/media/video/saa7134/saa7134.h Sat Jul 26 14:04:06
2008 +0200
@@ -668,8
[linuxtv-commits] [hg:v4l-dvb] v4l2-ctl: fix find_controls when dealing with old-style controls.
The patch number 8507 was added via Hans Verkuil [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Hans Verkuil [EMAIL PROTECTED]
v4l2-ctl: fix find_controls when dealing with old-style controls.
'v4l2-ctl -C contrast' would not show the control description.
Signed-off-by: Hans Verkuil [EMAIL PROTECTED]
---
v4l2-apps/util/v4l2-ctl.cpp |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff -r 4c60de4ef756 -r 8664b3f3a8bc v4l2-apps/util/v4l2-ctl.cpp
--- a/v4l2-apps/util/v4l2-ctl.cpp Sat Jul 26 14:04:06 2008 +0200
+++ b/v4l2-apps/util/v4l2-ctl.cpp Sat Jul 26 14:25:00 2008 +0200
@@ -634,13 +634,17 @@ static void find_controls(int fd)
for (id = V4L2_CID_USER_BASE; id V4L2_CID_LASTP1; id++) {
qctrl.id = id;
if (ioctl(fd, VIDIOC_QUERYCTRL, qctrl) == 0
- !(qctrl.flags V4L2_CTRL_FLAG_DISABLED))
+ !(qctrl.flags V4L2_CTRL_FLAG_DISABLED)) {
ctrl_str2id[name2var(qctrl.name)] = qctrl.id;
+ ctrl_id2str[qctrl.id] = name2var(qctrl.name);
+ }
}
for (qctrl.id = V4L2_CID_PRIVATE_BASE;
ioctl(fd, VIDIOC_QUERYCTRL, qctrl) == 0; qctrl.id++) {
- if (!(qctrl.flags V4L2_CTRL_FLAG_DISABLED))
+ if (!(qctrl.flags V4L2_CTRL_FLAG_DISABLED)) {
ctrl_str2id[name2var(qctrl.name)] = qctrl.id;
+ ctrl_id2str[qctrl.id] = name2var(qctrl.name);
+ }
}
}
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/8664b3f3a8bc7080b72f9d2b29a037635cbc8fc3
___
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/hvr19x0
The patch number 8510 was added via Mauro Carvalho Chehab [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Mauro Carvalho Chehab [EMAIL PROTECTED]
merge: http://linuxtv.org/hg/~mkrufky/hvr19x0
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -r c279c49e81e7 -r 4c83c5492a93
linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c Sun Jul 27
08:21:28 2008 -0300
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c Sun Jul 27
08:34:48 2008 -0300
@@ -330,7 +330,7 @@ static const char *pvr2_fw1_names_73xxx[
};
static const struct pvr2_device_desc pvr2_device_73xxx = {
- .description = WinTV PVR USB2 Model Category 73xxx,
+ .description = WinTV HVR-1900 Model Category 73xxx,
.shortname = 73xxx,
.client_modules.lst = pvr2_client_73xxx,
.client_modules.cnt = ARRAY_SIZE(pvr2_client_73xxx),
@@ -439,7 +439,7 @@ static const char *pvr2_fw1_names_75xxx[
};
static const struct pvr2_device_desc pvr2_device_750xx = {
- .description = WinTV PVR USB2 Model Category 750xx,
+ .description = WinTV HVR-1950 Model Category 750xx,
.shortname = 750xx,
.client_modules.lst = pvr2_client_75xxx,
.client_modules.cnt = ARRAY_SIZE(pvr2_client_75xxx),
@@ -461,7 +461,7 @@ static const struct pvr2_device_desc pvr
};
static const struct pvr2_device_desc pvr2_device_751xx = {
- .description = WinTV PVR USB2 Model Category 751xx,
+ .description = WinTV HVR-1950 Model Category 751xx,
.shortname = 751xx,
.client_modules.lst = pvr2_client_75xxx,
.client_modules.cnt = ARRAY_SIZE(pvr2_client_75xxx),
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/4c83c5492a9340b322cb9cc1933b49bcb817a04a
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] gspca: Do not use the driver_info field of usb_device_id.
The patch number 8512 was added via Jean-Francois Moine [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Jean-Francois Moine [EMAIL PROTECTED]
gspca: Do not use the driver_info field of usb_device_id.
The field driver_info will be used to handle the specific per webcam
information.
Signed-off-by: Jean-Francois Moine [EMAIL PROTECTED]
---
linux/drivers/media/video/gspca/conex.c |1 -
linux/drivers/media/video/gspca/etoms.c |1 -
linux/drivers/media/video/gspca/mars.c|1 -
linux/drivers/media/video/gspca/ov519.c |1 -
linux/drivers/media/video/gspca/pac7311.c |1 -
linux/drivers/media/video/gspca/sonixj.c |1 -
linux/drivers/media/video/gspca/spca500.c |1 -
linux/drivers/media/video/gspca/spca501.c |1 -
linux/drivers/media/video/gspca/spca505.c |1 -
linux/drivers/media/video/gspca/spca506.c |1 -
linux/drivers/media/video/gspca/spca508.c |1 -
linux/drivers/media/video/gspca/stk014.c |1 -
linux/drivers/media/video/gspca/sunplus.c |1 -
linux/drivers/media/video/gspca/t613.c|1 -
linux/drivers/media/video/gspca/tv8532.c |1 -
linux/drivers/media/video/gspca/vc032x.c |1 -
linux/drivers/media/video/gspca/zc3xx.c |1 -
17 files changed, 17 deletions(-)
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/conex.c
--- a/linux/drivers/media/video/gspca/conex.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/conex.c Wed Jul 23 08:39:42 2008 +0200
@@ -815,7 +815,6 @@ static int sd_config(struct gspca_dev *g
struct cam *cam;
cam = gspca_dev-cam;
- cam-dev_name = (char *) id-driver_info;
cam-epaddr = 0x01;
cam-cam_mode = vga_mode;
cam-nmodes = sizeof vga_mode / sizeof vga_mode[0];
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/etoms.c
--- a/linux/drivers/media/video/gspca/etoms.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/etoms.c Wed Jul 23 08:39:42 2008 +0200
@@ -617,7 +617,6 @@ static int sd_config(struct gspca_dev *g
/* break; */
}
cam = gspca_dev-cam;
- cam-dev_name = (char *) id-driver_info;
cam-epaddr = 1;
if (sd-sensor == SENSOR_PAS106) {
cam-cam_mode = sif_mode;
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/mars.c
--- a/linux/drivers/media/video/gspca/mars.cWed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/mars.cWed Jul 23 08:39:42 2008 +0200
@@ -137,7 +137,6 @@ static int sd_config(struct gspca_dev *g
struct cam *cam;
cam = gspca_dev-cam;
- cam-dev_name = (char *) id-driver_info;
cam-epaddr = 0x01;
cam-cam_mode = vga_mode;
cam-nmodes = sizeof vga_mode / sizeof vga_mode[0];
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/ov519.c
--- a/linux/drivers/media/video/gspca/ov519.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/ov519.c Wed Jul 23 08:39:42 2008 +0200
@@ -1372,7 +1372,6 @@ static int sd_config(struct gspca_dev *g
cam-cam_mode = sif_mode;
cam-nmodes = sizeof sif_mode / sizeof sif_mode[0];
}
- cam-dev_name = (char *) id-driver_info;
sd-brightness = sd_ctrls[SD_BRIGHTNESS].qctrl.default_value;
sd-contrast = sd_ctrls[SD_CONTRAST].qctrl.default_value;
sd-colors = sd_ctrls[SD_COLOR].qctrl.default_value;
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/pac7311.c
--- a/linux/drivers/media/video/gspca/pac7311.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/pac7311.c Wed Jul 23 08:39:42 2008 +0200
@@ -263,7 +263,6 @@ static int sd_config(struct gspca_dev *g
reg_w(gspca_dev, 0x3e, 0x20);
cam = gspca_dev-cam;
- cam-dev_name = (char *) id-driver_info;
cam-epaddr = 0x05;
cam-cam_mode = vga_mode;
cam-nmodes = ARRAY_SIZE(vga_mode);
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/sonixj.c
--- a/linux/drivers/media/video/gspca/sonixj.c Wed Jul 23 08:24:06 2008 +0200
+++ b/linux/drivers/media/video/gspca/sonixj.c Wed Jul 23 08:39:42 2008 +0200
@@ -987,7 +987,6 @@ static int sd_config(struct gspca_dev *g
}
cam = gspca_dev-cam;
- cam-dev_name = (char *) id-driver_info;
cam-epaddr = 0x01;
cam-cam_mode = vga_mode;
cam-nmodes = ARRAY_SIZE(vga_mode);
diff -r 0ccd3ffc8b6e -r ebd7bf0512fe linux/drivers/media/video/gspca/spca500.c
--- a/linux/drivers/media/video/gspca/spca500.c Wed Jul 23 08:24:06 2008 +0200
+++
[linuxtv-commits] [hg:v4l-dvb] gspca: Webcam 0c45:6143 added in sonixj.
The patch number 8515 was added via Jean-Francois Moine [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Jean-Francois Moine [EMAIL PROTECTED]
gspca: Webcam 0c45:6143 added in sonixj.
It is an other Pccam168. The .inf says SN9C120B + SP80708, but it should
work as SN9C120 + MI0360.
Signed-off-by: Jean-Francois Moine [EMAIL PROTECTED]
---
linux/drivers/media/video/gspca/sonixj.c |1 +
1 file changed, 1 insertion(+)
diff -r 4c0004ee02c2 -r d2da2096d811 linux/drivers/media/video/gspca/sonixj.c
--- a/linux/drivers/media/video/gspca/sonixj.c Fri Jul 25 13:53:43 2008 +0200
+++ b/linux/drivers/media/video/gspca/sonixj.c Sat Jul 26 08:43:59 2008 +0200
@@ -1488,6 +1488,7 @@ static const __devinitdata struct usb_de
{USB_DEVICE(0x0c45, 0x613c), BSI(SN9C120, HV7131R, 0x11)},
/* {USB_DEVICE(0x0c45, 0x613e), BSI(SN9C120, OV7630, 0x??)}, */
#endif
+ {USB_DEVICE(0x0c45, 0x6143), BSI(SN9C120, MI0360, 0x5d)},
{}
};
MODULE_DEVICE_TABLE(usb, device_table);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/d2da2096d8115706d08e816817d52fecdfd8269f
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: v4l-dvb
The patch number 8514 was added via Jean-Francois Moine [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
merge: v4l-dvb
---
linux/Documentation/video4linux/w9968cf.txt |3
linux/drivers/media/dvb/dvb-core/dvb_net.c |8 +
linux/drivers/media/dvb/dvb-core/dvbdev.c |6
linux/drivers/media/dvb/dvb-usb/dw2102.h|2
linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 25 +++
linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c |4
linux/drivers/media/video/cpia2/cpia2_core.c| 54 ++
linux/drivers/media/video/dabusb.c | 80 +-
linux/drivers/media/video/usbvideo/vicam.c | 43 +
v4l/scripts/gentree.pl |2
10 files changed, 217 insertions(+), 10 deletions(-)
diff -r 28b8203a830e -r 4c0004ee02c2 linux/Documentation/video4linux/w9968cf.txt
--- a/linux/Documentation/video4linux/w9968cf.txt Fri Jul 25 13:53:03
2008 +0200
+++ b/linux/Documentation/video4linux/w9968cf.txt Fri Jul 25 13:53:43
2008 +0200
@@ -193,9 +193,6 @@ Description: Automatic 'ovcamchip' m
loads that module automatically. This action is performed as
once soon as the 'w9968cf' module is loaded into memory.
Default: 1
-Note:The kernel must be compiled with the CONFIG_KMOD option
-enabled for the 'ovcamchip' module to be loaded and for
-this parameter to be present.
---
Name: simcams
Type: int
diff -r 28b8203a830e -r 4c0004ee02c2 linux/drivers/media/dvb/dvb-core/dvb_net.c
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.cFri Jul 25 13:53:03
2008 +0200
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.cFri Jul 25 13:53:43
2008 +0200
@@ -1165,7 +1165,11 @@ static void wq_set_multicast_list (struc
#ifdef OLD_XMIT_LOCK /* Kernels equal or lower than 2.6.17 */
spin_lock_bh(dev-xmit_lock);
#else
+#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 26)
netif_tx_lock_bh(dev);
+#else
+ netif_addr_lock_bh(dev);
+#endif
#endif
if (dev-flags IFF_PROMISC) {
@@ -1194,7 +1198,11 @@ static void wq_set_multicast_list (struc
#ifdef OLD_XMIT_LOCK /* Kernels equal or lower than 2.6.17 */
spin_unlock_bh(dev-xmit_lock);
#else
+#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 26)
netif_tx_unlock_bh(dev);
+#else
+ netif_addr_unlock_bh(dev);
+#endif
#endif
dvb_net_feed_start(dev);
}
diff -r 28b8203a830e -r 4c0004ee02c2 linux/drivers/media/dvb/dvb-core/dvbdev.c
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c Fri Jul 25 13:53:03 2008 +0200
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c Fri Jul 25 13:53:43 2008 +0200
@@ -242,9 +242,15 @@ int dvb_register_device(struct dvb_adapt
mutex_unlock(dvbdev_register_lock);
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 6, 26)
+ clsdev = device_create_drvdata(dvb_class, adap-device,
+ MKDEV(DVB_MAJOR, nums2minor(adap-num, type,
id)),
+ NULL, dvb%d.%s%d, adap-num, dnames[type], id);
+#else
clsdev = device_create(dvb_class, adap-device,
MKDEV(DVB_MAJOR, nums2minor(adap-num, type,
id)),
dvb%d.%s%d, adap-num, dnames[type], id);
+#endif
if (IS_ERR(clsdev)) {
printk(KERN_ERR %s: failed to create device dvb%d.%s%d
(%ld)\n,
__func__, adap-num, dnames[type], id, PTR_ERR(clsdev));
diff -r 28b8203a830e -r 4c0004ee02c2 linux/drivers/media/dvb/dvb-usb/dw2102.h
--- a/linux/drivers/media/dvb/dvb-usb/dw2102.h Fri Jul 25 13:53:03 2008 +0200
+++ b/linux/drivers/media/dvb/dvb-usb/dw2102.h Fri Jul 25 13:53:43 2008 +0200
@@ -2,7 +2,7 @@
#define _DW2102_H_
#define DVB_USB_LOG_PREFIX dw2102
-#include dvb-usb.h
+#include dvb-usb.h
extern int dvb_usb_dw2102_debug;
#define deb_xfer(args...) dprintk(dvb_usb_dw2102_debug, 0x02, args)
diff -r 28b8203a830e -r 4c0004ee02c2
linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
--- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c Fri Jul 25
13:53:03 2008 +0200
+++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c Fri Jul 25
13:53:43 2008 +0200
@@ -21,6 +21,9 @@
#include linux/jiffies.h
#include compat.h
#include linux/mutex.h
+#ifdef TTUSB_KERNEL
+#include linux/firmware.h
+#endif
#include dvb_frontend.h
#include dmxdev.h
@@ -287,13 +290,27 @@ static int master_xfer(struct i2c_adapte
return
[linuxtv-commits] [hg:v4l-dvb] gspca: Bad sensor for some webcams in zc3xx since 28b8203a830e.
The patch number 8517 was added via Jean-Francois Moine [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Jean-Francois Moine [EMAIL PROTECTED]
gspca: Bad sensor for some webcams in zc3xx since 28b8203a830e.
'.driver_info = ' forgotten in usb device id table.
Signed-off-by: Jean-Francois Moine [EMAIL PROTECTED]
---
linux/drivers/media/video/gspca/zc3xx.c |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff -r 58b978091abc -r 12531455ca63 linux/drivers/media/video/gspca/zc3xx.c
--- a/linux/drivers/media/video/gspca/zc3xx.c Sat Jul 26 12:39:02 2008 +0200
+++ b/linux/drivers/media/video/gspca/zc3xx.c Sat Jul 26 12:49:55 2008 +0200
@@ -7525,8 +7525,8 @@ static const __devinitdata struct usb_de
{USB_DEVICE(0x041e, 0x4036)},
{USB_DEVICE(0x041e, 0x403a)},
#endif
- {USB_DEVICE(0x041e, 0x4051), SENSOR_TAS5130C_VF0250},
- {USB_DEVICE(0x041e, 0x4053), SENSOR_TAS5130C_VF0250},
+ {USB_DEVICE(0x041e, 0x4051), .driver_info = SENSOR_TAS5130C_VF0250},
+ {USB_DEVICE(0x041e, 0x4053), .driver_info = SENSOR_TAS5130C_VF0250},
#ifndef CONFIG_USB_ZC0301
{USB_DEVICE(0x0458, 0x7007)},
{USB_DEVICE(0x0458, 0x700c)},
@@ -7552,7 +7552,7 @@ static const __devinitdata struct usb_de
{USB_DEVICE(0x046d, 0x08d9)},
{USB_DEVICE(0x046d, 0x08d8)},
{USB_DEVICE(0x046d, 0x08da)},
- {USB_DEVICE(0x046d, 0x08dd), SENSOR_MC501CB},
+ {USB_DEVICE(0x046d, 0x08dd), .driver_info = SENSOR_MC501CB},
{USB_DEVICE(0x0471, 0x0325)},
{USB_DEVICE(0x0471, 0x0326)},
{USB_DEVICE(0x0471, 0x032d)},
@@ -7568,7 +7568,7 @@ static const __devinitdata struct usb_de
{USB_DEVICE(0x0ac8, 0x301b)},
{USB_DEVICE(0x0ac8, 0x303b)},
#endif
- {USB_DEVICE(0x0ac8, 0x305b), SENSOR_TAS5130C_VF0250},
+ {USB_DEVICE(0x0ac8, 0x305b), .driver_info = SENSOR_TAS5130C_VF0250},
#ifndef CONFIG_USB_ZC0301
{USB_DEVICE(0x0ac8, 0x307b)},
{USB_DEVICE(0x10fd, 0x0128)},
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/12531455ca6316cbb7d479f1d7ac37fc69fb0740
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: v4l-dvb
The patch number 8516 was added via Jean-Francois Moine [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- merge: v4l-dvb --- linux/drivers/media/common/tuners/tda9887.c |4 linux/drivers/media/common/tuners/tuner-simple.c|2 linux/drivers/media/dvb/siano/smscoreapi.c | 16 linux/drivers/media/dvb/siano/smsdvb.c |4 linux/drivers/media/radio/dsbr100.c | 18 linux/drivers/media/radio/miropcm20-radio.c |1 linux/drivers/media/radio/radio-aimslab.c | 14 linux/drivers/media/radio/radio-aztech.c| 14 linux/drivers/media/radio/radio-cadet.c | 14 linux/drivers/media/radio/radio-gemtek-pci.c| 13 linux/drivers/media/radio/radio-gemtek.c| 13 linux/drivers/media/radio/radio-maestro.c | 12 linux/drivers/media/radio/radio-maxiradio.c | 15 linux/drivers/media/radio/radio-rtrack2.c | 14 linux/drivers/media/radio/radio-sf16fmi.c | 14 linux/drivers/media/radio/radio-sf16fmr2.c | 14 linux/drivers/media/radio/radio-si470x.c| 22 linux/drivers/media/radio/radio-terratec.c | 14 linux/drivers/media/radio/radio-trust.c | 14 linux/drivers/media/radio/radio-typhoon.c | 14 linux/drivers/media/radio/radio-zoltrix.c | 14 linux/drivers/media/video/Kconfig | 11 linux/drivers/media/video/Makefile |1 linux/drivers/media/video/arv.c |1 linux/drivers/media/video/bt8xx/bttv-driver.c | 26 linux/drivers/media/video/bw-qcam.c |1 linux/drivers/media/video/c-qcam.c |1 linux/drivers/media/video/cafe_ccic.c | 25 linux/drivers/media/video/cpia.c|1 linux/drivers/media/video/cpia2/cpia2_core.c|1 linux/drivers/media/video/cpia2/cpia2_v4l.c |1 linux/drivers/media/video/cs53l32a.c|2 linux/drivers/media/video/cx18/cx18-av-audio.c | 127 linux/drivers/media/video/cx18/cx18-ioctl.c | 94 linux/drivers/media/video/cx23885/cx23885-417.c | 20 linux/drivers/media/video/cx23885/cx23885-cards.c | 61 linux/drivers/media/video/cx23885/cx23885-core.c| 153 linux/drivers/media/video/cx23885/cx23885-video.c | 18 linux/drivers/media/video/cx88/cx88-blackbird.c | 16 linux/drivers/media/video/cx88/cx88-cards.c |2 linux/drivers/media/video/cx88/cx88-video.c | 37 linux/drivers/media/video/cx88/cx88.h |4 linux/drivers/media/video/em28xx/em28xx-cards.c |4 linux/drivers/media/video/em28xx/em28xx-video.c | 46 linux/drivers/media/video/et61x251/et61x251_core.c |1 linux/drivers/media/video/gspca/gspca.c | 16 linux/drivers/media/video/gspca/sonixb.c| 355 - linux/drivers/media/video/ivtv/ivtv-driver.c|5 linux/drivers/media/video/ivtv/ivtv-ioctl.c | 132 linux/drivers/media/video/m52790.c |2 linux/drivers/media/video/meye.c| 17 linux/drivers/media/video/msp3400-driver.c |1 linux/drivers/media/video/msp3400-kthreads.c|1 linux/drivers/media/video/ov511.c | 35 linux/drivers/media/video/planb.c | 2314 -- linux/drivers/media/video/planb.h | 232 - linux/drivers/media/video/pms.c |1 linux/drivers/media/video/pvrusb2/pvrusb2-context.h |4 linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c |5 linux/drivers/media/video/pvrusb2/pvrusb2-devattr.h | 26 linux/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h |2 linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c |9 linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c|4 linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c|1 linux/drivers/media/video/pwc/pwc-if.c | 13 linux/drivers/media/video/s2255drv.c| 16 linux/drivers/media/video/saa5246a.c|1 linux/drivers/media/video/saa5249.c |1 linux/drivers/media/video/saa7134/saa7134-empress.c | 22
[linuxtv-commits] [hg:v4l-dvb] gspca: Remove the remaining frame decoding functions from the subdrivers.
The patch number 8518 was added via Jean-Francois Moine [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Jean-Francois Moine [EMAIL PROTECTED]
gspca: Remove the remaining frame decoding functions from the subdrivers.
SPCA505 and SPCA508 added in the pixel formats.
Decode functions and associated resources removed in spca505, 506 and 508.
The decode routines are now found in the V4L library.
Signed-off-by: Jean-Francois Moine [EMAIL PROTECTED]
---
linux/drivers/media/video/gspca/spca505.c | 105 +-
linux/drivers/media/video/gspca/spca506.c | 105 +-
linux/drivers/media/video/gspca/spca508.c | 91 ---
linux/include/linux/videodev2.h |2
4 files changed, 76 insertions(+), 227 deletions(-)
diff -r 12531455ca63 -r 6de914aaad86 linux/drivers/media/video/gspca/spca505.c
--- a/linux/drivers/media/video/gspca/spca505.c Sat Jul 26 12:49:55 2008 +0200
+++ b/linux/drivers/media/video/gspca/spca505.c Sat Jul 26 13:02:47 2008 +0200
@@ -31,10 +31,6 @@ struct sd {
struct sd {
struct gspca_dev gspca_dev; /* !! must be the first item */
- int buflen;
- unsigned char tmpbuf[640 * 480 * 3 / 2]; /* YYUV per line */
- unsigned char tmpbuf2[640 * 480 * 2]; /* YUYV */
-
unsigned char brightness;
char subtype;
@@ -64,29 +60,29 @@ static struct ctrl sd_ctrls[] = {
};
static struct v4l2_pix_format vga_mode[] = {
- {160, 120, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
- .bytesperline = 160 * 2,
- .sizeimage = 160 * 120 * 2,
+ {160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+ .bytesperline = 160 * 3,
+ .sizeimage = 160 * 120 * 3 / 2,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 5},
- {176, 144, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
- .bytesperline = 176 * 2,
- .sizeimage = 176 * 144 * 2,
+ {176, 144, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+ .bytesperline = 176 * 3,
+ .sizeimage = 176 * 144 * 3 / 2,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 4},
- {320, 240, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
- .bytesperline = 320 * 2,
- .sizeimage = 320 * 240 * 2,
+ {320, 240, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+ .bytesperline = 320 * 3,
+ .sizeimage = 320 * 240 * 3 / 2,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 2},
- {352, 288, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
- .bytesperline = 352 * 2,
- .sizeimage = 352 * 288 * 2,
+ {352, 288, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+ .bytesperline = 352 * 3,
+ .sizeimage = 352 * 288 * 3 / 2,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 1},
- {640, 480, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
- .bytesperline = 640 * 2,
- .sizeimage = 640 * 480 * 2,
+ {640, 480, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,
+ .bytesperline = 640 * 3,
+ .sizeimage = 640 * 480 * 3 / 2,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0},
};
@@ -829,77 +825,30 @@ static void sd_close(struct gspca_dev *g
reg_write(gspca_dev-dev, 0x05, 0x11, 0xf);
}
-/* convert YYUV per line to YUYV (YUV 4:2:2) */
-static void yyuv_decode(unsigned char *out,
- unsigned char *in,
- int width,
- int height)
-{
- unsigned char *Ui, *Vi, *yi, *yi1;
- unsigned char *out1;
- int i, j;
-
- yi = in;
- for (i = height / 2; --i = 0; ) {
- out1 = out + width * 2; /* next line */
- yi1 = yi + width;
- Ui = yi1 + width;
- Vi = Ui + width / 2;
- for (j = width / 2; --j = 0; ) {
- *out++ = 128 + *yi++;
- *out++ = 128 + *Ui;
- *out++ = 128 + *yi++;
- *out++ = 128 + *Vi;
-
- *out1++ = 128 + *yi1++;
- *out1++ = 128 + *Ui++;
- *out1++ = 128 + *yi1++;
- *out1++ = 128 + *Vi++;
- }
- yi += width * 2;
- out = out1;
- }
-}
-
static void sd_pkt_scan(struct gspca_dev *gspca_dev,
struct gspca_frame *frame, /* target */
__u8 *data, /* isoc packet */
[linuxtv-commits] [hg:v4l-dvb] videodev2: Fix merge conflict
The patch number 8522 was added via Mauro Carvalho Chehab [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Mauro Carvalho Chehab [EMAIL PROTECTED] videodev2: Fix merge conflict Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/drivers/media/video/gspca/conex.c |4 linux/drivers/media/video/gspca/etoms.c | 25 - linux/drivers/media/video/gspca/gspca.c | 11 linux/drivers/media/video/gspca/mars.c|4 linux/drivers/media/video/gspca/ov519.c | 28 - linux/drivers/media/video/gspca/pac207.c | 19 - linux/drivers/media/video/gspca/pac7311.c | 17 - linux/drivers/media/video/gspca/sonixb.c | 134 +++- linux/drivers/media/video/gspca/sonixj.c | 245 ++- linux/drivers/media/video/gspca/spca500.c | 134 +--- linux/drivers/media/video/gspca/spca501.c | 70 linux/drivers/media/video/gspca/spca505.c | 135 +--- linux/drivers/media/video/gspca/spca506.c | 116 +-- linux/drivers/media/video/gspca/spca508.c | 159 + linux/drivers/media/video/gspca/spca561.c | 57 +-- linux/drivers/media/video/gspca/stk014.c |4 linux/drivers/media/video/gspca/sunplus.c | 356 -- linux/drivers/media/video/gspca/t613.c| 17 - linux/drivers/media/video/gspca/tv8532.c | 12 linux/drivers/media/video/gspca/vc032x.c | 39 -- linux/drivers/media/video/gspca/zc3xx.c | 126 +++ linux/include/linux/videodev2.h |2 22 files changed, 431 insertions(+), 1283 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/679674c40564837835d627f24aa0376afd54a3ac ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] gspca: Set the specific per webcam information in driver_info for sonixb.
The patch number 8519 was added via Jean-Francois Moine [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Jean-Francois Moine [EMAIL PROTECTED]
gspca: Set the specific per webcam information in driver_info for sonixb.
Signed-off-by: Jean-Francois Moine [EMAIL PROTECTED]
---
linux/drivers/media/video/gspca/sonixb.c | 134 +--
1 file changed, 57 insertions(+), 77 deletions(-)
diff -r 6de914aaad86 -r c503a6f8332a linux/drivers/media/video/gspca/sonixb.c
--- a/linux/drivers/media/video/gspca/sonixb.c Sat Jul 26 13:02:47 2008 +0200
+++ b/linux/drivers/media/video/gspca/sonixb.c Sat Jul 26 19:17:23 2008 +0200
@@ -57,6 +57,12 @@ struct sd {
__u8 sensor_addr;
__u8 reg11;
};
+
+/* flags used in the device id table */
+#define F_GAIN 0x01/* has gain */
+#define F_AUTO 0x02/* has autogain */
+#define F_SIF 0x04/* sif or vga */
+#define F_H18 0x08/* long (18 b) or short (12 b) frame header */
#define COMP2 0x8f
#define COMP 0xc7 /* 0x87 //0x07 */
@@ -784,74 +790,28 @@ static int sd_config(struct gspca_dev *g
{
struct sd *sd = (struct sd *) gspca_dev;
struct cam *cam;
- __u16 product;
int sif = 0;
/* nctrls depends upon the sensor, so we use a per cam copy */
memcpy(sd-sd_desc, gspca_dev-sd_desc, sizeof(struct sd_desc));
gspca_dev-sd_desc = sd-sd_desc;
- sd-fr_h_sz = 12; /* default size of the frame header */
- sd-sd_desc.nctrls = 2; /* default nb of ctrls */
- product = id-idProduct;
-/* switch (id-idVendor) { */
-/* case 0x0c45: * Sonix */
- switch (product) {
- case 0x6001:/* SN9C102 */
- case 0x6005:/* SN9C101 */
- case 0x6007:/* SN9C101 */
- sd-sensor = SENSOR_TAS5110;
- sd-sensor_has_gain = 1;
- sd-sd_desc.nctrls = 4;
- sd-sd_desc.dq_callback = do_autogain;
- sif = 1;
- break;
- case 0x6009:/* SN9C101 */
- case 0x600d:/* SN9C101 */
- case 0x6029:/* SN9C101 */
- sd-sensor = SENSOR_PAS106;
- sif = 1;
- break;
- case 0x6011:/* SN9C101 - SN9C101G */
- sd-sensor = SENSOR_OV6650;
- sd-sensor_has_gain = 1;
- sd-sensor_addr = 0x60;
- sd-sd_desc.nctrls = 5;
- sd-sd_desc.dq_callback = do_autogain;
- sif = 1;
- break;
- case 0x6019:/* SN9C101 */
- case 0x602c:/* SN9C102 */
- case 0x602e:/* SN9C102 */
- case 0x60b0:/* SN9C103 */
- sd-sensor = SENSOR_OV7630;
- sd-sensor_addr = 0x21;
- sd-sensor_has_gain = 1;
- sd-sd_desc.nctrls = 5;
- sd-sd_desc.dq_callback = do_autogain;
- if (product == 0x60b0)
- sd-fr_h_sz = 18; /* size of frame header */
- break;
- case 0x6024:/* SN9C102 */
- case 0x6025:/* SN9C102 */
- sd-sensor = SENSOR_TAS5130CXX;
- break;
- case 0x6028:/* SN9C102 */
- sd-sensor = SENSOR_PAS202;
- break;
- case 0x602d:/* SN9C102 */
- sd-sensor = SENSOR_HV7131R;
- break;
- case 0x60af:/* SN9C103 */
- sd-sensor = SENSOR_PAS202;
- sd-fr_h_sz = 18; /* size of frame header (?) */
- break;
- }
-/* break; */
-/* } */
+ /* copy the webcam info from the device id */
+ sd-sensor = (id-driver_info 24) 0xff;
+ if (id-driver_info (F_GAIN 16))
+ sd-sensor_has_gain = 1;
+ if (id-driver_info (F_AUTO 16))
+ sd-sd_desc.dq_callback = do_autogain;
+ if (id-driver_info (F_SIF 16))
+ sif
[linuxtv-commits] [hg:v4l-dvb] gspca: Webcams with Sonix bridge and sensor ov7630 are VGA.
The patch number 8521 was added via Jean-Francois Moine [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Jean-Francois Moine [EMAIL PROTECTED]
gspca: Webcams with Sonix bridge and sensor ov7630 are VGA.
This fixes a bug introduced in c503a6f8332a (thanks to Hans de Goede).
Signed-off-by: Jean-Francois Moine [EMAIL PROTECTED]
---
linux/drivers/media/video/gspca/sonixb.c |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff -r 83eafbcaea6d -r 6ad059fe3782 linux/drivers/media/video/gspca/sonixb.c
--- a/linux/drivers/media/video/gspca/sonixb.c Sat Jul 26 19:30:01 2008 +0200
+++ b/linux/drivers/media/video/gspca/sonixb.c Sun Jul 27 07:56:33 2008 +0200
@@ -1227,7 +1227,7 @@ static __devinitdata struct usb_device_i
SFCI(OV6650, F_GAIN|F_AUTO|F_SIF, 5, 0x60)},
#ifndef CONFIG_USB_SN9C102
{USB_DEVICE(0x0c45, 0x6019),/* SN9C101 */
- SFCI(OV7630, F_GAIN|F_AUTO|F_SIF, 5, 0x21)},
+ SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},
{USB_DEVICE(0x0c45, 0x6024),/* SN9C102 */
SFCI(TAS5130CXX, 0, 2, 0)},
{USB_DEVICE(0x0c45, 0x6025),/* SN9C102 */
@@ -1237,15 +1237,15 @@ static __devinitdata struct usb_device_i
{USB_DEVICE(0x0c45, 0x6029),/* SN9C101 */
SFCI(PAS106, F_SIF, 2, 0)},
{USB_DEVICE(0x0c45, 0x602c),/* SN9C102 */
- SFCI(OV7630, F_GAIN|F_AUTO|F_SIF, 5, 0x21)},
+ SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},
{USB_DEVICE(0x0c45, 0x602d),/* SN9C102 */
SFCI(HV7131R, 0, 2, 0)},
{USB_DEVICE(0x0c45, 0x602e),/* SN9C102 */
- SFCI(OV7630, F_GAIN|F_AUTO|F_SIF, 5, 0x21)},
+ SFCI(OV7630, F_GAIN|F_AUTO, 5, 0x21)},
{USB_DEVICE(0x0c45, 0x60af),/* SN9C103 */
SFCI(PAS202, F_H18, 2, 0)},
{USB_DEVICE(0x0c45, 0x60b0),/* SN9C103 */
- SFCI(OV7630, F_GAIN|F_AUTO|F_SIF|F_H18, 5, 0x21)},
+ SFCI(OV7630, F_GAIN|F_AUTO|F_H18, 5, 0x21)},
#endif
{}
};
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/6ad059fe37820a3bfaa05a6785049b3308d6a2ce
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] mxl5007t: enable _init and _sleep power management functionality
The patch number 8529 was added via Michael Krufky [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Michael Krufky [EMAIL PROTECTED]
mxl5007t: enable _init and _sleep power management functionality
Signed-off-by: Michael Krufky [EMAIL PROTECTED]
---
linux/drivers/media/common/tuners/mxl5007t.c | 42 +++
1 file changed, 34 insertions(+), 8 deletions(-)
diff -r 15fb29843b6d -r 779f14e0a563
linux/drivers/media/common/tuners/mxl5007t.c
--- a/linux/drivers/media/common/tuners/mxl5007t.c Mon Jul 07 17:20:58
2008 -0400
+++ b/linux/drivers/media/common/tuners/mxl5007t.c Sat Jul 12 17:22:38
2008 -0400
@@ -842,27 +842,53 @@ static int mxl5007t_init(struct dvb_fron
static int mxl5007t_init(struct dvb_frontend *fe)
{
struct mxl5007t_state *state = fe-tuner_priv;
- //int ret;
+ int ret;
+ u8 d;
mutex_lock(state-lock);
- /* do init */
-//fail:
+
+ if (fe-ops.i2c_gate_ctrl)
+ fe-ops.i2c_gate_ctrl(fe, 1);
+
+ ret = mxl5007t_read_reg(state, 0x05, d);
+ if (mxl_fail(ret))
+ goto fail;
+
+ ret = mxl5007t_write_reg(state, 0x05, d | 0x01);
+ mxl_fail(ret);
+fail:
+ if (fe-ops.i2c_gate_ctrl)
+ fe-ops.i2c_gate_ctrl(fe, 0);
+
mutex_unlock(state-lock);
- return 0;//ret;
+ return ret;
}
static int mxl5007t_sleep(struct dvb_frontend *fe)
{
struct mxl5007t_state *state = fe-tuner_priv;
- //int ret;
+ int ret;
+ u8 d;
mutex_lock(state-lock);
- /* do standby */
-//fail:
+
+ if (fe-ops.i2c_gate_ctrl)
+ fe-ops.i2c_gate_ctrl(fe, 1);
+
+ ret = mxl5007t_read_reg(state, 0x05, d);
+ if (mxl_fail(ret))
+ goto fail;
+
+ ret = mxl5007t_write_reg(state, 0x05, d ~0x01);
+ mxl_fail(ret);
+fail:
+ if (fe-ops.i2c_gate_ctrl)
+ fe-ops.i2c_gate_ctrl(fe, 0);
+
mutex_unlock(state-lock);
- return 0;//ret;
+ return ret;
}
/* - */
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/779f14e0a563adc20e1393816d30e9ab6b267bd1
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] au0828: add support for new revision of HVR950Q
The patch number 8530 was added via Michael Krufky [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Michael Krufky [EMAIL PROTECTED]
au0828: add support for new revision of HVR950Q
Signed-off-by: Michael Krufky [EMAIL PROTECTED]
---
linux/Documentation/video4linux/CARDLIST.au0828 |1 +
linux/drivers/media/video/au0828/Kconfig|1 +
linux/drivers/media/video/au0828/au0828-cards.c | 12
linux/drivers/media/video/au0828/au0828-cards.h |1 +
linux/drivers/media/video/au0828/au0828-dvb.c | 15 +++
5 files changed, 30 insertions(+)
diff -r 779f14e0a563 -r 38aa3b45bfe6
linux/Documentation/video4linux/CARDLIST.au0828
--- a/linux/Documentation/video4linux/CARDLIST.au0828 Sat Jul 12 17:22:38
2008 -0400
+++ b/linux/Documentation/video4linux/CARDLIST.au0828 Tue Jul 08 23:23:08
2008 -0400
@@ -2,3 +2,4 @@
1 - Hauppauge HVR950Q(au0828)
[2040:7200,2040:7210,2040:7217,2040:721b,2040:721f,2040:7280,0fd9:0008]
2 - Hauppauge HVR850 (au0828)[2040:7240]
3 - DViCO FusionHDTV USB (au0828)[0fe9:d620]
+ 4 - Hauppauge HVR950Q rev xxF8 (au0828)
[2040:7201,2040:7211,2040:7281]
diff -r 779f14e0a563 -r 38aa3b45bfe6 linux/drivers/media/video/au0828/Kconfig
--- a/linux/drivers/media/video/au0828/Kconfig Sat Jul 12 17:22:38 2008 -0400
+++ b/linux/drivers/media/video/au0828/Kconfig Tue Jul 08 23:23:08 2008 -0400
@@ -6,6 +6,7 @@ config VIDEO_AU0828
select VIDEO_TVEEPROM
select DVB_AU8522 if !DVB_FE_CUSTOMIZE
select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
+ select MEDIA_TUNER_MXL5007T if !DVB_FE_CUSTOMIZE
---help---
This is a video4linux driver for Auvitek's USB device.
diff -r 779f14e0a563 -r 38aa3b45bfe6
linux/drivers/media/video/au0828/au0828-cards.c
--- a/linux/drivers/media/video/au0828/au0828-cards.c Sat Jul 12 17:22:38
2008 -0400
+++ b/linux/drivers/media/video/au0828/au0828-cards.c Tue Jul 08 23:23:08
2008 -0400
@@ -32,6 +32,9 @@ struct au0828_board au0828_boards[] = {
[AU0828_BOARD_HAUPPAUGE_HVR950Q] = {
.name = Hauppauge HVR950Q,
},
+ [AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL] = {
+ .name = Hauppauge HVR950Q rev xxF8,
+ },
[AU0828_BOARD_DVICO_FUSIONHDTV7] = {
.name = DViCO FusionHDTV USB,
},
@@ -49,6 +52,7 @@ int au0828_tuner_callback(void *priv, in
switch (dev-board) {
case AU0828_BOARD_HAUPPAUGE_HVR850:
case AU0828_BOARD_HAUPPAUGE_HVR950Q:
+ case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
case AU0828_BOARD_DVICO_FUSIONHDTV7:
if (command == 0) {
/* Tuner Reset Command from xc5000 */
@@ -110,6 +114,7 @@ void au0828_card_setup(struct au0828_dev
switch (dev-board) {
case AU0828_BOARD_HAUPPAUGE_HVR850:
case AU0828_BOARD_HAUPPAUGE_HVR950Q:
+ case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
if (dev-i2c_rc == 0)
hauppauge_eeprom(dev, eeprom+0xa0);
break;
@@ -128,6 +133,7 @@ void au0828_gpio_setup(struct au0828_dev
switch (dev-board) {
case AU0828_BOARD_HAUPPAUGE_HVR850:
case AU0828_BOARD_HAUPPAUGE_HVR950Q:
+ case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
/* GPIO's
* 4 - CS5340
* 5 - AU8522 Demodulator
@@ -193,6 +199,12 @@ struct usb_device_id au0828_usb_id_table
.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
{ USB_DEVICE(0x0fd9, 0x0008),
.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
+ { USB_DEVICE(0x2040, 0x7201),
+ .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
+ { USB_DEVICE(0x2040, 0x7211),
+ .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
+ { USB_DEVICE(0x2040, 0x7281),
+ .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
{ },
};
diff -r 779f14e0a563 -r 38aa3b45bfe6
linux/drivers/media/video/au0828/au0828-cards.h
--- a/linux/drivers/media/video/au0828/au0828-cards.h Sat Jul 12 17:22:38
2008 -0400
+++ b/linux/drivers/media/video/au0828/au0828-cards.h Tue Jul 08 23:23:08
2008 -0400
@@ -23,3 +23,4 @@
#define AU0828_BOARD_HAUPPAUGE_HVR950Q 1
#define AU0828_BOARD_HAUPPAUGE_HVR850 2
#define AU0828_BOARD_DVICO_FUSIONHDTV7 3
+#define AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL 4
diff -r 779f14e0a563 -r 38aa3b45bfe6
linux/drivers/media/video/au0828/au0828-dvb.c
--- a/linux/drivers/media/video/au0828/au0828-dvb.c Sat Jul 12
[linuxtv-commits] [hg:v4l-dvb] fix a few assorted spelling mistakes.
The patch number 8525 was added via Hans Verkuil [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Hans Verkuil [EMAIL PROTECTED]
fix a few assorted spelling mistakes.
Signed-off-by: Hans Verkuil [EMAIL PROTECTED]
---
README.patches |2 +-
linux/drivers/media/video/videobuf-vmalloc.c |2 +-
linux/include/media/v4l2-dev.h |4 ++--
v4l2-apps/util/v4l_rec.pl|4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff -r c1bb94ea97fa -r 488c578e17c5 README.patches
--- a/README.patchesSat Jul 26 13:33:47 2008 +0200
+++ b/README.patchesSat Jul 26 13:37:58 2008 +0200
@@ -166,7 +166,7 @@ c) Since June, 1st, 2007, all patches ar
the script, between the kernel one and a copy at v4l-dvb development tree.
It is always a good idea to use in-kernel version, since additional tests
- are performed (like checking for the usage of depreciated API's that are
+ are performed (like checking for the usage of deprecated API's that are
about to be removed).
It is possible to override the in-kernel checkpatch.pl location, by using
diff -r c1bb94ea97fa -r 488c578e17c5
linux/drivers/media/video/videobuf-vmalloc.c
--- a/linux/drivers/media/video/videobuf-vmalloc.c Sat Jul 26 13:33:47
2008 +0200
+++ b/linux/drivers/media/video/videobuf-vmalloc.c Sat Jul 26 13:37:58
2008 +0200
@@ -204,7 +204,7 @@ static int __videobuf_iolock (struct vid
return 0;
/* FIXME: to properly support USERPTR, remap should occur.
- The code bellow won't work, since mem-vma = NULL
+ The code below won't work, since mem-vma = NULL
*/
/* Try to remap memory */
rc = remap_vmalloc_range(mem-vma, (void *)vb-baddr, 0);
diff -r c1bb94ea97fa -r 488c578e17c5 linux/include/media/v4l2-dev.h
--- a/linux/include/media/v4l2-dev.hSat Jul 26 13:33:47 2008 +0200
+++ b/linux/include/media/v4l2-dev.hSat Jul 26 13:37:58 2008 +0200
@@ -59,7 +59,7 @@ struct video_device
char name[32];
int vfl_type;
int minor;
- /* attribute to diferentiate multiple indexs on one physical device */
+ /* attribute to differentiate multiple indices on one physical device */
int index;
int debug; /* Activates debug level*/
@@ -82,7 +82,7 @@ struct video_device
void *priv;
#endif
- /* for videodev.c intenal usage -- please don't touch */
+ /* for videodev.c internal usage -- please don't touch */
int users; /* video_exclusive_{open|close} ... */
struct mutex lock; /* ... helper function uses these */
};
diff -r c1bb94ea97fa -r 488c578e17c5 v4l2-apps/util/v4l_rec.pl
--- a/v4l2-apps/util/v4l_rec.pl Sat Jul 26 13:33:47 2008 +0200
+++ b/v4l2-apps/util/v4l_rec.pl Sat Jul 26 13:37:58 2008 +0200
@@ -16,7 +16,7 @@ my $std;
$dev=shift or $dev=/dev/video1;
##
-# Those stuff bellow are currently hardcoded
+# Those stuff below are currently hardcoded
my $acard=0;
my $rec_ctrl=Aux,0;
@@ -25,7 +25,7 @@ my $abitrate=224;
my $abitrate=224;
##
-# Those stuff bellow are NTSC / PAL-M specific
+# Those stuff below are NTSC / PAL-M specific
my $list=/usr/share/xawtv/ntsc-cable.list;
my $fps=3/1001;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/488c578e17c540148969d17259283996b953062b
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] v4l2-dev: remove unused type and type2 field from video_device
The patch number 8523 was added via Hans Verkuil [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Hans Verkuil [EMAIL PROTECTED] v4l2-dev: remove unused type and type2 field from video_device The type and type2 fields were unused and so could be removed. Instead add a vfl_type field that contains the type of the video device. Signed-off-by: Hans Verkuil [EMAIL PROTECTED] --- linux/drivers/media/common/saa7146_fops.c |2 linux/drivers/media/radio/dsbr100.c |1 linux/drivers/media/radio/miropcm20-radio.c |1 linux/drivers/media/radio/radio-aimslab.c |1 linux/drivers/media/radio/radio-aztech.c |1 linux/drivers/media/radio/radio-cadet.c |1 linux/drivers/media/radio/radio-gemtek-pci.c |1 linux/drivers/media/radio/radio-gemtek.c |1 linux/drivers/media/radio/radio-maestro.c |1 linux/drivers/media/radio/radio-maxiradio.c |1 linux/drivers/media/radio/radio-rtrack2.c |1 linux/drivers/media/radio/radio-sf16fmi.c |1 linux/drivers/media/radio/radio-sf16fmr2.c|1 linux/drivers/media/radio/radio-si470x.c |1 linux/drivers/media/radio/radio-terratec.c|1 linux/drivers/media/radio/radio-trust.c |1 linux/drivers/media/radio/radio-typhoon.c |1 linux/drivers/media/radio/radio-zoltrix.c |1 linux/drivers/media/video/bt8xx/bttv-driver.c | 23 ++ linux/drivers/media/video/bw-qcam.c |1 linux/drivers/media/video/c-qcam.c|1 linux/drivers/media/video/cafe_ccic.c |2 linux/drivers/media/video/cpia.c |1 linux/drivers/media/video/cpia2/cpia2_v4l.c |3 - linux/drivers/media/video/cx18/cx18-streams.c |3 - linux/drivers/media/video/cx23885/cx23885-417.c |4 - linux/drivers/media/video/cx23885/cx23885-video.c | 15 +++--- linux/drivers/media/video/cx88/cx88-blackbird.c |2 linux/drivers/media/video/cx88/cx88-video.c |3 - linux/drivers/media/video/em28xx/em28xx-video.c | 14 +- linux/drivers/media/video/et61x251/et61x251_core.c|1 linux/drivers/media/video/gspca/gspca.c |1 linux/drivers/media/video/ivtv/ivtv-streams.c |5 -- linux/drivers/media/video/meye.c |1 linux/drivers/media/video/ov511.c |1 linux/drivers/media/video/pms.c |1 linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c |4 - linux/drivers/media/video/pwc/pwc-if.c|1 linux/drivers/media/video/s2255drv.c |1 linux/drivers/media/video/saa5246a.c |1 linux/drivers/media/video/saa5249.c |1 linux/drivers/media/video/saa7134/saa7134-core.c |9 +-- linux/drivers/media/video/saa7134/saa7134-empress.c |2 linux/drivers/media/video/saa7134/saa7134-video.c |3 - linux/drivers/media/video/se401.c |1 linux/drivers/media/video/sn9c102/sn9c102_core.c |1 linux/drivers/media/video/soc_camera.c|1 linux/drivers/media/video/stk-webcam.c|2 linux/drivers/media/video/stradis.c |1 linux/drivers/media/video/stv680.c|1 linux/drivers/media/video/usbvideo/usbvideo.c |1 linux/drivers/media/video/usbvideo/vicam.c|1 linux/drivers/media/video/usbvision/usbvision-video.c |3 - linux/drivers/media/video/uvc/uvc_driver.c|2 linux/drivers/media/video/v4l2-dev.c |1 linux/drivers/media/video/vino.c |2 linux/drivers/media/video/vivi.c |1 linux/drivers/media/video/w9966.c |1 linux/drivers/media/video/w9968cf.c |1 linux/drivers/media/video/zc0301/zc0301_core.c|1 linux/drivers/media/video/zoran_driver.c |2 linux/drivers/media/video/zr364xx.c |1 linux/include/media/v4l2-dev.h|3 - linux/sound/i2c/other/tea575x-tuner.c |1 64 files changed, 22 insertions(+), 129 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/8b45df965dfa570210105faa4e4a7b9e3d8d1760
[linuxtv-commits] [hg:v4l-dvb] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-videodev
The patch number 8527 was added via Mauro Carvalho Chehab [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Mauro Carvalho Chehab [EMAIL PROTECTED] merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-videodev Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- README.patches|2 linux/drivers/media/common/saa7146_fops.c |2 linux/drivers/media/common/saa7146_video.c| 17 +++ linux/drivers/media/radio/dsbr100.c |1 linux/drivers/media/radio/miropcm20-radio.c |1 linux/drivers/media/radio/radio-aimslab.c |1 linux/drivers/media/radio/radio-aztech.c |1 linux/drivers/media/radio/radio-cadet.c |1 linux/drivers/media/radio/radio-gemtek-pci.c |1 linux/drivers/media/radio/radio-gemtek.c |1 linux/drivers/media/radio/radio-maestro.c |1 linux/drivers/media/radio/radio-maxiradio.c |1 linux/drivers/media/radio/radio-rtrack2.c |1 linux/drivers/media/radio/radio-sf16fmi.c |1 linux/drivers/media/radio/radio-sf16fmr2.c|1 linux/drivers/media/radio/radio-si470x.c |1 linux/drivers/media/radio/radio-terratec.c|1 linux/drivers/media/radio/radio-trust.c |1 linux/drivers/media/radio/radio-typhoon.c |1 linux/drivers/media/radio/radio-zoltrix.c |1 linux/drivers/media/video/bt8xx/bttv-driver.c | 23 ++ linux/drivers/media/video/bw-qcam.c |1 linux/drivers/media/video/c-qcam.c|1 linux/drivers/media/video/cafe_ccic.c |2 linux/drivers/media/video/cpia.c |1 linux/drivers/media/video/cpia2/cpia2_v4l.c |3 - linux/drivers/media/video/cx18/cx18-streams.c |3 - linux/drivers/media/video/cx23885/cx23885-417.c |4 - linux/drivers/media/video/cx23885/cx23885-video.c | 15 +++--- linux/drivers/media/video/cx88/cx88-blackbird.c |2 linux/drivers/media/video/cx88/cx88-video.c |3 - linux/drivers/media/video/em28xx/em28xx-video.c | 14 +- linux/drivers/media/video/et61x251/et61x251_core.c|1 linux/drivers/media/video/gspca/gspca.c |1 linux/drivers/media/video/ivtv/ivtv-streams.c |5 -- linux/drivers/media/video/meye.c |1 linux/drivers/media/video/ov511.c |1 linux/drivers/media/video/pms.c |1 linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c |4 - linux/drivers/media/video/pwc/pwc-if.c|1 linux/drivers/media/video/s2255drv.c |1 linux/drivers/media/video/saa5246a.c |1 linux/drivers/media/video/saa5249.c |1 linux/drivers/media/video/saa7134/saa7134-core.c |9 +-- linux/drivers/media/video/saa7134/saa7134-empress.c |2 linux/drivers/media/video/saa7134/saa7134-video.c |3 - linux/drivers/media/video/se401.c |1 linux/drivers/media/video/sn9c102/sn9c102_core.c |1 linux/drivers/media/video/soc_camera.c|1 linux/drivers/media/video/stk-webcam.c|2 linux/drivers/media/video/stradis.c |1 linux/drivers/media/video/stv680.c|1 linux/drivers/media/video/usbvideo/usbvideo.c |1 linux/drivers/media/video/usbvideo/vicam.c|1 linux/drivers/media/video/usbvision/usbvision-video.c |3 - linux/drivers/media/video/uvc/uvc_driver.c|2 linux/drivers/media/video/v4l2-dev.c |1 linux/drivers/media/video/videobuf-vmalloc.c |2 linux/drivers/media/video/vino.c |2 linux/drivers/media/video/vivi.c |1 linux/drivers/media/video/w9966.c |1 linux/drivers/media/video/w9968cf.c |1 linux/drivers/media/video/zc0301/zc0301_core.c|1 linux/drivers/media/video/zoran_driver.c |2 linux/drivers/media/video/zr364xx.c |1 linux/include/linux/videodev.h| 15 ++ linux/include/linux/videodev2.h |6 ++ linux/include/media/v4l2-dev.h|7 +-- linux/sound/i2c/other/tea575x-tuner.c |
[linuxtv-commits] [hg:v4l-dvb] backport commit 27ac792ca0b0a1e7e65f20342260650516c95864
The patch number 8535 was added via Mauro Carvalho Chehab [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Mauro Carvalho Chehab [EMAIL PROTECTED] backport commit 27ac792ca0b0a1e7e65f20342260650516c95864 kernel-sync: Author: Andrea Righi [EMAIL PROTECTED] Date: Wed Jul 23 21:28:13 2008 -0700 PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures On 32-bit architectures PAGE_ALIGN() truncates 64-bit values to the 32-bit boundary. For example: u64 val = PAGE_ALIGN(size); always returns a value 4GB even if size is greater than 4GB. The problem resides in PAGE_MASK definition (from include/asm-x86/page.h for example): #define PAGE_SHIFT 12 #define PAGE_SIZE (_AC(1,UL) PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) ... #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)PAGE_MASK) The ~ is performed on a 32-bit value, so everything in and with PAGE_MASK greater than 4GB will be truncated to the 32-bit boundary. Using the ALIGN() macro seems to be the right way, because it uses typeof(addr) for the mask. Also move the PAGE_ALIGN() definitions out of include/asm-*/page.h in include/linux/mm.h. See also lkml discussion: http://lkml.org/lkml/2008/6/11/237 [EMAIL PROTECTED]: fix drivers/media/video/uvc/uvc_queue.c] [EMAIL PROTECTED]: fix v850] [EMAIL PROTECTED]: fix powerpc] [EMAIL PROTECTED]: fix arm] [EMAIL PROTECTED]: fix mips] [EMAIL PROTECTED]: fix drivers/media/video/pvrusb2/pvrusb2-dvb.c] [EMAIL PROTECTED]: fix drivers/mtd/maps/uclinux.c] [EMAIL PROTECTED]: fix powerpc] Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/drivers/media/video/pvrusb2/pvrusb2-dvb.c|1 + linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c |1 + linux/drivers/media/video/uvc/uvc_queue.c |1 + linux/drivers/media/video/videobuf-core.c |1 + 4 files changed, 4 insertions(+) diff -r 750f02af7bb2 -r 154bbd7aca47 linux/drivers/media/video/pvrusb2/pvrusb2-dvb.c --- a/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.c Sun Jul 27 13:04:55 2008 + +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-dvb.c Sun Jul 27 12:33:36 2008 -0300 @@ -24,6 +24,7 @@ #else #include linux/freezer.h #endif +#include linux/mm.h #include compat.h #include dvbdev.h #include pvrusb2-debug.h diff -r 750f02af7bb2 -r 154bbd7aca47 linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c --- a/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.cSun Jul 27 13:04:55 2008 + +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.cSun Jul 27 12:33:36 2008 -0300 @@ -22,6 +22,7 @@ #include pvrusb2-debug.h #include linux/errno.h #include linux/string.h +#include linux/mm.h #include linux/slab.h #include linux/mutex.h #include asm/uaccess.h diff -r 750f02af7bb2 -r 154bbd7aca47 linux/drivers/media/video/uvc/uvc_queue.c --- a/linux/drivers/media/video/uvc/uvc_queue.c Sun Jul 27 13:04:55 2008 + +++ b/linux/drivers/media/video/uvc/uvc_queue.c Sun Jul 27 12:33:36 2008 -0300 @@ -13,6 +13,7 @@ #include linux/kernel.h #include linux/version.h +#include linux/mm.h #include linux/list.h #include linux/module.h #include linux/usb.h diff -r 750f02af7bb2 -r 154bbd7aca47 linux/drivers/media/video/videobuf-core.c --- a/linux/drivers/media/video/videobuf-core.c Sun Jul 27 13:04:55 2008 + +++ b/linux/drivers/media/video/videobuf-core.c Sun Jul 27 12:33:36 2008 -0300 @@ -16,6 +16,7 @@ #include linux/init.h #include linux/module.h #include linux/moduleparam.h +#include linux/mm.h #include linux/slab.h #include linux/interrupt.h --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/154bbd7aca47b02221603b0b70c3732130f93213 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] em28xx-cards: Add GrabBeeX+ USB2800 model
The patch number 8538 was added via Mauro Carvalho Chehab [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Aron Szabo [EMAIL PROTECTED]
em28xx-cards: Add GrabBeeX+ USB2800 model
Added GrabBeeX+ USB2800 model (analog only)
Signed-off-by: Aron Szabo [EMAIL PROTECTED]
Signed-off-by: Douglas Schilling Landgraf [EMAIL PROTECTED]
[EMAIL PROTECTED]: Need to fix some merge conflicts]
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/Documentation/video4linux/CARDLIST.em28xx |1
linux/drivers/media/video/em28xx/em28xx-cards.c | 19
linux/drivers/media/video/em28xx/em28xx.h |1
3 files changed, 21 insertions(+)
diff -r 6fc57e1702e7 -r c86d631e0af6
linux/Documentation/video4linux/CARDLIST.em28xx
--- a/linux/Documentation/video4linux/CARDLIST.em28xx Sun Jul 27 12:41:32
2008 -0300
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx Sun Jul 27 13:47:52
2008 -0300
@@ -19,3 +19,4 @@
18 - Hauppauge WinTV HVR 900 (R2) (em2880)[2040:6502]
19 - PointNix Intra-Oral Camera (em2860)
20 - AMD ATI TV Wonder HD 600 (em2880)[0438:b002]
+ 21 - eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800)
[eb1a:2801]
diff -r 6fc57e1702e7 -r c86d631e0af6
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Sun Jul 27 12:41:32
2008 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Sun Jul 27 13:47:52
2008 -0300
@@ -367,6 +367,21 @@ struct em28xx_board em28xx_boards[] = {
.vmux = SAA7115_COMPOSITE2,
.amux = 0,
}, {
+ .type = EM28XX_VMUX_COMPOSITE1,
+ .vmux = SAA7115_COMPOSITE0,
+ .amux = 1,
+ }, {
+ .type = EM28XX_VMUX_SVIDEO,
+ .vmux = SAA7115_SVIDEO3,
+ .amux = 1,
+ } },
+ },
+ [EM2800_BOARD_GRABBEEX_USB2800] = {
+ .name = eMPIA Technology, Inc. GrabBeeX+ Video
Encoder,
+ .is_em2800= 1,
+ .vchannels= 2,
+ .decoder = EM28XX_SAA7113,
+ .input = { {
.type = EM28XX_VMUX_COMPOSITE1,
.vmux = SAA7115_COMPOSITE0,
.amux = 1,
@@ -542,6 +557,8 @@ struct usb_device_id em28xx_id_table []
.driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },
{ USB_DEVICE(0x0438, 0xb002),
.driver_info = EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600 },
+ { USB_DEVICE(0xeb1a, 0x2801),
+ .driver_info = EM2800_BOARD_GRABBEEX_USB2800 },
{ },
};
MODULE_DEVICE_TABLE(usb, em28xx_id_table);
@@ -864,6 +881,8 @@ void em28xx_set_ir(struct em28xx *dev, s
break;
case (EM2800_BOARD_KWORLD_USB2800):
break;
+ case (EM2800_BOARD_GRABBEEX_USB2800):
+ break;
}
}
diff -r 6fc57e1702e7 -r c86d631e0af6 linux/drivers/media/video/em28xx/em28xx.h
--- a/linux/drivers/media/video/em28xx/em28xx.h Sun Jul 27 12:41:32 2008 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx.h Sun Jul 27 13:47:52 2008 -0300
@@ -60,6 +60,7 @@
#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R218
#define EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA 19
#define EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600 20
+#define EM2800_BOARD_GRABBEEX_USB2800 21
/* Limits minimum and default number of buffers */
#define EM28XX_MIN_BUF 4
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/c86d631e0af6ce986ebe3a766e302a9cc987512b
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] em28xx-cards: New supported IDs for analog models
The patch number 8539 was added via Mauro Carvalho Chehab [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Douglas Schilling Landgraf [EMAIL PROTECTED] em28xx-cards: New supported IDs for analog models - New supported IDs for analog models (Based on Markus Rechberger [EMAIL PROTECTED] version of em28xx driver) - Validation field for new em28xx boards. Signed-off-by: Douglas Schilling Landgraf [EMAIL PROTECTED] [EMAIL PROTECTED]: Need to fix some merge conflicts] Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/Documentation/video4linux/CARDLIST.em28xx | 41 linux/drivers/media/video/em28xx/em28xx-cards.c | 919 +++- linux/drivers/media/video/em28xx/em28xx.h | 45 3 files changed, 981 insertions(+), 24 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/572c09c6861b8848ad40b53a86c3f4031b2a99b2 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] em28xx-cards: Add Compro VideoMate ForYou/Stereo model
The patch number 8540 was added via Mauro Carvalho Chehab [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Vitaly Wool [EMAIL PROTECTED]
em28xx-cards: Add Compro VideoMate ForYou/Stereo model
Added Compro VideoMate ForYou/Stereo model (analog only)
Signed-off-by: Vitaly Wool [EMAIL PROTECTED]
[EMAIL PROTECTED]: Solved conflicts with v4l-dvb devel tree]
Signed-off-by: Douglas Schilling Landgraf [EMAIL PROTECTED]
[EMAIL PROTECTED]: Need to fix some merge conflicts]
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/Documentation/video4linux/CARDLIST.em28xx |1
linux/drivers/media/video/em28xx/em28xx-cards.c | 18
linux/drivers/media/video/em28xx/em28xx.h |1
3 files changed, 20 insertions(+)
diff -r 572c09c6861b -r cd71b4080a1a
linux/Documentation/video4linux/CARDLIST.em28xx
--- a/linux/Documentation/video4linux/CARDLIST.em28xx Sun Jul 27 14:03:32
2008 -0300
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx Sun Jul 27 14:10:11
2008 -0300
@@ -57,3 +57,4 @@
56 - Pinnacle Hybrid Pro (2) (em2882)[2304:0226]
57 - Kworld PlusTV HD Hybrid 330 (em2883)[eb1a:a316]
58 - Hauppauge WinTV HVR 950 (em2883)
+ 59 - Compro VideoMate ForYou/Stereo (em2820/em2840) [185b:2041]
diff -r 572c09c6861b -r cd71b4080a1a
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Sun Jul 27 14:03:32
2008 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Sun Jul 27 14:10:11
2008 -0300
@@ -1133,6 +1133,22 @@ struct em28xx_board em28xx_boards[] = {
.type = EM28XX_VMUX_SVIDEO,
.vmux = TVP5150_SVIDEO,
.amux = 1,
+ } },
+ },
+ [EM2820_BOARD_COMPRO_VIDEO_MATE] = {
+ .name = Compro VideoMate ForYou/Stereo,
+ .vchannels= 2,
+ .tuner_type = TUNER_LG_PAL_NEW_TAPC,
+ .tda9887_conf = TDA9887_PRESENT,
+ .decoder = EM28XX_TVP5150,
+ .input = { {
+ .type = EM28XX_VMUX_TELEVISION,
+ .vmux = TVP5150_COMPOSITE0,
+ .amux = EM28XX_AMUX_LINE_IN,
+ }, {
+ .type = EM28XX_VMUX_SVIDEO,
+ .vmux = TVP5150_SVIDEO,
+ .amux = EM28XX_AMUX_LINE_IN,
} },
},
};
@@ -1196,6 +1212,8 @@ struct usb_device_id em28xx_id_table []
.driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },
{ USB_DEVICE(0x185b, 0x2870),
.driver_info = EM2870_BOARD_COMPRO_VIDEOMATE },
+ { USB_DEVICE(0x185b, 0x2041),
+ .driver_info = EM2820_BOARD_COMPRO_VIDEO_MATE },
{ USB_DEVICE(0x2040, 0x4200),
.driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },
{ USB_DEVICE(0x2040, 0x4201),
diff -r 572c09c6861b -r cd71b4080a1a linux/drivers/media/video/em28xx/em28xx.h
--- a/linux/drivers/media/video/em28xx/em28xx.h Sun Jul 27 14:03:32 2008 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx.h Sun Jul 27 14:10:11 2008 -0300
@@ -98,6 +98,7 @@
#define EM2882_BOARD_PINNACLE_HYBRID_PRO 56
#define EM2883_BOARD_KWORLD_HYBRID_A316 57
#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950 58
+#define EM2820_BOARD_COMPRO_VIDEO_MATE 59
/* Limits minimum and default number of buffers */
#define EM28XX_MIN_BUF 4
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/cd71b4080a1a0fa3c66bc803d0e895dfaf989288
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] gspca: probe/open race.
The patch number 8544 was added via Jean-Francois Moine [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Oliver Neukum [EMAIL PROTECTED] gspca: probe/open race. The device is flagged present after it is registered. During that window calls to open() that should work fail with -ENODEV. Reversing the order fixes the race. Signed-off-by: Oliver Neukum [EMAIL PROTECTED] Signed-off-by: Jean-Francois Moine [EMAIL PROTECTED] --- linux/drivers/media/video/gspca/gspca.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -r cd71b4080a1a -r a19c20d8c144 linux/drivers/media/video/gspca/gspca.c --- a/linux/drivers/media/video/gspca/gspca.c Sun Jul 27 14:10:11 2008 -0300 +++ b/linux/drivers/media/video/gspca/gspca.c Sun Jul 27 19:01:59 2008 +0200 @@ -1765,6 +1765,7 @@ int gspca_dev_probe(struct usb_interface memcpy(gspca_dev-fops, dev_fops, sizeof gspca_dev-fops); gspca_dev-vdev.fops = gspca_dev-fops; gspca_dev-fops.owner = module; /* module protection */ + gspca_dev-present = 1; ret = video_register_device(gspca_dev-vdev, VFL_TYPE_GRABBER, video_nr); @@ -1773,7 +1774,6 @@ int gspca_dev_probe(struct usb_interface goto out; } - gspca_dev-present = 1; usb_set_intfdata(intf, gspca_dev); PDEBUG(D_PROBE, probe ok); return 0; --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/a19c20d8c1448f982e3762110d578aa556d1e3a5 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] pwc: Fix compilation
The patch number 8548 was added via Mauro Carvalho Chehab [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Mauro Carvalho Chehab [EMAIL PROTECTED] pwc: Fix compilation Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/drivers/media/video/pwc/pwc.h |1 + 1 file changed, 1 insertion(+) diff -r a06612ae3d22 -r 69dca10a19f4 linux/drivers/media/video/pwc/pwc.h --- a/linux/drivers/media/video/pwc/pwc.h Sun Jul 27 17:56:15 2008 -0300 +++ b/linux/drivers/media/video/pwc/pwc.h Sun Jul 27 19:02:30 2008 -0300 @@ -32,6 +32,7 @@ #include linux/smp_lock.h #include linux/version.h #include linux/mutex.h +#include linux/mm.h #include asm/errno.h #include compat.h #include linux/videodev.h --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/69dca10a19f42ab369c165841b365b228447641f ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] mxl5007: Fix an error at include file
The patch number 8549 was added via Mauro Carvalho Chehab [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Mauro Carvalho Chehab [EMAIL PROTECTED]
mxl5007: Fix an error at include file
mxl5007 was forcing for its compilation:
In file included from
drivers/media/common/tuners/mxl5007t.c:25:drivers/media/common/tuners/mxl5007t.h:80:1:
warning: CONFIG_MEDIA_TUNER_MXL5007T redefined
In file included from command-line:0:
./include/linux/autoconf.h:2782:1: warning: this is the location of the
previous definition
Probably, some temporary hack for testing.
CC: Michael Krufky [EMAIL PROTECTED]
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/common/tuners/mxl5007t.h |1 -
1 file changed, 1 deletion(-)
diff -r 69dca10a19f4 -r 42e3970c09aa
linux/drivers/media/common/tuners/mxl5007t.h
--- a/linux/drivers/media/common/tuners/mxl5007t.h Sun Jul 27 19:02:30
2008 -0300
+++ b/linux/drivers/media/common/tuners/mxl5007t.h Sun Jul 27 19:30:46
2008 -0300
@@ -77,7 +77,6 @@ struct mxl5007t_config {
unsigned int clk_out_enable:1;
};
-#define CONFIG_MEDIA_TUNER_MXL5007T
#if defined(CONFIG_MEDIA_TUNER_MXL5007T) ||
(defined(CONFIG_MEDIA_TUNER_MXL5007T_MODULE) defined(MODULE))
extern struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, u8 addr,
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/42e3970c09aac2fce10ed3d06db4b70c03b9ccab
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
