Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 192786
b: refs/heads/master
c: c3f52f6
h: refs/heads/master
v: v3
  • Loading branch information
Max Thrun authored and Mauro Carvalho Chehab committed May 18, 2010
1 parent 2328b09 commit b51b95f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 95 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: c4ea13b40bc962245a38148dc5e7633fd8428880
refs/heads/master: c3f52f630d067c7590ed438bfb0a82bcb91e0b21
100 changes: 6 additions & 94 deletions trunk/drivers/media/video/gspca/ov534.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ struct sd {
u8 contrast;
u8 gain;
u8 exposure;
u8 redblc;
u8 blueblc;
u8 hue;
u8 autogain;
u8 awb;
Expand All @@ -76,10 +74,6 @@ static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_setredblc(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getredblc(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_setblueblc(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getblueblc(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val);
Expand Down Expand Up @@ -155,34 +149,6 @@ static const struct ctrl sd_ctrls[] = {
.get = sd_getexposure,
},
{ /* 4 */
{
.id = V4L2_CID_RED_BALANCE,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Red Balance",
.minimum = 0,
.maximum = 255,
.step = 1,
#define RED_BALANCE_DEF 128
.default_value = RED_BALANCE_DEF,
},
.set = sd_setredblc,
.get = sd_getredblc,
},
{ /* 5 */
{
.id = V4L2_CID_BLUE_BALANCE,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Blue Balance",
.minimum = 0,
.maximum = 255,
.step = 1,
#define BLUE_BALANCE_DEF 128
.default_value = BLUE_BALANCE_DEF,
},
.set = sd_setblueblc,
.get = sd_getblueblc,
},
{ /* 6 */
{
.id = V4L2_CID_HUE,
.type = V4L2_CTRL_TYPE_INTEGER,
Expand All @@ -196,7 +162,7 @@ static const struct ctrl sd_ctrls[] = {
.set = sd_sethue,
.get = sd_gethue,
},
{ /* 7 */
{ /* 5 */
{
.id = V4L2_CID_AUTOGAIN,
.type = V4L2_CTRL_TYPE_BOOLEAN,
Expand All @@ -210,8 +176,8 @@ static const struct ctrl sd_ctrls[] = {
.set = sd_setautogain,
.get = sd_getautogain,
},
#define AWB_IDX 8
{ /* 8 */
#define AWB_IDX 6
{ /* 6 */
{
.id = V4L2_CID_AUTO_WHITE_BALANCE,
.type = V4L2_CTRL_TYPE_BOOLEAN,
Expand All @@ -225,7 +191,7 @@ static const struct ctrl sd_ctrls[] = {
.set = sd_setawb,
.get = sd_getawb,
},
{ /* 9 */
{ /* 7 */
{
.id = V4L2_CID_SHARPNESS,
.type = V4L2_CTRL_TYPE_INTEGER,
Expand All @@ -239,7 +205,7 @@ static const struct ctrl sd_ctrls[] = {
.set = sd_setsharpness,
.get = sd_getsharpness,
},
{ /* 10 */
{ /* 8 */
{
.id = V4L2_CID_HFLIP,
.type = V4L2_CTRL_TYPE_BOOLEAN,
Expand All @@ -253,7 +219,7 @@ static const struct ctrl sd_ctrls[] = {
.set = sd_sethflip,
.get = sd_gethflip,
},
{ /* 11 */
{ /* 9 */
{
.id = V4L2_CID_VFLIP,
.type = V4L2_CTRL_TYPE_BOOLEAN,
Expand Down Expand Up @@ -722,20 +688,6 @@ static void setexposure(struct gspca_dev *gspca_dev)
sccb_reg_write(gspca_dev, 0x10, val << 1);
}

static void setredblc(struct gspca_dev *gspca_dev)
{
struct sd *sd = (struct sd *) gspca_dev;

sccb_reg_write(gspca_dev, 0x43, sd->redblc);
}

static void setblueblc(struct gspca_dev *gspca_dev)
{
struct sd *sd = (struct sd *) gspca_dev;

sccb_reg_write(gspca_dev, 0x42, sd->blueblc);
}

static void sethue(struct gspca_dev *gspca_dev)
{
struct sd *sd = (struct sd *) gspca_dev;
Expand Down Expand Up @@ -825,8 +777,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
sd->contrast = CONTRAST_DEF;
sd->gain = GAIN_DEF;
sd->exposure = EXPO_DEF;
sd->redblc = RED_BALANCE_DEF;
sd->blueblc = BLUE_BALANCE_DEF;
sd->hue = HUE_DEF;
#if AUTOGAIN_DEF != 0
sd->autogain = AUTOGAIN_DEF;
Expand Down Expand Up @@ -907,8 +857,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
setautogain(gspca_dev);
setawb(gspca_dev);
setgain(gspca_dev);
setredblc(gspca_dev);
setblueblc(gspca_dev);
sethue(gspca_dev);
setexposure(gspca_dev);
setbrightness(gspca_dev);
Expand Down Expand Up @@ -1092,42 +1040,6 @@ static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
return 0;
}

static int sd_setredblc(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;

sd->redblc = val;
if (gspca_dev->streaming)
setredblc(gspca_dev);
return 0;
}

static int sd_getredblc(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;

*val = sd->redblc;
return 0;
}

static int sd_setblueblc(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;

sd->blueblc = val;
if (gspca_dev->streaming)
setblueblc(gspca_dev);
return 0;
}

static int sd_getblueblc(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;

*val = sd->blueblc;
return 0;
}

static int sd_sethue(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;
Expand Down

0 comments on commit b51b95f

Please sign in to comment.