Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

V4L/DVB (10039): m5602 - ov9650: Add CIF mode

Browse source 
Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Erik Andrén 2008-12-23 17:07:58 -03:00 committed by Mauro Carvalho Chehab
parent 1b0b27b87f
commit 03f46de925
2 changed files with 51 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/media/video/gspca/m5602/m5602_ov9650.c
View file

@ -163,6 +163,19 @@ int ov9650_start(struct sd *sd)
}
break;
case 352:
PDEBUG(D_V4L2, "Configuring camera for CIF mode");
for (i = 0; i < ARRAY_SIZE(CIF_ov9650) && !err; i++) {
u8 data = CIF_ov9650[i][2];
if (CIF_ov9650[i][0] == SENSOR)
err = m5602_write_sensor(sd,
CIF_ov9650[i][1], &data, 1);
else
err = m5602_write_bridge(sd, CIF_ov9650[i][1], data);
}
break;
case 320:
PDEBUG(D_V4L2, "Configuring camera for QVGA mode");

39
drivers/media/video/gspca/m5602/m5602_ov9650.h
View file

@ -93,6 +93,7 @@
#define OV9650_REGISTER_RESET (1 << 7)
#define OV9650_VGA_SELECT (1 << 6)
#define OV9650_CIF_SELECT (1 << 5)
#define OV9650_QVGA_SELECT (1 << 4)
#define OV9650_RGB_SELECT (1 << 2)
#define OV9650_RAW_RGB_SELECT (1 << 0)
@ -258,7 +259,7 @@ static struct m5602_sensor ov9650 = {
}
},
.nmodes = 2,
.nmodes = 3,
.modes = {
{
320,
@ -270,6 +271,16 @@ static struct m5602_sensor ov9650 = {
.bytesperline = 320,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}, {
352,
288,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
352 * 288,
.bytesperline = 352,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}, {
640,
480,
@ -469,6 +480,32 @@ static const unsigned char VGA_ov9650[][3] =
{BRIDGE, M5602_XB_HSYNC_PARA, 0xe2}
};
static const unsigned char CIF_ov9650[][3] =
{
{SENSOR, OV9650_COM7, OV9650_CIF_SELECT |
OV9650_RGB_SELECT |
OV9650_RAW_RGB_SELECT},
{BRIDGE, M5602_XB_LINE_OF_FRAME_H, 0x82},
{BRIDGE, M5602_XB_LINE_OF_FRAME_L, 0x00},
{BRIDGE, M5602_XB_PIX_OF_LINE_H, 0x82},
{BRIDGE, M5602_XB_PIX_OF_LINE_L, 0x00},
{BRIDGE, M5602_XB_SIG_INI, 0x01},
/* Moves the view window in a vertical orientation */
{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_VSYNC_PARA, 0x09},
{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_VSYNC_PARA, 0x01},
{BRIDGE, M5602_XB_VSYNC_PARA, 0x20}, /* 288 */
{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_VSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_HSYNC_PARA, 0x00},
{BRIDGE, M5602_XB_HSYNC_PARA, 0x62}, /* 98 */
{BRIDGE, M5602_XB_HSYNC_PARA, 0x01}, /* 352 + 98 */
{BRIDGE, M5602_XB_HSYNC_PARA, 0xc2}
};
static const unsigned char QVGA_ov9650[][3] =
{
{SENSOR, OV9650_COM7, OV9650_QVGA_SELECT |