Skip to content

L
linux
Commit 9a582884 authored by Herman's avatar Herman Committed by Mauro Carvalho Chehab
Browse files
Options

media: drivers/media/usb/gspca: fix typo Fliker -> Flicker 

Change 'Fliker' into 'Flicker'.
Signed-off-by: default avatarHerman <yanshuaijun@yulong.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent e481ff3f
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 70 deletions
drivers/media/usb/gspca/vc032x.c
View file @ 9a582884
...@@ -1796,7 +1796,7 @@ static const u8 ov7660_60HZ[][4] = { ...@@ -1796,7 +1796,7 @@ static const u8 ov7660_60HZ[][4] = {
{} {}
}; };
static const u8 ov7660_NoFliker[][4] = { static const u8 ov7660_NoFlicker[][4] = {
{0x00, 0x13, 0x87, 0xaa}, {0x00, 0x13, 0x87, 0xaa},
{} {}
}; };
...@@ -3319,8 +3319,8 @@ static void sethvflip(struct gspca_dev *gspca_dev, bool hflip, bool vflip) ...@@ -3319,8 +3319,8 @@ static void sethvflip(struct gspca_dev *gspca_dev, bool hflip, bool vflip)
static void setlightfreq(struct gspca_dev *gspca_dev, s32 val) static void setlightfreq(struct gspca_dev *gspca_dev, s32 val)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
static const u8 (*ov7660_freq_tb[3])[4] = static const u8 (*ov7660_freq_tb[3])[4] = {
{ov7660_NoFliker, ov7660_50HZ, ov7660_60HZ}; ov7660_NoFlicker, ov7660_50HZ, ov7660_60HZ};
if (sd->sensor != SENSOR_OV7660) if (sd->sensor != SENSOR_OV7660)
return; return;
......
drivers/media/usb/gspca/zc3xx.c
View file @ 9a582884
...@@ -323,7 +323,7 @@ static const struct usb_action adcm2700_60HZ[] = { ...@@ -323,7 +323,7 @@ static const struct usb_action adcm2700_60HZ[] = {
{0xaa, 0x28, 0x0002}, /* 00,28,02,aa */ {0xaa, 0x28, 0x0002}, /* 00,28,02,aa */
{} {}
}; };
static const struct usb_action adcm2700_NoFliker[] = { static const struct usb_action adcm2700_NoFlicker[] = {
{0xa0, 0x01, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,01,cc */ {0xa0, 0x01, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,01,cc */
{0xaa, 0xfe, 0x0002}, /* 00,fe,02,aa */ {0xaa, 0xfe, 0x0002}, /* 00,fe,02,aa */
{0xa0, 0x0a, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,0a,cc */ {0xa0, 0x0a, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,0a,cc */
...@@ -525,7 +525,7 @@ static const struct usb_action cs2102_60HZ[] = { ...@@ -525,7 +525,7 @@ static const struct usb_action cs2102_60HZ[] = {
{0xa0, 0xff, ZC3XX_R020_HSYNC_3}, {0xa0, 0xff, ZC3XX_R020_HSYNC_3},
{} {}
}; };
static const struct usb_action cs2102_NoFlikerScale[] = { static const struct usb_action cs2102_NoFlickerScale[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xaa, 0x23, 0x0001}, {0xaa, 0x23, 0x0001},
{0xaa, 0x24, 0x005f}, {0xaa, 0x24, 0x005f},
...@@ -547,7 +547,7 @@ static const struct usb_action cs2102_NoFlikerScale[] = { ...@@ -547,7 +547,7 @@ static const struct usb_action cs2102_NoFlikerScale[] = {
{0xa0, 0xff, ZC3XX_R020_HSYNC_3}, {0xa0, 0xff, ZC3XX_R020_HSYNC_3},
{} {}
}; };
static const struct usb_action cs2102_NoFliker[] = { static const struct usb_action cs2102_NoFlicker[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xaa, 0x23, 0x0000}, {0xaa, 0x23, 0x0000},
{0xaa, 0x24, 0x00af}, {0xaa, 0x24, 0x00af},
...@@ -1385,7 +1385,7 @@ static const struct usb_action gc0305_60HZ[] = { ...@@ -1385,7 +1385,7 @@ static const struct usb_action gc0305_60HZ[] = {
{} {}
}; };
static const struct usb_action gc0305_NoFliker[] = { static const struct usb_action gc0305_NoFlicker[] = {
{0xa0, 0x0c, ZC3XX_R100_OPERATIONMODE}, /* 01,00,0c,cc */ {0xa0, 0x0c, ZC3XX_R100_OPERATIONMODE}, /* 01,00,0c,cc */
{0xaa, 0x82, 0x0000}, /* 00,82,00,aa */ {0xaa, 0x82, 0x0000}, /* 00,82,00,aa */
{0xaa, 0x83, 0x0000}, /* 00,83,00,aa */ {0xaa, 0x83, 0x0000}, /* 00,83,00,aa */
...@@ -1710,7 +1710,7 @@ static const struct usb_action hdcs2020_60HZ[] = { ...@@ -1710,7 +1710,7 @@ static const struct usb_action hdcs2020_60HZ[] = {
{0xa0, 0x2c, ZC3XX_R01F_HSYNC_2}, /* 00,1f,2c,cc */ {0xa0, 0x2c, ZC3XX_R01F_HSYNC_2}, /* 00,1f,2c,cc */
{} {}
}; };
static const struct usb_action hdcs2020_NoFliker[] = { static const struct usb_action hdcs2020_NoFlicker[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */
{0xaa, 0x13, 0x0010}, /* 00,13,10,aa */ {0xaa, 0x13, 0x0010}, /* 00,13,10,aa */
{0xaa, 0x14, 0x0001}, /* 00,14,01,aa */ {0xaa, 0x14, 0x0001}, /* 00,14,01,aa */
...@@ -1925,7 +1925,7 @@ static const struct usb_action hv7131b_60HZScale[] = { /* 320x240 */ ...@@ -1925,7 +1925,7 @@ static const struct usb_action hv7131b_60HZScale[] = { /* 320x240 */
{0xa0, 0x40, ZC3XX_R020_HSYNC_3}, /* 00,20,40,cc */ {0xa0, 0x40, ZC3XX_R020_HSYNC_3}, /* 00,20,40,cc */
{} {}
}; };
static const struct usb_action hv7131b_NoFliker[] = { /* 640x480*/ static const struct usb_action hv7131b_NoFlicker[] = { /* 640x480*/
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */
{0xaa, 0x25, 0x0003}, /* 00,25,03,aa */ {0xaa, 0x25, 0x0003}, /* 00,25,03,aa */
{0xaa, 0x26, 0x0000}, /* 00,26,00,aa */ {0xaa, 0x26, 0x0000}, /* 00,26,00,aa */
...@@ -1950,7 +1950,7 @@ static const struct usb_action hv7131b_NoFliker[] = { /* 640x480*/ ...@@ -1950,7 +1950,7 @@ static const struct usb_action hv7131b_NoFliker[] = { /* 640x480*/
{0xa0, 0x03, ZC3XX_R020_HSYNC_3}, /* 00,20,03,cc */ {0xa0, 0x03, ZC3XX_R020_HSYNC_3}, /* 00,20,03,cc */
{} {}
}; };
static const struct usb_action hv7131b_NoFlikerScale[] = { /* 320x240 */ static const struct usb_action hv7131b_NoFlickerScale[] = { /* 320x240 */
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */
{0xaa, 0x25, 0x0003}, /* 00,25,03,aa */ {0xaa, 0x25, 0x0003}, /* 00,25,03,aa */
{0xaa, 0x26, 0x0000}, /* 00,26,00,aa */ {0xaa, 0x26, 0x0000}, /* 00,26,00,aa */
...@@ -2141,7 +2141,7 @@ static const struct usb_action hv7131r_60HZScale[] = { ...@@ -2141,7 +2141,7 @@ static const struct usb_action hv7131r_60HZScale[] = {
{0xa0, 0x08, ZC3XX_R020_HSYNC_3}, {0xa0, 0x08, ZC3XX_R020_HSYNC_3},
{} {}
}; };
static const struct usb_action hv7131r_NoFliker[] = { static const struct usb_action hv7131r_NoFlicker[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xa0, 0x2f, ZC3XX_R190_EXPOSURELIMITHIGH}, {0xa0, 0x2f, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0xf8, ZC3XX_R191_EXPOSURELIMITMID}, {0xa0, 0xf8, ZC3XX_R191_EXPOSURELIMITMID},
...@@ -2159,7 +2159,7 @@ static const struct usb_action hv7131r_NoFliker[] = { ...@@ -2159,7 +2159,7 @@ static const struct usb_action hv7131r_NoFliker[] = {
{0xa0, 0x08, ZC3XX_R020_HSYNC_3}, {0xa0, 0x08, ZC3XX_R020_HSYNC_3},
{} {}
}; };
static const struct usb_action hv7131r_NoFlikerScale[] = { static const struct usb_action hv7131r_NoFlickerScale[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xa0, 0x2f, ZC3XX_R190_EXPOSURELIMITHIGH}, {0xa0, 0x2f, ZC3XX_R190_EXPOSURELIMITHIGH},
{0xa0, 0xf8, ZC3XX_R191_EXPOSURELIMITMID}, {0xa0, 0xf8, ZC3XX_R191_EXPOSURELIMITMID},
...@@ -2662,7 +2662,7 @@ static const struct usb_action icm105a_60HZ[] = { ...@@ -2662,7 +2662,7 @@ static const struct usb_action icm105a_60HZ[] = {
{0xa0, 0xc0, ZC3XX_R1A8_DIGITALGAIN}, /* 01,a8,c0,cc */ {0xa0, 0xc0, ZC3XX_R1A8_DIGITALGAIN}, /* 01,a8,c0,cc */
{} {}
}; };
static const struct usb_action icm105a_NoFlikerScale[] = { static const struct usb_action icm105a_NoFlickerScale[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */
{0xaa, 0x0d, 0x0003}, /* 00,0d,03,aa */ {0xaa, 0x0d, 0x0003}, /* 00,0d,03,aa */
{0xaa, 0x0c, 0x0004}, /* 00,0c,04,aa */ {0xaa, 0x0c, 0x0004}, /* 00,0c,04,aa */
...@@ -2693,7 +2693,7 @@ static const struct usb_action icm105a_NoFlikerScale[] = { ...@@ -2693,7 +2693,7 @@ static const struct usb_action icm105a_NoFlikerScale[] = {
{0xa0, 0xff, ZC3XX_R020_HSYNC_3}, /* 00,20,ff,cc */ {0xa0, 0xff, ZC3XX_R020_HSYNC_3}, /* 00,20,ff,cc */
{} {}
}; };
static const struct usb_action icm105a_NoFliker[] = { static const struct usb_action icm105a_NoFlicker[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */
{0xaa, 0x0d, 0x0003}, /* 00,0d,03,aa */ {0xaa, 0x0d, 0x0003}, /* 00,0d,03,aa */
{0xaa, 0x0c, 0x0004}, /* 00,0c,04,aa */ {0xaa, 0x0c, 0x0004}, /* 00,0c,04,aa */
...@@ -3009,7 +3009,7 @@ static const struct usb_action mc501cb_60HZScale[] = { ...@@ -3009,7 +3009,7 @@ static const struct usb_action mc501cb_60HZScale[] = {
{} {}
}; };
static const struct usb_action mc501cb_NoFliker[] = { static const struct usb_action mc501cb_NoFlicker[] = {
{0xaa, 0x03, 0x0003}, /* 00,03,03,aa */ {0xaa, 0x03, 0x0003}, /* 00,03,03,aa */
{0xaa, 0x10, 0x00fc}, /* 00,10,fc,aa */ {0xaa, 0x10, 0x00fc}, /* 00,10,fc,aa */
{0xaa, 0x36, 0x0018}, /* 00,36,18,aa */ {0xaa, 0x36, 0x0018}, /* 00,36,18,aa */
...@@ -3021,7 +3021,7 @@ static const struct usb_action mc501cb_NoFliker[] = { ...@@ -3021,7 +3021,7 @@ static const struct usb_action mc501cb_NoFliker[] = {
{} {}
}; };
static const struct usb_action mc501cb_NoFlikerScale[] = { static const struct usb_action mc501cb_NoFlickerScale[] = {
{0xaa, 0x03, 0x0003}, /* 00,03,03,aa */ {0xaa, 0x03, 0x0003}, /* 00,03,03,aa */
{0xaa, 0x10, 0x00fc}, /* 00,10,fc,aa */ {0xaa, 0x10, 0x00fc}, /* 00,10,fc,aa */
{0xaa, 0x36, 0x0030}, /* 00,36,30,aa */ {0xaa, 0x36, 0x0030}, /* 00,36,30,aa */
...@@ -3211,7 +3211,7 @@ static const struct usb_action ov7620_60HZ[] = { ...@@ -3211,7 +3211,7 @@ static const struct usb_action ov7620_60HZ[] = {
{0xa1, 0x01, 0x0037}, */ {0xa1, 0x01, 0x0037}, */
{} {}
}; };
static const struct usb_action ov7620_NoFliker[] = { static const struct usb_action ov7620_NoFlicker[] = {
{0xdd, 0x00, 0x0100}, /* 00,01,00,dd */ {0xdd, 0x00, 0x0100}, /* 00,01,00,dd */
{0xaa, 0x2b, 0x0000}, /* 00,2b,00,aa */ {0xaa, 0x2b, 0x0000}, /* 00,2b,00,aa */
/* disable 1/120s & 1/100s exposures for banding filter */ /* disable 1/120s & 1/100s exposures for banding filter */
...@@ -3827,7 +3827,7 @@ static const struct usb_action pas106b_60HZ[] = { ...@@ -3827,7 +3827,7 @@ static const struct usb_action pas106b_60HZ[] = {
{0xa0, 0x04, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,04,cc */ {0xa0, 0x04, ZC3XX_R1A9_DIGITALLIMITDIFF}, /* 01,a9,04,cc */
{} {}
}; };
static const struct usb_action pas106b_NoFliker[] = { static const struct usb_action pas106b_NoFlicker[] = {
{0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,00,cc */ {0xa0, 0x00, ZC3XX_R190_EXPOSURELIMITHIGH}, /* 01,90,00,cc */
{0xa0, 0x06, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,06,cc */ {0xa0, 0x06, ZC3XX_R191_EXPOSURELIMITMID}, /* 01,91,06,cc */
{0xa0, 0x50, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,50,cc */ {0xa0, 0x50, ZC3XX_R192_EXPOSURELIMITLOW}, /* 01,92,50,cc */
...@@ -4051,7 +4051,7 @@ static const struct usb_action pas202b_60HZScale[] = { ...@@ -4051,7 +4051,7 @@ static const struct usb_action pas202b_60HZScale[] = {
{0xa0, 0x0e, ZC3XX_R088_EXPTIMELOW}, /* 00,88,0e,cc */ {0xa0, 0x0e, ZC3XX_R088_EXPTIMELOW}, /* 00,88,0e,cc */
{} {}
}; };
static const struct usb_action pas202b_NoFliker[] = { static const struct usb_action pas202b_NoFlicker[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */
{0xa0, 0x20, ZC3XX_R087_EXPTIMEMID}, /* 00,87,20,cc */ {0xa0, 0x20, ZC3XX_R087_EXPTIMEMID}, /* 00,87,20,cc */
{0xa0, 0x21, ZC3XX_R088_EXPTIMELOW}, /* 00,88,21,cc */ {0xa0, 0x21, ZC3XX_R088_EXPTIMELOW}, /* 00,88,21,cc */
...@@ -4080,7 +4080,7 @@ static const struct usb_action pas202b_NoFliker[] = { ...@@ -4080,7 +4080,7 @@ static const struct usb_action pas202b_NoFliker[] = {
{0xa0, 0x0e, ZC3XX_R088_EXPTIMELOW}, /* 00,88,0e,cc */ {0xa0, 0x0e, ZC3XX_R088_EXPTIMELOW}, /* 00,88,0e,cc */
{} {}
}; };
static const struct usb_action pas202b_NoFlikerScale[] = { static const struct usb_action pas202b_NoFlickerScale[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */
{0xa0, 0x20, ZC3XX_R087_EXPTIMEMID}, /* 00,87,20,cc */ {0xa0, 0x20, ZC3XX_R087_EXPTIMEMID}, /* 00,87,20,cc */
{0xa0, 0x21, ZC3XX_R088_EXPTIMELOW}, /* 00,88,21,cc */ {0xa0, 0x21, ZC3XX_R088_EXPTIMELOW}, /* 00,88,21,cc */
...@@ -4309,7 +4309,7 @@ static const struct usb_action mt9v111_1_AE60HZScale[] = { ...@@ -4309,7 +4309,7 @@ static const struct usb_action mt9v111_1_AE60HZScale[] = {
{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE}, {0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
{} {}
}; };
static const struct usb_action mt9v111_1_AENoFliker[] = { static const struct usb_action mt9v111_1_AENoFlicker[] = {
{0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE}, {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xbb, 0x00, 0x0509}, {0xbb, 0x00, 0x0509},
...@@ -4332,7 +4332,7 @@ static const struct usb_action mt9v111_1_AENoFliker[] = { ...@@ -4332,7 +4332,7 @@ static const struct usb_action mt9v111_1_AENoFliker[] = {
{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE}, {0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
{} {}
}; };
static const struct usb_action mt9v111_1_AENoFlikerScale[] = { static const struct usb_action mt9v111_1_AENoFlickerScale[] = {
{0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE}, {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xbb, 0x00, 0x0534}, {0xbb, 0x00, 0x0534},
...@@ -4554,7 +4554,7 @@ static const struct usb_action mt9v111_3_AE60HZScale[] = { ...@@ -4554,7 +4554,7 @@ static const struct usb_action mt9v111_3_AE60HZScale[] = {
{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE}, {0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
{} {}
}; };
static const struct usb_action mt9v111_3_AENoFliker[] = { static const struct usb_action mt9v111_3_AENoFlicker[] = {
{0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE}, {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xaa, 0x05, 0x0034}, {0xaa, 0x05, 0x0034},
...@@ -4577,7 +4577,7 @@ static const struct usb_action mt9v111_3_AENoFliker[] = { ...@@ -4577,7 +4577,7 @@ static const struct usb_action mt9v111_3_AENoFliker[] = {
{0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE}, {0xa0, 0x42, ZC3XX_R180_AUTOCORRECTENABLE},
{} {}
}; };
static const struct usb_action mt9v111_3_AENoFlikerScale[] = { static const struct usb_action mt9v111_3_AENoFlickerScale[] = {
{0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE}, {0xa0, 0x00, ZC3XX_R180_AUTOCORRECTENABLE},
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xaa, 0x05, 0x0034}, {0xaa, 0x05, 0x0034},
...@@ -4787,7 +4787,7 @@ static const struct usb_action pb0330_60HZScale[] = { ...@@ -4787,7 +4787,7 @@ static const struct usb_action pb0330_60HZScale[] = {
{0xa0, 0xd0, ZC3XX_R020_HSYNC_3}, {0xa0, 0xd0, ZC3XX_R020_HSYNC_3},
{} {}
}; };
static const struct usb_action pb0330_NoFliker[] = { static const struct usb_action pb0330_NoFlicker[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xbb, 0x00, 0x0509}, {0xbb, 0x00, 0x0509},
{0xbb, 0x02, 0x0940}, {0xbb, 0x02, 0x0940},
...@@ -4809,7 +4809,7 @@ static const struct usb_action pb0330_NoFliker[] = { ...@@ -4809,7 +4809,7 @@ static const struct usb_action pb0330_NoFliker[] = {
{0xa0, 0xe0, ZC3XX_R020_HSYNC_3}, {0xa0, 0xe0, ZC3XX_R020_HSYNC_3},
{} {}
}; };
static const struct usb_action pb0330_NoFlikerScale[] = { static const struct usb_action pb0330_NoFlickerScale[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS},
{0xbb, 0x00, 0x0535}, {0xbb, 0x00, 0x0535},
{0xbb, 0x01, 0x0980}, {0xbb, 0x01, 0x0980},
...@@ -5031,7 +5031,7 @@ static const struct usb_action po2030_60HZ[] = { ...@@ -5031,7 +5031,7 @@ static const struct usb_action po2030_60HZ[] = {
{} {}
}; };
static const struct usb_action po2030_NoFliker[] = { static const struct usb_action po2030_NoFlicker[] = {
{0xa0, 0x02, ZC3XX_R180_AUTOCORRECTENABLE}, /* 01,80,02,cc */ {0xa0, 0x02, ZC3XX_R180_AUTOCORRECTENABLE}, /* 01,80,02,cc */
{0xaa, 0x8d, 0x000d}, /* 00,8d,0d,aa */ {0xaa, 0x8d, 0x000d}, /* 00,8d,0d,aa */
{0xaa, 0x1a, 0x0000}, /* 00,1a,00,aa */ {0xaa, 0x1a, 0x0000}, /* 00,1a,00,aa */
...@@ -5215,7 +5215,7 @@ static const struct usb_action tas5130c_60HZScale[] = { ...@@ -5215,7 +5215,7 @@ static const struct usb_action tas5130c_60HZScale[] = {
{0xa0, 0x50, ZC3XX_R11D_GLOBALGAIN}, {0xa0, 0x50, ZC3XX_R11D_GLOBALGAIN},
{} {}
}; };
static const struct usb_action tas5130c_NoFliker[] = { static const struct usb_action tas5130c_NoFlicker[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */
{0xaa, 0xa3, 0x0001}, /* 00,a3,01,aa */ {0xaa, 0xa3, 0x0001}, /* 00,a3,01,aa */
{0xaa, 0xa4, 0x0040}, /* 00,a4,40,aa */ {0xaa, 0xa4, 0x0040}, /* 00,a4,40,aa */
...@@ -5241,7 +5241,7 @@ static const struct usb_action tas5130c_NoFliker[] = { ...@@ -5241,7 +5241,7 @@ static const struct usb_action tas5130c_NoFliker[] = {
{} {}
}; };
static const struct usb_action tas5130c_NoFlikerScale[] = { static const struct usb_action tas5130c_NoFlickerScale[] = {
{0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */ {0xa0, 0x00, ZC3XX_R019_AUTOADJUSTFPS}, /* 00,19,00,cc */
{0xaa, 0xa3, 0x0001}, /* 00,a3,01,aa */ {0xaa, 0xa3, 0x0001}, /* 00,a3,01,aa */
{0xaa, 0xa4, 0x0090}, /* 00,a4,90,aa */ {0xaa, 0xa4, 0x0090}, /* 00,a4,90,aa */
...@@ -5482,7 +5482,7 @@ static const struct usb_action gc0303_60HZScale[] = { ...@@ -5482,7 +5482,7 @@ static const struct usb_action gc0303_60HZScale[] = {
{} {}
}; };
static const struct usb_action gc0303_NoFliker[] = { static const struct usb_action gc0303_NoFlicker[] = {
{0xa0, 0x0c, ZC3XX_R100_OPERATIONMODE}, /* 01,00,0c,cc, */ {0xa0, 0x0c, ZC3XX_R100_OPERATIONMODE}, /* 01,00,0c,cc, */
{0xaa, 0x82, 0x0000}, /* 00,82,00,aa */ {0xaa, 0x82, 0x0000}, /* 00,82,00,aa */
{0xaa, 0x83, 0x0000}, /* 00,83,00,aa */ {0xaa, 0x83, 0x0000}, /* 00,83,00,aa */
...@@ -5504,7 +5504,7 @@ static const struct usb_action gc0303_NoFliker[] = { ...@@ -5504,7 +5504,7 @@ static const struct usb_action gc0303_NoFliker[] = {
{} {}
}; };
static const struct usb_action gc0303_NoFlikerScale[] = { static const struct usb_action gc0303_NoFlickerScale[] = {
{0xa0, 0x0c, ZC3XX_R100_OPERATIONMODE}, /* 01,00,0c,cc, */ {0xa0, 0x0c, ZC3XX_R100_OPERATIONMODE}, /* 01,00,0c,cc, */
{0xaa, 0x82, 0x0000}, /* 00,82,00,aa */ {0xaa, 0x82, 0x0000}, /* 00,82,00,aa */
{0xaa, 0x83, 0x0000}, /* 00,83,00,aa */ {0xaa, 0x83, 0x0000}, /* 00,83,00,aa */
...@@ -5806,7 +5806,7 @@ static void setquality(struct gspca_dev *gspca_dev) ...@@ -5806,7 +5806,7 @@ static void setquality(struct gspca_dev *gspca_dev)
* Valid frequencies are: * Valid frequencies are:
* 50Hz, for European and Asian lighting (default) * 50Hz, for European and Asian lighting (default)
* 60Hz, for American lighting * 60Hz, for American lighting
* 0 = No Fliker (for outdoore usage) * 0 = No Flicker (for outdoor usage)
*/ */
static void setlightfreq(struct gspca_dev *gspca_dev, s32 val) static void setlightfreq(struct gspca_dev *gspca_dev, s32 val)
{ {
...@@ -5814,80 +5814,80 @@ static void setlightfreq(struct gspca_dev *gspca_dev, s32 val) ...@@ -5814,80 +5814,80 @@ static void setlightfreq(struct gspca_dev *gspca_dev, s32 val)
int i, mode; int i, mode;
const struct usb_action *zc3_freq; const struct usb_action *zc3_freq;
static const struct usb_action *freq_tb[SENSOR_MAX][6] = { static const struct usb_action *freq_tb[SENSOR_MAX][6] = {
[SENSOR_ADCM2700] = [SENSOR_ADCM2700] = {
{adcm2700_NoFliker, adcm2700_NoFliker, adcm2700_NoFlicker, adcm2700_NoFlicker,
adcm2700_50HZ, adcm2700_50HZ, adcm2700_50HZ, adcm2700_50HZ,
adcm2700_60HZ, adcm2700_60HZ}, adcm2700_60HZ, adcm2700_60HZ},
[SENSOR_CS2102] = [SENSOR_CS2102] = {
{cs2102_NoFliker, cs2102_NoFlikerScale, cs2102_NoFlicker, cs2102_NoFlickerScale,
cs2102_50HZ, cs2102_50HZScale, cs2102_50HZ, cs2102_50HZScale,
cs2102_60HZ, cs2102_60HZScale}, cs2102_60HZ, cs2102_60HZScale},
[SENSOR_CS2102K] = [SENSOR_CS2102K] = {
{cs2102_NoFliker, cs2102_NoFlikerScale, cs2102_NoFlicker, cs2102_NoFlickerScale,
NULL, NULL, /* currently disabled */ NULL, NULL, /* currently disabled */
NULL, NULL}, NULL, NULL},
[SENSOR_GC0303] = [SENSOR_GC0303] = {
{gc0303_NoFliker, gc0303_NoFlikerScale, gc0303_NoFlicker, gc0303_NoFlickerScale,
gc0303_50HZ, gc0303_50HZScale, gc0303_50HZ, gc0303_50HZScale,
gc0303_60HZ, gc0303_60HZScale}, gc0303_60HZ, gc0303_60HZScale},
[SENSOR_GC0305] = [SENSOR_GC0305] = {
{gc0305_NoFliker, gc0305_NoFliker, gc0305_NoFlicker, gc0305_NoFlicker,
gc0305_50HZ, gc0305_50HZ, gc0305_50HZ, gc0305_50HZ,
gc0305_60HZ, gc0305_60HZ}, gc0305_60HZ, gc0305_60HZ},
[SENSOR_HDCS2020] = [SENSOR_HDCS2020] = {
{hdcs2020_NoFliker, hdcs2020_NoFliker, hdcs2020_NoFlicker, hdcs2020_NoFlicker,
hdcs2020_50HZ, hdcs2020_50HZ, hdcs2020_50HZ, hdcs2020_50HZ,
hdcs2020_60HZ, hdcs2020_60HZ}, hdcs2020_60HZ, hdcs2020_60HZ},
[SENSOR_HV7131B] = [SENSOR_HV7131B] = {
{hv7131b_NoFliker, hv7131b_NoFlikerScale, hv7131b_NoFlicker, hv7131b_NoFlickerScale,
hv7131b_50HZ, hv7131b_50HZScale, hv7131b_50HZ, hv7131b_50HZScale,
hv7131b_60HZ, hv7131b_60HZScale}, hv7131b_60HZ, hv7131b_60HZScale},
[SENSOR_HV7131R] = [SENSOR_HV7131R] = {
{hv7131r_NoFliker, hv7131r_NoFlikerScale, hv7131r_NoFlicker, hv7131r_NoFlickerScale,
hv7131r_50HZ, hv7131r_50HZScale, hv7131r_50HZ, hv7131r_50HZScale,
hv7131r_60HZ, hv7131r_60HZScale}, hv7131r_60HZ, hv7131r_60HZScale},
[SENSOR_ICM105A] = [SENSOR_ICM105A] = {
{icm105a_NoFliker, icm105a_NoFlikerScale, icm105a_NoFlicker, icm105a_NoFlickerScale,
icm105a_50HZ, icm105a_50HZScale, icm105a_50HZ, icm105a_50HZScale,
icm105a_60HZ, icm105a_60HZScale}, icm105a_60HZ, icm105a_60HZScale},
[SENSOR_MC501CB] = [SENSOR_MC501CB] = {
{mc501cb_NoFliker, mc501cb_NoFlikerScale, mc501cb_NoFlicker, mc501cb_NoFlickerScale,
mc501cb_50HZ, mc501cb_50HZScale, mc501cb_50HZ, mc501cb_50HZScale,
mc501cb_60HZ, mc501cb_60HZScale}, mc501cb_60HZ, mc501cb_60HZScale},
[SENSOR_MT9V111_1] = [SENSOR_MT9V111_1] = {
{mt9v111_1_AENoFliker, mt9v111_1_AENoFlikerScale, mt9v111_1_AENoFlicker, mt9v111_1_AENoFlickerScale,
mt9v111_1_AE50HZ, mt9v111_1_AE50HZScale, mt9v111_1_AE50HZ, mt9v111_1_AE50HZScale,
mt9v111_1_AE60HZ, mt9v111_1_AE60HZScale}, mt9v111_1_AE60HZ, mt9v111_1_AE60HZScale},
[SENSOR_MT9V111_3] = [SENSOR_MT9V111_3] = {
{mt9v111_3_AENoFliker, mt9v111_3_AENoFlikerScale, mt9v111_3_AENoFlicker, mt9v111_3_AENoFlickerScale,
mt9v111_3_AE50HZ, mt9v111_3_AE50HZScale, mt9v111_3_AE50HZ, mt9v111_3_AE50HZScale,
mt9v111_3_AE60HZ, mt9v111_3_AE60HZScale}, mt9v111_3_AE60HZ, mt9v111_3_AE60HZScale},
[SENSOR_OV7620] = [SENSOR_OV7620] = {
{ov7620_NoFliker, ov7620_NoFliker, ov7620_NoFlicker, ov7620_NoFlicker,
ov7620_50HZ, ov7620_50HZ, ov7620_50HZ, ov7620_50HZ,
ov7620_60HZ, ov7620_60HZ}, ov7620_60HZ, ov7620_60HZ},
[SENSOR_OV7630C] = [SENSOR_OV7630C] = {
{NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL}, NULL, NULL},
[SENSOR_PAS106] = [SENSOR_PAS106] = {
{pas106b_NoFliker, pas106b_NoFliker, pas106b_NoFlicker, pas106b_NoFlicker,
pas106b_50HZ, pas106b_50HZ, pas106b_50HZ, pas106b_50HZ,
pas106b_60HZ, pas106b_60HZ}, pas106b_60HZ, pas106b_60HZ},
[SENSOR_PAS202B] = [SENSOR_PAS202B] = {
{pas202b_NoFliker, pas202b_NoFlikerScale, pas202b_NoFlicker, pas202b_NoFlickerScale,
pas202b_50HZ, pas202b_50HZScale, pas202b_50HZ, pas202b_50HZScale,
pas202b_60HZ, pas202b_60HZScale}, pas202b_60HZ, pas202b_60HZScale},
[SENSOR_PB0330] = [SENSOR_PB0330] = {
{pb0330_NoFliker, pb0330_NoFlikerScale, pb0330_NoFlicker, pb0330_NoFlickerScale,
pb0330_50HZ, pb0330_50HZScale, pb0330_50HZ, pb0330_50HZScale,
pb0330_60HZ, pb0330_60HZScale}, pb0330_60HZ, pb0330_60HZScale},
[SENSOR_PO2030] = [SENSOR_PO2030] = {
{po2030_NoFliker, po2030_NoFliker, po2030_NoFlicker, po2030_NoFlicker,
po2030_50HZ, po2030_50HZ, po2030_50HZ, po2030_50HZ,
po2030_60HZ, po2030_60HZ}, po2030_60HZ, po2030_60HZ},
[SENSOR_TAS5130C] = [SENSOR_TAS5130C] = {
{tas5130c_NoFliker, tas5130c_NoFlikerScale, tas5130c_NoFlicker, tas5130c_NoFlickerScale,
tas5130c_50HZ, tas5130c_50HZScale, tas5130c_50HZ, tas5130c_50HZScale,
tas5130c_60HZ, tas5130c_60HZScale}, tas5130c_60HZ, tas5130c_60HZScale},
}; };
......
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