gspca for_v2.6.40

The following changes since commit
d58307d6a1e2441ebaf2d924df4346309ff84c7d:

[media] anysee: add more info about known board configs (2011-04-19 10:35:37 -0300)

are available in the git repository at:
git://linuxtv.org/jfrancois/gspca.git for_v2.6.40

Antonio Ospite (2):
Add Y10B, a 10 bpp bit-packed greyscale format. gspca - kinect: New subdriver for Microsoft Kinect

Jean-François Moine (1):
gspca - zc3xx: Adjust the mc501cb exchanges

Patrice Chotard (5):
gspca - jeilinj: suppress workqueue
gspca - jeilinj: use gspca_dev->usb_err to forward error to upper layer gspca - jeilinj: add 640*480 resolution support
gspca - jeilinj: Add SPORTSCAM_DV15 camera support
gspca - jeilinj: add SPORTSCAM specific controls

 Documentation/DocBook/media-entities.tmpl |    1 +
 Documentation/DocBook/v4l/pixfmt-y10b.xml |   43 +++
 Documentation/DocBook/v4l/pixfmt.xml      |    1 +
 Documentation/DocBook/v4l/videodev2.h.xml |    3 +
 Documentation/video4linux/gspca.txt       |    1 +
 drivers/media/video/gspca/Kconfig         |    9 +
 drivers/media/video/gspca/Makefile        |    2 +
 drivers/media/video/gspca/jeilinj.c       |  581 ++++++++++++++++++++---------
 drivers/media/video/gspca/kinect.c        |  427 +++++++++++++++++++++
 drivers/media/video/gspca/zc3xx.c         |   42 +--
 include/linux/videodev2.h                 |    3 +
 11 files changed, 905 insertions(+), 208 deletions(-)
 create mode 100644 Documentation/DocBook/v4l/pixfmt-y10b.xml
 create mode 100644 drivers/media/video/gspca/kinect.c

Ken ar c'hentañ	|	      ** Breizh ha Linux atav! **
Jef		|		http://moinejf.free.fr/

Ah glad to see that, so there was no major concern on the code, was there?

Thanks Jean-Francois,
Antonio

Antonio Ospite
http://ao2.it

PGP public key ID: 0x4553B001

A: Because it messes up the order in which people normally read text.
   See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?

Em 19-04-2011 16:54, Antonio Ospite escreveu:

There's just a problem that I noticed:

drivers/media/video/gspca/kinect.c: In function ‘send_cmd.clone.0’:
drivers/media/video/gspca/kinect.c:202: warning: the frame size of 1548 bytes is larger than 1024 bytes

Please, don't do things like:

+ uint8_t obuf[0x400];
+ uint8_t ibuf[0x200];

at the stack. Instead, put it into a per-device struct.

Anyway, I've applied your patches here. Please send us a fix for it as soon as possible.

Thanks,
Mauro

Hi,

some incremental fixes for the gspca kinect driver, the first patch in the series by Drew Fisher addresses the issue Mauro was pointing out.

Thanks,
Antonio

Antonio Ospite (1):
gspca - kinect: fix comments referring to color camera

Drew Fisher (2):
gspca - kinect: move communications buffers out of stack gspca - kinect: fix a typo s/steram/stream/

 drivers/media/video/gspca/kinect.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

Antonio Ospite
http://ao2.it

PGP public key ID: 0x4553B001

A: Because it messes up the order in which people normally read text.
   See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?

From: Drew Fisher <[email protected]>

Move large communications buffers out of stack and into device structure. This prevents the frame size from being >1kB and fixes a compiler warning when CONFIG_FRAME_WARN=1024:

drivers/media/video/gspca/kinect.c: In function ‘send_cmd.clone.0’:
drivers/media/video/gspca/kinect.c:202: warning: the frame size of 1548 bytes is larger than 1024 bytes

---
 drivers/media/video/gspca/kinect.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

index f85e746..79c4ef5 100644
@@ -62,6 +62,8 @@ struct sd {
 	struct gspca_dev gspca_dev; /* !! must be the first item */
 	uint16_t cam_tag;           /* a sequence number for packets */
 	uint8_t stream_flag;        /* to identify different steram types */
+	uint8_t obuf[0x400];        /* output buffer for control commands */
+	uint8_t ibuf[0x200];        /* input buffer for control commands */
 };
 
 /* V4L2 controls supported by the driver */

@@ -133,8 +135,8 @@ static int send_cmd(struct gspca_dev *gspca_dev, uint16_t cmd, void *cmdbuf,
 	struct sd *sd = (struct sd *) gspca_dev;
 	struct usb_device *udev = gspca_dev->dev;
 	int res, actual_len;
-	uint8_t obuf[0x400];
-	uint8_t ibuf[0x200];
+	uint8_t *obuf = sd->obuf;
+	uint8_t *ibuf = sd->ibuf;
 	struct cam_hdr *chdr = (void *)obuf;
 	struct cam_hdr *rhdr = (void *)ibuf;
 

1.7.4.4

From: Drew Fisher <[email protected]>

---
 drivers/media/video/gspca/kinect.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 79c4ef5..b4f9e2b 100644
@@ -61,7 +61,7 @@ struct cam_hdr {
 struct sd {
 	struct gspca_dev gspca_dev; /* !! must be the first item */
 	uint16_t cam_tag;           /* a sequence number for packets */
-	uint8_t stream_flag;        /* to identify different steram types */
+	uint8_t stream_flag;        /* to identify different stream types */
 	uint8_t obuf[0x400];        /* output buffer for control commands */
 	uint8_t ibuf[0x200];        /* input buffer for control commands */
 };

1.7.4.4

Use the expression "video stream" instead of "color camera" which is more correct as the driver supports the RGB and IR image on the same endpoint.

---
 drivers/media/video/gspca/kinect.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

index b4f9e2b..2028c64 100644
@@ -233,7 +233,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
 
 	sd->cam_tag = 0;
 
-	/* Only color camera is supported for now,
+	/* Only video stream is supported for now,
 	 * which has stream flag = 0x80 */
 	sd->stream_flag = 0x80;
 

@@ -243,7 +243,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
 	cam->nmodes = ARRAY_SIZE(video_camera_mode);
 
 #if 0
-	/* Setting those values is not needed for color camera */
+	/* Setting those values is not needed for video stream */
 	cam->npkt = 15;
 	gspca_dev->pkt_size = 960 * 2;
 #endif

1.7.4.4