Skip to content

L
linux-davinci
Commit 58e2ded8 authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (11212): gspca - vc032x: Use YVYU format for sensor mi1320_soc. 

Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 33f5b07e
Show whitespace changes
Inline Side-by-side
Showing with 412 additions and 30 deletions
drivers/media/video/gspca/vc032x.c
View file @ 58e2ded8
...@@ -37,6 +37,8 @@ struct sd { ...@@ -37,6 +37,8 @@ struct sd {
__u8 lightfreq; __u8 lightfreq;
__u8 sharpness; __u8 sharpness;
u8 image_offset;
char bridge; char bridge;
#define BRIDGE_VC0321 0 #define BRIDGE_VC0321 0
#define BRIDGE_VC0323 1 #define BRIDGE_VC0323 1
...@@ -156,7 +158,44 @@ static const struct v4l2_pix_format vc0323_mode[] = { ...@@ -156,7 +158,44 @@ static const struct v4l2_pix_format vc0323_mode[] = {
.colorspace = V4L2_COLORSPACE_JPEG, .colorspace = V4L2_COLORSPACE_JPEG,
.priv = 2}, .priv = 2},
}; };
static const struct v4l2_pix_format bi_mode[] = {
/*fixme: jeg does not work
{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 3 / 8 + 590,
.colorspace = V4L2_COLORSPACE_JPEG,
.priv = 5},
*/
{320, 240, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 2,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 4},
/*
{640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 640,
.sizeimage = 640 * 480 * 3 / 8 + 590,
.colorspace = V4L2_COLORSPACE_JPEG,
.priv = 3},
*/
{640, 480, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
.bytesperline = 640,
.sizeimage = 640 * 480 * 2,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 2},
/*
{1280, 1024, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 1280,
.sizeimage = 1280 * 1024 * 1 / 4 + 590,
.colorspace = V4L2_COLORSPACE_JPEG,
.priv = 1},
*/
{1280, 1024, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
.bytesperline = 1280,
.sizeimage = 1280 * 1024 * 2,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0},
};
static const struct v4l2_pix_format svga_mode[] = { static const struct v4l2_pix_format svga_mode[] = {
{800, 600, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, {800, 600, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 800, .bytesperline = 800,
...@@ -892,6 +931,109 @@ static const __u8 mi1320_initQVGA_data[][4] = { ...@@ -892,6 +931,109 @@ static const __u8 mi1320_initQVGA_data[][4] = {
{} {}
}; };
static const u8 mi1320_soc_InitVGA[][4] = {
{0xb3, 0x01, 0x01, 0xcc},
{0xb0, 0x03, 0x19, 0xcc},
{0xb0, 0x04, 0x02, 0xcc},
{0x00, 0x00, 0x30, 0xdd},
{0xb3, 0x00, 0x64, 0xcc},
{0xb3, 0x00, 0x67, 0xcc},
{0xb3, 0x05, 0x01, 0xcc},
{0xb3, 0x06, 0x01, 0xcc},
{0xb3, 0x08, 0x01, 0xcc},
{0xb3, 0x09, 0x0c, 0xcc},
{0xb3, 0x34, 0x02, 0xcc},
{0xb3, 0x35, 0xc8, 0xcc},
{0xb3, 0x02, 0x00, 0xcc},
{0xb3, 0x03, 0x0a, 0xcc},
{0xb3, 0x04, 0x05, 0xcc},
{0xb3, 0x20, 0x00, 0xcc},
{0xb3, 0x21, 0x00, 0xcc},
{0xb3, 0x22, 0x01, 0xcc},
{0xb3, 0x23, 0xe0, 0xcc},
{0xb3, 0x14, 0x00, 0xcc},
{0xb3, 0x15, 0x00, 0xcc},
{0xb3, 0x16, 0x02, 0xcc},
{0xb3, 0x17, 0x7f, 0xcc},
{0xb3, 0x00, 0x67, 0xcc},
{0xb8, 0x00, 0x00, 0xcc},
{0xbc, 0x00, 0x71, 0xcc},
{0xbc, 0x01, 0x01, 0xcc},
{0xb3, 0x5c, 0x01, 0xcc},
{0xf0, 0x00, 0x02, 0xbb},
{0x00, 0x00, 0x10, 0xdd},
{0xc8, 0x00, 0x00, 0xbb},
{0x00, 0x00, 0x30, 0xdd},
{0xf0, 0x00, 0x00, 0xbb},
{0x00, 0x00, 0x10, 0xdd},
{0x07, 0x00, 0xe0, 0xbb},
{0x08, 0x00, 0x0b, 0xbb},
{0x21, 0x00, 0x0c, 0xbb},
{0x20, 0x01, 0x03, 0xbb},
{0xbf, 0xc0, 0x26, 0xcc},
{0xbf, 0xc1, 0x02, 0xcc},
{0xbf, 0xcc, 0x04, 0xcc},
{0xb3, 0x01, 0x41, 0xcc},
{0xf0, 0x00, 0x00, 0xbb},
{0x05, 0x01, 0x78, 0xbb},
{0x06, 0x00, 0x11, 0xbb},
{0x07, 0x01, 0x42, 0xbb},
{0x08, 0x00, 0x11, 0xbb},
{0x20, 0x01, 0x03, 0xbb},
{0x21, 0x80, 0x00, 0xbb},
{0x22, 0x0d, 0x0f, 0xbb},
{0x24, 0x80, 0x00, 0xbb},
{0x59, 0x00, 0xff, 0xbb},
{0xf0, 0x00, 0x02, 0xbb},
{0x39, 0x03, 0xca, 0xbb},
{0x3a, 0x06, 0x80, 0xbb},
{0x3b, 0x01, 0x52, 0xbb},
{0x3c, 0x05, 0x40, 0xbb},
{0x57, 0x01, 0x9c, 0xbb},
{0x58, 0x01, 0xee, 0xbb},
{0x59, 0x00, 0xf0, 0xbb},
{0x5a, 0x01, 0x20, 0xbb},
{0x5c, 0x1d, 0x17, 0xbb},
{0x5d, 0x22, 0x1c, 0xbb},
{0x64, 0x1e, 0x1c, 0xbb},
{0x5b, 0x00, 0x00, 0xbb},
{0xf0, 0x00, 0x02, 0xbb},
{0x22, 0xa0, 0x78, 0xbb},
{0x23, 0xa0, 0x78, 0xbb},
{0x24, 0x7f, 0x00, 0xbb},
{0x28, 0xea, 0x02, 0xbb},
{0x29, 0x86, 0x7a, 0xbb},
{0x5e, 0x52, 0x4c, 0xbb},
{0x5f, 0x20, 0x24, 0xbb},
{0x60, 0x00, 0x02, 0xbb},
{0x02, 0x00, 0xee, 0xbb},
{0x03, 0x39, 0x23, 0xbb},
{0x04, 0x07, 0x24, 0xbb},
{0x09, 0x00, 0xc0, 0xbb},
{0x0a, 0x00, 0x79, 0xbb},
{0x0b, 0x00, 0x04, 0xbb},
{0x0c, 0x00, 0x5c, 0xbb},
{0x0d, 0x00, 0xd9, 0xbb},
{0x0e, 0x00, 0x53, 0xbb},
{0x0f, 0x00, 0x21, 0xbb},
{0x10, 0x00, 0xa4, 0xbb},
{0x11, 0x00, 0xe5, 0xbb},
{0x15, 0x00, 0x00, 0xbb},
{0x16, 0x00, 0x00, 0xbb},
{0x17, 0x00, 0x00, 0xbb},
{0x18, 0x00, 0x00, 0xbb},
{0x19, 0x00, 0x00, 0xbb},
{0x1a, 0x00, 0x00, 0xbb},
{0x1b, 0x00, 0x00, 0xbb},
{0x1c, 0x00, 0x00, 0xbb},
{0x1d, 0x00, 0x00, 0xbb},
{0x1e, 0x00, 0x00, 0xbb},
{0xf0, 0x00, 0x01, 0xbb},
{0x06, 0xe0, 0x0e, 0xbb},
{0x06, 0x60, 0x0e, 0xbb},
{0xb3, 0x5c, 0x01, 0xcc},
{}
};
static const u8 mi1320_soc_InitVGA_JPG[][4] = { static const u8 mi1320_soc_InitVGA_JPG[][4] = {
{0xb3, 0x01, 0x01, 0xcc}, {0xb3, 0x01, 0x01, 0xcc},
{0xb0, 0x03, 0x19, 0xcc}, {0xb0, 0x03, 0x19, 0xcc},
...@@ -1007,6 +1149,119 @@ static const u8 mi1320_soc_InitVGA_JPG[][4] = { ...@@ -1007,6 +1149,119 @@ static const u8 mi1320_soc_InitVGA_JPG[][4] = {
{0xb3, 0x5c, 0x01, 0xcc}, {0xb3, 0x5c, 0x01, 0xcc},
{} {}
}; };
static const u8 mi1320_soc_InitQVGA[][4] = {
{0xb3, 0x01, 0x01, 0xcc},
{0xb0, 0x03, 0x19, 0xcc},
{0xb0, 0x04, 0x02, 0xcc},
{0x00, 0x00, 0x30, 0xdd},
{0xb3, 0x00, 0x64, 0xcc},
{0xb3, 0x00, 0x67, 0xcc},
{0xb3, 0x05, 0x01, 0xcc},
{0xb3, 0x06, 0x01, 0xcc},
{0xb3, 0x08, 0x01, 0xcc},
{0xb3, 0x09, 0x0c, 0xcc},
{0xb3, 0x34, 0x02, 0xcc},
{0xb3, 0x35, 0xc8, 0xcc},
{0xb3, 0x02, 0x00, 0xcc},
{0xb3, 0x03, 0x0a, 0xcc},
{0xb3, 0x04, 0x05, 0xcc},
{0xb3, 0x20, 0x00, 0xcc},
{0xb3, 0x21, 0x00, 0xcc},
{0xb3, 0x22, 0x01, 0xcc},
{0xb3, 0x23, 0xe0, 0xcc},
{0xb3, 0x14, 0x00, 0xcc},
{0xb3, 0x15, 0x00, 0xcc},
{0xb3, 0x16, 0x02, 0xcc},
{0xb3, 0x17, 0x7f, 0xcc},
{0xb3, 0x00, 0x67, 0xcc},
{0xb8, 0x00, 0x00, 0xcc},
{0xbc, 0x00, 0xd1, 0xcc},
{0xbc, 0x01, 0x01, 0xcc},
{0xb3, 0x5c, 0x01, 0xcc},
{0xf0, 0x00, 0x02, 0xbb},
{0x00, 0x00, 0x10, 0xdd},
{0xc8, 0x00, 0x00, 0xbb},
{0x00, 0x00, 0x30, 0xdd},
{0xf0, 0x00, 0x00, 0xbb},
{0x00, 0x00, 0x10, 0xdd},
{0x07, 0x00, 0xe0, 0xbb},
{0x08, 0x00, 0x0b, 0xbb},
{0x21, 0x00, 0x0c, 0xbb},
{0x20, 0x01, 0x03, 0xbb},
{0xbf, 0xc0, 0x26, 0xcc},
{0xbf, 0xc1, 0x02, 0xcc},
{0xbf, 0xcc, 0x04, 0xcc},
{0xbc, 0x02, 0x18, 0xcc},
{0xbc, 0x03, 0x50, 0xcc},
{0xbc, 0x04, 0x18, 0xcc},
{0xbc, 0x05, 0x00, 0xcc},
{0xbc, 0x06, 0x00, 0xcc},
{0xbc, 0x08, 0x30, 0xcc},
{0xbc, 0x09, 0x40, 0xcc},
{0xbc, 0x0a, 0x10, 0xcc},
{0xbc, 0x0b, 0x00, 0xcc},
{0xbc, 0x0c, 0x00, 0xcc},
{0xb3, 0x01, 0x41, 0xcc},
{0xf0, 0x00, 0x00, 0xbb},
{0x05, 0x01, 0x78, 0xbb},
{0x06, 0x00, 0x11, 0xbb},
{0x07, 0x01, 0x42, 0xbb},
{0x08, 0x00, 0x11, 0xbb},
{0x20, 0x01, 0x03, 0xbb},
{0x21, 0x80, 0x00, 0xbb},
{0x22, 0x0d, 0x0f, 0xbb},
{0x24, 0x80, 0x00, 0xbb},
{0x59, 0x00, 0xff, 0xbb},
{0xf0, 0x00, 0x02, 0xbb},
{0x39, 0x03, 0xca, 0xbb},
{0x3a, 0x06, 0x80, 0xbb},
{0x3b, 0x01, 0x52, 0xbb},
{0x3c, 0x05, 0x40, 0xbb},
{0x57, 0x01, 0x9c, 0xbb},
{0x58, 0x01, 0xee, 0xbb},
{0x59, 0x00, 0xf0, 0xbb},
{0x5a, 0x01, 0x20, 0xbb},
{0x5c, 0x1d, 0x17, 0xbb},
{0x5d, 0x22, 0x1c, 0xbb},
{0x64, 0x1e, 0x1c, 0xbb},
{0x5b, 0x00, 0x00, 0xbb},
{0xf0, 0x00, 0x02, 0xbb},
{0x22, 0xa0, 0x78, 0xbb},
{0x23, 0xa0, 0x78, 0xbb},
{0x24, 0x7f, 0x00, 0xbb},
{0x28, 0xea, 0x02, 0xbb},
{0x29, 0x86, 0x7a, 0xbb},
{0x5e, 0x52, 0x4c, 0xbb},
{0x5f, 0x20, 0x24, 0xbb},
{0x60, 0x00, 0x02, 0xbb},
{0x02, 0x00, 0xee, 0xbb},
{0x03, 0x39, 0x23, 0xbb},
{0x04, 0x07, 0x24, 0xbb},
{0x09, 0x00, 0xc0, 0xbb},
{0x0a, 0x00, 0x79, 0xbb},
{0x0b, 0x00, 0x04, 0xbb},
{0x0c, 0x00, 0x5c, 0xbb},
{0x0d, 0x00, 0xd9, 0xbb},
{0x0e, 0x00, 0x53, 0xbb},
{0x0f, 0x00, 0x21, 0xbb},
{0x10, 0x00, 0xa4, 0xbb},
{0x11, 0x00, 0xe5, 0xbb},
{0x15, 0x00, 0x00, 0xbb},
{0x16, 0x00, 0x00, 0xbb},
{0x17, 0x00, 0x00, 0xbb},
{0x18, 0x00, 0x00, 0xbb},
{0x19, 0x00, 0x00, 0xbb},
{0x1a, 0x00, 0x00, 0xbb},
{0x1b, 0x00, 0x00, 0xbb},
{0x1c, 0x00, 0x00, 0xbb},
{0x1d, 0x00, 0x00, 0xbb},
{0x1e, 0x00, 0x00, 0xbb},
{0xf0, 0x00, 0x01, 0xbb},
{0x06, 0xe0, 0x0e, 0xbb},
{0x06, 0x60, 0x0e, 0xbb},
{0xb3, 0x5c, 0x01, 0xcc},
{}
};
static const u8 mi1320_soc_InitQVGA_JPG[][4] = { static const u8 mi1320_soc_InitQVGA_JPG[][4] = {
{0xb3, 0x01, 0x01, 0xcc}, {0xb3, 0x01, 0x01, 0xcc},
{0xb0, 0x03, 0x19, 0xcc}, {0xb0, 0x03, 0x19, 0xcc},
...@@ -1269,6 +1524,129 @@ static const u8 mi1320_soc_InitSXGA_JPG[][4] = { ...@@ -1269,6 +1524,129 @@ static const u8 mi1320_soc_InitSXGA_JPG[][4] = {
{0x2f, 0x90, 0x00, 0xbb}, {0x2f, 0x90, 0x00, 0xbb},
{} {}
}; };
static const u8 mi1320_soc_InitSXGA[][4] = {
{0xb3, 0x01, 0x01, 0xcc},
{0xb0, 0x03, 0x19, 0xcc},
{0x00, 0x00, 0x30, 0xdd},
{0xb3, 0x00, 0x64, 0xcc},
{0xb3, 0x00, 0x67, 0xcc},
{0xb3, 0x05, 0x01, 0xcc},
{0xb3, 0x06, 0x01, 0xcc},
{0xb3, 0x08, 0x01, 0xcc},
{0xb3, 0x09, 0x0c, 0xcc},
{0xb3, 0x34, 0x02, 0xcc},
{0xb3, 0x35, 0xc8, 0xcc},
{0xb3, 0x02, 0x00, 0xcc},
{0xb3, 0x03, 0x0a, 0xcc},
{0xb3, 0x04, 0x05, 0xcc},
{0xb3, 0x20, 0x00, 0xcc},
{0xb3, 0x21, 0x00, 0xcc},
{0xb3, 0x22, 0x04, 0xcc},
{0xb3, 0x23, 0x00, 0xcc},
{0xb3, 0x14, 0x00, 0xcc},
{0xb3, 0x15, 0x00, 0xcc},
{0xb3, 0x16, 0x04, 0xcc},
{0xb3, 0x17, 0xff, 0xcc},
{0xb3, 0x00, 0x67, 0xcc},
{0xbc, 0x00, 0x71, 0xcc},
{0xbc, 0x01, 0x01, 0xcc},
{0xb3, 0x5c, 0x01, 0xcc},
{0xf0, 0x00, 0x02, 0xbb},
{0x00, 0x00, 0x30, 0xdd},
{0xc8, 0x9f, 0x0b, 0xbb},
{0x00, 0x00, 0x20, 0xdd},
{0x5b, 0x00, 0x01, 0xbb},
{0x00, 0x00, 0x20, 0xdd},
{0xf0, 0x00, 0x00, 0xbb},
{0x00, 0x00, 0x30, 0xdd},
{0x20, 0x01, 0x03, 0xbb},
{0x00, 0x00, 0x20, 0xdd},
{0xbf, 0xc0, 0x26, 0xcc},
{0xbf, 0xc1, 0x02, 0xcc},
{0xbf, 0xcc, 0x04, 0xcc},
{0xb3, 0x01, 0x41, 0xcc},
{0xf0, 0x00, 0x00, 0xbb},
{0x05, 0x01, 0x78, 0xbb},
{0x06, 0x00, 0x11, 0xbb},
{0x07, 0x01, 0x42, 0xbb},
{0x08, 0x00, 0x11, 0xbb},
{0x20, 0x01, 0x03, 0xbb},
{0x21, 0x80, 0x00, 0xbb},
{0x22, 0x0d, 0x0f, 0xbb},
{0x24, 0x80, 0x00, 0xbb},
{0x59, 0x00, 0xff, 0xbb},
{0xf0, 0x00, 0x02, 0xbb},
{0x39, 0x03, 0xca, 0xbb},
{0x3a, 0x06, 0x80, 0xbb},
{0x3b, 0x01, 0x52, 0xbb},
{0x3c, 0x05, 0x40, 0xbb},
{0x57, 0x01, 0x9c, 0xbb},
{0x58, 0x01, 0xee, 0xbb},
{0x59, 0x00, 0xf0, 0xbb},
{0x5a, 0x01, 0x20, 0xbb},
{0x5c, 0x1d, 0x17, 0xbb},
{0x5d, 0x22, 0x1c, 0xbb},
{0x64, 0x1e, 0x1c, 0xbb},
{0x5b, 0x00, 0x00, 0xbb},
{0xf0, 0x00, 0x02, 0xbb},
{0x22, 0xa0, 0x78, 0xbb},
{0x23, 0xa0, 0x78, 0xbb},
{0x24, 0x7f, 0x00, 0xbb},
{0x28, 0xea, 0x02, 0xbb},
{0x29, 0x86, 0x7a, 0xbb},
{0x5e, 0x52, 0x4c, 0xbb},
{0x5f, 0x20, 0x24, 0xbb},
{0x60, 0x00, 0x02, 0xbb},
{0x02, 0x00, 0xee, 0xbb},
{0x03, 0x39, 0x23, 0xbb},
{0x04, 0x07, 0x24, 0xbb},
{0x09, 0x00, 0xc0, 0xbb},
{0x0a, 0x00, 0x79, 0xbb},
{0x0b, 0x00, 0x04, 0xbb},
{0x0c, 0x00, 0x5c, 0xbb},
{0x0d, 0x00, 0xd9, 0xbb},
{0x0e, 0x00, 0x53, 0xbb},
{0x0f, 0x00, 0x21, 0xbb},
{0x10, 0x00, 0xa4, 0xbb},
{0x11, 0x00, 0xe5, 0xbb},
{0x15, 0x00, 0x00, 0xbb},
{0x16, 0x00, 0x00, 0xbb},
{0x17, 0x00, 0x00, 0xbb},
{0x18, 0x00, 0x00, 0xbb},
{0x19, 0x00, 0x00, 0xbb},
{0x1a, 0x00, 0x00, 0xbb},
{0x1b, 0x00, 0x00, 0xbb},
{0x1c, 0x00, 0x00, 0xbb},
{0x1d, 0x00, 0x00, 0xbb},
{0x1e, 0x00, 0x00, 0xbb},
{0xf0, 0x00, 0x01, 0xbb},
{0x06, 0xe0, 0x0e, 0xbb},
{0x06, 0x60, 0x0e, 0xbb},
{0xb3, 0x5c, 0x01, 0xcc},
{0xf0, 0x00, 0x00, 0xbb},
{0x05, 0x01, 0x13, 0xbb},
{0x06, 0x00, 0x11, 0xbb},
{0x07, 0x00, 0x85, 0xbb},
{0x08, 0x00, 0x27, 0xbb},
{0x20, 0x01, 0x03, 0xbb},
{0x21, 0x80, 0x00, 0xbb},
{0x22, 0x0d, 0x0f, 0xbb},
{0x24, 0x80, 0x00, 0xbb},
{0x59, 0x00, 0xff, 0xbb},
{0xf0, 0x00, 0x02, 0xbb},
{0x39, 0x03, 0x0d, 0xbb},
{0x3a, 0x06, 0x1b, 0xbb},
{0x3b, 0x00, 0x95, 0xbb},
{0x3c, 0x04, 0xdb, 0xbb},
{0x57, 0x02, 0x00, 0xbb},
{0x58, 0x02, 0x66, 0xbb},
{0x59, 0x00, 0xff, 0xbb},
{0x5a, 0x01, 0x33, 0xbb},
{0x5c, 0x12, 0x0d, 0xbb},
{0x5d, 0x16, 0x11, 0xbb},
{0x64, 0x5e, 0x1c, 0xbb},
{}
};
static const __u8 po3130_gamma[17] = { static const __u8 po3130_gamma[17] = {
0x00, 0x13, 0x38, 0x59, 0x79, 0x92, 0xa7, 0xb9, 0xc8, 0x00, 0x13, 0x38, 0x59, 0x79, 0x92, 0xa7, 0xb9, 0xc8,
0xd4, 0xdf, 0xe7, 0xee, 0xf4, 0xf9, 0xfc, 0xff 0xd4, 0xdf, 0xe7, 0xee, 0xf4, 0xf9, 0xfc, 0xff
...@@ -2516,21 +2894,24 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -2516,21 +2894,24 @@ static int sd_config(struct gspca_dev *gspca_dev,
cam->cam_mode = vc0321_mode; cam->cam_mode = vc0321_mode;
cam->nmodes = ARRAY_SIZE(vc0321_mode); cam->nmodes = ARRAY_SIZE(vc0321_mode);
} else { } else {
if (sensor != SENSOR_PO1200) {
cam->cam_mode = vc0323_mode;
switch (sensor) { switch (sensor) {
case SENSOR_PO1200:
cam->cam_mode = svga_mode;
cam->nmodes = ARRAY_SIZE(svga_mode);
break;
case SENSOR_MI1310_SOC: case SENSOR_MI1310_SOC:
case SENSOR_MI1320_SOC: cam->cam_mode = vc0323_mode;
cam->nmodes = ARRAY_SIZE(vc0323_mode); cam->nmodes = ARRAY_SIZE(vc0323_mode);
break; break;
default: /* no SXGA */ case SENSOR_MI1320_SOC:
cam->cam_mode = bi_mode;
cam->nmodes = ARRAY_SIZE(bi_mode);
break;
default:
cam->cam_mode = vc0323_mode;
cam->nmodes = ARRAY_SIZE(vc0323_mode) - 1; cam->nmodes = ARRAY_SIZE(vc0323_mode) - 1;
break; break;
} }
} else {
cam->cam_mode = svga_mode;
cam->nmodes = ARRAY_SIZE(svga_mode);
}
} }
sd->hflip = HFLIP_DEF; sd->hflip = HFLIP_DEF;
...@@ -2632,6 +3013,14 @@ static int sd_start(struct gspca_dev *gspca_dev) ...@@ -2632,6 +3013,14 @@ static int sd_start(struct gspca_dev *gspca_dev)
const __u8 *GammaT = NULL; const __u8 *GammaT = NULL;
const __u8 *MatrixT = NULL; const __u8 *MatrixT = NULL;
int mode; int mode;
static const u8 (*mi1320_soc_init[])[4] = {
mi1320_soc_InitSXGA,
mi1320_soc_InitSXGA_JPG,
mi1320_soc_InitVGA,
mi1320_soc_InitVGA_JPG,
mi1320_soc_InitQVGA,
mi1320_soc_InitQVGA_JPG
};
/* Assume start use the good resolution from gspca_dev->mode */ /* Assume start use the good resolution from gspca_dev->mode */
if (sd->bridge == BRIDGE_VC0321) { if (sd->bridge == BRIDGE_VC0321) {
...@@ -2639,6 +3028,13 @@ static int sd_start(struct gspca_dev *gspca_dev) ...@@ -2639,6 +3028,13 @@ static int sd_start(struct gspca_dev *gspca_dev)
reg_w(gspca_dev->dev, 0xa0, 0xff, 0xbfed); reg_w(gspca_dev->dev, 0xa0, 0xff, 0xbfed);
reg_w(gspca_dev->dev, 0xa0, 0xff, 0xbfee); reg_w(gspca_dev->dev, 0xa0, 0xff, 0xbfee);
reg_w(gspca_dev->dev, 0xa0, 0xff, 0xbfef); reg_w(gspca_dev->dev, 0xa0, 0xff, 0xbfef);
sd->image_offset = 46;
} else {
if (gspca_dev->cam.cam_mode[gspca_dev->curr_mode].pixelformat
== V4L2_PIX_FMT_JPEG)
sd->image_offset = 0;
else
sd->image_offset = 32;
} }
mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv; mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
...@@ -2701,17 +3097,7 @@ static int sd_start(struct gspca_dev *gspca_dev) ...@@ -2701,17 +3097,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
case SENSOR_MI1320_SOC: case SENSOR_MI1320_SOC:
GammaT = mi1320_gamma; GammaT = mi1320_gamma;
MatrixT = mi1320_matrix; MatrixT = mi1320_matrix;
switch (mode) { init = mi1320_soc_init[mode];
case 1:
init = mi1320_soc_InitQVGA_JPG; /* 320x240 */
break;
case 0:
init = mi1320_soc_InitVGA_JPG; /* 640x480 */
break;
default:
init = mi1320_soc_InitSXGA_JPG; /* 1280x1024 */
break;
}
break; break;
case SENSOR_PO3130NC: case SENSOR_PO3130NC:
GammaT = po3130_gamma; GammaT = po3130_gamma;
...@@ -2783,12 +3169,8 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, ...@@ -2783,12 +3169,8 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
"vc032x header packet found len %d", len); "vc032x header packet found len %d", len);
frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame, frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
data, 0); data, 0);
if (sd->bridge == BRIDGE_VC0321) { data += sd->image_offset;
#define VCHDRSZ 46 len -= sd->image_offset;
data += VCHDRSZ;
len -= VCHDRSZ;
#undef VCHDRSZ
}
gspca_frame_add(gspca_dev, FIRST_PACKET, frame, gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
data, len); data, len);
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment