Gspca-gl860 driver update

PATCH In review Olivier Lorin 3 participants 3 messages May 30, 2010 – May 31, 2010 Media (V4L/DVB)

lore

Share & tools

lore

Olivier Lorin

author

2010-05-30 22:24 UTC #0 lore raw

PATCH 1/3 Gspca-gl860 driver update

gspca - gl860: minor fixes

From: Olivier Lorin <[email protected]>

- Change of rounded image resolutions to the real ones
- Fix for an irrelevant OV9655 image resolution identifier name
- Extra spaces to align some variable names and a defined value

Priority: normal

Signed-off-by Olivier Lorin <[email protected]>

gl860.c +4 -4

diff -rupN der_gl860b/gl860.c gl860/gl860.c
@@ -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
 	},

gl860.h +5 -5

diff -rupN der_gl860b/gl860.h gl860/gl860.h
@@ -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;
 };

gl860-ov9655.c +2 -2

diff -rupN der_gl860b/gl860-ov9655.c gl860/gl860-ov9655.c
@@ -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]);

Jean-Francois Moine

2010-05-31 07:30 UTC #1 lore raw

Quoted 3 lines · On Mon, 31 May 2010 00:24:21 +0200 Olivier Lorin <[email protected]> wrote:

- Change of rounded image resolutions to the real ones
- Fix for an irrelevant OV9655 image resolution identifier name
- Extra spaces to align some variable names and a defined value

Hi Olivier,

If I can anticipate, the changes are too different. You should split this patch.

Best regards.

Signature · 2 lines

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

Theodore Kilgore

2010-05-31 19:25 UTC #2 lore raw

Quoted 7 lines · Jean-Francois Moine

Quoted 3 lines · On Mon, 31 May 2010 00:24:21 +0200 Olivier Lorin <[email protected]> wrote:
- Change of rounded image resolutions to the real ones
- Fix for an irrelevant OV9655 image resolution identifier name
- Extra spaces to align some variable names and a defined value

Quoted 15 lines

Hi Olivier,
If I can anticipate, the changes are too different. You should split this patch.
Best regards.
Signature · 6 lines
Ken ar c'hentañ	|	      ** Breizh ha Linux atav! **
Jef		|		http://moinejf.free.fr/
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Congratulations. Nice.

Theodore Kilgore