Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 137786
b: refs/heads/master
c: c314b53
h: refs/heads/master
v: v3
  • Loading branch information
Jean-Francois Moine authored and Mauro Carvalho Chehab committed Mar 30, 2009
1 parent 7a744ec commit a937fb8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 41 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f1ee8e88e93cec2aabbd6669a0a94c8b8ad6d8fc
refs/heads/master: c314b53bdd2059860ae49c0cd1256d9c60b185fd
43 changes: 3 additions & 40 deletions trunk/drivers/media/video/gspca/zc3xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,19 +381,6 @@ static const struct usb_action adcm2700_50HZ[] = {
{0xaa, 0x28, 0x0002}, /* 00,28,02,aa */
{}
};
static const struct usb_action adcm2700_50HZScale[] = {
{0xa0, 0x01, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,01,cc */
{0xaa, 0xfe, 0x0002}, /* 00,fe,02,aa */
{0xa0, 0x0a, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,0a,cc */
{0xbb, 0x05, 0x8400}, /* 84,05,00,bb */
{0xbb, 0xd0, 0xb007}, /* b0,d0,07,bb */
{0xbb, 0xa0, 0xb80f}, /* b8,a0,0f,bb */
{0xa0, 0x01, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,01,cc */
{0xaa, 0xfe, 0x0010}, /* 00,fe,10,aa */
{0xaa, 0x26, 0x00d0}, /* 00,26,d0,aa */
{0xaa, 0x28, 0x0002}, /* 00,28,02,aa */
{}
};
static const struct usb_action adcm2700_60HZ[] = {
{0xa0, 0x01, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,01,cc */
{0xaa, 0xfe, 0x0002}, /* 00,fe,02,aa */
Expand All @@ -407,19 +394,6 @@ static const struct usb_action adcm2700_60HZ[] = {
{0xaa, 0x28, 0x0002}, /* 00,28,02,aa */
{}
};
static const struct usb_action adcm2700_60HZScale[] = {
{0xa0, 0x01, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,01,cc */
{0xaa, 0xfe, 0x0002}, /* 00,fe,02,aa */
{0xa0, 0x0a, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,0a,cc */
{0xbb, 0x07, 0x8400}, /* 84,07,00,bb */
{0xbb, 0x82, 0xb006}, /* b0,82,06,bb */
{0xbb, 0x04, 0xb80d}, /* b8,04,0d,bb */
{0xa0, 0x01, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,01,cc */
{0xaa, 0xfe, 0x0010}, /* 00,fe,10,aa */
{0xaa, 0x26, 0x0057}, /* 00,26,57,aa */
{0xaa, 0x28, 0x0002}, /* 00,28,02,aa */
{}
};
static const struct usb_action adcm2700_NoFliker[] = {
{0xa0, 0x01, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,01,cc */
{0xaa, 0xfe, 0x0002}, /* 00,fe,02,aa */
Expand All @@ -431,17 +405,6 @@ static const struct usb_action adcm2700_NoFliker[] = {
{0xaa, 0xfe, 0x0010}, /* 00,fe,10,aa */
{}
};
static const struct usb_action adcm2700_NoFlikerScale[] = {
{0xa0, 0x01, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,01,cc */
{0xaa, 0xfe, 0x0002}, /* 00,fe,02,aa */
{0xa0, 0x0a, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,0a,cc */
{0xbb, 0x07, 0x8400}, /* 84,07,00,bb */
{0xbb, 0x05, 0xb000}, /* b0,05,00,bb */
{0xbb, 0xa0, 0xb801}, /* b8,a0,01,bb */
{0xa0, 0x01, ZC3XX_R010_CMOSSENSORSELECT}, /* 00,10,01,cc */
{0xaa, 0xfe, 0x0010}, /* 00,fe,10,aa */
{}
};
static const struct usb_action cs2102_Initial[] = {
{0xa1, 0x01, 0x0008},
{0xa1, 0x01, 0x0008},
Expand Down Expand Up @@ -6622,9 +6585,9 @@ static int setlightfreq(struct gspca_dev *gspca_dev)
const struct usb_action *zc3_freq;
static const struct usb_action *freq_tb[SENSOR_MAX][6] = {
/* SENSOR_ADCM2700 0 */
{adcm2700_NoFlikerScale, adcm2700_NoFliker,
adcm2700_50HZScale, adcm2700_50HZ,
adcm2700_60HZScale, adcm2700_60HZ},
{adcm2700_NoFliker, adcm2700_NoFliker,
adcm2700_50HZ, adcm2700_50HZ,
adcm2700_60HZ, adcm2700_60HZ},
/* SENSOR_CS2102 1 */
{cs2102_NoFliker, cs2102_NoFlikerScale,
cs2102_50HZ, cs2102_50HZScale,
Expand Down

0 comments on commit a937fb8

Please sign in to comment.