Skip to content

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

V4L/DVB (13323): gspca - zc3xx: Adjust the exchanges of sensors mi0360soc and pb0330. 

- the pb03303x exchanges were the mi0360soc ones
- add the new sensor mi0360soc
- the new exchanges are taken from the info file of the ms-win driver
  of the webcams 0ac8:301b and 0ac8:303b (vm30x.inf)
Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 350d6407
Hide whitespace changes
Inline Side-by-side
Showing with 335 additions and 488 deletions
drivers/media/video/gspca/zc3xx.c
View file @ 56205cc0
...@@ -61,17 +61,18 @@ struct sd { ...@@ -61,17 +61,18 @@ struct sd {
#define SENSOR_HV7131C 6 #define SENSOR_HV7131C 6
#define SENSOR_ICM105A 7 #define SENSOR_ICM105A 7
#define SENSOR_MC501CB 8 #define SENSOR_MC501CB 8
#define SENSOR_OV7620 9 #define SENSOR_MI0360SOC 9
/*#define SENSOR_OV7648 9 - same values */ #define SENSOR_OV7620 10
#define SENSOR_OV7630C 10 /*#define SENSOR_OV7648 10 - same values */
#define SENSOR_PAS106 11 #define SENSOR_OV7630C 11
#define SENSOR_PAS202B 12 #define SENSOR_PAS106 12
#define SENSOR_PB0330 13 #define SENSOR_PAS202B 13
#define SENSOR_PO2030 14 #define SENSOR_PB0330 14 /* (MI0360) */
#define SENSOR_TAS5130CK 15 #define SENSOR_PO2030 15
#define SENSOR_TAS5130CXX 16 #define SENSOR_TAS5130CK 16
#define SENSOR_TAS5130C_VF0250 17 #define SENSOR_TAS5130CXX 17
#define SENSOR_MAX 18 #define SENSOR_TAS5130C_VF0250 18
#define SENSOR_MAX 19
unsigned short chip_revision; unsigned short chip_revision;
u8 *jpeg_hdr; u8 *jpeg_hdr;
...@@ -4235,170 +4236,80 @@ static const struct usb_action pas202b_NoFlikerScale[] = { ...@@ -4235,170 +4236,80 @@ static const struct usb_action pas202b_NoFlikerScale[] = {
{} {}
}; };
static const struct usb_action pb03303x_Initial[] = { /* mi0360soc and pb0330 from vm30x.inf for 0ac8:301b and 0ac8:303b 07/02/13 */
static const struct usb_action mi0360soc_Initial[] = { /* 640x480 */
{0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL}, {0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL},
{0xa0, 0x03, ZC3XX_R008_CLOCKSETTING}, {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},
{0xa0, 0x0a, ZC3XX_R010_CMOSSENSORSELECT}, {0xa0, 0x0a, ZC3XX_R010_CMOSSENSORSELECT},
{0xa0, 0x10, ZC3XX_R002_CLOCKSELECT}, {0xa0, 0x00, ZC3XX_R002_CLOCKSELECT},
{0xa0, 0x02, ZC3XX_R003_FRAMEWIDTHHIGH}, {0xa0, 0x02, ZC3XX_R003_FRAMEWIDTHHIGH},
{0xa0, 0x80, ZC3XX_R004_FRAMEWIDTHLOW}, {0xa0, 0x80, ZC3XX_R004_FRAMEWIDTHLOW},
{0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH}, {0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH},
{0xa0, 0xe0, ZC3XX_R006_FRAMEHEIGHTLOW}, {0xa0, 0xe0, ZC3XX_R006_FRAMEHEIGHTLOW},
{0xa0, 0xdc, ZC3XX_R08B_I2CDEVICEADDR}, /* 8b -> dc */ {0xa0, 0xdc, ZC3XX_R08B_I2CDEVICEADDR},
{0xa0, 0x01, ZC3XX_R001_SYSTEMOPERATING}, {0xa0, 0x01, ZC3XX_R001_SYSTEMOPERATING},
{0xa0, 0x03, ZC3XX_R012_VIDEOCONTROLFUNC}, {0xa0, 0x07, ZC3XX_R012_VIDEOCONTROLFUNC}, /*jfm: was 03*/
{0xa0, 0x01, ZC3XX_R012_VIDEOCONTROLFUNC}, /* {0xa0, 0x01, ZC3XX_R012_VIDEOCONTROLFUNC}, */
{0xa0, 0x00, ZC3XX_R098_WINYSTARTLOW}, {0xa0, 0x00, ZC3XX_R098_WINYSTARTLOW},
{0xa0, 0x00, ZC3XX_R09A_WINXSTARTLOW}, {0xa0, 0x00, ZC3XX_R09A_WINXSTARTLOW},
{0xa0, 0x00, ZC3XX_R11A_FIRSTYLOW}, {0xa0, 0x00, ZC3XX_R11A_FIRSTYLOW},
{0xa0, 0x00, ZC3XX_R11C_FIRSTXLOW}, {0xa0, 0x00, ZC3XX_R11C_FIRSTXLOW},
{0xa0, 0xdc, ZC3XX_R08B_I2CDEVICEADDR}, {0xa0, 0xdc, ZC3XX_R08B_I2CDEVICEADDR},
{0xdd, 0x00, 0x0200},
{0xaa, 0x01, 0x0001}, {0xaa, 0x01, 0x0001},
{0xaa, 0x06, 0x0000}, {0xaa, 0x06, 0x0000},
{0xaa, 0x08, 0x0483}, {0xaa, 0x08, 0x0483},
{0xaa, 0x01, 0x0004}, {0xaa, 0x01, 0x0004},
{0xaa, 0x08, 0x0006}, {0xaa, 0x08, 0x0006},
{0xaa, 0x02, 0x0011}, {0xaa, 0x02, 0x0011},
{0xaa, 0x03, 0x01e7}, {0xaa, 0x03, 0x01e5}, /*jfm: was 01e7*/
{0xaa, 0x04, 0x0287}, {0xaa, 0x04, 0x0285}, /*jfm: was 0287*/
{0xaa, 0x07, 0x3002}, {0xaa, 0x07, 0x3002},
{0xaa, 0x20, 0x1100}, {0xaa, 0x20, 0x5100}, /*jfm: was 1100*/
{0xaa, 0x35, 0x0050}, {0xaa, 0x35, 0x507f}, /*jfm: was 0050*/
{0xaa, 0x30, 0x0005}, {0xaa, 0x30, 0x0005},
{0xaa, 0x31, 0x0000}, {0xaa, 0x31, 0x0000},
{0xaa, 0x58, 0x0078}, {0xaa, 0x58, 0x0078},
{0xaa, 0x62, 0x0411}, {0xaa, 0x62, 0x0411},
{0xaa, 0x2b, 0x0028}, {0xaa, 0x2b, 0x0028},
{0xaa, 0x2c, 0x0030}, {0xaa, 0x2c, 0x007f}, /*jfm: was 0030*/
{0xaa, 0x2d, 0x0030}, {0xaa, 0x2d, 0x007f}, /*jfm: was 0030*/
{0xaa, 0x2e, 0x0028}, {0xaa, 0x2e, 0x007f}, /*jfm: was 0030*/
{0xa0, 0x10, ZC3XX_R087_EXPTIMEMID}, {0xa0, 0x10, ZC3XX_R087_EXPTIMEMID},
{0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION}, {0xa0, 0xb7, ZC3XX_R101_SENSORCORRECTION}, /*jfm: was 37*/
{0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC}, {0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC},
{0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE}, {0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE},
{0xa0, 0x06, ZC3XX_R189_AWBSTATUS}, {0xa0, 0x06, ZC3XX_R189_AWBSTATUS},
{0xa0, 0x00, 0x01ad}, {0xa0, 0x09, 0x01ad}, /*jfm: was 00*/
{0xa0, 0x03, ZC3XX_R1C5_SHARPNESSMODE}, {0xa0, 0x03, ZC3XX_R1C5_SHARPNESSMODE},
{0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05}, {0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05},
{0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE}, {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE},
{0xa0, 0x08, ZC3XX_R301_EEPROMACCESS}, {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},
{0xa0, 0x60, ZC3XX_R1A8_DIGITALGAIN}, {0xa0, 0x60, ZC3XX_R1A8_DIGITALGAIN},
{0xa0, 0x78, ZC3XX_R18D_YTARGET}, {0xa0, 0x6c, ZC3XX_R18D_YTARGET}, /* jfm: was 78 */
{0xa0, 0x61, ZC3XX_R116_RGAIN}, {0xa0, 0x61, ZC3XX_R116_RGAIN},
{0xa0, 0x65, ZC3XX_R118_BGAIN}, {0xa0, 0x65, ZC3XX_R118_BGAIN},
{0xa1, 0x01, 0x0002},
{0xa0, 0x09, 0x01ad},
{0xa0, 0x15, 0x01ae},
{0xa0, 0x0d, 0x003a},
{0xa0, 0x02, 0x003b},
{0xa0, 0x00, 0x0038},
{0xa0, 0x50, ZC3XX_R10A_RGB00}, /* matrix */
{0xa0, 0xf8, ZC3XX_R10B_RGB01},
{0xa0, 0xf8, ZC3XX_R10C_RGB02},
{0xa0, 0xf8, ZC3XX_R10D_RGB10},
{0xa0, 0x50, ZC3XX_R10E_RGB11},
{0xa0, 0xf8, ZC3XX_R10F_RGB12},
{0xa0, 0xf8, ZC3XX_R110_RGB20},
{0xa0, 0xf8, ZC3XX_R111_RGB21},
{0xa0, 0x50, ZC3XX_R112_RGB22},
{0xa1, 0x01, 0x0008},
{0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},
{0xa0, 0x08, ZC3XX_R1C6_SHARPNESS00},
{0xa1, 0x01, 0x01c8},
{0xa1, 0x01, 0x01c9},
{0xa1, 0x01, 0x01ca},
{0xa0, 0x0f, ZC3XX_R1CB_SHARPNESS05}, /* sharpness- */
{0xa0, 0x13, ZC3XX_R120_GAMMA00}, /* gamma 4 */
{0xa0, 0x38, ZC3XX_R121_GAMMA01},
{0xa0, 0x59, ZC3XX_R122_GAMMA02},
{0xa0, 0x79, ZC3XX_R123_GAMMA03},
{0xa0, 0x92, ZC3XX_R124_GAMMA04},
{0xa0, 0xa7, ZC3XX_R125_GAMMA05},
{0xa0, 0xb9, ZC3XX_R126_GAMMA06},
{0xa0, 0xc8, ZC3XX_R127_GAMMA07},
{0xa0, 0xd4, ZC3XX_R128_GAMMA08},
{0xa0, 0xdf, ZC3XX_R129_GAMMA09},
{0xa0, 0xe7, ZC3XX_R12A_GAMMA0A},
{0xa0, 0xee, ZC3XX_R12B_GAMMA0B},
{0xa0, 0xf4, ZC3XX_R12C_GAMMA0C},
{0xa0, 0xf9, ZC3XX_R12D_GAMMA0D},
{0xa0, 0xfc, ZC3XX_R12E_GAMMA0E},
{0xa0, 0xff, ZC3XX_R12F_GAMMA0F},
{0xa0, 0x26, ZC3XX_R130_GAMMA10},
{0xa0, 0x22, ZC3XX_R131_GAMMA11},
{0xa0, 0x20, ZC3XX_R132_GAMMA12},
{0xa0, 0x1c, ZC3XX_R133_GAMMA13},
{0xa0, 0x16, ZC3XX_R134_GAMMA14},
{0xa0, 0x13, ZC3XX_R135_GAMMA15},
{0xa0, 0x10, ZC3XX_R136_GAMMA16},
{0xa0, 0x0d, ZC3XX_R137_GAMMA17},
{0xa0, 0x0b, ZC3XX_R138_GAMMA18},
{0xa0, 0x09, ZC3XX_R139_GAMMA19},
{0xa0, 0x07, ZC3XX_R13A_GAMMA1A},
{0xa0, 0x06, ZC3XX_R13B_GAMMA1B},
{0xa0, 0x05, ZC3XX_R13C_GAMMA1C},
{0xa0, 0x04, ZC3XX_R13D_GAMMA1D},
{0xa0, 0x03, ZC3XX_R13E_GAMMA1E},
{0xa0, 0x02, ZC3XX_R13F_GAMMA1F},
{0xa0, 0x50, ZC3XX_R10A_RGB00}, /* matrix */
{0xa0, 0xf8, ZC3XX_R10B_RGB01},
{0xa0, 0xf8, ZC3XX_R10C_RGB02},
{0xa0, 0xf8, ZC3XX_R10D_RGB10},
{0xa0, 0x50, ZC3XX_R10E_RGB11},
{0xa0, 0xf8, ZC3XX_R10F_RGB12},
{0xa0, 0xf8, ZC3XX_R110_RGB20},
{0xa0, 0xf8, ZC3XX_R111_RGB21},
{0xa0, 0x50, ZC3XX_R112_RGB22},
{0xa1, 0x01, 0x0180},
{0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xaa, 0x05, 0x0009},
{0xaa, 0x09, 0x0134},
{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID},
{0xa0, 0xec, ZC3XX_R192_EXPOSURELIMITLOW},
{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
{0xa0, 0x9c, ZC3XX_R197_ANTIFLICKERLOW},
{0xa0, 0x0e, ZC3XX_R18C_AEFREEZE},
{0xa0, 0x1c, ZC3XX_R18F_AEUNFREEZE},
{0xa0, 0x14, ZC3XX_R1A9_DIGITALLIMITDIFF},
{0xa0, 0x24, ZC3XX_R1AA_DIGITALGAINSTEP},
{0xa0, 0xd7, ZC3XX_R01D_HSYNC_0},
{0xa0, 0xf4, ZC3XX_R01E_HSYNC_1},
{0xa0, 0xf9, ZC3XX_R01F_HSYNC_2},
{0xa0, 0xff, ZC3XX_R020_HSYNC_3},
{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x09, 0x01ad},
{0xa0, 0x15, 0x01ae},
{0xa0, 0x40, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa1, 0x01, 0x0180},
{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
{} {}
}; };
static const struct usb_action mi0360soc_InitialScale[] = { /* 320x240 */
static const struct usb_action pb03303x_InitialScale[] = {
{0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL}, {0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL},
{0xa0, 0x03, ZC3XX_R008_CLOCKSETTING}, {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING},
{0xa0, 0x0a, ZC3XX_R010_CMOSSENSORSELECT}, {0xa0, 0x0a, ZC3XX_R010_CMOSSENSORSELECT},
{0xa0, 0x00, ZC3XX_R002_CLOCKSELECT}, {0xa0, 0x10, ZC3XX_R002_CLOCKSELECT},
{0xa0, 0x02, ZC3XX_R003_FRAMEWIDTHHIGH}, {0xa0, 0x02, ZC3XX_R003_FRAMEWIDTHHIGH},
{0xa0, 0x80, ZC3XX_R004_FRAMEWIDTHLOW}, {0xa0, 0x80, ZC3XX_R004_FRAMEWIDTHLOW},
{0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH}, {0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH},
{0xa0, 0xe0, ZC3XX_R006_FRAMEHEIGHTLOW}, {0xa0, 0xe0, ZC3XX_R006_FRAMEHEIGHTLOW},
{0xa0, 0xdc, ZC3XX_R08B_I2CDEVICEADDR}, /* 8b -> dc */ {0xa0, 0xdc, ZC3XX_R08B_I2CDEVICEADDR},
{0xa0, 0x01, ZC3XX_R001_SYSTEMOPERATING}, {0xa0, 0x01, ZC3XX_R001_SYSTEMOPERATING},
{0xa0, 0x03, ZC3XX_R012_VIDEOCONTROLFUNC}, {0xa0, 0x07, ZC3XX_R012_VIDEOCONTROLFUNC}, /*jfm: was 03*/
{0xa0, 0x01, ZC3XX_R012_VIDEOCONTROLFUNC}, /* {0xa0, 0x01, ZC3XX_R012_VIDEOCONTROLFUNC}, */
{0xa0, 0x00, ZC3XX_R098_WINYSTARTLOW}, {0xa0, 0x00, ZC3XX_R098_WINYSTARTLOW},
{0xa0, 0x00, ZC3XX_R09A_WINXSTARTLOW}, {0xa0, 0x00, ZC3XX_R09A_WINXSTARTLOW},
{0xa0, 0x00, ZC3XX_R11A_FIRSTYLOW}, {0xa0, 0x00, ZC3XX_R11A_FIRSTYLOW},
{0xa0, 0x00, ZC3XX_R11C_FIRSTXLOW}, {0xa0, 0x00, ZC3XX_R11C_FIRSTXLOW},
{0xa0, 0xdc, ZC3XX_R08B_I2CDEVICEADDR}, {0xa0, 0xdc, ZC3XX_R08B_I2CDEVICEADDR},
{0xdd, 0x00, 0x0200},
{0xaa, 0x01, 0x0001}, {0xaa, 0x01, 0x0001},
{0xaa, 0x06, 0x0000}, {0xaa, 0x06, 0x0000},
{0xaa, 0x08, 0x0483}, {0xaa, 0x08, 0x0483},
...@@ -4408,111 +4319,111 @@ static const struct usb_action pb03303x_InitialScale[] = { ...@@ -4408,111 +4319,111 @@ static const struct usb_action pb03303x_InitialScale[] = {
{0xaa, 0x03, 0x01e7}, {0xaa, 0x03, 0x01e7},
{0xaa, 0x04, 0x0287}, {0xaa, 0x04, 0x0287},
{0xaa, 0x07, 0x3002}, {0xaa, 0x07, 0x3002},
{0xaa, 0x20, 0x1100}, {0xaa, 0x20, 0x5100}, /*jfm: was 1100*/
{0xaa, 0x35, 0x0050}, {0xaa, 0x35, 0x007f}, /*jfm: was 0050*/
{0xaa, 0x30, 0x0005}, {0xaa, 0x30, 0x0005},
{0xaa, 0x31, 0x0000}, {0xaa, 0x31, 0x0000},
{0xaa, 0x58, 0x0078}, {0xaa, 0x58, 0x0078},
{0xaa, 0x62, 0x0411}, {0xaa, 0x62, 0x0411},
{0xaa, 0x2b, 0x0028}, {0xaa, 0x2b, 0x007f}, /*jfm: was 28*/
{0xaa, 0x2c, 0x0030}, {0xaa, 0x2c, 0x007f}, /*jfm: was 30*/
{0xaa, 0x2d, 0x0030}, {0xaa, 0x2d, 0x007f}, /*jfm: was 30*/
{0xaa, 0x2e, 0x0028}, {0xaa, 0x2e, 0x007f}, /*jfm: was 28*/
{0xa0, 0x10, ZC3XX_R087_EXPTIMEMID}, {0xa0, 0x10, ZC3XX_R087_EXPTIMEMID},
{0xa0, 0x37, ZC3XX_R101_SENSORCORRECTION}, {0xa0, 0xb7, ZC3XX_R101_SENSORCORRECTION}, /*jfm: was 37*/
{0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC}, {0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC},
{0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE}, {0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE},
{0xa0, 0x06, ZC3XX_R189_AWBSTATUS}, {0xa0, 0x06, ZC3XX_R189_AWBSTATUS},
{0xa0, 0x00, 0x01ad}, {0xa0, 0x09, 0x01ad}, /*jfm: was 00*/
{0xa0, 0x03, ZC3XX_R1C5_SHARPNESSMODE}, {0xa0, 0x03, ZC3XX_R1C5_SHARPNESSMODE},
{0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05}, {0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05},
{0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE}, {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE},
{0xa0, 0x08, ZC3XX_R301_EEPROMACCESS}, {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},
{0xa0, 0x60, ZC3XX_R1A8_DIGITALGAIN}, {0xa0, 0x60, ZC3XX_R1A8_DIGITALGAIN},
{0xa0, 0x78, ZC3XX_R18D_YTARGET}, {0xa0, 0x6c, ZC3XX_R18D_YTARGET}, /*jfm: was 78*/
{0xa0, 0x61, ZC3XX_R116_RGAIN}, {0xa0, 0x61, ZC3XX_R116_RGAIN},
{0xa0, 0x65, ZC3XX_R118_BGAIN}, {0xa0, 0x65, ZC3XX_R118_BGAIN},
{}
{0xa1, 0x01, 0x0002}, };
static const struct usb_action mi360soc_AE50HZ[] = {
{0xa0, 0x09, 0x01ad}, {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x15, 0x01ae}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xbb, 0x00, 0x0562},
{0xa0, 0x0d, 0x003a}, {0xbb, 0x01, 0x09aa},
{0xa0, 0x02, 0x003b}, {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0x00, 0x0038}, {0xa0, 0x03, ZC3XX_R191_EXPOSURELIMITMID},
{0xa0, 0x50, ZC3XX_R10A_RGB00}, /* matrix */ {0xa0, 0x9b, ZC3XX_R192_EXPOSURELIMITLOW},
{0xa0, 0xf8, ZC3XX_R10B_RGB01}, {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
{0xa0, 0xf8, ZC3XX_R10C_RGB02}, {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
{0xa0, 0xf8, ZC3XX_R10D_RGB10}, {0xa0, 0x47, ZC3XX_R197_ANTIFLICKERLOW},
{0xa0, 0x50, ZC3XX_R10E_RGB11}, {0xa0, 0x0e, ZC3XX_R18C_AEFREEZE},
{0xa0, 0xf8, ZC3XX_R10F_RGB12}, {0xa0, 0x1c, ZC3XX_R18F_AEUNFREEZE},
{0xa0, 0xf8, ZC3XX_R110_RGB20}, {0xa0, 0x14, ZC3XX_R1A9_DIGITALLIMITDIFF},
{0xa0, 0xf8, ZC3XX_R111_RGB21}, {0xa0, 0x66, ZC3XX_R1AA_DIGITALGAINSTEP},
{0xa0, 0x50, ZC3XX_R112_RGB22}, {0xa0, 0x62, ZC3XX_R01D_HSYNC_0},
{0xa0, 0x90, ZC3XX_R01E_HSYNC_1},
{0xa1, 0x01, 0x0008}, {0xa0, 0xc8, ZC3XX_R01F_HSYNC_2},
{0xa0, 0x03, ZC3XX_R008_CLOCKSETTING}, /* clock ? */ {0xa0, 0xff, ZC3XX_R020_HSYNC_3},
{0xa0, 0x08, ZC3XX_R1C6_SHARPNESS00}, /* sharpness+ */ {0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},
{0xa1, 0x01, 0x01c8}, {0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa1, 0x01, 0x01c9}, {}
{0xa1, 0x01, 0x01ca}, };
{0xa0, 0x0f, ZC3XX_R1CB_SHARPNESS05}, /* sharpness- */ static const struct usb_action mi360soc_AE50HZScale[] = {
{0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x13, ZC3XX_R120_GAMMA00}, /* gamma 4 */ {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xa0, 0x38, ZC3XX_R121_GAMMA01}, {0xbb, 0x00, 0x0509},
{0xa0, 0x59, ZC3XX_R122_GAMMA02}, {0xbb, 0x01, 0x0934},
{0xa0, 0x79, ZC3XX_R123_GAMMA03}, {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0x92, ZC3XX_R124_GAMMA04}, {0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID},
{0xa0, 0xa7, ZC3XX_R125_GAMMA05}, {0xa0, 0xd2, ZC3XX_R192_EXPOSURELIMITLOW},
{0xa0, 0xb9, ZC3XX_R126_GAMMA06}, {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
{0xa0, 0xc8, ZC3XX_R127_GAMMA07}, {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
{0xa0, 0xd4, ZC3XX_R128_GAMMA08}, {0xa0, 0x9a, ZC3XX_R197_ANTIFLICKERLOW},
{0xa0, 0xdf, ZC3XX_R129_GAMMA09}, {0xa0, 0x0e, ZC3XX_R18C_AEFREEZE},
{0xa0, 0xe7, ZC3XX_R12A_GAMMA0A}, {0xa0, 0x1c, ZC3XX_R18F_AEUNFREEZE},
{0xa0, 0xee, ZC3XX_R12B_GAMMA0B}, {0xa0, 0x14, ZC3XX_R1A9_DIGITALLIMITDIFF},
{0xa0, 0xf4, ZC3XX_R12C_GAMMA0C}, {0xa0, 0x66, ZC3XX_R1AA_DIGITALGAINSTEP},
{0xa0, 0xf9, ZC3XX_R12D_GAMMA0D}, {0xa0, 0xd7, ZC3XX_R01D_HSYNC_0},
{0xa0, 0xfc, ZC3XX_R12E_GAMMA0E}, {0xa0, 0xf4, ZC3XX_R01E_HSYNC_1},
{0xa0, 0xff, ZC3XX_R12F_GAMMA0F}, {0xa0, 0xf9, ZC3XX_R01F_HSYNC_2},
{0xa0, 0x26, ZC3XX_R130_GAMMA10}, {0xa0, 0xff, ZC3XX_R020_HSYNC_3},
{0xa0, 0x22, ZC3XX_R131_GAMMA11}, {0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x20, ZC3XX_R132_GAMMA12}, {}
{0xa0, 0x1c, ZC3XX_R133_GAMMA13}, };
{0xa0, 0x16, ZC3XX_R134_GAMMA14}, static const struct usb_action mi360soc_AE60HZ[] = {
{0xa0, 0x13, ZC3XX_R135_GAMMA15},
{0xa0, 0x10, ZC3XX_R136_GAMMA16},
{0xa0, 0x0d, ZC3XX_R137_GAMMA17},
{0xa0, 0x0b, ZC3XX_R138_GAMMA18},
{0xa0, 0x09, ZC3XX_R139_GAMMA19},
{0xa0, 0x07, ZC3XX_R13A_GAMMA1A},
{0xa0, 0x06, ZC3XX_R13B_GAMMA1B},
{0xa0, 0x05, ZC3XX_R13C_GAMMA1C},
{0xa0, 0x04, ZC3XX_R13D_GAMMA1D},
{0xa0, 0x03, ZC3XX_R13E_GAMMA1E},
{0xa0, 0x02, ZC3XX_R13F_GAMMA1F},
{0xa0, 0x50, ZC3XX_R10A_RGB00}, /* matrix */
{0xa0, 0xf8, ZC3XX_R10B_RGB01},
{0xa0, 0xf8, ZC3XX_R10C_RGB02},
{0xa0, 0xf8, ZC3XX_R10D_RGB10},
{0xa0, 0x50, ZC3XX_R10E_RGB11},
{0xa0, 0xf8, ZC3XX_R10F_RGB12},
{0xa0, 0xf8, ZC3XX_R110_RGB20},
{0xa0, 0xf8, ZC3XX_R111_RGB21},
{0xa0, 0x50, ZC3XX_R112_RGB22},
{0xa1, 0x01, 0x0180},
{0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE}, {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xbb, 0x00, 0x053d},
{0xbb, 0x01, 0x096e},
{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID},
{0xa0, 0xdd, ZC3XX_R192_EXPOSURELIMITLOW},
{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
{0xa0, 0x3d, ZC3XX_R197_ANTIFLICKERLOW},
{0xa0, 0x0e, ZC3XX_R18C_AEFREEZE},
{0xa0, 0x1c, ZC3XX_R18F_AEUNFREEZE},
{0xa0, 0x14, ZC3XX_R1A9_DIGITALLIMITDIFF},
{0xa0, 0x24, ZC3XX_R1AA_DIGITALGAINSTEP},
{0xa0, 0x62, ZC3XX_R01D_HSYNC_0},
{0xa0, 0x90, ZC3XX_R01E_HSYNC_1},
{0xa0, 0xc8, ZC3XX_R01F_HSYNC_2},
{0xa0, 0xff, ZC3XX_R020_HSYNC_3},
{0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},
{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
{}
};
static const struct usb_action mi360soc_AE60HZScale[] = {
{0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE}, {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xaa, 0x05, 0x0009}, {0xbb, 0x00, 0x0509},
{0xaa, 0x09, 0x0134}, {0xbb, 0x01, 0x0983},
{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID}, {0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID},
{0xa0, 0xec, ZC3XX_R192_EXPOSURELIMITLOW}, {0xa0, 0x8f, ZC3XX_R192_EXPOSURELIMITLOW},
{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID}, {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
{0xa0, 0x9c, ZC3XX_R197_ANTIFLICKERLOW}, {0xa0, 0x81, ZC3XX_R197_ANTIFLICKERLOW},
{0xa0, 0x0e, ZC3XX_R18C_AEFREEZE}, {0xa0, 0x0e, ZC3XX_R18C_AEFREEZE},
{0xa0, 0x1c, ZC3XX_R18F_AEUNFREEZE}, {0xa0, 0x1c, ZC3XX_R18F_AEUNFREEZE},
{0xa0, 0x14, ZC3XX_R1A9_DIGITALLIMITDIFF}, {0xa0, 0x14, ZC3XX_R1A9_DIGITALLIMITDIFF},
...@@ -4522,20 +4433,60 @@ static const struct usb_action pb03303x_InitialScale[] = { ...@@ -4522,20 +4433,60 @@ static const struct usb_action pb03303x_InitialScale[] = {
{0xa0, 0xf9, ZC3XX_R01F_HSYNC_2}, {0xa0, 0xf9, ZC3XX_R01F_HSYNC_2},
{0xa0, 0xff, ZC3XX_R020_HSYNC_3}, {0xa0, 0xff, ZC3XX_R020_HSYNC_3},
{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE}, {0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x09, 0x01ad}, {}
{0xa0, 0x15, 0x01ae}, };
{0xa0, 0x40, ZC3XX_R180_AUTOCORRECTENABLE}, static const struct usb_action mi360soc_AENoFliker[] = {
{0xa1, 0x01, 0x0180}, {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xbb, 0x00, 0x0509},
{0xbb, 0x01, 0x0960},
{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID},
{0xa0, 0xf0, ZC3XX_R192_EXPOSURELIMITLOW},
{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
{0xa0, 0x04, ZC3XX_R197_ANTIFLICKERLOW},
{0xa0, 0x0e, ZC3XX_R18C_AEFREEZE},
{0xa0, 0x1c, ZC3XX_R18F_AEUNFREEZE},
{0xa0, 0x00, ZC3XX_R1A9_DIGITALLIMITDIFF},
{0xa0, 0x00, ZC3XX_R1AA_DIGITALGAINSTEP},
{0xa0, 0x09, ZC3XX_R01D_HSYNC_0},
{0xa0, 0x40, ZC3XX_R01E_HSYNC_1},
{0xa0, 0x90, ZC3XX_R01F_HSYNC_2},
{0xa0, 0xe0, ZC3XX_R020_HSYNC_3},
{0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},
{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE}, {0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
{} {}
}; };
static const struct usb_action pb0330xx_Initial[] = { static const struct usb_action mi360soc_AENoFlikerScale[] = {
{0xa1, 0x01, 0x0008}, {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa1, 0x01, 0x0008}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xbb, 0x00, 0x0534},
{0xbb, 0x02, 0x0960},
{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID},
{0xa0, 0xf0, ZC3XX_R192_EXPOSURELIMITLOW},
{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
{0xa0, 0x04, ZC3XX_R197_ANTIFLICKERLOW},
{0xa0, 0x0e, ZC3XX_R18C_AEFREEZE},
{0xa0, 0x1c, ZC3XX_R18F_AEUNFREEZE},
{0xa0, 0x00, ZC3XX_R1A9_DIGITALLIMITDIFF},
{0xa0, 0x00, ZC3XX_R1AA_DIGITALGAINSTEP},
{0xa0, 0x34, ZC3XX_R01D_HSYNC_0},
{0xa0, 0x60, ZC3XX_R01E_HSYNC_1},
{0xa0, 0x90, ZC3XX_R01F_HSYNC_2},
{0xa0, 0xe0, ZC3XX_R020_HSYNC_3},
{0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},
{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
{}
};
static const struct usb_action pb0330_Initial[] = { /* 640x480 */
{0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL}, {0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL},
{0xa0, 0x03, ZC3XX_R008_CLOCKSETTING}, /* 00 */ {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING}, /* 00 */
{0xa0, 0x0a, ZC3XX_R010_CMOSSENSORSELECT}, {0xa0, 0x0a, ZC3XX_R010_CMOSSENSORSELECT},
{0xa0, 0x10, ZC3XX_R002_CLOCKSELECT}, {0xa0, 0x00, ZC3XX_R002_CLOCKSELECT},
{0xa0, 0x02, ZC3XX_R003_FRAMEWIDTHHIGH}, {0xa0, 0x02, ZC3XX_R003_FRAMEWIDTHHIGH},
{0xa0, 0x80, ZC3XX_R004_FRAMEWIDTHLOW}, {0xa0, 0x80, ZC3XX_R004_FRAMEWIDTHLOW},
{0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH}, {0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH},
...@@ -4547,11 +4498,12 @@ static const struct usb_action pb0330xx_Initial[] = { ...@@ -4547,11 +4498,12 @@ static const struct usb_action pb0330xx_Initial[] = {
{0xa0, 0x00, ZC3XX_R09A_WINXSTARTLOW}, {0xa0, 0x00, ZC3XX_R09A_WINXSTARTLOW},
{0xa0, 0x00, ZC3XX_R11A_FIRSTYLOW}, {0xa0, 0x00, ZC3XX_R11A_FIRSTYLOW},
{0xa0, 0x00, ZC3XX_R11C_FIRSTXLOW}, {0xa0, 0x00, ZC3XX_R11C_FIRSTXLOW},
{0xdd, 0x00, 0x0200},
{0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC}, {0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC},
{0xaa, 0x01, 0x0006}, {0xaa, 0x01, 0x0006},
{0xaa, 0x02, 0x0011}, {0xaa, 0x02, 0x0011},
{0xaa, 0x03, 0x01e7}, {0xaa, 0x03, 0x01e5}, /*jfm: was 1e7*/
{0xaa, 0x04, 0x0287}, {0xaa, 0x04, 0x0285}, /*jfm: was 0287*/
{0xaa, 0x06, 0x0003}, {0xaa, 0x06, 0x0003},
{0xaa, 0x07, 0x3002}, {0xaa, 0x07, 0x3002},
{0xaa, 0x20, 0x1100}, {0xaa, 0x20, 0x1100},
...@@ -4569,88 +4521,21 @@ static const struct usb_action pb0330xx_Initial[] = { ...@@ -4569,88 +4521,21 @@ static const struct usb_action pb0330xx_Initial[] = {
{0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC}, {0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC},
{0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE}, {0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE},
{0xa0, 0x06, ZC3XX_R189_AWBSTATUS}, {0xa0, 0x06, ZC3XX_R189_AWBSTATUS},
{0xa0, 0x00, 0x01ad}, {0xa0, 0x09, 0x01ad}, /*jfm: was 00 */
{0xa0, 0x15, 0x01ae},
{0xa0, 0x03, ZC3XX_R1C5_SHARPNESSMODE}, {0xa0, 0x03, ZC3XX_R1C5_SHARPNESSMODE},
{0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05}, {0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05},
{0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE}, {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE},
{0xa0, 0x08, ZC3XX_R301_EEPROMACCESS}, {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},
{0xa0, 0x60, ZC3XX_R1A8_DIGITALGAIN}, {0xa0, 0x60, ZC3XX_R1A8_DIGITALGAIN},
{0xa0, 0x6c, ZC3XX_R18D_YTARGET}, {0xa0, 0x78, ZC3XX_R18D_YTARGET}, /*jfm: was 6c*/
{0xa1, 0x01, 0x0002},
{0xa0, 0x09, 0x01ad},
{0xa0, 0x15, 0x01ae},
{0xa0, 0x00, ZC3XX_R092_I2CADDRESSSELECT},
{0xa0, 0x02, ZC3XX_R090_I2CCOMMAND},
{0xa1, 0x01, 0x0091},
{0xa1, 0x01, 0x0095},
{0xa1, 0x01, 0x0096},
{0xa0, 0x50, ZC3XX_R10A_RGB00}, /* matrix */
{0xa0, 0xf8, ZC3XX_R10B_RGB01},
{0xa0, 0xf8, ZC3XX_R10C_RGB02},
{0xa0, 0xf8, ZC3XX_R10D_RGB10},
{0xa0, 0x50, ZC3XX_R10E_RGB11},
{0xa0, 0xf8, ZC3XX_R10F_RGB12},
{0xa0, 0xf8, ZC3XX_R110_RGB20},
{0xa0, 0xf8, ZC3XX_R111_RGB21},
{0xa0, 0x50, ZC3XX_R112_RGB22},
{0xa1, 0x01, 0x0008},
{0xa0, 0x03, ZC3XX_R008_CLOCKSETTING}, /* clock ? */
{0xa0, 0x08, ZC3XX_R1C6_SHARPNESS00}, /* sharpness+ */
{0xa1, 0x01, 0x01c8},
{0xa1, 0x01, 0x01c9},
{0xa1, 0x01, 0x01ca},
{0xa0, 0x0f, ZC3XX_R1CB_SHARPNESS05}, /* sharpness- */
{0xa0, 0x50, ZC3XX_R10A_RGB00}, /* matrix */
{0xa0, 0xf8, ZC3XX_R10B_RGB01},
{0xa0, 0xf8, ZC3XX_R10C_RGB02},
{0xa0, 0xf8, ZC3XX_R10D_RGB10},
{0xa0, 0x50, ZC3XX_R10E_RGB11},
{0xa0, 0xf8, ZC3XX_R10F_RGB12},
{0xa0, 0xf8, ZC3XX_R110_RGB20},
{0xa0, 0xf8, ZC3XX_R111_RGB21},
{0xa0, 0x50, ZC3XX_R112_RGB22},
{0xa1, 0x01, 0x0180},
{0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xaa, 0x05, 0x0066},
{0xaa, 0x09, 0x02b2},
{0xaa, 0x10, 0x0002},
{0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},
{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID},
{0xa0, 0x8c, ZC3XX_R192_EXPOSURELIMITLOW},
{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
{0xa0, 0x8a, ZC3XX_R197_ANTIFLICKERLOW},
{0xa0, 0x10, ZC3XX_R18C_AEFREEZE},
{0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE},
{0xa0, 0x14, ZC3XX_R1A9_DIGITALLIMITDIFF},
{0xa0, 0x24, ZC3XX_R1AA_DIGITALGAINSTEP},
{0xa0, 0xd7, ZC3XX_R01D_HSYNC_0},
{0xa0, 0xf0, ZC3XX_R01E_HSYNC_1},
{0xa0, 0xf8, ZC3XX_R01F_HSYNC_2},
{0xa0, 0xff, ZC3XX_R020_HSYNC_3},
{0xa0, 0x09, 0x01ad},
{0xa0, 0x15, 0x01ae},
{0xa0, 0x40, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa1, 0x01, 0x0180},
{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa1, 0x01, 0x0008},
{0xa1, 0x01, 0x0007},
/* {0xa0, 0x30, 0x0007}, */
/* {0xa0, 0x00, 0x0007}, */
{} {}
}; };
static const struct usb_action pb0330_InitialScale[] = { /* 320x240 */
static const struct usb_action pb0330xx_InitialScale[] = {
{0xa1, 0x01, 0x0008},
{0xa1, 0x01, 0x0008},
{0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL}, {0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL},
{0xa0, 0x03, ZC3XX_R008_CLOCKSETTING}, /* 00 */ {0xa0, 0x03, ZC3XX_R008_CLOCKSETTING}, /* 00 */
{0xa0, 0x0a, ZC3XX_R010_CMOSSENSORSELECT}, {0xa0, 0x0a, ZC3XX_R010_CMOSSENSORSELECT},
{0xa0, 0x00, ZC3XX_R002_CLOCKSELECT}, /* 10 */ {0xa0, 0x10, ZC3XX_R002_CLOCKSELECT},
{0xa0, 0x02, ZC3XX_R003_FRAMEWIDTHHIGH}, {0xa0, 0x02, ZC3XX_R003_FRAMEWIDTHHIGH},
{0xa0, 0x80, ZC3XX_R004_FRAMEWIDTHLOW}, {0xa0, 0x80, ZC3XX_R004_FRAMEWIDTHLOW},
{0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH}, {0xa0, 0x01, ZC3XX_R005_FRAMEHEIGHTHIGH},
...@@ -4662,6 +4547,7 @@ static const struct usb_action pb0330xx_InitialScale[] = { ...@@ -4662,6 +4547,7 @@ static const struct usb_action pb0330xx_InitialScale[] = {
{0xa0, 0x00, ZC3XX_R09A_WINXSTARTLOW}, {0xa0, 0x00, ZC3XX_R09A_WINXSTARTLOW},
{0xa0, 0x00, ZC3XX_R11A_FIRSTYLOW}, {0xa0, 0x00, ZC3XX_R11A_FIRSTYLOW},
{0xa0, 0x00, ZC3XX_R11C_FIRSTXLOW}, {0xa0, 0x00, ZC3XX_R11C_FIRSTXLOW},
{0xdd, 0x00, 0x0200},
{0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC}, {0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC},
{0xaa, 0x01, 0x0006}, {0xaa, 0x01, 0x0006},
{0xaa, 0x02, 0x0011}, {0xaa, 0x02, 0x0011},
...@@ -4684,53 +4570,43 @@ static const struct usb_action pb0330xx_InitialScale[] = { ...@@ -4684,53 +4570,43 @@ static const struct usb_action pb0330xx_InitialScale[] = {
{0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC}, {0xa0, 0x05, ZC3XX_R012_VIDEOCONTROLFUNC},
{0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE}, {0xa0, 0x0d, ZC3XX_R100_OPERATIONMODE},
{0xa0, 0x06, ZC3XX_R189_AWBSTATUS}, {0xa0, 0x06, ZC3XX_R189_AWBSTATUS},
{0xa0, 0x00, 0x01ad}, {0xa0, 0x09, 0x01ad},
{0xa0, 0x15, 0x01ae},
{0xa0, 0x03, ZC3XX_R1C5_SHARPNESSMODE}, {0xa0, 0x03, ZC3XX_R1C5_SHARPNESSMODE},
{0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05}, {0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05},
{0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE}, {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE},
{0xa0, 0x08, ZC3XX_R301_EEPROMACCESS}, {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},
{0xa0, 0x60, ZC3XX_R1A8_DIGITALGAIN}, {0xa0, 0x60, ZC3XX_R1A8_DIGITALGAIN},
{0xa0, 0x6c, ZC3XX_R18D_YTARGET}, {0xa0, 0x78, ZC3XX_R18D_YTARGET}, /*jfm: was 6c*/
{0xa1, 0x01, 0x0002}, {}
{0xa0, 0x09, 0x01ad}, };
{0xa0, 0x15, 0x01ae}, static const struct usb_action pb0330_50HZ[] = {
{0xa0, 0x00, ZC3XX_R092_I2CADDRESSSELECT}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xa0, 0x02, ZC3XX_R090_I2CCOMMAND}, {0xbb, 0x00, 0x055c},
{0xa1, 0x01, 0x0091}, {0xbb, 0x01, 0x09aa},
{0xa1, 0x01, 0x0095}, {0xbb, 0x00, 0x1001},
{0xa1, 0x01, 0x0096}, {0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},
{0xa0, 0x50, ZC3XX_R10A_RGB00}, /* matrix */ {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0xf8, ZC3XX_R10B_RGB01}, {0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID},
{0xa0, 0xf8, ZC3XX_R10C_RGB02}, {0xa0, 0xc4, ZC3XX_R192_EXPOSURELIMITLOW},
{0xa0, 0xf8, ZC3XX_R10D_RGB10}, {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
{0xa0, 0x50, ZC3XX_R10E_RGB11}, {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
{0xa0, 0xf8, ZC3XX_R10F_RGB12}, {0xa0, 0x47, ZC3XX_R197_ANTIFLICKERLOW},
{0xa0, 0xf8, ZC3XX_R110_RGB20}, {0xa0, 0x0e, ZC3XX_R18C_AEFREEZE},
{0xa0, 0xf8, ZC3XX_R111_RGB21}, {0xa0, 0x1a, ZC3XX_R18F_AEUNFREEZE},
{0xa0, 0x50, ZC3XX_R112_RGB22}, {0xa0, 0x14, ZC3XX_R1A9_DIGITALLIMITDIFF},
{0xa1, 0x01, 0x0008}, {0xa0, 0x66, ZC3XX_R1AA_DIGITALGAINSTEP},
{0xa0, 0x03, ZC3XX_R008_CLOCKSETTING}, /* clock ? */ {0xa0, 0x5c, ZC3XX_R01D_HSYNC_0},
{0xa0, 0x08, ZC3XX_R1C6_SHARPNESS00}, /* sharpness+ */ {0xa0, 0x90, ZC3XX_R01E_HSYNC_1},
{0xa1, 0x01, 0x01c8}, {0xa0, 0xc8, ZC3XX_R01F_HSYNC_2},
{0xa1, 0x01, 0x01c9}, {0xa0, 0xff, ZC3XX_R020_HSYNC_3},
{0xa1, 0x01, 0x01ca}, {}
{0xa0, 0x0f, ZC3XX_R1CB_SHARPNESS05}, /* sharpness- */ };
static const struct usb_action pb0330_50HZScale[] = {
{0xa0, 0x50, ZC3XX_R10A_RGB00}, /* matrix */
{0xa0, 0xf8, ZC3XX_R10B_RGB01},
{0xa0, 0xf8, ZC3XX_R10C_RGB02},
{0xa0, 0xf8, ZC3XX_R10D_RGB10},
{0xa0, 0x50, ZC3XX_R10E_RGB11},
{0xa0, 0xf8, ZC3XX_R10F_RGB12},
{0xa0, 0xf8, ZC3XX_R110_RGB20},
{0xa0, 0xf8, ZC3XX_R111_RGB21},
{0xa0, 0x50, ZC3XX_R112_RGB22},
{0xa1, 0x01, 0x0180},
{0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xaa, 0x05, 0x0066}, {0xbb, 0x00, 0x0566},
{0xaa, 0x09, 0x02b2}, {0xbb, 0x02, 0x09b2},
{0xaa, 0x10, 0x0002}, {0xbb, 0x00, 0x1002},
{0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN}, {0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},
{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID}, {0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID},
...@@ -4738,124 +4614,102 @@ static const struct usb_action pb0330xx_InitialScale[] = { ...@@ -4738,124 +4614,102 @@ static const struct usb_action pb0330xx_InitialScale[] = {
{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID}, {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
{0xa0, 0x8a, ZC3XX_R197_ANTIFLICKERLOW}, {0xa0, 0x8a, ZC3XX_R197_ANTIFLICKERLOW},
{0xa0, 0x10, ZC3XX_R18C_AEFREEZE}, {0xa0, 0x0e, ZC3XX_R18C_AEFREEZE},
{0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE}, {0xa0, 0x1a, ZC3XX_R18F_AEUNFREEZE},
{0xa0, 0x14, ZC3XX_R1A9_DIGITALLIMITDIFF}, {0xa0, 0x14, ZC3XX_R1A9_DIGITALLIMITDIFF},
{0xa0, 0x24, ZC3XX_R1AA_DIGITALGAINSTEP}, {0xa0, 0x66, ZC3XX_R1AA_DIGITALGAINSTEP},
{0xa0, 0xd7, ZC3XX_R01D_HSYNC_0}, {0xa0, 0xd7, ZC3XX_R01D_HSYNC_0},
{0xa0, 0xf0, ZC3XX_R01E_HSYNC_1}, {0xa0, 0xf0, ZC3XX_R01E_HSYNC_1},
{0xa0, 0xf8, ZC3XX_R01F_HSYNC_2}, {0xa0, 0xf8, ZC3XX_R01F_HSYNC_2},
{0xa0, 0xff, ZC3XX_R020_HSYNC_3}, {0xa0, 0xff, ZC3XX_R020_HSYNC_3},
{0xa0, 0x09, 0x01ad},
{0xa0, 0x15, 0x01ae},
{0xa0, 0x40, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa1, 0x01, 0x0180},
{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa1, 0x01, 0x0008},
{0xa1, 0x01, 0x0007},
/* {0xa0, 0x30, 0x0007}, */
/* {0xa0, 0x00, 0x0007}, */
{}
};
static const struct usb_action pb0330_50HZ[] = {
{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,00,cc */
{0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,07,cc */
{0xa0, 0xee, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,ee,cc */
{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,00,cc */
{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,00,cc */
{0xa0, 0x46, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,46,cc */
{0xa0, 0x10, ZC3XX_R18C_AEFREEZE}, /* 01,8c,10,cc */
{0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,20,cc */
{0xa0, 0x0c, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,0c,cc */
{0xa0, 0x26, ZC3XX_R1AA_DIGITALGAINSTEP}, /* 01,aa,26,cc */
{0xa0, 0x68, ZC3XX_R01D_HSYNC_0}, /* 00,1d,68,cc */
{0xa0, 0x90, ZC3XX_R01E_HSYNC_1}, /* 00,1e,90,cc */
{0xa0, 0xc8, ZC3XX_R01F_HSYNC_2}, /* 00,1f,c8,cc */
{}
};
static const struct usb_action pb0330_50HZScale[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */
{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,00,cc */
{0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,07,cc */
{0xa0, 0xa0, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,a0,cc */
{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,00,cc */
{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,00,cc */
{0xa0, 0x7a, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,7a,cc */
{0xa0, 0x10, ZC3XX_R18C_AEFREEZE}, /* 01,8c,10,cc */
{0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,20,cc */
{0xa0, 0x0c, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,0c,cc */
{0xa0, 0x26, ZC3XX_R1AA_DIGITALGAINSTEP}, /* 01,aa,26,cc */
{0xa0, 0xe5, ZC3XX_R01D_HSYNC_0}, /* 00,1d,e5,cc */
{0xa0, 0xf0, ZC3XX_R01E_HSYNC_1}, /* 00,1e,f0,cc */
{0xa0, 0xf8, ZC3XX_R01F_HSYNC_2}, /* 00,1f,f8,cc */
{} {}
}; };
static const struct usb_action pb0330_60HZ[] = { static const struct usb_action pb0330_60HZ[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,00,cc */ {0xbb, 0x00, 0x0535},
{0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,07,cc */ {0xbb, 0x01, 0x0974},
{0xa0, 0xdd, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,dd,cc */ {0xbb, 0x00, 0x1001},
{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,00,cc */ {0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},
{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,00,cc */ {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0x3d, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,3d,cc */ {0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID},
{0xa0, 0x10, ZC3XX_R18C_AEFREEZE}, /* 01,8c,10,cc */ {0xa0, 0xfe, ZC3XX_R192_EXPOSURELIMITLOW},
{0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,20,cc */ {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
{0xa0, 0x0c, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,0c,cc */ {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
{0xa0, 0x26, ZC3XX_R1AA_DIGITALGAINSTEP}, /* 01,aa,26,cc */ {0xa0, 0x3e, ZC3XX_R197_ANTIFLICKERLOW},
{0xa0, 0x43, ZC3XX_R01D_HSYNC_0}, /* 00,1d,43,cc */ {0xa0, 0x0e, ZC3XX_R18C_AEFREEZE},
{0xa0, 0x50, ZC3XX_R01E_HSYNC_1}, /* 00,1e,50,cc */ {0xa0, 0x1a, ZC3XX_R18F_AEUNFREEZE},
{0xa0, 0x90, ZC3XX_R01F_HSYNC_2}, /* 00,1f,90,cc */ {0xa0, 0x14, ZC3XX_R1A9_DIGITALLIMITDIFF},
{0xa0, 0x66, ZC3XX_R1AA_DIGITALGAINSTEP},
{0xa0, 0x35, ZC3XX_R01D_HSYNC_0},
{0xa0, 0x50, ZC3XX_R01E_HSYNC_1},
{0xa0, 0x90, ZC3XX_R01F_HSYNC_2},
{0xa0, 0xd0, ZC3XX_R020_HSYNC_3},
{} {}
}; };
static const struct usb_action pb0330_60HZScale[] = { static const struct usb_action pb0330_60HZScale[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,00,cc */ {0xbb, 0x00, 0x0535},
{0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,07,cc */ {0xbb, 0x02, 0x096c},
{0xa0, 0xa0, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,a0,cc */ {0xbb, 0x00, 0x1002},
{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,00,cc */ {0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},
{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,00,cc */ {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0x7a, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,7a,cc */ {0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID},
{0xa0, 0x10, ZC3XX_R18C_AEFREEZE}, /* 01,8c,10,cc */ {0xa0, 0xc0, ZC3XX_R192_EXPOSURELIMITLOW},
{0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,20,cc */ {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
{0xa0, 0x0c, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,0c,cc */ {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
{0xa0, 0x26, ZC3XX_R1AA_DIGITALGAINSTEP}, /* 01,aa,26,cc */ {0xa0, 0x7c, ZC3XX_R197_ANTIFLICKERLOW},
{0xa0, 0x41, ZC3XX_R01D_HSYNC_0}, /* 00,1d,41,cc */ {0xa0, 0x0e, ZC3XX_R18C_AEFREEZE},
{0xa0, 0x50, ZC3XX_R01E_HSYNC_1}, /* 00,1e,50,cc */ {0xa0, 0x1a, ZC3XX_R18F_AEUNFREEZE},
{0xa0, 0x90, ZC3XX_R01F_HSYNC_2}, /* 00,1f,90,cc */ {0xa0, 0x14, ZC3XX_R1A9_DIGITALLIMITDIFF},
{0xa0, 0x66, ZC3XX_R1AA_DIGITALGAINSTEP},
{0xa0, 0x35, ZC3XX_R01D_HSYNC_0},
{0xa0, 0x50, ZC3XX_R01E_HSYNC_1},
{0xa0, 0x90, ZC3XX_R01F_HSYNC_2},
{0xa0, 0xd0, ZC3XX_R020_HSYNC_3},
{} {}
}; };
static const struct usb_action pb0330_NoFliker[] = { static const struct usb_action pb0330_NoFliker[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,00,cc */ {0xbb, 0x00, 0x0509},
{0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,07,cc */ {0xbb, 0x02, 0x0940},
{0xa0, 0xf0, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,f0,cc */ {0xbb, 0x00, 0x1002},
{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,00,cc */ {0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},
{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,00,cc */ {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0x10, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,10,cc */ {0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID},
{0xa0, 0x10, ZC3XX_R18C_AEFREEZE}, /* 01,8c,10,cc */ {0xa0, 0xf0, ZC3XX_R192_EXPOSURELIMITLOW},
{0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,20,cc */ {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
{0xa0, 0x00, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,00,cc */ {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
{0xa0, 0x00, ZC3XX_R1AA_DIGITALGAINSTEP}, /* 01,aa,00,cc */ {0xa0, 0x01, ZC3XX_R197_ANTIFLICKERLOW},
{0xa0, 0x09, ZC3XX_R01D_HSYNC_0}, /* 00,1d,09,cc */ {0xa0, 0x10, ZC3XX_R18C_AEFREEZE},
{0xa0, 0x40, ZC3XX_R01E_HSYNC_1}, /* 00,1e,40,cc */ {0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE},
{0xa0, 0x90, ZC3XX_R01F_HSYNC_2}, /* 00,1f,90,cc */ {0xa0, 0x00, ZC3XX_R1A9_DIGITALLIMITDIFF},
{0xa0, 0x00, ZC3XX_R1AA_DIGITALGAINSTEP},
{0xa0, 0x09, ZC3XX_R01D_HSYNC_0},
{0xa0, 0x40, ZC3XX_R01E_HSYNC_1},
{0xa0, 0x90, ZC3XX_R01F_HSYNC_2},
{0xa0, 0xe0, ZC3XX_R020_HSYNC_3},
{} {}
}; };
static const struct usb_action pb0330_NoFlikerScale[] = { static const struct usb_action pb0330_NoFlikerScale[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,00,cc */ {0xbb, 0x00, 0x0535},
{0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,07,cc */ {0xbb, 0x01, 0x0980},
{0xa0, 0xf0, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,f0,cc */ {0xbb, 0x00, 0x1001},
{0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH}, /* 01,95,00,cc */ {0xa0, 0x60, ZC3XX_R11D_GLOBALGAIN},
{0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID}, /* 01,96,00,cc */ {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0x10, ZC3XX_R197_ANTIFLICKERLOW}, /* 01,97,10,cc */ {0xa0, 0x07, ZC3XX_R191_EXPOSURELIMITMID},
{0xa0, 0x10, ZC3XX_R18C_AEFREEZE}, /* 01,8c,10,cc */ {0xa0, 0xf0, ZC3XX_R192_EXPOSURELIMITLOW},
{0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE}, /* 01,8f,20,cc */ {0xa0, 0x00, ZC3XX_R195_ANTIFLICKERHIGH},
{0xa0, 0x00, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,00,cc */ {0xa0, 0x00, ZC3XX_R196_ANTIFLICKERMID},
{0xa0, 0x00, ZC3XX_R1AA_DIGITALGAINSTEP}, /* 01,aa,00,cc */ {0xa0, 0x01, ZC3XX_R197_ANTIFLICKERLOW},
{0xa0, 0x09, ZC3XX_R01D_HSYNC_0}, /* 00,1d,09,cc */ {0xa0, 0x10, ZC3XX_R18C_AEFREEZE},
{0xa0, 0x40, ZC3XX_R01E_HSYNC_1}, /* 00,1e,40,cc */ {0xa0, 0x20, ZC3XX_R18F_AEUNFREEZE},
{0xa0, 0x90, ZC3XX_R01F_HSYNC_2}, /* 00,1f,90,cc */ {0xa0, 0x00, ZC3XX_R1A9_DIGITALLIMITDIFF},
{0xa0, 0x00, ZC3XX_R1AA_DIGITALGAINSTEP},
{0xa0, 0x35, ZC3XX_R01D_HSYNC_0},
{0xa0, 0x60, ZC3XX_R01E_HSYNC_1},
{0xa0, 0x90, ZC3XX_R01F_HSYNC_2},
{0xa0, 0xe0, ZC3XX_R020_HSYNC_3},
{} {}
}; };
...@@ -6131,15 +5985,16 @@ static void setmatrix(struct gspca_dev *gspca_dev) ...@@ -6131,15 +5985,16 @@ static void setmatrix(struct gspca_dev *gspca_dev)
NULL, /* SENSOR_HV7131C 6 */ NULL, /* SENSOR_HV7131C 6 */
NULL, /* SENSOR_ICM105A 7 */ NULL, /* SENSOR_ICM105A 7 */
NULL, /* SENSOR_MC501CB 8 */ NULL, /* SENSOR_MC501CB 8 */
ov7620_matrix, /* SENSOR_OV7620 9 */ gc0305_matrix, /* SENSOR_MI0360SOC 9 */
NULL, /* SENSOR_OV7630C 10 */ ov7620_matrix, /* SENSOR_OV7620 10 */
NULL, /* SENSOR_PAS106 11 */ NULL, /* SENSOR_OV7630C 11 */
pas202b_matrix, /* SENSOR_PAS202B 12 */ NULL, /* SENSOR_PAS106 12 */
NULL, /* SENSOR_PB0330 13 */ pas202b_matrix, /* SENSOR_PAS202B 13 */
po2030_matrix, /* SENSOR_PO2030 14 */ gc0305_matrix, /* SENSOR_PB0330 14 */
NULL, /* SENSOR_TAS5130CK 15 */ po2030_matrix, /* SENSOR_PO2030 15 */
tas5130c_matrix, /* SENSOR_TAS5130CXX 16 */ NULL, /* SENSOR_TAS5130CK 16 */
vf0250_matrix, /* SENSOR_TAS5130C_VF0250 17 */ tas5130c_matrix, /* SENSOR_TAS5130CXX 17 */
vf0250_matrix, /* SENSOR_TAS5130C_VF0250 18 */
}; };
matrix = matrix_tb[sd->sensor]; matrix = matrix_tb[sd->sensor];
...@@ -6379,39 +6234,43 @@ static int setlightfreq(struct gspca_dev *gspca_dev) ...@@ -6379,39 +6234,43 @@ static int setlightfreq(struct gspca_dev *gspca_dev)
{MC501CB_NoFliker, MC501CB_NoFlikerScale, {MC501CB_NoFliker, MC501CB_NoFlikerScale,
MC501CB_50HZ, MC501CB_50HZScale, MC501CB_50HZ, MC501CB_50HZScale,
MC501CB_60HZ, MC501CB_60HZScale}, MC501CB_60HZ, MC501CB_60HZScale},
/* SENSOR_OV7620 9 */ /* SENSOR_MI0360SOC 9 */
{mi360soc_AENoFlikerScale, mi360soc_AENoFliker,
mi360soc_AE50HZScale, mi360soc_AE50HZ,
mi360soc_AE60HZScale, mi360soc_AE60HZ},
/* SENSOR_OV7620 10 */
{OV7620_NoFliker, OV7620_NoFliker, {OV7620_NoFliker, OV7620_NoFliker,
OV7620_50HZ, OV7620_50HZ, OV7620_50HZ, OV7620_50HZ,
OV7620_60HZ, OV7620_60HZ}, OV7620_60HZ, OV7620_60HZ},
/* SENSOR_OV7630C 10 */ /* SENSOR_OV7630C 11 */
{NULL, NULL, {NULL, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL}, NULL, NULL},
/* SENSOR_PAS106 11 */ /* SENSOR_PAS106 12 */
{pas106b_NoFliker, pas106b_NoFliker, {pas106b_NoFliker, pas106b_NoFliker,
pas106b_50HZ, pas106b_50HZ, pas106b_50HZ, pas106b_50HZ,
pas106b_60HZ, pas106b_60HZ}, pas106b_60HZ, pas106b_60HZ},
/* SENSOR_PAS202B 12 */ /* SENSOR_PAS202B 13 */
{pas202b_NoFlikerScale, pas202b_NoFliker, {pas202b_NoFlikerScale, pas202b_NoFliker,
pas202b_50HZScale, pas202b_50HZ, pas202b_50HZScale, pas202b_50HZ,
pas202b_60HZScale, pas202b_60HZ}, pas202b_60HZScale, pas202b_60HZ},
/* SENSOR_PB0330 13 */ /* SENSOR_PB0330 14 */
{pb0330_NoFliker, pb0330_NoFlikerScale, {pb0330_NoFlikerScale, pb0330_NoFliker,
pb0330_50HZ, pb0330_50HZScale, pb0330_50HZScale, pb0330_50HZ,
pb0330_60HZ, pb0330_60HZScale}, pb0330_60HZScale, pb0330_60HZ},
/* SENSOR_PO2030 14 */ /* SENSOR_PO2030 15 */
{PO2030_NoFliker, PO2030_NoFliker, {PO2030_NoFliker, PO2030_NoFliker,
PO2030_50HZ, PO2030_50HZ, PO2030_50HZ, PO2030_50HZ,
PO2030_60HZ, PO2030_60HZ}, PO2030_60HZ, PO2030_60HZ},
/* SENSOR_TAS5130CK 15 */ /* SENSOR_TAS5130CK 16 */
{tas5130cxx_NoFlikerScale, tas5130cxx_NoFliker, {tas5130cxx_NoFlikerScale, tas5130cxx_NoFliker,
tas5130cxx_50HZScale, tas5130cxx_50HZ, tas5130cxx_50HZScale, tas5130cxx_50HZ,
tas5130cxx_60HZScale, tas5130cxx_60HZ}, tas5130cxx_60HZScale, tas5130cxx_60HZ},
/* SENSOR_TAS5130CXX 16 */ /* SENSOR_TAS5130CXX 17 */
{tas5130cxx_NoFlikerScale, tas5130cxx_NoFliker, {tas5130cxx_NoFlikerScale, tas5130cxx_NoFliker,
tas5130cxx_50HZScale, tas5130cxx_50HZ, tas5130cxx_50HZScale, tas5130cxx_50HZ,
tas5130cxx_60HZScale, tas5130cxx_60HZ}, tas5130cxx_60HZScale, tas5130cxx_60HZ},
/* SENSOR_TAS5130C_VF0250 17 */ /* SENSOR_TAS5130C_VF0250 18 */
{tas5130c_vf0250_NoFliker, tas5130c_vf0250_NoFlikerScale, {tas5130c_vf0250_NoFliker, tas5130c_vf0250_NoFlikerScale,
tas5130c_vf0250_50HZ, tas5130c_vf0250_50HZScale, tas5130c_vf0250_50HZ, tas5130c_vf0250_50HZScale,
tas5130c_vf0250_60HZ, tas5130c_vf0250_60HZScale}, tas5130c_vf0250_60HZ, tas5130c_vf0250_60HZScale},
...@@ -6468,6 +6327,7 @@ static void send_unknown(struct usb_device *dev, int sensor) ...@@ -6468,6 +6327,7 @@ static void send_unknown(struct usb_device *dev, int sensor)
case SENSOR_ADCM2700: case SENSOR_ADCM2700:
case SENSOR_GC0305: case SENSOR_GC0305:
case SENSOR_OV7620: case SENSOR_OV7620:
case SENSOR_MI0360SOC:
case SENSOR_PB0330: case SENSOR_PB0330:
case SENSOR_PO2030: case SENSOR_PO2030:
reg_w(dev, 0x0d, 0x003a); reg_w(dev, 0x0d, 0x003a);
...@@ -6603,7 +6463,7 @@ struct sensor_by_chipset_revision { ...@@ -6603,7 +6463,7 @@ struct sensor_by_chipset_revision {
}; };
static const struct sensor_by_chipset_revision chipset_revision_sensor[] = { static const struct sensor_by_chipset_revision chipset_revision_sensor[] = {
{0xc000, 0x12}, /* TAS5130C */ {0xc000, 0x12}, /* TAS5130C */
{0xc001, 0x13}, /* MI0360 */ {0xc001, 0x13}, /* MI0360SOC */
{0xe001, 0x13}, {0xe001, 0x13},
{0x8001, 0x13}, {0x8001, 0x13},
{0x8000, 0x14}, /* CS2102K */ {0x8000, 0x14}, /* CS2102K */
...@@ -6772,15 +6632,16 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -6772,15 +6632,16 @@ static int sd_config(struct gspca_dev *gspca_dev,
4, /* SENSOR_HV7131C 6 */ 4, /* SENSOR_HV7131C 6 */
4, /* SENSOR_ICM105A 7 */ 4, /* SENSOR_ICM105A 7 */
4, /* SENSOR_MC501CB 8 */ 4, /* SENSOR_MC501CB 8 */
3, /* SENSOR_OV7620 9 */ 4, /* SENSOR_MI0360SOC 9 */
4, /* SENSOR_OV7630C 10 */ 3, /* SENSOR_OV7620 10 */
4, /* SENSOR_PAS106 11 */ 4, /* SENSOR_OV7630C 11 */
4, /* SENSOR_PAS202B 12 */ 4, /* SENSOR_PAS106 12 */
4, /* SENSOR_PB0330 13 */ 4, /* SENSOR_PAS202B 13 */
4, /* SENSOR_PO2030 14 */ 4, /* SENSOR_PB0330 14 */
4, /* SENSOR_TAS5130CK 15 */ 4, /* SENSOR_PO2030 15 */
3, /* SENSOR_TAS5130CXX 16 */ 4, /* SENSOR_TAS5130CK 16 */
3, /* SENSOR_TAS5130C_VF0250 17 */ 3, /* SENSOR_TAS5130CXX 17 */
3, /* SENSOR_TAS5130C_VF0250 18 */
}; };
/* define some sensors from the vendor/product */ /* define some sensors from the vendor/product */
...@@ -6851,9 +6712,9 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -6851,9 +6712,9 @@ static int sd_config(struct gspca_dev *gspca_dev,
break; break;
case 0x13: case 0x13:
PDEBUG(D_PROBE, PDEBUG(D_PROBE,
"Find Sensor MI0360. Chip revision %x", "Find Sensor MI0360SOC. Chip revision %x",
sd->chip_revision); sd->chip_revision);
sd->sensor = SENSOR_PB0330; sd->sensor = SENSOR_MI0360SOC;
break; break;
case 0x14: case 0x14:
PDEBUG(D_PROBE, PDEBUG(D_PROBE,
...@@ -6967,17 +6828,17 @@ static int sd_start(struct gspca_dev *gspca_dev) ...@@ -6967,17 +6828,17 @@ static int sd_start(struct gspca_dev *gspca_dev)
{hv7131cxx_InitialScale, hv7131cxx_Initial}, /* 6 */ {hv7131cxx_InitialScale, hv7131cxx_Initial}, /* 6 */
{icm105axx_InitialScale, icm105axx_Initial}, /* 7 */ {icm105axx_InitialScale, icm105axx_Initial}, /* 7 */
{MC501CB_InitialScale, MC501CB_Initial}, /* 8 */ {MC501CB_InitialScale, MC501CB_Initial}, /* 8 */
{OV7620_mode0, OV7620_mode1}, /* 9 */ {mi0360soc_Initial, mi0360soc_InitialScale}, /* 9 */
{ov7630c_InitialScale, ov7630c_Initial}, /* 10 */ {OV7620_mode0, OV7620_mode1}, /* 10 */
{pas106b_InitialScale, pas106b_Initial}, /* 11 */ {ov7630c_InitialScale, ov7630c_Initial}, /* 11 */
{pas202b_Initial, pas202b_InitialScale}, /* 12 */ {pas106b_InitialScale, pas106b_Initial}, /* 12 */
{pb0330xx_InitialScale, pb0330xx_Initial}, /* 13 */ {pas202b_Initial, pas202b_InitialScale}, /* 13 */
/* or {pb03303x_InitialScale, pb03303x_Initial}, */ {pb0330_Initial, pb0330_InitialScale}, /* 14 */
{PO2030_mode0, PO2030_mode1}, /* 14 */ {PO2030_mode0, PO2030_mode1}, /* 15 */
{tas5130CK_InitialScale, tas5130CK_Initial}, /* 15 */ {tas5130CK_InitialScale, tas5130CK_Initial}, /* 16 */
{tas5130cxx_Initial, tas5130cxx_InitialScale}, /* 16 */ {tas5130cxx_Initial, tas5130cxx_InitialScale}, /* 17 */
{tas5130c_vf0250_InitialScale, tas5130c_vf0250_Initial}, {tas5130c_vf0250_InitialScale, tas5130c_vf0250_Initial},
/* 17 */ /* 18 */
}; };
/* create the JPEG header */ /* create the JPEG header */
...@@ -6997,19 +6858,6 @@ static int sd_start(struct gspca_dev *gspca_dev) ...@@ -6997,19 +6858,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
case SENSOR_PAS106: case SENSOR_PAS106:
usb_exchange(gspca_dev, pas106b_Initial_com); usb_exchange(gspca_dev, pas106b_Initial_com);
break; break;
case SENSOR_PB0330:
if (mode) {
if (sd->chip_revision == 0xc001
|| sd->chip_revision == 0xe001
|| sd->chip_revision == 0x8001)
zc3_init = pb03303x_Initial;
} else {
if (sd->chip_revision == 0xc001
|| sd->chip_revision == 0xe001
|| sd->chip_revision == 0x8001)
zc3_init = pb03303x_InitialScale;
}
break;
} }
usb_exchange(gspca_dev, zc3_init); usb_exchange(gspca_dev, zc3_init);
...@@ -7051,7 +6899,6 @@ static int sd_start(struct gspca_dev *gspca_dev) ...@@ -7051,7 +6899,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
switch (sd->sensor) { switch (sd->sensor) {
case SENSOR_CS2102K: /* gamma set in xxx_Initial */ case SENSOR_CS2102K: /* gamma set in xxx_Initial */
case SENSOR_HDCS2020b: case SENSOR_HDCS2020b:
case SENSOR_PB0330: /* pb with chip_revision - see above */
case SENSOR_OV7630C: case SENSOR_OV7630C:
case SENSOR_TAS5130CK: case SENSOR_TAS5130CK:
break; break;
......
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