system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-27 23:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (13893): gspca - vc032x: Change the sensor of 046d:0892 and 046d:0896.

Browse source 
- new sensor POxxxx (unknown ID)
- no probe
- new controls
- table for the disabled controls

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jean-Francois Moine 2009-12-26 16:07:24 -03:00 committed by Mauro Carvalho Chehab
parent 219f3027a8
commit 83c94a1863
1 changed files with 522 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

568
drivers/media/video/gspca/vc032x.c
View file

@ -32,10 +32,13 @@ MODULE_LICENSE("GPL");
struct sd { struct sd {
struct gspca_dev gspca_dev; /* !! must be the first item */ struct gspca_dev gspca_dev; /* !! must be the first item */
u8 brightness;
u8 contrast;
u8 colors;
u8 hflip; u8 hflip;
u8 vflip; u8 vflip;
u8 lightfreq; u8 lightfreq;
u8 sharpness; s8 sharpness;
u8 image_offset; u8 image_offset;
@ -52,6 +55,7 @@ struct sd {
#define SENSOR_OV7670 6 #define SENSOR_OV7670 6
#define SENSOR_PO1200 7 #define SENSOR_PO1200 7
#define SENSOR_PO3130NC 8 #define SENSOR_PO3130NC 8
#define SENSOR_POxxxx 9
u8 flags; u8 flags;
#define FL_SAMSUNG 0x01 /* SamsungQ1 (2 sensors) */ #define FL_SAMSUNG 0x01 /* SamsungQ1 (2 sensors) */
#define FL_HFLIP 0x02 /* mirrored by default */ #define FL_HFLIP 0x02 /* mirrored by default */
@ -59,6 +63,12 @@ struct sd {
}; };
/* V4L2 controls supported by the driver */ /* V4L2 controls supported by the driver */
static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val); static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val);
static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val); static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val); static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val);
@ -69,8 +79,53 @@ static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val); static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val);
static struct ctrl sd_ctrls[] = { static struct ctrl sd_ctrls[] = {
#define BRIGHTNESS_IDX 0
{
{
.id = V4L2_CID_BRIGHTNESS,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Brightness",
.minimum = 0,
.maximum = 255,
.step = 1,
#define BRIGHTNESS_DEF 128
.default_value = BRIGHTNESS_DEF,
},
.set = sd_setbrightness,
.get = sd_getbrightness,
},
#define CONTRAST_IDX 1
{
{
.id = V4L2_CID_CONTRAST,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Contrast",
.minimum = 0,
.maximum = 255,
.step = 1,
#define CONTRAST_DEF 127
.default_value = CONTRAST_DEF,
},
.set = sd_setcontrast,
.get = sd_getcontrast,
},
#define COLORS_IDX 2
{
{
.id = V4L2_CID_SATURATION,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Saturation",
.minimum = 1,
.maximum = 127,
.step = 1,
#define COLOR_DEF 63
.default_value = COLOR_DEF,
},
.set = sd_setcolors,
.get = sd_getcolors,
},
/* next 2 controls work with some sensors only */ /* next 2 controls work with some sensors only */
#define HFLIP_IDX 0 #define HFLIP_IDX 3
{ {
{ {
.id = V4L2_CID_HFLIP, .id = V4L2_CID_HFLIP,
@ -85,7 +140,7 @@ static struct ctrl sd_ctrls[] = {
.set = sd_sethflip, .set = sd_sethflip,
.get = sd_gethflip, .get = sd_gethflip,
}, },
#define VFLIP_IDX 1 #define VFLIP_IDX 4
{ {
{ {
.id = V4L2_CID_VFLIP, .id = V4L2_CID_VFLIP,
@ -100,7 +155,7 @@ static struct ctrl sd_ctrls[] = {
.set = sd_setvflip, .set = sd_setvflip,
.get = sd_getvflip, .get = sd_getvflip,
}, },
#define LIGHTFREQ_IDX 2 #define LIGHTFREQ_IDX 5
{ {
{ {
.id = V4L2_CID_POWER_LINE_FREQUENCY, .id = V4L2_CID_POWER_LINE_FREQUENCY,
@ -115,17 +170,16 @@ static struct ctrl sd_ctrls[] = {
.set = sd_setfreq, .set = sd_setfreq,
.get = sd_getfreq, .get = sd_getfreq,
}, },
/* po1200 only */ #define SHARPNESS_IDX 6
#define SHARPNESS_IDX 3
{ {
{ {
.id = V4L2_CID_SHARPNESS, .id = V4L2_CID_SHARPNESS,
.type = V4L2_CTRL_TYPE_INTEGER, .type = V4L2_CTRL_TYPE_INTEGER,
.name = "Sharpness", .name = "Sharpness",
.minimum = 0, .minimum = -1,
.maximum = 2, .maximum = 2,
.step = 1, .step = 1,
#define SHARPNESS_DEF 1 #define SHARPNESS_DEF -1
.default_value = SHARPNESS_DEF, .default_value = SHARPNESS_DEF,
}, },
.set = sd_setsharpness, .set = sd_setsharpness,
@ -133,6 +187,42 @@ static struct ctrl sd_ctrls[] = {
}, },
}; };
/* table of the disabled controls */
static u32 ctrl_dis[] = {
/* SENSOR_HV7131R 0 */
(1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
| (1 << HFLIP_IDX) | (1 << VFLIP_IDX) | (1 << LIGHTFREQ_IDX)
| (1 << SHARPNESS_IDX),
/* SENSOR_MI0360 1 */
(1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
| (1 << HFLIP_IDX) | (1 << VFLIP_IDX) | (1 << LIGHTFREQ_IDX)
| (1 << SHARPNESS_IDX),
/* SENSOR_MI1310_SOC 2 */
(1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
| (1 << LIGHTFREQ_IDX) | (1 << SHARPNESS_IDX),
/* SENSOR_MI1320 3 */
(1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
| (1 << LIGHTFREQ_IDX) | (1 << SHARPNESS_IDX),
/* SENSOR_MI1320_SOC 4 */
(1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
| (1 << LIGHTFREQ_IDX) | (1 << SHARPNESS_IDX),
/* SENSOR_OV7660 5 */
(1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
| (1 << LIGHTFREQ_IDX) | (1 << SHARPNESS_IDX),
/* SENSOR_OV7670 6 */
(1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
| (1 << SHARPNESS_IDX),
/* SENSOR_PO1200 7 */
(1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
| (1 << LIGHTFREQ_IDX),
/* SENSOR_PO3130NC 8 */
(1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
| (1 << HFLIP_IDX) | (1 << VFLIP_IDX) | (1 << LIGHTFREQ_IDX)
| (1 << SHARPNESS_IDX),
/* SENSOR_POxxxx 9 */
(1 << HFLIP_IDX) | (1 << VFLIP_IDX) | (1 << LIGHTFREQ_IDX),
};
static const struct v4l2_pix_format vc0321_mode[] = { static const struct v4l2_pix_format vc0321_mode[] = {
{320, 240, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE, {320, 240, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
.bytesperline = 320, .bytesperline = 320,
@ -2413,6 +2503,251 @@ static const u8 po1200_initVGA_data[][4] = {
{0x00, 0xb6, 0x39, 0xaa}, {0x00, 0xb6, 0x39, 0xaa},
{0x00, 0xb7, 0x24, 0xaa}, {0x00, 0xb7, 0x24, 0xaa},
/*write 89 0400 1415*/ /*write 89 0400 1415*/
{}
};
static const u8 poxxxx_init_common[][4] = {
{0xb3, 0x00, 0x04, 0xcc},
{0x00, 0x00, 0x10, 0xdd},
{0xb3, 0x00, 0x64, 0xcc},
{0x00, 0x00, 0x10, 0xdd},
{0xb3, 0x00, 0x65, 0xcc},
{0x00, 0x00, 0x10, 0xdd},
{0xb3, 0x00, 0x67, 0xcc},
{0xb0, 0x03, 0x09, 0xcc},
{0xb3, 0x05, 0x00, 0xcc},
{0xb3, 0x06, 0x00, 0xcc},
{0xb3, 0x5c, 0x01, 0xcc},
{0xb3, 0x08, 0x01, 0xcc},
{0xb3, 0x09, 0x0c, 0xcc},
{0xb3, 0x34, 0x01, 0xcc},
{0xb3, 0x35, 0xf6, 0xcc}, /* i2c add: 76 */
{0xb3, 0x02, 0xb0, 0xcc},
{0xb3, 0x03, 0x18, 0xcc},
{0xb3, 0x04, 0x15, 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, 0x2c, 0x03, 0xcc},
{0xb3, 0x2d, 0x56, 0xcc},
{0xb3, 0x2e, 0x02, 0xcc},
{0xb3, 0x2f, 0x0a, 0xcc},
{0xb3, 0x40, 0x00, 0xcc},
{0xb3, 0x41, 0x34, 0xcc},
{0xb3, 0x42, 0x01, 0xcc},
{0xb3, 0x43, 0xe0, 0xcc},
{0xbc, 0x00, 0x71, 0xcc},
{0xbc, 0x01, 0x01, 0xcc},
{0xb3, 0x01, 0x41, 0xcc},
{0xb3, 0x4d, 0x00, 0xcc},
{0x00, 0x0b, 0x2a, 0xaa},
{0x00, 0x0e, 0x03, 0xaa},
{0x00, 0x0f, 0xea, 0xaa},
{0x00, 0x12, 0x08, 0xaa},
{0x00, 0x1e, 0x06, 0xaa},
{0x00, 0x21, 0x00, 0xaa},
{0x00, 0x31, 0x1f, 0xaa},
{0x00, 0x33, 0x38, 0xaa},
{0x00, 0x36, 0xc0, 0xaa},
{0x00, 0x37, 0xc8, 0xaa},
{0x00, 0x3b, 0x36, 0xaa},
{0x00, 0x4b, 0xfe, 0xaa},
{0x00, 0x4d, 0x2e, 0xaa},
{0x00, 0x51, 0x1c, 0xaa},
{0x00, 0x52, 0x01, 0xaa},
{0x00, 0x55, 0x0a, 0xaa},
{0x00, 0x56, 0x0a, 0xaa},
{0x00, 0x57, 0x07, 0xaa},
{0x00, 0x58, 0x07, 0xaa},
{0x00, 0x59, 0x04, 0xaa},
{0x00, 0x70, 0x68, 0xaa},
{0x00, 0x71, 0x04, 0xaa},
{0x00, 0x72, 0x10, 0xaa},
{0x00, 0x80, 0x71, 0xaa},
{0x00, 0x81, 0x08, 0xaa},
{0x00, 0x82, 0x00, 0xaa},
{0x00, 0x83, 0x55, 0xaa},
{0x00, 0x84, 0x06, 0xaa},
{0x00, 0x85, 0x06, 0xaa},
{0x00, 0x8b, 0x25, 0xaa},
{0x00, 0x8c, 0x00, 0xaa},
{0x00, 0x8d, 0x86, 0xaa},
{0x00, 0x8e, 0x82, 0xaa},
{0x00, 0x8f, 0x2d, 0xaa},
{0x00, 0x90, 0x8b, 0xaa},
{0x00, 0x91, 0x81, 0xaa},
{0x00, 0x92, 0x81, 0xaa},
{0x00, 0x93, 0x23, 0xaa},
{0x00, 0xa3, 0x2a, 0xaa},
{0x00, 0xa4, 0x03, 0xaa},
{0x00, 0xa5, 0xea, 0xaa},
{0x00, 0xb0, 0x68, 0xaa},
{0x00, 0xbc, 0x04, 0xaa},
{0x00, 0xbe, 0x3b, 0xaa},
{0x00, 0x4e, 0x40, 0xaa},
{0x00, 0x06, 0x04, 0xaa},
{0x00, 0x07, 0x03, 0xaa},
{0x00, 0xcd, 0x18, 0xaa},
{0x00, 0x28, 0x03, 0xaa},
{0x00, 0x29, 0xef, 0xaa},
/* reinit on alt 2 (qvga) or alt7 (vga) */
{0xb3, 0x05, 0x00, 0xcc},
{0xb3, 0x06, 0x00, 0xcc},
{0xb8, 0x00, 0x01, 0xcc},
{0x00, 0x1d, 0x85, 0xaa},
{0x00, 0x1e, 0xc6, 0xaa},
{0x00, 0x00, 0x40, 0xdd},
{0x00, 0x1d, 0x05, 0xaa},
{0x00, 0xd6, 0x22, 0xaa}, /* gamma 0 */
{0x00, 0x73, 0x00, 0xaa},
{0x00, 0x74, 0x0a, 0xaa},
{0x00, 0x75, 0x16, 0xaa},
{0x00, 0x76, 0x25, 0xaa},
{0x00, 0x77, 0x34, 0xaa},
{0x00, 0x78, 0x49, 0xaa},
{0x00, 0x79, 0x5a, 0xaa},
{0x00, 0x7a, 0x7f, 0xaa},
{0x00, 0x7b, 0x9b, 0xaa},
{0x00, 0x7c, 0xba, 0xaa},
{0x00, 0x7d, 0xd4, 0xaa},
{0x00, 0x7e, 0xea, 0xaa},
{0x00, 0xd6, 0x62, 0xaa}, /* gamma 1 */
{0x00, 0x73, 0x00, 0xaa},
{0x00, 0x74, 0x0a, 0xaa},
{0x00, 0x75, 0x16, 0xaa},
{0x00, 0x76, 0x25, 0xaa},
{0x00, 0x77, 0x34, 0xaa},
{0x00, 0x78, 0x49, 0xaa},
{0x00, 0x79, 0x5a, 0xaa},
{0x00, 0x7a, 0x7f, 0xaa},
{0x00, 0x7b, 0x9b, 0xaa},
{0x00, 0x7c, 0xba, 0xaa},
{0x00, 0x7d, 0xd4, 0xaa},
{0x00, 0x7e, 0xea, 0xaa},
{0x00, 0xd6, 0xa2, 0xaa}, /* gamma 2 */
{0x00, 0x73, 0x00, 0xaa},
{0x00, 0x74, 0x0a, 0xaa},
{0x00, 0x75, 0x16, 0xaa},
{0x00, 0x76, 0x25, 0xaa},
{0x00, 0x77, 0x34, 0xaa},
{0x00, 0x78, 0x49, 0xaa},
{0x00, 0x79, 0x5a, 0xaa},
{0x00, 0x7a, 0x7f, 0xaa},
{0x00, 0x7b, 0x9b, 0xaa},
{0x00, 0x7c, 0xba, 0xaa},
{0x00, 0x7d, 0xd4, 0xaa},
{0x00, 0x7e, 0xea, 0xaa},
{0x00, 0xaa, 0xff, 0xaa}, /* back light comp */
{0x00, 0xc4, 0x03, 0xaa},
{0x00, 0xc5, 0x19, 0xaa},
{0x00, 0xc6, 0x03, 0xaa},
{0x00, 0xc7, 0x91, 0xaa},
{0x00, 0xc8, 0x01, 0xaa},
{0x00, 0xc9, 0xdd, 0xaa},
{0x00, 0xca, 0x02, 0xaa},
{0x00, 0xcb, 0x37, 0xaa},
/* read d1 */
{0x00, 0xd1, 0x3c, 0xaa},
{0x00, 0xb8, 0x28, 0xaa},
{0x00, 0xb9, 0x1e, 0xaa},
{0x00, 0xb6, 0x14, 0xaa},
{0x00, 0xb7, 0x0f, 0xaa},
{0x00, 0x5c, 0x10, 0xaa},
{0x00, 0x5d, 0x18, 0xaa},
{0x00, 0x5e, 0x24, 0xaa},
{0x00, 0x5f, 0x24, 0xaa},
{0x00, 0x86, 0x1a, 0xaa},
{0x00, 0x60, 0x00, 0xaa},
{0x00, 0x61, 0x1b, 0xaa},
{0x00, 0x62, 0x30, 0xaa},
{0x00, 0x63, 0x40, 0xaa},
{0x00, 0x87, 0x1a, 0xaa},
{0x00, 0x64, 0x00, 0xaa},
{0x00, 0x65, 0x08, 0xaa},
{0x00, 0x66, 0x10, 0xaa},
{0x00, 0x67, 0x20, 0xaa},
{0x00, 0x88, 0x10, 0xaa},
{0x00, 0x68, 0x00, 0xaa},
{0x00, 0x69, 0x08, 0xaa},
{0x00, 0x6a, 0x0f, 0xaa},
{0x00, 0x6b, 0x0f, 0xaa},
{0x00, 0x89, 0x07, 0xaa},
{0x00, 0xd5, 0x4c, 0xaa},
{0x00, 0x0a, 0x00, 0xaa},
{0x00, 0x0b, 0x2a, 0xaa},
{0x00, 0x0e, 0x03, 0xaa},
{0x00, 0x0f, 0xea, 0xaa},
{0x00, 0xa2, 0x00, 0xaa},
{0x00, 0xa3, 0x2a, 0xaa},
{0x00, 0xa4, 0x03, 0xaa},
{0x00, 0xa5, 0xea, 0xaa},
{}
};
static const u8 poxxxx_initVGA[][4] = {
{0x00, 0x20, 0x11, 0xaa},
{0x00, 0x33, 0x38, 0xaa},
{0x00, 0xbb, 0x0d, 0xaa},
{0xb3, 0x22, 0x01, 0xcc},
{0xb3, 0x23, 0xe0, 0xcc},
{0xb3, 0x16, 0x02, 0xcc},
{0xb3, 0x17, 0x7f, 0xcc},
{0xb3, 0x02, 0xb0, 0xcc},
{0xb3, 0x06, 0x00, 0xcc},
{0xb3, 0x5c, 0x01, 0xcc},
{0x00, 0x04, 0x06, 0xaa},
{0x00, 0x05, 0x3f, 0xaa},
{0x00, 0x04, 0x00, 0xdd}, /* delay 1s */
{}
};
static const u8 poxxxx_initQVGA[][4] = {
{0x00, 0x20, 0x33, 0xaa},
{0x00, 0x33, 0x38, 0xaa},
{0x00, 0xbb, 0x0d, 0xaa},
{0xb3, 0x22, 0x00, 0xcc},
{0xb3, 0x23, 0xf0, 0xcc},
{0xb3, 0x16, 0x01, 0xcc},
{0xb3, 0x17, 0x3f, 0xcc},
{0xb3, 0x02, 0xb0, 0xcc},
{0xb3, 0x06, 0x01, 0xcc},
{0xb3, 0x5c, 0x00, 0xcc},
{0x00, 0x04, 0x06, 0xaa},
{0x00, 0x05, 0x3f, 0xaa},
{0x00, 0x04, 0x00, 0xdd}, /* delay 1s */
{}
};
static const u8 poxxxx_init_end_1[][4] = {
{0x00, 0x47, 0x25, 0xaa},
{0x00, 0x48, 0x80, 0xaa},
{0x00, 0x49, 0x1f, 0xaa},
{0x00, 0x4a, 0x40, 0xaa},
{0x00, 0x44, 0x40, 0xaa},
{0x00, 0xab, 0x4a, 0xaa},
{0x00, 0xb1, 0x00, 0xaa},
{0x00, 0xb2, 0x04, 0xaa},
{0x00, 0xb3, 0x08, 0xaa},
{0x00, 0xb4, 0x0b, 0xaa},
{0x00, 0xb5, 0x0d, 0xaa},
{0x00, 0x59, 0x7e, 0xaa}, /* sharpness */
{0x00, 0x16, 0x00, 0xaa}, /* white balance */
{0x00, 0x18, 0x00, 0xaa},
{}
};
static const u8 poxxxx_init_end_2[][4] = {
{0x00, 0x1d, 0x85, 0xaa},
{0x00, 0x1e, 0x06, 0xaa},
{0x00, 0x1d, 0x05, 0xaa},
{}
}; };
struct sensor_info { struct sensor_info {
@ -2689,7 +3024,7 @@ static void usb_exchange(struct gspca_dev *gspca_dev,
i2c_write(gspca_dev, data[i][0], &data[i][1], 2); i2c_write(gspca_dev, data[i][0], &data[i][1], 2);
break; break;
case 0xdd: case 0xdd:
msleep(data[i][2] + 10); msleep(data[i][1] * 256 + data[i][2] + 10);
break; break;
} }
i++; i++;
@ -2716,12 +3051,17 @@ static int sd_config(struct gspca_dev *gspca_dev,
64, /* OV7670 6 */ 64, /* OV7670 6 */
128, /* PO1200 7 */ 128, /* PO1200 7 */
128, /* PO3130NC 8 */ 128, /* PO3130NC 8 */
128, /* POxxxx 9 */
}; };
cam = &gspca_dev->cam; cam = &gspca_dev->cam;
sd->bridge = id->driver_info >> 8; sd->bridge = id->driver_info >> 8;
sd->flags = id->driver_info & 0xff; sd->flags = id->driver_info & 0xff;
sensor = vc032x_probe_sensor(gspca_dev); if (id->idVendor == 0x046d &&
(id->idProduct == 0x0892 || id->idProduct == 0x0896))
sensor = SENSOR_POxxxx;
else
sensor = vc032x_probe_sensor(gspca_dev);
switch (sensor) { switch (sensor) {
case -1: case -1:
PDEBUG(D_PROBE, "Unknown sensor..."); PDEBUG(D_PROBE, "Unknown sensor...");
@ -2754,6 +3094,9 @@ static int sd_config(struct gspca_dev *gspca_dev,
case SENSOR_PO3130NC: case SENSOR_PO3130NC:
PDEBUG(D_PROBE, "Find Sensor PO3130NC"); PDEBUG(D_PROBE, "Find Sensor PO3130NC");
break; break;
case SENSOR_POxxxx:
PDEBUG(D_PROBE, "Sensor POxxxx");
break;
} }
sd->sensor = sensor; sd->sensor = sensor;
@ -2782,28 +3125,18 @@ static int sd_config(struct gspca_dev *gspca_dev,
} }
cam->npkt = npkt[sd->sensor]; cam->npkt = npkt[sd->sensor];
sd->brightness = BRIGHTNESS_DEF;
sd->contrast = CONTRAST_DEF;
sd->colors = COLOR_DEF;
sd->hflip = HFLIP_DEF; sd->hflip = HFLIP_DEF;
sd->vflip = VFLIP_DEF; sd->vflip = VFLIP_DEF;
sd->lightfreq = FREQ_DEF;
sd->sharpness = SHARPNESS_DEF;
gspca_dev->ctrl_dis = ctrl_dis[sd->sensor];
if (sd->sensor == SENSOR_OV7670) if (sd->sensor == SENSOR_OV7670)
sd->flags |= FL_HFLIP | FL_VFLIP; sd->flags |= FL_HFLIP | FL_VFLIP;
sd->lightfreq = FREQ_DEF;
if (sd->sensor != SENSOR_OV7670)
gspca_dev->ctrl_dis = (1 << LIGHTFREQ_IDX);
switch (sd->sensor) {
case SENSOR_MI1310_SOC:
case SENSOR_MI1320:
case SENSOR_MI1320_SOC:
case SENSOR_OV7660:
case SENSOR_OV7670:
case SENSOR_PO1200:
break;
default:
gspca_dev->ctrl_dis = (1 << HFLIP_IDX)
| (1 << VFLIP_IDX);
break;
}
sd->sharpness = SHARPNESS_DEF;
if (sd->bridge == BRIDGE_VC0321) { if (sd->bridge == BRIDGE_VC0321) {
reg_r(gspca_dev, 0x8a, 0, 3); reg_r(gspca_dev, 0x8a, 0, 3);
@ -2818,10 +3151,55 @@ static int sd_config(struct gspca_dev *gspca_dev,
/* this function is called at probe and resume time */ /* this function is called at probe and resume time */
static int sd_init(struct gspca_dev *gspca_dev) static int sd_init(struct gspca_dev *gspca_dev)
{ {
struct sd *sd = (struct sd *) gspca_dev;
if (sd->sensor == SENSOR_POxxxx) {
reg_r(gspca_dev, 0xa1, 0xb300, 1);
if (gspca_dev->usb_buf[0] != 0) {
reg_w(gspca_dev->dev, 0xa0, 0x26, 0xb300);
reg_w(gspca_dev->dev, 0xa0, 0x04, 0xb300);
reg_w(gspca_dev->dev, 0xa0, 0x00, 0xb300);
}
}
return 0; return 0;
} }
/* some sensors only */ static void setbrightness(struct gspca_dev *gspca_dev)
{
struct sd *sd = (struct sd *) gspca_dev;
u8 data;
if (gspca_dev->ctrl_dis & (1 << BRIGHTNESS_IDX))
return;
data = sd->brightness;
if (data >= 0x80)
data &= 0x7f;
else
data = 0xff ^ data;
i2c_write(gspca_dev, 0x98, &data, 1);
}
static void setcontrast(struct gspca_dev *gspca_dev)
{
struct sd *sd = (struct sd *) gspca_dev;
if (gspca_dev->ctrl_dis & (1 << CONTRAST_IDX))
return;
i2c_write(gspca_dev, 0x99, &sd->contrast, 1);
}
static void setcolors(struct gspca_dev *gspca_dev)
{
struct sd *sd = (struct sd *) gspca_dev;
u8 data;
if (gspca_dev->ctrl_dis & (1 << COLORS_IDX))
return;
data = sd->colors - (sd->colors >> 3) - 1;
i2c_write(gspca_dev, 0x94, &data, 1);
i2c_write(gspca_dev, 0x95, &sd->colors, 1);
}
static void sethvflip(struct gspca_dev *gspca_dev) static void sethvflip(struct gspca_dev *gspca_dev)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
@ -2873,18 +3251,29 @@ static void setlightfreq(struct gspca_dev *gspca_dev)
usb_exchange(gspca_dev, ov7660_freq_tb[sd->lightfreq]); usb_exchange(gspca_dev, ov7660_freq_tb[sd->lightfreq]);
} }
/* po1200 only */
static void setsharpness(struct gspca_dev *gspca_dev) static void setsharpness(struct gspca_dev *gspca_dev)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
u8 data; u8 data;
if (sd->sensor != SENSOR_PO1200) switch (sd->sensor) {
return; case SENSOR_PO1200:
data = 0; data = 0;
i2c_write(gspca_dev, 0x03, &data, 1); i2c_write(gspca_dev, 0x03, &data, 1);
data = 0xb5 + sd->sharpness * 3; if (sd->sharpness < 0)
i2c_write(gspca_dev, 0x61, &data, 1); data = 0x6a;
else
data = 0xb5 + sd->sharpness * 3;
i2c_write(gspca_dev, 0x61, &data, 1);
break;
case SENSOR_POxxxx:
if (sd->sharpness < 0)
data = 0x7e; /* def = max */
else
data = 0x60 + sd->sharpness * 0x0f;
i2c_write(gspca_dev, 0x59, &data, 1);
break;
}
} }
static int sd_start(struct gspca_dev *gspca_dev) static int sd_start(struct gspca_dev *gspca_dev)
@ -2994,12 +3383,27 @@ static int sd_start(struct gspca_dev *gspca_dev)
usb_exchange(gspca_dev, init); usb_exchange(gspca_dev, init);
init = po3130_rundata; init = po3130_rundata;
break; break;
default: case SENSOR_PO1200:
/* case SENSOR_PO1200: */
GammaT = po1200_gamma; GammaT = po1200_gamma;
MatrixT = po1200_matrix; MatrixT = po1200_matrix;
init = po1200_initVGA_data; init = po1200_initVGA_data;
break; break;
default:
/* case SENSOR_POxxxx: */
usb_exchange(gspca_dev, poxxxx_init_common);
if (mode)
init = poxxxx_initQVGA;
else
init = poxxxx_initVGA;
usb_exchange(gspca_dev, init);
reg_r(gspca_dev, 0x8c, 0x0000, 3);
reg_w(gspca_dev->dev, 0xa0,
gspca_dev->usb_buf[2] & 1 ? 0 : 1,
0xb35c);
msleep(300);
/*fixme: i2c read 04 and 05*/
init = poxxxx_init_end_1;
break;
} }
usb_exchange(gspca_dev, init); usb_exchange(gspca_dev, init);
if (GammaT && MatrixT) { if (GammaT && MatrixT) {
@ -3008,7 +3412,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
put_tab_to_reg(gspca_dev, GammaT, 17, 0xb86c); put_tab_to_reg(gspca_dev, GammaT, 17, 0xb86c);
put_tab_to_reg(gspca_dev, MatrixT, 9, 0xb82c); put_tab_to_reg(gspca_dev, MatrixT, 9, 0xb82c);
/* set the led on 0x0892 0x0896 */
switch (sd->sensor) { switch (sd->sensor) {
case SENSOR_PO1200: case SENSOR_PO1200:
case SENSOR_HV7131R: case SENSOR_HV7131R:
@ -3017,16 +3420,22 @@ static int sd_start(struct gspca_dev *gspca_dev)
case SENSOR_MI1310_SOC: case SENSOR_MI1310_SOC:
reg_w(gspca_dev->dev, 0x89, 0x058c, 0x0000); reg_w(gspca_dev->dev, 0x89, 0x058c, 0x0000);
break; break;
default:
if (!(sd->flags & FL_SAMSUNG))
reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
break;
} }
msleep(100); msleep(100);
setsharpness(gspca_dev); setsharpness(gspca_dev);
sethvflip(gspca_dev); sethvflip(gspca_dev);
setlightfreq(gspca_dev); setlightfreq(gspca_dev);
} }
if (sd->sensor == SENSOR_POxxxx) {
setcolors(gspca_dev);
setbrightness(gspca_dev);
setcontrast(gspca_dev);
/* led on */
msleep(80);
reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
usb_exchange(gspca_dev, poxxxx_init_end_2);
}
return 0; return 0;
} }
@ -3035,10 +3444,17 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
struct usb_device *dev = gspca_dev->dev; struct usb_device *dev = gspca_dev->dev;
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
if (sd->sensor == SENSOR_MI1310_SOC) switch (sd->sensor) {
case SENSOR_MI1310_SOC:
reg_w(dev, 0x89, 0x058c, 0x00ff); reg_w(dev, 0x89, 0x058c, 0x00ff);
else if (!(sd->flags & FL_SAMSUNG)) break;
reg_w(dev, 0x89, 0xffff, 0xffff); case SENSOR_POxxxx:
return;
default:
if (!(sd->flags & FL_SAMSUNG))
reg_w(dev, 0x89, 0xffff, 0xffff);
break;
}
reg_w(dev, 0xa0, 0x01, 0xb301); reg_w(dev, 0xa0, 0x01, 0xb301);
reg_w(dev, 0xa0, 0x09, 0xb003); reg_w(dev, 0xa0, 0x09, 0xb003);
} }
@ -3056,6 +3472,12 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
reg_w(dev, 0x89, 0x058c, 0x00ff); reg_w(dev, 0x89, 0x058c, 0x00ff);
else if (!(sd->flags & FL_SAMSUNG)) else if (!(sd->flags & FL_SAMSUNG))
reg_w(dev, 0x89, 0xffff, 0xffff); reg_w(dev, 0x89, 0xffff, 0xffff);
if (sd->sensor == SENSOR_POxxxx) {
reg_w(dev, 0xa0, 0x26, 0xb300);
reg_w(dev, 0xa0, 0x04, 0xb300);
reg_w(dev, 0xa0, 0x00, 0xb300);
}
} }
static void sd_pkt_scan(struct gspca_dev *gspca_dev, static void sd_pkt_scan(struct gspca_dev *gspca_dev,
@ -3092,6 +3514,60 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
gspca_frame_add(gspca_dev, INTER_PACKET, data, len); gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
} }
static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;
sd->brightness = val;
if (gspca_dev->streaming)
setbrightness(gspca_dev);
return 0;
}
static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;
*val = sd->brightness;
return 0;
}
static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;
sd->contrast = val;
if (gspca_dev->streaming)
setcontrast(gspca_dev);
return 0;
}
static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;
*val = sd->contrast;
return 0;
}
static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;
sd->colors = val;
if (gspca_dev->streaming)
setcolors(gspca_dev);
return 0;
}
static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;
*val = sd->colors;
return 0;
}
static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val) static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;