[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~jfrancois/gspca/
The patch number 14091 was added via Douglas Schilling Landgraf
dougsl...@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: Douglas Schilling Landgraf dougsl...@redhat.com
merge: http://linuxtv.org/hg/~jfrancois/gspca/
Signed-off-by: Douglas Schilling Landgraf dougsl...@redhat.com
---
linux/drivers/media/video/gspca/gspca.c | 209 +-
linux/drivers/media/video/gspca/gspca.h | 13 +
linux/drivers/media/video/gspca/pac7302.c | 39
linux/drivers/media/video/gspca/t613.c| 49 +
4 files changed, 307 insertions(+), 3 deletions(-)
diff -r 4909baa8268c -r eb48c9f43044 linux/drivers/media/video/gspca/gspca.c
--- a/linux/drivers/media/video/gspca/gspca.c Mon Feb 01 15:45:37 2010 -0200
+++ b/linux/drivers/media/video/gspca/gspca.c Mon Feb 01 16:55:58 2010 -0200
@@ -3,6 +3,9 @@
*
* Copyright (C) 2008-2009 Jean-Francois Moine (http://moinejf.free.fr)
*
+ * Camera button input handling by Márton Németh
+ * Copyright (C) 2009-2010 Márton Németh nm...@freemail.hu
+ *
* 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
@@ -41,6 +44,9 @@
#include gspca.h
+#include linux/input.h
+#include linux/usb/input.h
+
/* global values */
#define DEF_NURBS 3/* default number of URBs */
#if DEF_NURBS MAX_NURBS
@@ -51,7 +57,7 @@
MODULE_DESCRIPTION(GSPCA USB Camera Driver);
MODULE_LICENSE(GPL);
-#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 8, 0)
+#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 9, 0)
#ifdef GSPCA_DEBUG
int gspca_debug = D_ERR | D_PROBE;
@@ -112,6 +118,186 @@
.close = gspca_vm_close,
};
+/*
+ * Input and interrupt endpoint handling functions
+ */
+#ifdef CONFIG_INPUT
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 6, 19)
+static void int_irq(struct urb *urb, struct pt_regs *regs)
+#else
+static void int_irq(struct urb *urb)
+#endif
+{
+ struct gspca_dev *gspca_dev = (struct gspca_dev *) urb-context;
+ int ret;
+
+ ret = urb-status;
+ switch (ret) {
+ case 0:
+ if (gspca_dev-sd_desc-int_pkt_scan(gspca_dev,
+ urb-transfer_buffer, urb-actual_length) 0) {
+ PDEBUG(D_ERR, Unknown packet received);
+ }
+ break;
+
+ case -ENOENT:
+ case -ECONNRESET:
+ case -ENODEV:
+ case -ESHUTDOWN:
+ /* Stop is requested either by software or hardware is gone,
+* keep the ret value non-zero and don't resubmit later.
+*/
+ break;
+
+ default:
+ PDEBUG(D_ERR, URB error %i, resubmitting, urb-status);
+ urb-status = 0;
+ ret = 0;
+ }
+
+ if (ret == 0) {
+ ret = usb_submit_urb(urb, GFP_ATOMIC);
+ if (ret 0)
+ PDEBUG(D_ERR, Resubmit URB failed with error %i, ret);
+ }
+}
+
+static int gspca_input_connect(struct gspca_dev *dev)
+{
+ struct input_dev *input_dev;
+ int err = 0;
+
+ dev-input_dev = NULL;
+ if (dev-sd_desc-int_pkt_scan) {
+ input_dev = input_allocate_device();
+ if (!input_dev)
+ return -ENOMEM;
+
+ usb_make_path(dev-dev, dev-phys, sizeof(dev-phys));
+ strlcat(dev-phys, /input0, sizeof(dev-phys));
+
+ input_dev-name = dev-sd_desc-name;
+ input_dev-phys = dev-phys;
+
+ usb_to_input_id(dev-dev, input_dev-id);
+
+ input_dev-evbit[0] = BIT_MASK(EV_KEY);
+ input_dev-keybit[BIT_WORD(KEY_CAMERA)] = BIT_MASK(KEY_CAMERA);
+ input_dev-dev.parent = dev-dev-dev;
+
+ err = input_register_device(input_dev);
+ if (err) {
+ PDEBUG(D_ERR, Input device registration failed
+ with error %i, err);
+ input_dev-dev.parent = NULL;
+ input_free_device(input_dev);
+ } else {
+ dev-input_dev = input_dev;
+ }
+ } else
+ err = -EINVAL;
+
+ return err;
+}
+
+static int alloc_and_submit_int_urb(struct gspca_dev *gspca_dev,
+ struct usb_endpoint_descriptor *ep)
+{
+ unsigned int buffer_len;
+ int interval;
+ struct urb *urb;
+ struct usb_device *dev;
+ void *buffer = NULL;
+ int ret =
[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] merge: http://linuxtv.org/hg/~jfrancois/gspca/
The patch number 10051 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: v4l-dvb-maintai...@linuxtv.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| 10 linux/drivers/media/video/gspca/Kconfig |1 linux/drivers/media/video/gspca/Makefile |2 linux/drivers/media/video/gspca/conex.c |2 linux/drivers/media/video/gspca/etoms.c |4 linux/drivers/media/video/gspca/finepix.c|2 linux/drivers/media/video/gspca/gspca.c | 18 linux/drivers/media/video/gspca/gspca.h |2 linux/drivers/media/video/gspca/m5602/m5602_bridge.h |7 linux/drivers/media/video/gspca/m5602/m5602_core.c | 100 + linux/drivers/media/video/gspca/m5602/m5602_mt9m111.c| 157 -- linux/drivers/media/video/gspca/m5602/m5602_mt9m111.h| 14 linux/drivers/media/video/gspca/m5602/m5602_ov9650.c | 320 ++--- linux/drivers/media/video/gspca/m5602/m5602_ov9650.h | 164 ++ linux/drivers/media/video/gspca/m5602/m5602_po1030.c | 196 +-- linux/drivers/media/video/gspca/m5602/m5602_po1030.h | 10 linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 254 +--- linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h | 19 linux/drivers/media/video/gspca/m5602/m5602_s5k83a.c | 253 +--- linux/drivers/media/video/gspca/m5602/m5602_s5k83a.h | 27 linux/drivers/media/video/gspca/m5602/m5602_sensor.h | 14 linux/drivers/media/video/gspca/mars.c |2 linux/drivers/media/video/gspca/ov519.c |4 linux/drivers/media/video/gspca/ov534.c | 132 +- linux/drivers/media/video/gspca/pac207.c |7 linux/drivers/media/video/gspca/pac7311.c|4 linux/drivers/media/video/gspca/sonixb.c |4 linux/drivers/media/video/gspca/sonixj.c |2 linux/drivers/media/video/gspca/spca500.c|4 linux/drivers/media/video/gspca/spca501.c|2 linux/drivers/media/video/gspca/spca505.c|2 linux/drivers/media/video/gspca/spca506.c|2 linux/drivers/media/video/gspca/spca508.c|2 linux/drivers/media/video/gspca/spca561.c| 563 -- linux/drivers/media/video/gspca/stk014.c |2 linux/drivers/media/video/gspca/stv06xx/Kconfig |9 linux/drivers/media/video/gspca/stv06xx/Makefile |6 linux/drivers/media/video/gspca/stv06xx/stv06xx.c| 522 + linux/drivers/media/video/gspca/stv06xx/stv06xx.h| 107 + linux/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | 533 + linux/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h | 263 linux/drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c | 430 +++ linux/drivers/media/video/gspca/stv06xx/stv06xx_pb0100.h | 297 + linux/drivers/media/video/gspca/stv06xx/stv06xx_sensor.h | 92 + linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c | 251 linux/drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 315 + linux/drivers/media/video/gspca/sunplus.c|6 linux/drivers/media/video/gspca/t613.c |4 linux/drivers/media/video/gspca/tv8532.c |2 linux/drivers/media/video/gspca/vc032x.c |7 linux/drivers/media/video/gspca/zc3xx.c |5 v4l/versions.txt |3 52 files changed, 3895 insertions(+), 1265 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/a0fd71d9ce23e86b2d79ab36500d12efcafb642a ___ 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/gspca/
The patch number 9566 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/~jfrancois/gspca/ Priority: normal Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/Documentation/video4linux/gspca.txt|1 linux/drivers/media/video/gspca/Kconfig |2 linux/drivers/media/video/gspca/finepix.c|3 linux/drivers/media/video/gspca/gspca.c | 16 linux/drivers/media/video/gspca/gspca.h | 11 linux/drivers/media/video/gspca/ov519.c | 159 ++--- linux/drivers/media/video/gspca/pac207.c |1 linux/drivers/media/video/gspca/sonixb.c | 21 linux/drivers/media/video/gspca/sonixj.c | 66 ++ linux/drivers/media/video/gspca/tv8532.c | 142 + linux/drivers/media/video/gspca/zc3xx.c | 296 ++- linux/drivers/media/video/sn9c102/sn9c102_devtable.h |4 12 files changed, 369 insertions(+), 353 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/7f45620b44316438852309423e7e8b70d5c6414e ___ 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/gspca/
The patch number 9128 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/~jfrancois/gspca/ Priority: normal Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/drivers/media/video/gspca/Kconfig | 15 linux/drivers/media/video/gspca/Makefile |2 linux/drivers/media/video/gspca/gspca.c | 11 linux/drivers/media/video/gspca/m5602/m5602_bridge.h | 12 linux/drivers/media/video/gspca/m5602/m5602_core.c| 359 ++-- linux/drivers/media/video/gspca/m5602/m5602_mt9m111.c |2 linux/drivers/media/video/gspca/m5602/m5602_ov9650.h |6 linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h |6 linux/drivers/media/video/gspca/m5602/m5602_s5k83a.c | 92 + linux/drivers/media/video/gspca/m5602/m5602_s5k83a.h | 58 linux/drivers/media/video/gspca/sonixj.c |6 linux/drivers/media/video/gspca/t613.c| 885 +- 12 files changed, 818 insertions(+), 636 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/28568be11a14b2cd7dcdc275f02925b17539c616 ___ 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/gspca/
The patch number 8934 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/~jfrancois/gspca/
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/Documentation/video4linux/gspca.txt |2
linux/drivers/media/video/gspca/gspca.c | 25 +-
linux/drivers/media/video/gspca/pac207.c |1
linux/drivers/media/video/gspca/sonixj.c | 51 +-
linux/drivers/media/video/gspca/zc3xx.c |4 -
5 files changed, 67 insertions(+), 16 deletions(-)
diff -r ed5ea7c1bc82 -r e3f4b17fead0 linux/Documentation/video4linux/gspca.txt
--- a/linux/Documentation/video4linux/gspca.txt Mon Sep 08 07:54:27 2008 -0300
+++ b/linux/Documentation/video4linux/gspca.txt Wed Sep 10 23:34:19 2008 -0300
@@ -42,6 +42,7 @@ zc3xx 0458:700c Genius VideoCam V3
zc3xx 0458:700c Genius VideoCam V3
zc3xx 0458:700f Genius VideoCam Web V2
sonixj 0458:7025 Genius Eye 311Q
+sonixj 0458:702e Genius Slim 310 NB
sonixj 045e:00f5 MicroSoft VX3000
sonixj 045e:00f7 MicroSoft VX1000
ov519 045e:028c Micro$oft xbox cam
@@ -181,6 +182,7 @@ pac207 093a:2470 Genius GF112
pac207 093a:2470 Genius GF112
pac207 093a:2471 Genius VideoCam ge111
pac207 093a:2472 Genius VideoCam ge110
+pac207 093a:2476 Genius e-Messenger 112
pac7311093a:2600 PAC7311 Typhoon
pac7311093a:2601 Philips SPC 610 NC
pac7311093a:2603 PAC7312
diff -r ed5ea7c1bc82 -r e3f4b17fead0 linux/drivers/media/video/gspca/gspca.c
--- a/linux/drivers/media/video/gspca/gspca.c Mon Sep 08 07:54:27 2008 -0300
+++ b/linux/drivers/media/video/gspca/gspca.c Wed Sep 10 23:34:19 2008 -0300
@@ -47,7 +47,7 @@ MODULE_DESCRIPTION(GSPCA USB Camera Dri
MODULE_DESCRIPTION(GSPCA USB Camera Driver);
MODULE_LICENSE(GPL);
-#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 2, 0)
+#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 3, 0)
static int video_nr = -1;
@@ -195,7 +195,7 @@ static void bulk_irq(struct urb *urb
{
struct gspca_dev *gspca_dev = (struct gspca_dev *) urb-context;
struct gspca_frame *frame;
- int j, ret;
+ int j;
PDEBUG(D_PACK, bulk irq);
if (!gspca_dev-streaming)
@@ -222,11 +222,6 @@ static void bulk_irq(struct urb *urb
urb-transfer_buffer,
urb-actual_length);
}
- /* resubmit the URB */
- urb-status = 0;
- ret = usb_submit_urb(urb, GFP_ATOMIC);
- if (ret 0)
- PDEBUG(D_ERR|D_PACK, usb_submit_urb() ret %d, ret);
}
/*
@@ -512,20 +507,20 @@ static int create_urbs(struct gspca_dev
PDEBUG(D_STREAM,
isoc %d pkts size %d = bsize:%d,
npkt, psize, bsize);
+ nurbs = DEF_NURBS;
} else {
npkt = 0;
bsize = psize;
PDEBUG(D_STREAM, bulk bsize:%d, bsize);
- }
-
- nurbs = DEF_NURBS;
+ nurbs = 1;
+ }
+
gspca_dev-nurbs = nurbs;
for (n = 0; n nurbs; n++) {
urb = usb_alloc_urb(npkt, GFP_KERNEL);
if (!urb) {
err(usb_alloc_urb failed);
- for (i = 0; i n; i++)
- usb_free_urb(gspca_dev-urb[i]);
+ destroy_urbs(gspca_dev);
return -ENOMEM;
}
urb-transfer_buffer = usb_buffer_alloc(gspca_dev-dev,
@@ -535,8 +530,8 @@ static int create_urbs(struct gspca_dev
if (urb-transfer_buffer == NULL) {
usb_free_urb(urb);
+ err(usb_buffer_urb failed);
destroy_urbs(gspca_dev);
- err(usb_buffer_urb failed);
return -ENOMEM;
}
gspca_dev-urb[n] = urb;
@@ -593,6 +588,10 @@ static int gspca_init_transfer(struct gs
gspca_dev-sd_desc-start(gspca_dev);
gspca_dev-streaming = 1;
atomic_set(gspca_dev-nevent, 0);
+
+ /* start the bulk transfer is done by the subdriver */
+ if (gspca_dev-bulk)
+ break;
/* submit the URBs */
for (n = 0; n gspca_dev-nurbs; n++) {
diff -r
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~jfrancois/gspca/
The patch number 8875 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/~jfrancois/gspca/
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/gspca/sonixb.c | 120 +++
linux/drivers/media/video/gspca/spca561.c| 88 ++--
linux/drivers/media/video/sn9c102/sn9c102_devtable.h |8
3 files changed, 159 insertions(+), 57 deletions(-)
diff -r 2f69e8c7306f -r 9ab7fa3b7e4c linux/drivers/media/video/gspca/sonixb.c
--- a/linux/drivers/media/video/gspca/sonixb.c Tue Sep 02 06:01:57 2008 -0300
+++ b/linux/drivers/media/video/gspca/sonixb.c Tue Sep 02 06:07:32 2008 -0300
@@ -20,6 +20,26 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+/* Some documentation on known sonixb registers:
+
+RegUse
+0x10 high nibble red gain low nibble blue gain
+0x11 low nibble green gain
+0x12 hstart
+0x13 vstart
+0x15 hsize (hsize = register-value * 16)
+0x16 vsize (vsize = register-value * 16)
+0x17 bit 0 toggle compression quality (according to sn9c102 driver)
+0x18 bit 7 enables compression, bit 4-5 set image down scaling:
+ 00 scale 1, 01 scale 1/2, 10, scale 1/4
+0x19 high-nibble is sensor clock divider, changes exposure on sensors which
+ use a clock generated by the bridge. Some sensors have their own clock.
+0x1c auto_exposure area (for avg_lum) startx (startx = register-value * 32)
+0x1d auto_exposure area (for avg_lum) starty (starty = register-value * 32)
+0x1e auto_exposure area (for avg_lum) stopx (hsize = (0x1e - 0x1c) * 32)
+0x1f auto_exposure area (for avg_lum) stopy (vsize = (0x1f - 0x1d) * 32)
+*/
+
#define MODULE_NAME sonixb
#include gspca.h
@@ -32,6 +52,7 @@ struct sd {
struct sd {
struct gspca_dev gspca_dev; /* !! must be the first item */
atomic_t avg_lum;
+ int prev_avg_lum;
unsigned char gain;
unsigned char exposure;
@@ -74,10 +95,10 @@ struct sensor_data {
/* sensor_data flags */
#define F_GAIN 0x01/* has gain */
#define F_SIF 0x02/* sif or vga */
-#define F_RAW 0x04/* sensor tested ok with raw bayer mode */
/* priv field of struct v4l2_pix_format flags (do not use low nibble!) */
#define MODE_RAW 0x10 /* raw bayer mode */
+#define MODE_REDUCED_SIF 0x20 /* vga mode (320x240 / 160x120) on sif cam */
/* ctrl_dis helper macros */
#define NO_EXPO ((1 EXPOSURE_IDX) | (1 AUTOGAIN_IDX))
@@ -231,6 +252,16 @@ static struct v4l2_pix_format vga_mode[]
.priv = 0},
};
static struct v4l2_pix_format sif_mode[] = {
+ {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
+ .bytesperline = 160,
+ .sizeimage = 160 * 120,
+ .colorspace = V4L2_COLORSPACE_SRGB,
+ .priv = 1 | MODE_RAW | MODE_REDUCED_SIF},
+ {160, 120, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
+ .bytesperline = 160,
+ .sizeimage = 160 * 120 * 5 / 4,
+ .colorspace = V4L2_COLORSPACE_SRGB,
+ .priv = 1 | MODE_REDUCED_SIF},
{176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
.bytesperline = 176,
.sizeimage = 176 * 144,
@@ -241,6 +272,11 @@ static struct v4l2_pix_format sif_mode[]
.sizeimage = 176 * 144 * 5 / 4,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 1},
+ {320, 240, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
+ .bytesperline = 320,
+ .sizeimage = 320 * 240 * 5 / 4,
+ .colorspace = V4L2_COLORSPACE_SRGB,
+ .priv = 0 | MODE_REDUCED_SIF},
{352, 288, V4L2_PIX_FMT_SN9C10X, V4L2_FIELD_NONE,
.bytesperline = 352,
.sizeimage = 352 * 288 * 5 / 4,
@@ -267,7 +303,7 @@ static const __u8 initOv6650[] = {
0x44, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x01, 0x01, 0x0a, 0x16, 0x12, 0x68, 0x8b,
- 0x10, 0x1d, 0x10, 0x00, 0x06, 0x1f, 0x00
+ 0x10, 0x1d, 0x10, 0x02, 0x02, 0x09, 0x07
#else
/* old version? */
0x64, 0x44, 0x28, 0x00, 0x00, 0x00, 0x00, 0x10,
@@ -342,7 +378,7 @@ static const __u8 initOv7630_3[] = {
static const __u8 initOv7630_3[] = {
0x44, 0x44, 0x00, 0x1a, 0x20, 0x20, 0x20, 0x80, /* r01 .. r08 */
0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, /* r09 .. r10 */
- 0x00, 0x01, 0x01, 0x0a, /* r11 .. r14 */
+ 0x00, 0x02,
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~jfrancois/gspca/
The patch number 8882 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/~jfrancois/gspca/
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/gspca/conex.c |4 ++--
linux/drivers/media/video/gspca/spca561.c |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff -r 2746374494cf -r 910ba7d707d4 linux/drivers/media/video/gspca/conex.c
--- a/linux/drivers/media/video/gspca/conex.c Mon Sep 01 20:28:23 2008 +0200
+++ b/linux/drivers/media/video/gspca/conex.c Tue Sep 02 08:39:29 2008 -0300
@@ -731,13 +731,13 @@ static void cx11646_jpeg(struct gspca_de
reg_w_val(gspca_dev, 0x, 0x00);
/* wait for completion */
retry = 50;
- while (retry--) {
+ do {
reg_r(gspca_dev, 0x0002, 1);
/* 0x07 until 0x00 */
if (gspca_dev-usb_buf[0] == 0x00)
break;
reg_w_val(gspca_dev, 0x0053, 0x00);
- }
+ } while (--retry);
if (retry == 0)
PDEBUG(D_ERR, Damned Errors sending jpeg Table);
/* send the qtable now */
diff -r 2746374494cf -r 910ba7d707d4 linux/drivers/media/video/gspca/spca561.c
--- a/linux/drivers/media/video/gspca/spca561.c Mon Sep 01 20:28:23 2008 +0200
+++ b/linux/drivers/media/video/gspca/spca561.c Tue Sep 02 08:39:29 2008 -0300
@@ -223,11 +223,11 @@ static int i2c_read(struct gspca_dev *gs
reg_w_val(gspca_dev-dev, 0x8804, 0x92);
reg_w_val(gspca_dev-dev, 0x8801, reg);
reg_w_val(gspca_dev-dev, 0x8802, (mode | 0x01));
- while (retry--) {
+ do {
reg_r(gspca_dev, 0x8803, 1);
if (!gspca_dev-usb_buf)
break;
- }
+ } while (--retry);
if (retry == 0)
return -1;
reg_r(gspca_dev, 0x8800, 1);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/910ba7d707d44d2ee1393ce89f4728aec2759e64
___
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/gspca/
The patch number 8836 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/~jfrancois/gspca/ Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/Documentation/video4linux/gspca.txt|2 linux/drivers/media/video/gspca/conex.c | 20 linux/drivers/media/video/gspca/etoms.c | 24 linux/drivers/media/video/gspca/gspca.c | 108 - linux/drivers/media/video/gspca/gspca.h | 17 linux/drivers/media/video/gspca/mars.c | 43 linux/drivers/media/video/gspca/ov519.c | 1165 +-- linux/drivers/media/video/gspca/pac207.c | 94 linux/drivers/media/video/gspca/pac7311.c| 664 +++--- linux/drivers/media/video/gspca/pac_common.h | 60 linux/drivers/media/video/gspca/sonixb.c | 533 ++--- linux/drivers/media/video/gspca/sonixj.c | 104 linux/drivers/media/video/gspca/spca500.c| 16 linux/drivers/media/video/gspca/spca501.c| 12 linux/drivers/media/video/gspca/spca505.c| 12 linux/drivers/media/video/gspca/spca506.c| 16 linux/drivers/media/video/gspca/spca508.c| 17 linux/drivers/media/video/gspca/spca561.c| 19 linux/drivers/media/video/gspca/stk014.c | 16 linux/drivers/media/video/gspca/sunplus.c| 167 - linux/drivers/media/video/gspca/t613.c | 33 linux/drivers/media/video/gspca/tv8532.c | 16 linux/drivers/media/video/gspca/vc032x.c | 27 linux/drivers/media/video/gspca/zc3xx.c | 88 linux/drivers/media/video/sn9c102/sn9c102_devtable.h | 13 linux/drivers/media/video/zc0301/zc0301_sensor.h | 19 linux/include/linux/videodev2.h |6 27 files changed, 1643 insertions(+), 1668 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/b66774e706dca25f6ab14b0901dd375b76faa99f ___ 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/gspca/
The patch number 8721 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/~jfrancois/gspca/ Priority: normal Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/Documentation/video4linux/gspca.txt | 26 +- linux/drivers/media/video/gspca/conex.c |4 linux/drivers/media/video/gspca/etoms.c |4 linux/drivers/media/video/gspca/gspca.c | 37 ++- linux/drivers/media/video/gspca/gspca.h | 11 + linux/drivers/media/video/gspca/mars.c|4 linux/drivers/media/video/gspca/ov519.c |4 linux/drivers/media/video/gspca/pac207.c |4 linux/drivers/media/video/gspca/pac7311.c | 185 +++-- linux/drivers/media/video/gspca/sonixb.c |4 linux/drivers/media/video/gspca/sonixj.c | 234 +++--- linux/drivers/media/video/gspca/spca500.c |4 linux/drivers/media/video/gspca/spca501.c |4 linux/drivers/media/video/gspca/spca505.c |4 linux/drivers/media/video/gspca/spca506.c |4 linux/drivers/media/video/gspca/spca508.c |4 linux/drivers/media/video/gspca/spca561.c | 108 +- linux/drivers/media/video/gspca/stk014.c |4 linux/drivers/media/video/gspca/sunplus.c |4 linux/drivers/media/video/gspca/t613.c|8 linux/drivers/media/video/gspca/tv8532.c |4 linux/drivers/media/video/gspca/vc032x.c |4 linux/drivers/media/video/gspca/zc3xx.c | 35 ++- linux/include/linux/videodev2.h |5 24 files changed, 492 insertions(+), 217 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/0b626a7dbc9bb8e871834249411d38cb885cfe84 ___ 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/gspca/
The patch number 8676 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/~jfrancois/gspca/ Priority: normal Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/Documentation/video4linux/gspca.txt |1 linux/drivers/media/video/gspca/etoms.c |4 linux/drivers/media/video/gspca/gspca.h |1 linux/drivers/media/video/gspca/pac207.c |1 linux/drivers/media/video/gspca/pac7311.c | 708 -- linux/drivers/media/video/gspca/sonixj.c | 257 ++- linux/drivers/media/video/gspca/spca561.c | 628 --- linux/drivers/media/video/gspca/zc3xx.c | 31 linux/include/linux/videodev2.h |1 9 files changed, 1041 insertions(+), 591 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/9085febc91ab25027301b93e19f78842ba82839b ___ 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/gspca/
The patch number 8416 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/~jfrancois/gspca/
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/gspca/etoms.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -r ffbf7bb96b21 -r 1f08e05739b2 linux/drivers/media/video/gspca/etoms.c
--- a/linux/drivers/media/video/gspca/etoms.c Fri Jul 18 12:07:10 2008 +0200
+++ b/linux/drivers/media/video/gspca/etoms.c Fri Jul 18 08:11:59 2008 -0300
@@ -292,7 +292,7 @@ static int i2c_w(struct gspca_dev *gspca
static int i2c_w(struct gspca_dev *gspca_dev,
__u8 reg,
const __u8 *buffer,
-__u16 len, __u8 mode)
+int len, __u8 mode)
{
/* buffer should be [D0..D7] */
__u8 ptchcount;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/1f08e05739b2fd5975ff1173fce89113910ffef9
___
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/gspca/
The patch number 8375 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/~jfrancois/gspca/ Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/Documentation/video4linux/gspca.txt|6 linux/drivers/media/video/gspca/conex.c | 421 linux/drivers/media/video/gspca/etoms.c | 493 linux/drivers/media/video/gspca/gspca.c | 252 linux/drivers/media/video/gspca/gspca.h |3 linux/drivers/media/video/gspca/mars.c | 180 linux/drivers/media/video/gspca/ov519.c | 21 linux/drivers/media/video/gspca/pac207.c | 91 linux/drivers/media/video/gspca/pac7311.c| 355 linux/drivers/media/video/gspca/sonixb.c | 873 - linux/drivers/media/video/gspca/sonixj.c | 590 linux/drivers/media/video/gspca/spca500.c| 285 linux/drivers/media/video/gspca/spca501.c| 35 linux/drivers/media/video/gspca/spca505.c| 26 linux/drivers/media/video/gspca/spca506.c| 37 linux/drivers/media/video/gspca/spca508.c| 39 linux/drivers/media/video/gspca/spca561.c| 121 linux/drivers/media/video/gspca/stk014.c | 86 linux/drivers/media/video/gspca/sunplus.c| 305 linux/drivers/media/video/gspca/t613.c | 222 linux/drivers/media/video/gspca/tv8532.c | 400 linux/drivers/media/video/gspca/vc032x.c | 130 linux/drivers/media/video/gspca/zc3xx-reg.h | 261 linux/drivers/media/video/gspca/zc3xx.c | 8394 +-- linux/drivers/media/video/sn9c102/sn9c102_devtable.h |2 25 files changed, 7213 insertions(+), 6415 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/e43f5566fa03433d3a4d2686f50786e778751ccb ___ 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/gspca/
The patch number 8233 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/~jfrancois/gspca/
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/gspca/etoms.c |2
linux/drivers/media/video/gspca/gspca.c | 205 +--
linux/drivers/media/video/gspca/gspca.h |2
linux/drivers/media/video/gspca/sonixb.c |2
linux/drivers/media/video/gspca/sonixj.c |4
linux/drivers/media/video/gspca/vc032x.c | 16 -
linux/drivers/media/video/gspca/zc3xx.c | 23 +-
7 files changed, 85 insertions(+), 169 deletions(-)
diff -r 7485e46c30e9 -r 28ab9f5b4d3e linux/drivers/media/video/gspca/etoms.c
--- a/linux/drivers/media/video/gspca/etoms.c Tue Jul 08 07:20:50 2008 -0300
+++ b/linux/drivers/media/video/gspca/etoms.c Tue Jul 08 07:25:08 2008 -0300
@@ -918,7 +918,9 @@ static struct sd_desc sd_desc = {
/* -- module initialisation -- */
#define DVNM(name) .driver_info = (kernel_ulong_t) name
static __devinitdata struct usb_device_id device_table[] = {
+#ifndef CONFIG_USB_ET61X251
{USB_DEVICE(0x102c, 0x6151), DVNM(Qcam Sangha CIF)},
+#endif
{USB_DEVICE(0x102c, 0x6251), DVNM(Qcam xx VGA)},
{}
};
diff -r 7485e46c30e9 -r 28ab9f5b4d3e linux/drivers/media/video/gspca/gspca.c
--- a/linux/drivers/media/video/gspca/gspca.c Tue Jul 08 07:20:50 2008 -0300
+++ b/linux/drivers/media/video/gspca/gspca.c Tue Jul 08 07:25:08 2008 -0300
@@ -36,15 +36,14 @@
#include gspca.h
/* global values */
-#define DEF_NURBS 2/* default number of URBs (mmap) */
-#define USR_NURBS 5/* default number of URBs (userptr) */
+#define DEF_NURBS 2/* default number of URBs */
MODULE_AUTHOR(Jean-Francois Moine http://moinejf.free.fr);
MODULE_DESCRIPTION(GSPCA USB Camera Driver);
MODULE_LICENSE(GPL);
-#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 5)
-static const char version[] = 2.1.5;
+#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 6)
+static const char version[] = 2.1.6;
static int video_nr = -1;
@@ -153,7 +152,6 @@ static void fill_frame(struct gspca_dev
}
/* resubmit the URB */
-/*fixme: don't do that when userptr and too many URBs sent*/
urb-status = 0;
st = usb_submit_urb(urb, GFP_ATOMIC);
if (st 0)
@@ -163,18 +161,9 @@ static void fill_frame(struct gspca_dev
/*
* ISOC message interrupt from the USB device
*
- * Analyse each packet and call the subdriver for copy
- * to the frame buffer.
- *
- * There are 2 functions:
- * - the first one (isoc_irq_mmap) is used when the application
- * buffers are mapped. The frame detection and copy is done
- * at interrupt level.
- * - the second one (isoc_irq_user) is used when the application
- * buffers are in user space (userptr). The frame detection
- * and copy is done by the application.
+ * Analyse each packet and call the subdriver for copy to the frame buffer.
*/
-static void isoc_irq_mmap(struct urb *urb
+static void isoc_irq(struct urb *urb
#if LINUX_VERSION_CODE KERNEL_VERSION(2, 6, 19)
, struct pt_regs *regs
#endif
@@ -188,59 +177,11 @@ static void isoc_irq_mmap(struct urb *ur
fill_frame(gspca_dev, urb);
}
-static void isoc_irq_user(struct urb *urb
-#if LINUX_VERSION_CODE KERNEL_VERSION(2, 6, 19)
- , struct pt_regs *regs
-#endif
-)
-{
- struct gspca_dev *gspca_dev = (struct gspca_dev *) urb-context;
- int i;
-
- PDEBUG(D_PACK, isoc irq user);
- if (!gspca_dev-streaming)
- return;
-
- i = gspca_dev-urb_in % gspca_dev-nurbs;
- if (urb != gspca_dev-urb[i]) {
- PDEBUG(D_ERR|D_PACK, urb out of sequence);
- return; /* should never occur */
- }
-
- gspca_dev-urb_in++;
- atomic_inc(gspca_dev-nevent); /* new event */
- wake_up_interruptible(gspca_dev-wq);
-/*fixme: submit a new URBs until urb_in == urb_out (% nurbs)*/
-}
-
-/*
- * treat the isoc messages
- *
- * This routine is called by the application (case userptr).
- */
-static void isoc_transfer(struct gspca_dev *gspca_dev)
-{
- struct urb *urb;
- int i;
-
- for (;;) {
- i = gspca_dev-urb_out;
- PDEBUG(D_PACK, isoc transf i:%d o:%d, gspca_dev-urb_in, i);
- if (i == gspca_dev-urb_in) /* isoc message to read */
- break; /* no (more) message */
- atomic_dec(gspca_dev-nevent);
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~jfrancois/gspca/
The patch number 8206 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/~jfrancois/gspca/ Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/drivers/media/video/gspca/conex.c | 187 +++--- linux/drivers/media/video/gspca/etoms.c | 639 +- linux/drivers/media/video/gspca/gspca.c | 167 + linux/drivers/media/video/gspca/gspca.h | 39 - linux/drivers/media/video/gspca/mars.c| 79 +- linux/drivers/media/video/gspca/ov519.c | 90 +-- linux/drivers/media/video/gspca/pac207.c | 396 ++--- linux/drivers/media/video/gspca/pac7311.c | 121 ++-- linux/drivers/media/video/gspca/sonixb.c | 90 ++- linux/drivers/media/video/gspca/sonixj.c | 192 +++--- linux/drivers/media/video/gspca/spca500.c | 375 ++-- linux/drivers/media/video/gspca/spca501.c | 51 + linux/drivers/media/video/gspca/spca505.c | 60 +- linux/drivers/media/video/gspca/spca506.c | 52 + linux/drivers/media/video/gspca/spca508.c | 100 +-- linux/drivers/media/video/gspca/spca561.c | 62 +- linux/drivers/media/video/gspca/stk014.c | 50 - linux/drivers/media/video/gspca/sunplus.c | 86 ++ linux/drivers/media/video/gspca/t613.c| 257 +--- linux/drivers/media/video/gspca/tv8532.c | 53 - linux/drivers/media/video/gspca/vc032x.c | 118 ++-- linux/drivers/media/video/gspca/zc3xx.c | 318 +- linux/include/linux/videodev2.h |4 23 files changed, 1725 insertions(+), 1861 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/e937406381c0334c58b7e4a44f69eb1b65e8bb37 ___ 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/gspca/
The patch number 8160 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/~jfrancois/gspca/ Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- README.patches|6 linux/Documentation/video4linux/gspca.txt | 240 linux/drivers/media/video/Kconfig |2 linux/drivers/media/video/Makefile|1 linux/drivers/media/video/gspca/Kconfig | 13 linux/drivers/media/video/gspca/Makefile | 29 linux/drivers/media/video/gspca/conex.c | 1059 +++ linux/drivers/media/video/gspca/etoms.c | 1068 +++ linux/drivers/media/video/gspca/gspca.c | 2016 + linux/drivers/media/video/gspca/gspca.h | 200 linux/drivers/media/video/gspca/jpeg.h| 301 linux/drivers/media/video/gspca/mars.c| 455 + linux/drivers/media/video/gspca/ov519.c | 2228 ++ linux/drivers/media/video/gspca/pac207.c | 943 ++ linux/drivers/media/video/gspca/pac7311.c | 770 ++ linux/drivers/media/video/gspca/sonixb.c | 887 ++ linux/drivers/media/video/gspca/sonixj.c | 1650 linux/drivers/media/video/gspca/spca500.c | 1212 +++ linux/drivers/media/video/gspca/spca501.c | 2230 ++ linux/drivers/media/video/gspca/spca505.c | 1002 ++ linux/drivers/media/video/gspca/spca506.c | 830 ++ linux/drivers/media/video/gspca/spca508.c | 1812 + linux/drivers/media/video/gspca/spca561.c | 1025 ++ linux/drivers/media/video/gspca/stk014.c | 588 + linux/drivers/media/video/gspca/sunplus.c | 1669 linux/drivers/media/video/gspca/t613.c| 1049 +++ linux/drivers/media/video/gspca/tv8532.c | 722 ++ linux/drivers/media/video/gspca/vc032x.c | 2013 + linux/drivers/media/video/gspca/zc3xx.c | 7588 ++ linux/include/asm-arm/arch-pxa/pxa-regs.h | 12 linux/include/linux/videodev2.h |2 v4l/scripts/check_deps.pl |8 32 files changed, 33617 insertions(+), 13 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/92f844f35c39535f235a39979037263d21e2304e ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
