Skip to content

L
linux
Commit 111815ef authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (12353): gspca - vc032x: Add the 1280x960 resolution for sensor mi1310_soc 

Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4041f6b3
Show whitespace changes
Inline Side-by-side
Showing with 165 additions and 80 deletions
drivers/media/video/gspca/vc032x.c
View file @ 111815ef
...@@ -153,9 +153,9 @@ static const struct v4l2_pix_format vc0323_mode[] = { ...@@ -153,9 +153,9 @@ static const struct v4l2_pix_format vc0323_mode[] = {
.sizeimage = 640 * 480 * 3 / 8 + 590, .sizeimage = 640 * 480 * 3 / 8 + 590,
.colorspace = V4L2_COLORSPACE_JPEG, .colorspace = V4L2_COLORSPACE_JPEG,
.priv = 0}, .priv = 0},
{1280, 1024, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, /* mi13x0_soc only */ {1280, 960, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, /* mi1310_soc only */
.bytesperline = 1280, .bytesperline = 1280,
.sizeimage = 1280 * 1024 * 1 / 4 + 590, .sizeimage = 1280 * 960 * 3 / 8 + 590,
.colorspace = V4L2_COLORSPACE_JPEG, .colorspace = V4L2_COLORSPACE_JPEG,
.priv = 2}, .priv = 2},
}; };
...@@ -650,108 +650,194 @@ static const __u8 mi1310_socinitQVGA_JPG[][4] = { ...@@ -650,108 +650,194 @@ static const __u8 mi1310_socinitQVGA_JPG[][4] = {
static const u8 mi1310_soc_InitSXGA_JPG[][4] = { static const u8 mi1310_soc_InitSXGA_JPG[][4] = {
{0xb0, 0x03, 0x19, 0xcc}, {0xb0, 0x03, 0x19, 0xcc},
{0xb0, 0x04, 0x02, 0xcc}, {0xb0, 0x04, 0x02, 0xcc},
{0xb3, 0x00, 0x24, 0xcc}, {0xb3, 0x00, 0x64, 0xcc},
{0xb3, 0x00, 0x25, 0xcc}, {0xb3, 0x00, 0x65, 0xcc},
{0xb3, 0x05, 0x00, 0xcc}, {0xb3, 0x05, 0x00, 0xcc},
{0xb3, 0x06, 0x01, 0xcc}, {0xb3, 0x06, 0x00, 0xcc},
{0xb3, 0x5c, 0x01, 0xcc},
{0xb3, 0x08, 0x01, 0xcc}, {0xb3, 0x08, 0x01, 0xcc},
{0xb3, 0x09, 0x0c, 0xcc}, {0xb3, 0x09, 0x0c, 0xcc},
{0xb3, 0x34, 0x02, 0xcc}, {0xb3, 0x34, 0x02, 0xcc},
{0xb3, 0x35, 0xdd, 0xcc}, {0xb3, 0x35, 0xdd, 0xcc},
{0xb3, 0x02, 0x00, 0xcc},
{0xb3, 0x03, 0x0a, 0xcc}, {0xb3, 0x03, 0x0a, 0xcc},
{0xb3, 0x04, 0x0d, 0xcc}, {0xb3, 0x04, 0x0d, 0xcc},
{0xb3, 0x20, 0x00, 0xcc}, {0xb3, 0x20, 0x00, 0xcc},
{0xb3, 0x21, 0x00, 0xcc}, {0xb3, 0x21, 0x00, 0xcc},
{0xb3, 0x22, 0x04, 0xcc}, {0xb3, 0x22, 0x03, 0xcc},
{0xb3, 0x23, 0x00, 0xcc}, {0xb3, 0x23, 0xc0, 0xcc},
{0xb3, 0x14, 0x00, 0xcc}, {0xb3, 0x14, 0x00, 0xcc},
{0xb3, 0x15, 0x00, 0xcc}, {0xb3, 0x15, 0x00, 0xcc},
{0xb3, 0x16, 0x04, 0xcc}, {0xb3, 0x16, 0x04, 0xcc},
{0xb3, 0x17, 0xff, 0xcc}, {0xb3, 0x17, 0xff, 0xcc},
{0xb8, 0x01, 0x7d, 0xcc}, {0xb3, 0x00, 0x65, 0xcc},
{0xb8, 0x81, 0x09, 0xcc}, {0xb8, 0x00, 0x00, 0xcc},
{0xb8, 0x27, 0x20, 0xcc}, {0xbc, 0x00, 0x70, 0xcc},
{0xb8, 0x26, 0x80, 0xcc}, {0xbc, 0x01, 0x01, 0xcc},
{0xb8, 0x06, 0x00, 0xcc}, {0xf0, 0x00, 0x02, 0xbb},
{0xb8, 0x07, 0x05, 0xcc}, {0xc8, 0x9f, 0x0b, 0xbb},
{0xb8, 0x08, 0x00, 0xcc}, {0x5b, 0x00, 0x01, 0xbb},
{0xb8, 0x09, 0x04, 0xcc},
{0xb3, 0x00, 0x25, 0xcc},
{0xb8, 0x00, 0x11, 0xcc},
{0xbc, 0x00, 0x71, 0xcc},
{0xb8, 0x81, 0x01, 0xcc},
{0xb8, 0x2c, 0x5a, 0xcc},
{0xb8, 0x2d, 0xff, 0xcc},
{0xb8, 0x2e, 0xee, 0xcc},
{0xb8, 0x2f, 0xfb, 0xcc},
{0xb8, 0x30, 0x52, 0xcc},
{0xb8, 0x31, 0xf8, 0xcc},
{0xb8, 0x32, 0xf1, 0xcc},
{0xb8, 0x33, 0xff, 0xcc},
{0xb8, 0x34, 0x54, 0xcc},
{0xf0, 0x00, 0x00, 0xbb}, {0xf0, 0x00, 0x00, 0xbb},
{0x00, 0x01, 0x00, 0xdd}, {0x20, 0x03, 0x03, 0xbb},
{0x0d, 0x00, 0x09, 0xbb},
{0x0d, 0x00, 0x08, 0xbb},
{0xf0, 0x00, 0x01, 0xbb}, {0xf0, 0x00, 0x01, 0xbb},
{0x00, 0x01, 0x00, 0xdd}, {0x05, 0x00, 0x07, 0xbb},
{0x06, 0x00, 0x14, 0xbb}, {0x34, 0x00, 0x00, 0xbb},
{0x3a, 0x10, 0x00, 0xbb}, {0x35, 0xff, 0x00, 0xbb},
{0x00, 0x00, 0x10, 0xdd}, {0xdc, 0x07, 0x02, 0xbb},
{0x9b, 0x10, 0x00, 0xbb}, {0xdd, 0x3c, 0x18, 0xbb},
{0x00, 0x00, 0x10, 0xdd}, {0xde, 0x92, 0x6d, 0xbb},
{0xdf, 0xcd, 0xb1, 0xbb},
{0xe0, 0xff, 0xe7, 0xbb},
{0x06, 0xf0, 0x0d, 0xbb},
{0x06, 0x70, 0x0e, 0xbb},
{0x4c, 0x00, 0x01, 0xbb},
{0x4d, 0x00, 0x01, 0xbb},
{0xf0, 0x00, 0x02, 0xbb},
{0x2e, 0x0c, 0x60, 0xbb},
{0x21, 0xb6, 0x6e, 0xbb},
{0x37, 0x01, 0x40, 0xbb},
{0xf0, 0x00, 0x00, 0xbb}, {0xf0, 0x00, 0x00, 0xbb},
{0x00, 0x01, 0x00, 0xdd}, {0x07, 0x00, 0x84, 0xbb},
{0x2b, 0x00, 0x28, 0xbb}, {0x08, 0x02, 0x4a, 0xbb},
{0x2c, 0x00, 0x30, 0xbb}, {0x05, 0x01, 0x10, 0xbb},
{0x2d, 0x00, 0x30, 0xbb}, {0x06, 0x00, 0x39, 0xbb},
{0x2e, 0x00, 0x28, 0xbb}, {0xf0, 0x00, 0x02, 0xbb},
{0x41, 0x00, 0xd7, 0xbb}, {0x58, 0x02, 0x67, 0xbb},
{0x09, 0x02, 0x3a, 0xbb}, {0x57, 0x02, 0x00, 0xbb},
{0x0c, 0x00, 0x00, 0xbb}, {0x5a, 0x02, 0x67, 0xbb},
{0x20, 0x00, 0x00, 0xbb}, {0x59, 0x02, 0x00, 0xbb},
{0x05, 0x00, 0x8c, 0xbb}, {0x5c, 0x12, 0x0d, 0xbb},
{0x06, 0x00, 0x32, 0xbb}, {0x5d, 0x16, 0x11, 0xbb},
{0x07, 0x00, 0xc6, 0xbb}, {0x39, 0x06, 0x18, 0xbb},
{0x08, 0x00, 0x19, 0xbb}, {0x3a, 0x06, 0x18, 0xbb},
{0x24, 0x80, 0x6f, 0xbb}, {0x3b, 0x06, 0x18, 0xbb},
{0xc8, 0x00, 0x0f, 0xbb}, {0x3c, 0x06, 0x18, 0xbb},
{0x20, 0x00, 0x03, 0xbb}, {0x64, 0x7b, 0x5b, 0xbb},
{0xb6, 0x00, 0x00, 0xcc}, {0xb6, 0x00, 0x00, 0xcc},
{0xb6, 0x03, 0x05, 0xcc}, {0xb6, 0x03, 0x05, 0xcc},
{0xb6, 0x02, 0x00, 0xcc}, {0xb6, 0x02, 0x00, 0xcc},
{0xb6, 0x05, 0x04, 0xcc}, {0xb6, 0x05, 0x03, 0xcc},
{0xb6, 0x04, 0x00, 0xcc}, {0xb6, 0x04, 0xc0, 0xcc},
{0xb6, 0x12, 0xf8, 0xcc}, {0xb6, 0x12, 0xf8, 0xcc},
{0xb6, 0x18, 0x0a, 0xcc}, {0xb6, 0x13, 0x29, 0xcc},
{0xb6, 0x17, 0x00, 0xcc}, {0xb6, 0x18, 0x09, 0xcc},
{0xb6, 0x17, 0x60, 0xcc},
{0xb6, 0x16, 0x00, 0xcc}, {0xb6, 0x16, 0x00, 0xcc},
{0xb6, 0x22, 0x12, 0xcc}, {0xb6, 0x22, 0x12, 0xcc},
{0xb6, 0x23, 0x0b, 0xcc}, {0xb6, 0x23, 0x0b, 0xcc},
{0xb3, 0x02, 0x02, 0xcc},
{0xbf, 0xc0, 0x39, 0xcc}, {0xbf, 0xc0, 0x39, 0xcc},
{0xbf, 0xc1, 0x04, 0xcc}, {0xbf, 0xc1, 0x04, 0xcc},
{0xbf, 0xcc, 0x10, 0xcc}, {0xbf, 0xcc, 0x00, 0xcc},
{0xb9, 0x12, 0x00, 0xcc},
{0xb9, 0x13, 0x14, 0xcc},
{0xb9, 0x14, 0x14, 0xcc},
{0xb9, 0x15, 0x14, 0xcc},
{0xb9, 0x16, 0x14, 0xcc},
{0xb9, 0x18, 0x00, 0xcc},
{0xb9, 0x19, 0x1e, 0xcc},
{0xb9, 0x1a, 0x1e, 0xcc},
{0xb9, 0x1b, 0x1e, 0xcc},
{0xb9, 0x1c, 0x1e, 0xcc},
{0xb3, 0x01, 0x41, 0xcc}, {0xb3, 0x01, 0x41, 0xcc},
{0xb8, 0x8e, 0x00, 0xcc}, {0x00, 0x00, 0x80, 0xdd},
{0xb8, 0x8f, 0xff, 0xcc}, {0xf0, 0x00, 0x02, 0xbb},
{0xb6, 0x12, 0xf8, 0xcc}, {0x00, 0x00, 0x10, 0xdd},
{0xb8, 0x0c, 0x20, 0xcc}, {0x22, 0xa0, 0x78, 0xbb},
{0xb8, 0x0d, 0x70, 0xcc}, {0x23, 0xa0, 0x78, 0xbb},
{0xb6, 0x13, 0x13, 0xcc}, {0x24, 0x7f, 0x00, 0xbb},
{0x2f, 0x00, 0xC0, 0xbb}, {0x28, 0xea, 0x02, 0xbb},
{0xb8, 0xa0, 0x12, 0xcc}, {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},
{0x00, 0x00, 0x20, 0xdd},
{0x06, 0xf0, 0x8e, 0xbb},
{0x00, 0x00, 0x80, 0xdd},
{0x06, 0x70, 0x8e, 0xbb},
{0xf0, 0x00, 0x02, 0xbb},
{0x00, 0x00, 0x20, 0xdd},
{0x5e, 0x6a, 0x53, 0xbb},
{0x5f, 0x40, 0x2c, 0xbb},
{0xf0, 0x00, 0x01, 0xbb},
{0x00, 0x00, 0x20, 0xdd},
{0x58, 0x00, 0x00, 0xbb},
{0x53, 0x09, 0x03, 0xbb},
{0x54, 0x31, 0x18, 0xbb},
{0x55, 0x8b, 0x5f, 0xbb},
{0x56, 0xc0, 0xa9, 0xbb},
{0x57, 0xe0, 0xd2, 0xbb},
{0xe1, 0x00, 0x00, 0xbb},
{0xdc, 0x09, 0x03, 0xbb},
{0xdd, 0x31, 0x18, 0xbb},
{0xde, 0x8b, 0x5f, 0xbb},
{0xdf, 0xc0, 0xa9, 0xbb},
{0xe0, 0xe0, 0xd2, 0xbb},
{0xb3, 0x5c, 0x01, 0xcc},
{0xf0, 0x00, 0x01, 0xbb},
{0x06, 0xf0, 0x8e, 0xbb},
{0xf0, 0x00, 0x02, 0xbb},
{0x2f, 0xde, 0x20, 0xbb},
{0xf0, 0x00, 0x02, 0xbb},
{0x24, 0x50, 0x20, 0xbb},
{0xbc, 0x0e, 0x00, 0xcc},
{0xbc, 0x0f, 0x05, 0xcc},
{0xbc, 0x10, 0xc0, 0xcc},
{0xf0, 0x00, 0x02, 0xbb},
{0x34, 0x0c, 0x50, 0xbb},
{0xbc, 0x11, 0x03, 0xcc},
{0xf0, 0x00, 0x01, 0xbb},
{0x80, 0x00, 0x03, 0xbb},
{0x81, 0xc7, 0x14, 0xbb},
{0x82, 0xeb, 0xe8, 0xbb},
{0x83, 0xfe, 0xf4, 0xbb},
{0x84, 0xcd, 0x10, 0xbb},
{0x85, 0xf3, 0xee, 0xbb},
{0x86, 0xff, 0xf1, 0xbb},
{0x87, 0xcd, 0x10, 0xbb},
{0x88, 0xf3, 0xee, 0xbb},
{0x89, 0x01, 0xf1, 0xbb},
{0x8a, 0xe5, 0x17, 0xbb},
{0x8b, 0xe8, 0xe2, 0xbb},
{0x8c, 0xf7, 0xed, 0xbb},
{0x8d, 0x00, 0xff, 0xbb},
{0x8e, 0xec, 0x10, 0xbb},
{0x8f, 0xf0, 0xed, 0xbb},
{0x90, 0xf9, 0xf2, 0xbb},
{0x91, 0x00, 0x00, 0xbb},
{0x92, 0xe9, 0x0d, 0xbb},
{0x93, 0xf4, 0xf2, 0xbb},
{0x94, 0xfb, 0xf5, 0xbb},
{0x95, 0x00, 0xff, 0xbb},
{0xb6, 0x0f, 0x08, 0xbb},
{0xb7, 0x3d, 0x16, 0xbb},
{0xb8, 0x0c, 0x04, 0xbb},
{0xb9, 0x1c, 0x07, 0xbb},
{0xba, 0x0a, 0x03, 0xbb},
{0xbb, 0x1b, 0x09, 0xbb},
{0xbc, 0x17, 0x0d, 0xbb},
{0xbd, 0x23, 0x1d, 0xbb},
{0xbe, 0x00, 0x28, 0xbb},
{0xbf, 0x11, 0x09, 0xbb},
{0xc0, 0x16, 0x15, 0xbb},
{0xc1, 0x00, 0x1b, 0xbb},
{0xc2, 0x0e, 0x07, 0xbb},
{0xc3, 0x14, 0x10, 0xbb},
{0xc4, 0x00, 0x17, 0xbb},
{0x06, 0x74, 0x8e, 0xbb},
{0xf0, 0x00, 0x00, 0xbb},
{0x03, 0x03, 0xc0, 0xbb},
{} {}
}; };
...@@ -2522,8 +2608,7 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -2522,8 +2608,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
break; break;
case SENSOR_MI1310_SOC: case SENSOR_MI1310_SOC:
cam->cam_mode = vc0323_mode; cam->cam_mode = vc0323_mode;
/* TODO: 1280x1024 resolution setting is incorrect, so don't export it now*/ cam->nmodes = ARRAY_SIZE(vc0323_mode);
cam->nmodes = ARRAY_SIZE(vc0323_mode) - 1;
break; break;
case SENSOR_MI1320_SOC: case SENSOR_MI1320_SOC:
cam->cam_mode = bi_mode; cam->cam_mode = bi_mode;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7