Skip to content

L
linux
Commit 9bf81642 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files
Options

[media] gspca_t613: convert to the control framework 

Changes by Hans de Goede:
-rework how gain controls work to better match control framework
-make awb + gain + red/blue-balance a single auto-cluster
-only add the HFLIP control for TAS5130a sensor cams, as it breaks the
 video on other cams
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ed5cd6bb
Show whitespace changes
Inline Side-by-side
Showing with 201 additions and 618 deletions
drivers/media/video/gspca/t613.c
View file @ 9bf81642
...@@ -34,28 +34,19 @@ ...@@ -34,28 +34,19 @@
#include <linux/slab.h> #include <linux/slab.h>
#include "gspca.h" #include "gspca.h"
#define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 0)
MODULE_AUTHOR("Leandro Costantino <le_costantino@pixartargentina.com.ar>"); MODULE_AUTHOR("Leandro Costantino <le_costantino@pixartargentina.com.ar>");
MODULE_DESCRIPTION("GSPCA/T613 (JPEG Compliance) USB Camera Driver"); MODULE_DESCRIPTION("GSPCA/T613 (JPEG Compliance) USB Camera Driver");
MODULE_LICENSE("GPL"); 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 */
struct v4l2_ctrl *freq;
u8 brightness; struct { /* awb / color gains control cluster */
u8 contrast; struct v4l2_ctrl *awb;
u8 colors; struct v4l2_ctrl *gain;
u8 autogain; struct v4l2_ctrl *red_balance;
u8 gamma; struct v4l2_ctrl *blue_balance;
u8 sharpness; };
u8 freq;
u8 red_gain;
u8 blue_gain;
u8 green_gain;
u8 awb; /* set default r/g/b and activate */
u8 mirror;
u8 effect;
u8 sensor; u8 sensor;
u8 button_pressed; u8 button_pressed;
...@@ -67,224 +58,6 @@ enum sensors { ...@@ -67,224 +58,6 @@ enum sensors {
SENSOR_LT168G, /* must verify if this is the actual model */ SENSOR_LT168G, /* must verify if this is the actual model */
}; };
/* 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_setlowlight(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getlowlight(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_setgamma(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getgamma(struct gspca_dev *gspca_dev, __s32 *val);
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_setfreq(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_setawb(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getawb(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_setblue_gain(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getblue_gain(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_setred_gain(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getred_gain(struct gspca_dev *gspca_dev, __s32 *val);
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_setmirror(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getmirror(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_seteffect(struct gspca_dev *gspca_dev, __s32 val);
static int sd_geteffect(struct gspca_dev *gspca_dev, __s32 *val);
static const struct ctrl sd_ctrls[] = {
{
{
.id = V4L2_CID_BRIGHTNESS,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Brightness",
.minimum = 0,
.maximum = 14,
.step = 1,
#define BRIGHTNESS_DEF 8
.default_value = BRIGHTNESS_DEF,
},
.set = sd_setbrightness,
.get = sd_getbrightness,
},
{
{
.id = V4L2_CID_CONTRAST,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Contrast",
.minimum = 0,
.maximum = 0x0d,
.step = 1,
#define CONTRAST_DEF 0x07
.default_value = CONTRAST_DEF,
},
.set = sd_setcontrast,
.get = sd_getcontrast,
},
{
{
.id = V4L2_CID_SATURATION,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Color",
.minimum = 0,
.maximum = 0x0f,
.step = 1,
#define COLORS_DEF 0x05
.default_value = COLORS_DEF,
},
.set = sd_setcolors,
.get = sd_getcolors,
},
#define GAMMA_MAX 16
#define GAMMA_DEF 10
{
{
.id = V4L2_CID_GAMMA, /* (gamma on win) */
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Gamma",
.minimum = 0,
.maximum = GAMMA_MAX - 1,
.step = 1,
.default_value = GAMMA_DEF,
},
.set = sd_setgamma,
.get = sd_getgamma,
},
{
{
.id = V4L2_CID_BACKLIGHT_COMPENSATION, /* Activa lowlight,
* some apps dont bring up the
* backligth_compensation control) */
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Low Light",
.minimum = 0,
.maximum = 1,
.step = 1,
#define AUTOGAIN_DEF 0x01
.default_value = AUTOGAIN_DEF,
},
.set = sd_setlowlight,
.get = sd_getlowlight,
},
{
{
.id = V4L2_CID_HFLIP,
.type = V4L2_CTRL_TYPE_BOOLEAN,
.name = "Mirror Image",
.minimum = 0,
.maximum = 1,
.step = 1,
#define MIRROR_DEF 0
.default_value = MIRROR_DEF,
},
.set = sd_setmirror,
.get = sd_getmirror
},
{
{
.id = V4L2_CID_POWER_LINE_FREQUENCY,
.type = V4L2_CTRL_TYPE_MENU,
.name = "Light Frequency Filter",
.minimum = 1, /* 1 -> 0x50, 2->0x60 */
.maximum = 2,
.step = 1,
#define FREQ_DEF 1
.default_value = FREQ_DEF,
},
.set = sd_setfreq,
.get = sd_getfreq},
{
{
.id = V4L2_CID_AUTO_WHITE_BALANCE,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Auto White Balance",
.minimum = 0,
.maximum = 1,
.step = 1,
#define AWB_DEF 0
.default_value = AWB_DEF,
},
.set = sd_setawb,
.get = sd_getawb
},
{
{
.id = V4L2_CID_SHARPNESS,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Sharpness",
.minimum = 0,
.maximum = 15,
.step = 1,
#define SHARPNESS_DEF 0x06
.default_value = SHARPNESS_DEF,
},
.set = sd_setsharpness,
.get = sd_getsharpness,
},
{
{
.id = V4L2_CID_EFFECTS,
.type = V4L2_CTRL_TYPE_MENU,
.name = "Webcam Effects",
.minimum = 0,
.maximum = 4,
.step = 1,
#define EFFECTS_DEF 0
.default_value = EFFECTS_DEF,
},
.set = sd_seteffect,
.get = sd_geteffect
},
{
{
.id = V4L2_CID_BLUE_BALANCE,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Blue Balance",
.minimum = 0x10,
.maximum = 0x40,
.step = 1,
#define BLUE_GAIN_DEF 0x20
.default_value = BLUE_GAIN_DEF,
},
.set = sd_setblue_gain,
.get = sd_getblue_gain,
},
{
{
.id = V4L2_CID_RED_BALANCE,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Red Balance",
.minimum = 0x10,
.maximum = 0x40,
.step = 1,
#define RED_GAIN_DEF 0x20
.default_value = RED_GAIN_DEF,
},
.set = sd_setred_gain,
.get = sd_getred_gain,
},
{
{
.id = V4L2_CID_GAIN,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Gain",
.minimum = 0x10,
.maximum = 0x40,
.step = 1,
#define GAIN_DEF 0x20
.default_value = GAIN_DEF,
},
.set = sd_setgain,
.get = sd_getgain,
},
};
static const struct v4l2_pix_format vga_mode_t16[] = { static const struct v4l2_pix_format vga_mode_t16[] = {
{160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 160, .bytesperline = 160,
...@@ -454,17 +227,6 @@ static const struct additional_sensor_data sensor_data[] = { ...@@ -454,17 +227,6 @@ static const struct additional_sensor_data sensor_data[] = {
}; };
#define MAX_EFFECTS 7 #define MAX_EFFECTS 7
/* easily done by soft, this table could be removed,
* i keep it here just in case */
static char *effects_control[MAX_EFFECTS] = {
"Normal",
"Emboss", /* disabled */
"Monochrome",
"Sepia",
"Sketch",
"Sun Effect", /* disabled */
"Negative",
};
static const u8 effects_table[MAX_EFFECTS][6] = { static const u8 effects_table[MAX_EFFECTS][6] = {
{0xa8, 0xe8, 0xc6, 0xd2, 0xc0, 0x00}, /* Normal */ {0xa8, 0xe8, 0xc6, 0xd2, 0xc0, 0x00}, /* Normal */
{0xa8, 0xc8, 0xc6, 0x52, 0xc0, 0x04}, /* Repujar */ {0xa8, 0xc8, 0xc6, 0x52, 0xc0, 0x04}, /* Repujar */
...@@ -475,7 +237,8 @@ static const u8 effects_table[MAX_EFFECTS][6] = { ...@@ -475,7 +237,8 @@ static const u8 effects_table[MAX_EFFECTS][6] = {
{0xa8, 0xc8, 0xc6, 0xd2, 0xc0, 0x40}, /* Negative */ {0xa8, 0xc8, 0xc6, 0xd2, 0xc0, 0x40}, /* Negative */
}; };
static const u8 gamma_table[GAMMA_MAX][17] = { #define GAMMA_MAX (15)
static const u8 gamma_table[GAMMA_MAX+1][17] = {
/* gamma table from cam1690.ini */ /* gamma table from cam1690.ini */
{0x00, 0x00, 0x01, 0x04, 0x08, 0x0e, 0x16, 0x21, /* 0 */ {0x00, 0x00, 0x01, 0x04, 0x08, 0x0e, 0x16, 0x21, /* 0 */
0x2e, 0x3d, 0x50, 0x65, 0x7d, 0x99, 0xb8, 0xdb, 0x2e, 0x3d, 0x50, 0x65, 0x7d, 0x99, 0xb8, 0xdb,
...@@ -683,38 +446,18 @@ static void om6802_sensor_init(struct gspca_dev *gspca_dev) ...@@ -683,38 +446,18 @@ static void om6802_sensor_init(struct gspca_dev *gspca_dev)
static int sd_config(struct gspca_dev *gspca_dev, static int sd_config(struct gspca_dev *gspca_dev,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct cam *cam = &gspca_dev->cam;
struct cam *cam;
cam = &gspca_dev->cam;
cam->cam_mode = vga_mode_t16; cam->cam_mode = vga_mode_t16;
cam->nmodes = ARRAY_SIZE(vga_mode_t16); cam->nmodes = ARRAY_SIZE(vga_mode_t16);
sd->brightness = BRIGHTNESS_DEF;
sd->contrast = CONTRAST_DEF;
sd->colors = COLORS_DEF;
sd->gamma = GAMMA_DEF;
sd->autogain = AUTOGAIN_DEF;
sd->mirror = MIRROR_DEF;
sd->freq = FREQ_DEF;
sd->awb = AWB_DEF;
sd->sharpness = SHARPNESS_DEF;
sd->effect = EFFECTS_DEF;
sd->red_gain = RED_GAIN_DEF;
sd->blue_gain = BLUE_GAIN_DEF;
sd->green_gain = GAIN_DEF * 3 - RED_GAIN_DEF - BLUE_GAIN_DEF;
return 0; return 0;
} }
static void setbrightness(struct gspca_dev *gspca_dev) static void setbrightness(struct gspca_dev *gspca_dev, s32 brightness)
{ {
struct sd *sd = (struct sd *) gspca_dev;
unsigned int brightness;
u8 set6[4] = { 0x8f, 0x24, 0xc3, 0x00 }; u8 set6[4] = { 0x8f, 0x24, 0xc3, 0x00 };
brightness = sd->brightness;
if (brightness < 7) { if (brightness < 7) {
set6[1] = 0x26; set6[1] = 0x26;
set6[3] = 0x70 - brightness * 0x10; set6[3] = 0x70 - brightness * 0x10;
...@@ -725,10 +468,8 @@ static void setbrightness(struct gspca_dev *gspca_dev) ...@@ -725,10 +468,8 @@ static void setbrightness(struct gspca_dev *gspca_dev)
reg_w_buf(gspca_dev, set6, sizeof set6); reg_w_buf(gspca_dev, set6, sizeof set6);
} }
static void setcontrast(struct gspca_dev *gspca_dev) static void setcontrast(struct gspca_dev *gspca_dev, s32 contrast)
{ {
struct sd *sd = (struct sd *) gspca_dev;
unsigned int contrast = sd->contrast;
u16 reg_to_write; u16 reg_to_write;
if (contrast < 7) if (contrast < 7)
...@@ -739,89 +480,62 @@ static void setcontrast(struct gspca_dev *gspca_dev) ...@@ -739,89 +480,62 @@ static void setcontrast(struct gspca_dev *gspca_dev)
reg_w(gspca_dev, reg_to_write); reg_w(gspca_dev, reg_to_write);
} }
static void setcolors(struct gspca_dev *gspca_dev) static void setcolors(struct gspca_dev *gspca_dev, s32 val)
{ {
struct sd *sd = (struct sd *) gspca_dev;
u16 reg_to_write; u16 reg_to_write;
reg_to_write = 0x80bb + sd->colors * 0x100; /* was 0xc0 */ reg_to_write = 0x80bb + val * 0x100; /* was 0xc0 */
reg_w(gspca_dev, reg_to_write); reg_w(gspca_dev, reg_to_write);
} }
static void setgamma(struct gspca_dev *gspca_dev) static void setgamma(struct gspca_dev *gspca_dev, s32 val)
{ {
struct sd *sd = (struct sd *) gspca_dev;
PDEBUG(D_CONF, "Gamma: %d", sd->gamma); PDEBUG(D_CONF, "Gamma: %d", sd->gamma);
reg_w_ixbuf(gspca_dev, 0x90, reg_w_ixbuf(gspca_dev, 0x90,
gamma_table[sd->gamma], sizeof gamma_table[0]); gamma_table[val], sizeof gamma_table[0]);
} }
static void setRGB(struct gspca_dev *gspca_dev) static void setawb_n_RGB(struct gspca_dev *gspca_dev)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
u8 all_gain_reg[6] = u8 all_gain_reg[8] = {
{0x87, 0x00, 0x88, 0x00, 0x89, 0x00}; 0x87, 0x00, 0x88, 0x00, 0x89, 0x00, 0x80, 0x00 };
s32 red_gain, blue_gain, green_gain;
green_gain = sd->gain->val;
red_gain = green_gain + sd->red_balance->val;
if (red_gain > 0x40)
red_gain = 0x40;
else if (red_gain < 0x10)
red_gain = 0x10;
blue_gain = green_gain + sd->blue_balance->val;
if (blue_gain > 0x40)
blue_gain = 0x40;
else if (blue_gain < 0x10)
blue_gain = 0x10;
all_gain_reg[1] = red_gain;
all_gain_reg[3] = blue_gain;
all_gain_reg[5] = green_gain;
all_gain_reg[7] = sensor_data[sd->sensor].reg80;
if (!sd->awb->val)
all_gain_reg[7] &= ~0x04; /* AWB off */
all_gain_reg[1] = sd->red_gain;
all_gain_reg[3] = sd->blue_gain;
all_gain_reg[5] = sd->green_gain;
reg_w_buf(gspca_dev, all_gain_reg, sizeof all_gain_reg); reg_w_buf(gspca_dev, all_gain_reg, sizeof all_gain_reg);
} }
/* Generic fnc for r/b balance, exposure and awb */ static void setsharpness(struct gspca_dev *gspca_dev, s32 val)
static void setawb(struct gspca_dev *gspca_dev)
{
struct sd *sd = (struct sd *) gspca_dev;
u16 reg80;
reg80 = (sensor_data[sd->sensor].reg80 << 8) | 0x80;
/* on awb leave defaults values */
if (!sd->awb) {
/* shoud we wait here.. */
/* update and reset RGB gains with webcam values */
sd->red_gain = reg_r(gspca_dev, 0x0087);
sd->blue_gain = reg_r(gspca_dev, 0x0088);
sd->green_gain = reg_r(gspca_dev, 0x0089);
reg80 &= ~0x0400; /* AWB off */
}
reg_w(gspca_dev, reg80);
reg_w(gspca_dev, reg80);
}
static void init_gains(struct gspca_dev *gspca_dev)
{ {
struct sd *sd = (struct sd *) gspca_dev;
u16 reg80;
u8 all_gain_reg[8] =
{0x87, 0x00, 0x88, 0x00, 0x89, 0x00, 0x80, 0x00};
all_gain_reg[1] = sd->red_gain;
all_gain_reg[3] = sd->blue_gain;
all_gain_reg[5] = sd->green_gain;
reg80 = sensor_data[sd->sensor].reg80;
if (!sd->awb)
reg80 &= ~0x04;
all_gain_reg[7] = reg80;
reg_w_buf(gspca_dev, all_gain_reg, sizeof all_gain_reg);
reg_w(gspca_dev, (sd->red_gain << 8) + 0x87);
reg_w(gspca_dev, (sd->blue_gain << 8) + 0x88);
reg_w(gspca_dev, (sd->green_gain << 8) + 0x89);
}
static void setsharpness(struct gspca_dev *gspca_dev)
{
struct sd *sd = (struct sd *) gspca_dev;
u16 reg_to_write; u16 reg_to_write;
reg_to_write = 0x0aa6 + 0x1000 * sd->sharpness; reg_to_write = 0x0aa6 + 0x1000 * val;
reg_w(gspca_dev, reg_to_write); reg_w(gspca_dev, reg_to_write);
} }
static void setfreq(struct gspca_dev *gspca_dev) static void setfreq(struct gspca_dev *gspca_dev, s32 val)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
u8 reg66; u8 reg66;
...@@ -829,7 +543,7 @@ static void setfreq(struct gspca_dev *gspca_dev) ...@@ -829,7 +543,7 @@ static void setfreq(struct gspca_dev *gspca_dev)
switch (sd->sensor) { switch (sd->sensor) {
case SENSOR_LT168G: case SENSOR_LT168G:
if (sd->freq != 0) if (val != 0)
freq[3] = 0xa8; freq[3] = 0xa8;
reg66 = 0x41; reg66 = 0x41;
break; break;
...@@ -840,7 +554,7 @@ static void setfreq(struct gspca_dev *gspca_dev) ...@@ -840,7 +554,7 @@ static void setfreq(struct gspca_dev *gspca_dev)
reg66 = 0x40; reg66 = 0x40;
break; break;
} }
switch (sd->freq) { switch (val) {
case 0: /* no flicker */ case 0: /* no flicker */
freq[3] = 0xf0; freq[3] = 0xf0;
break; break;
...@@ -941,14 +655,9 @@ static int sd_init(struct gspca_dev *gspca_dev) ...@@ -941,14 +655,9 @@ static int sd_init(struct gspca_dev *gspca_dev)
reg_w(gspca_dev, (sensor->reg80 << 8) + 0x80); reg_w(gspca_dev, (sensor->reg80 << 8) + 0x80);
reg_w(gspca_dev, (sensor->reg80 << 8) + 0x80); reg_w(gspca_dev, (sensor->reg80 << 8) + 0x80);
reg_w(gspca_dev, (sensor->reg8e << 8) + 0x8e); reg_w(gspca_dev, (sensor->reg8e << 8) + 0x8e);
reg_w(gspca_dev, (0x20 << 8) + 0x87);
setbrightness(gspca_dev); reg_w(gspca_dev, (0x20 << 8) + 0x88);
setcontrast(gspca_dev); reg_w(gspca_dev, (0x20 << 8) + 0x89);
setgamma(gspca_dev);
setcolors(gspca_dev);
setsharpness(gspca_dev);
init_gains(gspca_dev);
setfreq(gspca_dev);
reg_w_buf(gspca_dev, sensor->data5, sizeof sensor->data5); reg_w_buf(gspca_dev, sensor->data5, sizeof sensor->data5);
reg_w_buf(gspca_dev, sensor->nset8, sizeof sensor->nset8); reg_w_buf(gspca_dev, sensor->nset8, sizeof sensor->nset8);
...@@ -968,31 +677,44 @@ static int sd_init(struct gspca_dev *gspca_dev) ...@@ -968,31 +677,44 @@ static int sd_init(struct gspca_dev *gspca_dev)
return 0; return 0;
} }
static void setmirror(struct gspca_dev *gspca_dev) static void setmirror(struct gspca_dev *gspca_dev, s32 val)
{ {
struct sd *sd = (struct sd *) gspca_dev;
u8 hflipcmd[8] = u8 hflipcmd[8] =
{0x62, 0x07, 0x63, 0x03, 0x64, 0x00, 0x60, 0x09}; {0x62, 0x07, 0x63, 0x03, 0x64, 0x00, 0x60, 0x09};
if (sd->mirror) if (val)
hflipcmd[3] = 0x01; hflipcmd[3] = 0x01;
reg_w_buf(gspca_dev, hflipcmd, sizeof hflipcmd); reg_w_buf(gspca_dev, hflipcmd, sizeof hflipcmd);
} }
static void seteffect(struct gspca_dev *gspca_dev) static void seteffect(struct gspca_dev *gspca_dev, s32 val)
{ {
struct sd *sd = (struct sd *) gspca_dev; int idx = 0;
reg_w_buf(gspca_dev, effects_table[sd->effect], switch (val) {
sizeof effects_table[0]); case V4L2_COLORFX_NONE:
if (sd->effect == 1 || sd->effect == 5) { break;
PDEBUG(D_CONF, case V4L2_COLORFX_BW:
"This effect have been disabled for webcam \"safety\""); idx = 2;
return; break;
case V4L2_COLORFX_SEPIA:
idx = 3;
break;
case V4L2_COLORFX_SKETCH:
idx = 4;
break;
case V4L2_COLORFX_NEGATIVE:
idx = 6;
break;
default:
break;
} }
if (sd->effect == 1 || sd->effect == 4) reg_w_buf(gspca_dev, effects_table[idx],
sizeof effects_table[0]);
if (val == V4L2_COLORFX_SKETCH)
reg_w(gspca_dev, 0x4aa6); reg_w(gspca_dev, 0x4aa6);
else else
reg_w(gspca_dev, 0xfaa6); reg_w(gspca_dev, 0xfaa6);
...@@ -1070,7 +792,7 @@ static int sd_start(struct gspca_dev *gspca_dev) ...@@ -1070,7 +792,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
break; break;
} }
sensor = &sensor_data[sd->sensor]; sensor = &sensor_data[sd->sensor];
setfreq(gspca_dev); setfreq(gspca_dev, v4l2_ctrl_g_ctrl(sd->freq));
reg_r(gspca_dev, 0x0012); reg_r(gspca_dev, 0x0012);
reg_w_buf(gspca_dev, t2, sizeof t2); reg_w_buf(gspca_dev, t2, sizeof t2);
reg_w_ixbuf(gspca_dev, 0xb3, t3, sizeof t3); reg_w_ixbuf(gspca_dev, 0xb3, t3, sizeof t3);
...@@ -1142,296 +864,157 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, ...@@ -1142,296 +864,157 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
gspca_frame_add(gspca_dev, pkt_type, data, len); gspca_frame_add(gspca_dev, pkt_type, data, len);
} }
static int sd_setblue_gain(struct gspca_dev *gspca_dev, __s32 val) static int sd_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct gspca_dev *gspca_dev =
container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
sd->blue_gain = val; struct sd *sd = (struct sd *)gspca_dev;
if (gspca_dev->streaming) s32 red_gain, blue_gain, green_gain;
reg_w(gspca_dev, (val << 8) + 0x88);
return 0; gspca_dev->usb_err = 0;
}
switch (ctrl->id) {
static int sd_getblue_gain(struct gspca_dev *gspca_dev, __s32 *val) case V4L2_CID_AUTO_WHITE_BALANCE:
{ red_gain = reg_r(gspca_dev, 0x0087);
struct sd *sd = (struct sd *) gspca_dev; if (red_gain > 0x40)
red_gain = 0x40;
*val = sd->blue_gain; else if (red_gain < 0x10)
return 0; red_gain = 0x10;
}
blue_gain = reg_r(gspca_dev, 0x0088);
static int sd_setred_gain(struct gspca_dev *gspca_dev, __s32 val) if (blue_gain > 0x40)
{ blue_gain = 0x40;
struct sd *sd = (struct sd *) gspca_dev; else if (blue_gain < 0x10)
blue_gain = 0x10;
sd->red_gain = val;
if (gspca_dev->streaming) green_gain = reg_r(gspca_dev, 0x0089);
reg_w(gspca_dev, (val << 8) + 0x87); if (green_gain > 0x40)
green_gain = 0x40;
return 0; else if (green_gain < 0x10)
} green_gain = 0x10;
static int sd_getred_gain(struct gspca_dev *gspca_dev, __s32 *val) sd->gain->val = green_gain;
{ sd->red_balance->val = red_gain - green_gain;
struct sd *sd = (struct sd *) gspca_dev; sd->blue_balance->val = blue_gain - green_gain;
break;
*val = sd->red_gain; }
return 0;
}
static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;
u16 psg, nsg;
psg = sd->red_gain + sd->blue_gain + sd->green_gain;
nsg = val * 3;
sd->red_gain = sd->red_gain * nsg / psg;
if (sd->red_gain > 0x40)
sd->red_gain = 0x40;
else if (sd->red_gain < 0x10)
sd->red_gain = 0x10;
sd->blue_gain = sd->blue_gain * nsg / psg;
if (sd->blue_gain > 0x40)
sd->blue_gain = 0x40;
else if (sd->blue_gain < 0x10)
sd->blue_gain = 0x10;
sd->green_gain = sd->green_gain * nsg / psg;
if (sd->green_gain > 0x40)
sd->green_gain = 0x40;
else if (sd->green_gain < 0x10)
sd->green_gain = 0x10;
if (gspca_dev->streaming)
setRGB(gspca_dev);
return 0;
}
static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;
*val = (sd->red_gain + sd->blue_gain + sd->green_gain) / 3;
return 0;
}
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 *val;
}
static int sd_setawb(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;
sd->awb = val;
if (gspca_dev->streaming)
setawb(gspca_dev);
return 0;
}
static int sd_getawb(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;
*val = sd->awb;
return *val;
}
static int sd_setmirror(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;
sd->mirror = val;
if (gspca_dev->streaming)
setmirror(gspca_dev);
return 0;
}
static int sd_getmirror(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;
*val = sd->mirror;
return *val;
}
static int sd_seteffect(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;
sd->effect = val;
if (gspca_dev->streaming)
seteffect(gspca_dev);
return 0;
}
static int sd_geteffect(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;
*val = sd->effect;
return *val;
}
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 *val;
}
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_setgamma(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;
sd->gamma = val;
if (gspca_dev->streaming)
setgamma(gspca_dev);
return 0;
}
static int sd_getgamma(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;
*val = sd->gamma;
return 0; return 0;
} }
static int sd_setfreq(struct gspca_dev *gspca_dev, __s32 val) static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct gspca_dev *gspca_dev =
container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
sd->freq = val; gspca_dev->usb_err = 0;
if (gspca_dev->streaming)
setfreq(gspca_dev);
return 0;
}
static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val) if (!gspca_dev->streaming)
{
struct sd *sd = (struct sd *) gspca_dev;
*val = sd->freq;
return 0; return 0;
}
static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val) switch (ctrl->id) {
{ case V4L2_CID_BRIGHTNESS:
struct sd *sd = (struct sd *) gspca_dev; setbrightness(gspca_dev, ctrl->val);
break;
sd->sharpness = val; case V4L2_CID_CONTRAST:
if (gspca_dev->streaming) setcontrast(gspca_dev, ctrl->val);
setsharpness(gspca_dev); break;
return 0; case V4L2_CID_SATURATION:
} setcolors(gspca_dev, ctrl->val);
break;
static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val) case V4L2_CID_GAMMA:
{ setgamma(gspca_dev, ctrl->val);
struct sd *sd = (struct sd *) gspca_dev; break;
case V4L2_CID_HFLIP:
*val = sd->sharpness; setmirror(gspca_dev, ctrl->val);
return 0; break;
case V4L2_CID_SHARPNESS:
setsharpness(gspca_dev, ctrl->val);
break;
case V4L2_CID_POWER_LINE_FREQUENCY:
setfreq(gspca_dev, ctrl->val);
break;
case V4L2_CID_BACKLIGHT_COMPENSATION:
reg_w(gspca_dev, ctrl->val ? 0xf48e : 0xb48e);
break;
case V4L2_CID_AUTO_WHITE_BALANCE:
setawb_n_RGB(gspca_dev);
break;
case V4L2_CID_COLORFX:
seteffect(gspca_dev, ctrl->val);
break;
}
return gspca_dev->usb_err;
} }
/* Low Light set here......*/ static const struct v4l2_ctrl_ops sd_ctrl_ops = {
static int sd_setlowlight(struct gspca_dev *gspca_dev, __s32 val) .g_volatile_ctrl = sd_g_volatile_ctrl,
{ .s_ctrl = sd_s_ctrl,
struct sd *sd = (struct sd *) gspca_dev; };
sd->autogain = val;
if (val != 0)
reg_w(gspca_dev, 0xf48e);
else
reg_w(gspca_dev, 0xb48e);
return 0;
}
static int sd_getlowlight(struct gspca_dev *gspca_dev, __s32 *val) static int sd_init_controls(struct gspca_dev *gspca_dev)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *)gspca_dev;
struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
*val = sd->autogain;
return 0; gspca_dev->vdev.ctrl_handler = hdl;
} v4l2_ctrl_handler_init(hdl, 12);
v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_BRIGHTNESS, 0, 14, 1, 8);
v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_CONTRAST, 0, 0x0d, 1, 7);
v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_SATURATION, 0, 0xf, 1, 5);
v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_GAMMA, 0, GAMMA_MAX, 1, 10);
/* Activate lowlight, some apps dont bring up the
backlight_compensation control) */
v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_BACKLIGHT_COMPENSATION, 0, 1, 1, 1);
if (sd->sensor == SENSOR_TAS5130A)
v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_HFLIP, 0, 1, 1, 0);
sd->awb = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_AUTO_WHITE_BALANCE, 0, 1, 1, 1);
sd->gain = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_GAIN, 0x10, 0x40, 1, 0x20);
sd->blue_balance = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_BLUE_BALANCE, -0x30, 0x30, 1, 0);
sd->red_balance = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_RED_BALANCE, -0x30, 0x30, 1, 0);
v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_SHARPNESS, 0, 15, 1, 6);
v4l2_ctrl_new_std_menu(hdl, &sd_ctrl_ops,
V4L2_CID_COLORFX, V4L2_COLORFX_SKETCH,
~((1 << V4L2_COLORFX_NONE) |
(1 << V4L2_COLORFX_BW) |
(1 << V4L2_COLORFX_SEPIA) |
(1 << V4L2_COLORFX_SKETCH) |
(1 << V4L2_COLORFX_NEGATIVE)),
V4L2_COLORFX_NONE);
sd->freq = v4l2_ctrl_new_std_menu(hdl, &sd_ctrl_ops,
V4L2_CID_POWER_LINE_FREQUENCY,
V4L2_CID_POWER_LINE_FREQUENCY_60HZ, 1,
V4L2_CID_POWER_LINE_FREQUENCY_50HZ);
if (hdl->error) {
pr_err("Could not initialize controls\n");
return hdl->error;
}
static int sd_querymenu(struct gspca_dev *gspca_dev, v4l2_ctrl_auto_cluster(4, &sd->awb, 0, true);
struct v4l2_querymenu *menu)
{
static const char *freq_nm[3] = {"NoFliker", "50 Hz", "60 Hz"};
switch (menu->id) {
case V4L2_CID_POWER_LINE_FREQUENCY:
if ((unsigned) menu->index >= ARRAY_SIZE(freq_nm))
break;
strcpy((char *) menu->name, freq_nm[menu->index]);
return 0; return 0;
case V4L2_CID_EFFECTS:
if ((unsigned) menu->index < ARRAY_SIZE(effects_control)) {
strlcpy((char *) menu->name,
effects_control[menu->index],
sizeof menu->name);
return 0;
}
break;
}
return -EINVAL;
} }
/* sub-driver description */ /* sub-driver description */
static const struct sd_desc sd_desc = { static const struct sd_desc sd_desc = {
.name = MODULE_NAME, .name = MODULE_NAME,
.ctrls = sd_ctrls,
.nctrls = ARRAY_SIZE(sd_ctrls),
.config = sd_config, .config = sd_config,
.init = sd_init, .init = sd_init,
.init_controls = sd_init_controls,
.start = sd_start, .start = sd_start,
.stopN = sd_stopN, .stopN = sd_stopN,
.pkt_scan = sd_pkt_scan, .pkt_scan = sd_pkt_scan,
.querymenu = sd_querymenu,
#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
.other_input = 1, .other_input = 1,
#endif #endif
......
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