From patchwork Sun May 30 22:24:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Lorin X-Patchwork-Id: 103171 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4UMOQJP013711 for ; Sun, 30 May 2010 22:24:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754579Ab0E3WYZ (ORCPT ); Sun, 30 May 2010 18:24:25 -0400 Received: from mail-ww0-f46.google.com ([74.125.82.46]:62445 "EHLO mail-ww0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751266Ab0E3WYZ (ORCPT ); Sun, 30 May 2010 18:24:25 -0400 Received: by wwb28 with SMTP id 28so913563wwb.19 for ; Sun, 30 May 2010 15:24:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=Mi+ZOMsf0CRkYlIDh985TLnqpGezyAdRejlDjuZ47VE=; b=vDYnCeuoBGkqA5y2KTKwcP+j+QyltKF8VsN1rQA35GCXRQqUtWNNvbr3smLdUcqfaD 9JED0/vTtyKIk3rkSG/2fjr+2cWxzIhc6NLbQmbZ3p8rEN+nOYIqES0UubrB3RXD5tj3 FpD8ZCAf4F+1T2D0CbVrfKTw6cd3k8JbU2oWI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=EnHdaS2rmLy3JwXm0ksYxuTcOSu1lO0c2ALCnGmfjDZs0ysScd5d/kan+AICAQ0svx UUbJOG4nuBlHiUym6rRcB3Ii/tE41FajXWcMCNXhJ+vE9kaZ9pMCtMoq8WUMGKsiKhtr ZLRT90L8gZkJUfYkf1WhZ4GwPRCYtol9g7J2g= Received: by 10.227.136.13 with SMTP id p13mr3404308wbt.193.1275258263666; Sun, 30 May 2010 15:24:23 -0700 (PDT) Received: from [192.168.1.4] (cha25-4-78-248-177-42.fbx.proxad.net [78.248.177.42]) by mx.google.com with ESMTPS id r35sm6271427wbv.11.2010.05.30.15.24.22 (version=SSLv3 cipher=RC4-MD5); Sun, 30 May 2010 15:24:23 -0700 (PDT) Subject: [PATCH 1/3] Gspca-gl860 driver update From: Olivier Lorin To: V4L Mailing List Cc: Jean-Francois Moine Date: Mon, 31 May 2010 00:24:21 +0200 Message-Id: <1275258261.18267.23.camel@miniol> Mime-Version: 1.0 X-Mailer: Evolution 2.24.3 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 30 May 2010 22:24:27 +0000 (UTC) diff -rupN der_gl860b/gl860.c gl860/gl860.c --- der_gl860b/gl860.c 2010-03-27 10:08:16.000000000 +0100 +++ gl860/gl860.c 2010-04-28 23:26:53.000000000 +0200 @@ -235,9 +235,9 @@ static struct v4l2_pix_format mi2020_mod .colorspace = V4L2_COLORSPACE_SRGB, .priv = 0 }, - { 800, 600, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE, + { 800, 598, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE, .bytesperline = 800, - .sizeimage = 800 * 600, + .sizeimage = 800 * 598, .colorspace = V4L2_COLORSPACE_SRGB, .priv = 1 }, @@ -247,9 +247,9 @@ static struct v4l2_pix_format mi2020_mod .colorspace = V4L2_COLORSPACE_SRGB, .priv = 2 }, - {1600, 1200, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE, + {1600, 1198, V4L2_PIX_FMT_SGBRG8, V4L2_FIELD_NONE, .bytesperline = 1600, - .sizeimage = 1600 * 1200, + .sizeimage = 1600 * 1198, .colorspace = V4L2_COLORSPACE_SRGB, .priv = 3 }, diff -rupN der_gl860b/gl860.h gl860/gl860.h --- der_gl860b/gl860.h 2010-03-27 10:08:25.000000000 +0100 +++ gl860/gl860.h 2010-04-28 13:56:51.000000000 +0200 @@ -44,7 +44,7 @@ #define IMAGE_640 0 #define IMAGE_800 1 #define IMAGE_1280 2 -#define IMAGE_1600 3 +#define IMAGE_1600 3 struct sd_gl860 { u16 backlight; @@ -75,10 +75,10 @@ struct sd { int (*dev_camera_settings)(struct gspca_dev *); u8 swapRB; - u8 mirrorMask; - u8 sensor; - s32 nbIm; - s32 nbRightUp; + u8 mirrorMask; + u8 sensor; + s32 nbIm; + s32 nbRightUp; u8 waitSet; }; diff -rupN der_gl860b/gl860-ov9655.c gl860/gl860-ov9655.c --- der_gl860b/gl860-ov9655.c 2010-03-27 10:08:16.000000000 +0100 +++ gl860/gl860-ov9655.c 2010-04-28 13:39:14.000000000 +0200 @@ -69,7 +69,7 @@ static u8 *tbl_640[] = { "\xd0\x01\xd1\x08\xd2\xe0\xd3\x01" "\xd4\x10\xd5\x80" }; -static u8 *tbl_800[] = { +static u8 *tbl_1280[] = { "\x00\x40\x07\x6a\x06\xf3\x0d\x6a" "\x10\x10\xc1\x01" , "\x12\x80\x00\x00\x01\x98\x02\x80" "\x03\x12\x04\x01\x0b\x57\x0e\x61" @@ -217,7 +217,7 @@ static int ov9655_init_post_alt(struct g ctrl_out(gspca_dev, 0x40, 5, 0x0001, 0x0000, 0, NULL); - tbl = (reso == IMAGE_640) ? tbl_640 : tbl_800; + tbl = (reso == IMAGE_640) ? tbl_640 : tbl_1280; ctrl_out(gspca_dev, 0x40, 3, 0x0000, 0x0200, tbl_length[0], tbl[0]);