Skip to content

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

[media] xirlink_cit: convert to the control framework 

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 4910adf1
Show whitespace changes
Inline Side-by-side
Showing with 141 additions and 324 deletions
drivers/media/video/gspca/xirlink_cit.c
View file @ d5d875cb
...@@ -53,6 +53,7 @@ MODULE_PARM_DESC(rca_input, ...@@ -53,6 +53,7 @@ MODULE_PARM_DESC(rca_input,
/* specific webcam descriptor */ /* specific webcam descriptor */
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 *lighting;
u8 model; u8 model;
#define CIT_MODEL0 0 /* bcd version 0.01 cams ie the xvp-500 */ #define CIT_MODEL0 0 /* bcd version 0.01 cams ie the xvp-500 */
#define CIT_MODEL1 1 /* The model 1 - 4 nomenclature comes from the old */ #define CIT_MODEL1 1 /* The model 1 - 4 nomenclature comes from the old */
...@@ -65,127 +66,10 @@ struct sd { ...@@ -65,127 +66,10 @@ struct sd {
u8 stop_on_control_change; u8 stop_on_control_change;
u8 sof_read; u8 sof_read;
u8 sof_len; u8 sof_len;
u8 contrast;
u8 brightness;
u8 hue;
u8 sharpness;
u8 lighting;
u8 hflip;
}; };
/* 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_sethue(struct gspca_dev *gspca_dev, __s32 val);
static int sd_gethue(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_setlighting(struct gspca_dev *gspca_dev, __s32 val);
static int sd_getlighting(struct gspca_dev *gspca_dev, __s32 *val);
static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val);
static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val);
static void sd_stop0(struct gspca_dev *gspca_dev); static void sd_stop0(struct gspca_dev *gspca_dev);
static const struct ctrl sd_ctrls[] = {
#define SD_BRIGHTNESS 0
{
{
.id = V4L2_CID_BRIGHTNESS,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Brightness",
.minimum = 0,
.maximum = 63,
.step = 1,
#define BRIGHTNESS_DEFAULT 32
.default_value = BRIGHTNESS_DEFAULT,
.flags = 0,
},
.set = sd_setbrightness,
.get = sd_getbrightness,
},
#define SD_CONTRAST 1
{
{
.id = V4L2_CID_CONTRAST,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "contrast",
.minimum = 0,
.maximum = 20,
.step = 1,
#define CONTRAST_DEFAULT 10
.default_value = CONTRAST_DEFAULT,
.flags = 0,
},
.set = sd_setcontrast,
.get = sd_getcontrast,
},
#define SD_HUE 2
{
{
.id = V4L2_CID_HUE,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Hue",
.minimum = 0,
.maximum = 127,
.step = 1,
#define HUE_DEFAULT 63
.default_value = HUE_DEFAULT,
.flags = 0,
},
.set = sd_sethue,
.get = sd_gethue,
},
#define SD_SHARPNESS 3
{
{
.id = V4L2_CID_SHARPNESS,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Sharpness",
.minimum = 0,
.maximum = 6,
.step = 1,
#define SHARPNESS_DEFAULT 3
.default_value = SHARPNESS_DEFAULT,
.flags = 0,
},
.set = sd_setsharpness,
.get = sd_getsharpness,
},
#define SD_LIGHTING 4
{
{
.id = V4L2_CID_BACKLIGHT_COMPENSATION,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Lighting",
.minimum = 0,
.maximum = 2,
.step = 1,
#define LIGHTING_DEFAULT 1
.default_value = LIGHTING_DEFAULT,
.flags = 0,
},
.set = sd_setlighting,
.get = sd_getlighting,
},
#define SD_HFLIP 5
{
{
.id = V4L2_CID_HFLIP,
.type = V4L2_CTRL_TYPE_BOOLEAN,
.name = "Mirror",
.minimum = 0,
.maximum = 1,
.step = 1,
#define HFLIP_DEFAULT 0
.default_value = HFLIP_DEFAULT,
},
.set = sd_sethflip,
.get = sd_gethflip,
},
};
static const struct v4l2_pix_format cif_yuv_mode[] = { static const struct v4l2_pix_format cif_yuv_mode[] = {
{176, 144, V4L2_PIX_FMT_CIT_YYVYUY, V4L2_FIELD_NONE, {176, 144, V4L2_PIX_FMT_CIT_YYVYUY, V4L2_FIELD_NONE,
.bytesperline = 176, .bytesperline = 176,
...@@ -995,56 +879,36 @@ static int sd_config(struct gspca_dev *gspca_dev, ...@@ -995,56 +879,36 @@ static int sd_config(struct gspca_dev *gspca_dev,
case CIT_MODEL0: case CIT_MODEL0:
cam->cam_mode = model0_mode; cam->cam_mode = model0_mode;
cam->nmodes = ARRAY_SIZE(model0_mode); cam->nmodes = ARRAY_SIZE(model0_mode);
gspca_dev->ctrl_dis = ~((1 << SD_CONTRAST) | (1 << SD_HFLIP));
sd->sof_len = 4; sd->sof_len = 4;
break; break;
case CIT_MODEL1: case CIT_MODEL1:
cam->cam_mode = cif_yuv_mode; cam->cam_mode = cif_yuv_mode;
cam->nmodes = ARRAY_SIZE(cif_yuv_mode); cam->nmodes = ARRAY_SIZE(cif_yuv_mode);
gspca_dev->ctrl_dis = (1 << SD_HUE) | (1 << SD_HFLIP);
sd->sof_len = 4; sd->sof_len = 4;
break; break;
case CIT_MODEL2: case CIT_MODEL2:
cam->cam_mode = model2_mode + 1; /* no 160x120 */ cam->cam_mode = model2_mode + 1; /* no 160x120 */
cam->nmodes = 3; cam->nmodes = 3;
gspca_dev->ctrl_dis = (1 << SD_CONTRAST) |
(1 << SD_SHARPNESS) |
(1 << SD_HFLIP);
break; break;
case CIT_MODEL3: case CIT_MODEL3:
cam->cam_mode = vga_yuv_mode; cam->cam_mode = vga_yuv_mode;
cam->nmodes = ARRAY_SIZE(vga_yuv_mode); cam->nmodes = ARRAY_SIZE(vga_yuv_mode);
gspca_dev->ctrl_dis = (1 << SD_HUE) |
(1 << SD_LIGHTING) |
(1 << SD_HFLIP);
sd->stop_on_control_change = 1; sd->stop_on_control_change = 1;
sd->sof_len = 4; sd->sof_len = 4;
break; break;
case CIT_MODEL4: case CIT_MODEL4:
cam->cam_mode = model2_mode; cam->cam_mode = model2_mode;
cam->nmodes = ARRAY_SIZE(model2_mode); cam->nmodes = ARRAY_SIZE(model2_mode);
gspca_dev->ctrl_dis = (1 << SD_CONTRAST) |
(1 << SD_SHARPNESS) |
(1 << SD_LIGHTING) |
(1 << SD_HFLIP);
break; break;
case CIT_IBM_NETCAM_PRO: case CIT_IBM_NETCAM_PRO:
cam->cam_mode = vga_yuv_mode; cam->cam_mode = vga_yuv_mode;
cam->nmodes = 2; /* no 640 x 480 */ cam->nmodes = 2; /* no 640 x 480 */
cam->input_flags = V4L2_IN_ST_VFLIP; cam->input_flags = V4L2_IN_ST_VFLIP;
gspca_dev->ctrl_dis = ~(1 << SD_CONTRAST);
sd->stop_on_control_change = 1; sd->stop_on_control_change = 1;
sd->sof_len = 4; sd->sof_len = 4;
break; break;
} }
sd->brightness = BRIGHTNESS_DEFAULT;
sd->contrast = CONTRAST_DEFAULT;
sd->hue = HUE_DEFAULT;
sd->sharpness = SHARPNESS_DEFAULT;
sd->lighting = LIGHTING_DEFAULT;
sd->hflip = HFLIP_DEFAULT;
return 0; return 0;
} }
...@@ -1287,7 +1151,7 @@ static int sd_init(struct gspca_dev *gspca_dev) ...@@ -1287,7 +1151,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
return 0; return 0;
} }
static int cit_set_brightness(struct gspca_dev *gspca_dev) static int cit_set_brightness(struct gspca_dev *gspca_dev, s32 val)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
int i; int i;
...@@ -1299,19 +1163,19 @@ static int cit_set_brightness(struct gspca_dev *gspca_dev) ...@@ -1299,19 +1163,19 @@ static int cit_set_brightness(struct gspca_dev *gspca_dev)
break; break;
case CIT_MODEL1: case CIT_MODEL1:
/* Model 1: Brightness range 0 - 63 */ /* Model 1: Brightness range 0 - 63 */
cit_Packet_Format1(gspca_dev, 0x0031, sd->brightness); cit_Packet_Format1(gspca_dev, 0x0031, val);
cit_Packet_Format1(gspca_dev, 0x0032, sd->brightness); cit_Packet_Format1(gspca_dev, 0x0032, val);
cit_Packet_Format1(gspca_dev, 0x0033, sd->brightness); cit_Packet_Format1(gspca_dev, 0x0033, val);
break; break;
case CIT_MODEL2: case CIT_MODEL2:
/* Model 2: Brightness range 0x60 - 0xee */ /* Model 2: Brightness range 0x60 - 0xee */
/* Scale 0 - 63 to 0x60 - 0xee */ /* Scale 0 - 63 to 0x60 - 0xee */
i = 0x60 + sd->brightness * 2254 / 1000; i = 0x60 + val * 2254 / 1000;
cit_model2_Packet1(gspca_dev, 0x001a, i); cit_model2_Packet1(gspca_dev, 0x001a, i);
break; break;
case CIT_MODEL3: case CIT_MODEL3:
/* Model 3: Brightness range 'i' in [0x0C..0x3F] */ /* Model 3: Brightness range 'i' in [0x0C..0x3F] */
i = sd->brightness; i = val;
if (i < 0x0c) if (i < 0x0c)
i = 0x0c; i = 0x0c;
cit_model3_Packet1(gspca_dev, 0x0036, i); cit_model3_Packet1(gspca_dev, 0x0036, i);
...@@ -1319,7 +1183,7 @@ static int cit_set_brightness(struct gspca_dev *gspca_dev) ...@@ -1319,7 +1183,7 @@ static int cit_set_brightness(struct gspca_dev *gspca_dev)
case CIT_MODEL4: case CIT_MODEL4:
/* Model 4: Brightness range 'i' in [0x04..0xb4] */ /* Model 4: Brightness range 'i' in [0x04..0xb4] */
/* Scale 0 - 63 to 0x04 - 0xb4 */ /* Scale 0 - 63 to 0x04 - 0xb4 */
i = 0x04 + sd->brightness * 2794 / 1000; i = 0x04 + val * 2794 / 1000;
cit_model4_BrightnessPacket(gspca_dev, i); cit_model4_BrightnessPacket(gspca_dev, i);
break; break;
} }
...@@ -1327,7 +1191,7 @@ static int cit_set_brightness(struct gspca_dev *gspca_dev) ...@@ -1327,7 +1191,7 @@ static int cit_set_brightness(struct gspca_dev *gspca_dev)
return 0; return 0;
} }
static int cit_set_contrast(struct gspca_dev *gspca_dev) static int cit_set_contrast(struct gspca_dev *gspca_dev, s32 val)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
...@@ -1335,16 +1199,16 @@ static int cit_set_contrast(struct gspca_dev *gspca_dev) ...@@ -1335,16 +1199,16 @@ static int cit_set_contrast(struct gspca_dev *gspca_dev)
case CIT_MODEL0: { case CIT_MODEL0: {
int i; int i;
/* gain 0-15, 0-20 -> 0-15 */ /* gain 0-15, 0-20 -> 0-15 */
i = sd->contrast * 1000 / 1333; i = val * 1000 / 1333;
cit_write_reg(gspca_dev, i, 0x0422); cit_write_reg(gspca_dev, i, 0x0422);
/* gain 0-31, may not be lower then 0x0422, 0-20 -> 0-31 */ /* gain 0-31, may not be lower then 0x0422, 0-20 -> 0-31 */
i = sd->contrast * 2000 / 1333; i = val * 2000 / 1333;
cit_write_reg(gspca_dev, i, 0x0423); cit_write_reg(gspca_dev, i, 0x0423);
/* gain 0-127, may not be lower then 0x0423, 0-20 -> 0-63 */ /* gain 0-127, may not be lower then 0x0423, 0-20 -> 0-63 */
i = sd->contrast * 4000 / 1333; i = val * 4000 / 1333;
cit_write_reg(gspca_dev, i, 0x0424); cit_write_reg(gspca_dev, i, 0x0424);
/* gain 0-127, may not be lower then 0x0424, , 0-20 -> 0-127 */ /* gain 0-127, may not be lower then 0x0424, , 0-20 -> 0-127 */
i = sd->contrast * 8000 / 1333; i = val * 8000 / 1333;
cit_write_reg(gspca_dev, i, 0x0425); cit_write_reg(gspca_dev, i, 0x0425);
break; break;
} }
...@@ -1355,7 +1219,7 @@ static int cit_set_contrast(struct gspca_dev *gspca_dev) ...@@ -1355,7 +1219,7 @@ static int cit_set_contrast(struct gspca_dev *gspca_dev)
case CIT_MODEL1: case CIT_MODEL1:
{ {
/* Scale 0 - 20 to 15 - 0 */ /* Scale 0 - 20 to 15 - 0 */
int i, new_contrast = (20 - sd->contrast) * 1000 / 1333; int i, new_contrast = (20 - val) * 1000 / 1333;
for (i = 0; i < cit_model1_ntries; i++) { for (i = 0; i < cit_model1_ntries; i++) {
cit_Packet_Format1(gspca_dev, 0x0014, new_contrast); cit_Packet_Format1(gspca_dev, 0x0014, new_contrast);
cit_send_FF_04_02(gspca_dev); cit_send_FF_04_02(gspca_dev);
...@@ -1377,20 +1241,20 @@ static int cit_set_contrast(struct gspca_dev *gspca_dev) ...@@ -1377,20 +1241,20 @@ static int cit_set_contrast(struct gspca_dev *gspca_dev)
{ 0x01, 0x0e, 0x16 }, { 0x01, 0x0e, 0x16 },
{ 0x01, 0x10, 0x16 } /* Maximum */ { 0x01, 0x10, 0x16 } /* Maximum */
}; };
int i = sd->contrast / 3; int i = val / 3;
cit_model3_Packet1(gspca_dev, 0x0067, cv[i].cv1); cit_model3_Packet1(gspca_dev, 0x0067, cv[i].cv1);
cit_model3_Packet1(gspca_dev, 0x005b, cv[i].cv2); cit_model3_Packet1(gspca_dev, 0x005b, cv[i].cv2);
cit_model3_Packet1(gspca_dev, 0x005c, cv[i].cv3); cit_model3_Packet1(gspca_dev, 0x005c, cv[i].cv3);
break; break;
} }
case CIT_IBM_NETCAM_PRO: case CIT_IBM_NETCAM_PRO:
cit_model3_Packet1(gspca_dev, 0x005b, sd->contrast + 1); cit_model3_Packet1(gspca_dev, 0x005b, val + 1);
break; break;
} }
return 0; return 0;
} }
static int cit_set_hue(struct gspca_dev *gspca_dev) static int cit_set_hue(struct gspca_dev *gspca_dev, s32 val)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
...@@ -1401,7 +1265,7 @@ static int cit_set_hue(struct gspca_dev *gspca_dev) ...@@ -1401,7 +1265,7 @@ static int cit_set_hue(struct gspca_dev *gspca_dev)
/* No hue control for these models */ /* No hue control for these models */
break; break;
case CIT_MODEL2: case CIT_MODEL2:
cit_model2_Packet1(gspca_dev, 0x0024, sd->hue); cit_model2_Packet1(gspca_dev, 0x0024, val);
/* cit_model2_Packet1(gspca_dev, 0x0020, sat); */ /* cit_model2_Packet1(gspca_dev, 0x0020, sat); */
break; break;
case CIT_MODEL3: { case CIT_MODEL3: {
...@@ -1409,7 +1273,7 @@ static int cit_set_hue(struct gspca_dev *gspca_dev) ...@@ -1409,7 +1273,7 @@ static int cit_set_hue(struct gspca_dev *gspca_dev)
/* TESTME according to the ibmcam driver this does not work */ /* TESTME according to the ibmcam driver this does not work */
if (0) { if (0) {
/* Scale 0 - 127 to 0x05 - 0x37 */ /* Scale 0 - 127 to 0x05 - 0x37 */
int i = 0x05 + sd->hue * 1000 / 2540; int i = 0x05 + val * 1000 / 2540;
cit_model3_Packet1(gspca_dev, 0x007e, i); cit_model3_Packet1(gspca_dev, 0x007e, i);
} }
break; break;
...@@ -1435,14 +1299,14 @@ static int cit_set_hue(struct gspca_dev *gspca_dev) ...@@ -1435,14 +1299,14 @@ static int cit_set_hue(struct gspca_dev *gspca_dev)
cit_write_reg(gspca_dev, 160, 0x012e); /* Red gain */ cit_write_reg(gspca_dev, 160, 0x012e); /* Red gain */
cit_write_reg(gspca_dev, 160, 0x0130); /* Blue gain */ cit_write_reg(gspca_dev, 160, 0x0130); /* Blue gain */
cit_write_reg(gspca_dev, 0x8a28, 0x0124); cit_write_reg(gspca_dev, 0x8a28, 0x0124);
cit_write_reg(gspca_dev, sd->hue, 0x012d); /* Hue */ cit_write_reg(gspca_dev, val, 0x012d); /* Hue */
cit_write_reg(gspca_dev, 0xf545, 0x0124); cit_write_reg(gspca_dev, 0xf545, 0x0124);
break; break;
} }
return 0; return 0;
} }
static int cit_set_sharpness(struct gspca_dev *gspca_dev) static int cit_set_sharpness(struct gspca_dev *gspca_dev, s32 val)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
...@@ -1459,7 +1323,7 @@ static int cit_set_sharpness(struct gspca_dev *gspca_dev) ...@@ -1459,7 +1323,7 @@ static int cit_set_sharpness(struct gspca_dev *gspca_dev)
0x11, 0x13, 0x16, 0x18, 0x1a, 0x8, 0x0a }; 0x11, 0x13, 0x16, 0x18, 0x1a, 0x8, 0x0a };
for (i = 0; i < cit_model1_ntries; i++) for (i = 0; i < cit_model1_ntries; i++)
cit_PacketFormat2(gspca_dev, 0x0013, sa[sd->sharpness]); cit_PacketFormat2(gspca_dev, 0x0013, sa[val]);
break; break;
} }
case CIT_MODEL3: case CIT_MODEL3:
...@@ -1482,10 +1346,10 @@ static int cit_set_sharpness(struct gspca_dev *gspca_dev) ...@@ -1482,10 +1346,10 @@ static int cit_set_sharpness(struct gspca_dev *gspca_dev)
{ 0x03, 0x06, 0x05, 0x14 }, { 0x03, 0x06, 0x05, 0x14 },
{ 0x03, 0x07, 0x05, 0x14 } /* Sharpest */ { 0x03, 0x07, 0x05, 0x14 } /* Sharpest */
}; };
cit_model3_Packet1(gspca_dev, 0x0060, sv[sd->sharpness].sv1); cit_model3_Packet1(gspca_dev, 0x0060, sv[val].sv1);
cit_model3_Packet1(gspca_dev, 0x0061, sv[sd->sharpness].sv2); cit_model3_Packet1(gspca_dev, 0x0061, sv[val].sv2);
cit_model3_Packet1(gspca_dev, 0x0062, sv[sd->sharpness].sv3); cit_model3_Packet1(gspca_dev, 0x0062, sv[val].sv3);
cit_model3_Packet1(gspca_dev, 0x0063, sv[sd->sharpness].sv4); cit_model3_Packet1(gspca_dev, 0x0063, sv[val].sv4);
break; break;
} }
} }
...@@ -1510,7 +1374,7 @@ static int cit_set_sharpness(struct gspca_dev *gspca_dev) ...@@ -1510,7 +1374,7 @@ static int cit_set_sharpness(struct gspca_dev *gspca_dev)
* 1/5/00 Created. * 1/5/00 Created.
* 2/20/00 Added support for Model 2 cameras. * 2/20/00 Added support for Model 2 cameras.
*/ */
static void cit_set_lighting(struct gspca_dev *gspca_dev) static void cit_set_lighting(struct gspca_dev *gspca_dev, s32 val)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
...@@ -1524,19 +1388,19 @@ static void cit_set_lighting(struct gspca_dev *gspca_dev) ...@@ -1524,19 +1388,19 @@ static void cit_set_lighting(struct gspca_dev *gspca_dev)
case CIT_MODEL1: { case CIT_MODEL1: {
int i; int i;
for (i = 0; i < cit_model1_ntries; i++) for (i = 0; i < cit_model1_ntries; i++)
cit_Packet_Format1(gspca_dev, 0x0027, sd->lighting); cit_Packet_Format1(gspca_dev, 0x0027, val);
break; break;
} }
} }
} }
static void cit_set_hflip(struct gspca_dev *gspca_dev) static void cit_set_hflip(struct gspca_dev *gspca_dev, s32 val)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
switch (sd->model) { switch (sd->model) {
case CIT_MODEL0: case CIT_MODEL0:
if (sd->hflip) if (val)
cit_write_reg(gspca_dev, 0x0020, 0x0115); cit_write_reg(gspca_dev, 0x0020, 0x0115);
else else
cit_write_reg(gspca_dev, 0x0040, 0x0115); cit_write_reg(gspca_dev, 0x0040, 0x0115);
...@@ -1831,7 +1695,8 @@ static int cit_start_model1(struct gspca_dev *gspca_dev) ...@@ -1831,7 +1695,8 @@ static int cit_start_model1(struct gspca_dev *gspca_dev)
cit_PacketFormat2(gspca_dev, 0x13, 0x1a); cit_PacketFormat2(gspca_dev, 0x13, 0x1a);
/* Default lighting conditions */ /* Default lighting conditions */
cit_Packet_Format1(gspca_dev, 0x0027, sd->lighting); cit_Packet_Format1(gspca_dev, 0x0027,
v4l2_ctrl_g_ctrl(sd->lighting));
} }
/* Assorted init */ /* Assorted init */
...@@ -2051,7 +1916,7 @@ static int cit_start_model2(struct gspca_dev *gspca_dev) ...@@ -2051,7 +1916,7 @@ static int cit_start_model2(struct gspca_dev *gspca_dev)
/* FIXME this cannot be changed while streaming, so we /* FIXME this cannot be changed while streaming, so we
should report a grabbed flag for this control. */ should report a grabbed flag for this control. */
cit_model2_Packet1(gspca_dev, 0x0028, sd->lighting); cit_model2_Packet1(gspca_dev, 0x0028, v4l2_ctrl_g_ctrl(sd->lighting));
/* color balance rg2 */ /* color balance rg2 */
cit_model2_Packet1(gspca_dev, 0x001e, 0x002f); cit_model2_Packet1(gspca_dev, 0x001e, 0x002f);
/* saturation */ /* saturation */
...@@ -2755,12 +2620,7 @@ static int sd_start(struct gspca_dev *gspca_dev) ...@@ -2755,12 +2620,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
break; break;
} }
cit_set_brightness(gspca_dev); v4l2_ctrl_handler_setup(&gspca_dev->ctrl_handler);
cit_set_contrast(gspca_dev);
cit_set_hue(gspca_dev);
cit_set_sharpness(gspca_dev);
cit_set_lighting(gspca_dev);
cit_set_hflip(gspca_dev);
/* Program max isoc packet size */ /* Program max isoc packet size */
cit_write_reg(gspca_dev, packet_size >> 8, 0x0106); cit_write_reg(gspca_dev, packet_size >> 8, 0x0106);
...@@ -3055,152 +2915,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, ...@@ -3055,152 +2915,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
gspca_frame_add(gspca_dev, INTER_PACKET, data, len); gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
} }
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) {
if (sd->stop_on_control_change)
sd_stopN(gspca_dev);
cit_set_brightness(gspca_dev);
if (sd->stop_on_control_change)
cit_restart_stream(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 0;
}
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) {
if (sd->stop_on_control_change)
sd_stopN(gspca_dev);
cit_set_contrast(gspca_dev);
if (sd->stop_on_control_change)
cit_restart_stream(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 0;
}
static int sd_sethue(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;
sd->hue = val;
if (gspca_dev->streaming) {
if (sd->stop_on_control_change)
sd_stopN(gspca_dev);
cit_set_hue(gspca_dev);
if (sd->stop_on_control_change)
cit_restart_stream(gspca_dev);
}
return 0;
}
static int sd_gethue(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;
*val = sd->hue;
return 0;
}
static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;
sd->sharpness = val;
if (gspca_dev->streaming) {
if (sd->stop_on_control_change)
sd_stopN(gspca_dev);
cit_set_sharpness(gspca_dev);
if (sd->stop_on_control_change)
cit_restart_stream(gspca_dev);
}
return 0;
}
static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;
*val = sd->sharpness;
return 0;
}
static int sd_setlighting(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;
sd->lighting = val;
if (gspca_dev->streaming) {
if (sd->stop_on_control_change)
sd_stopN(gspca_dev);
cit_set_lighting(gspca_dev);
if (sd->stop_on_control_change)
cit_restart_stream(gspca_dev);
}
return 0;
}
static int sd_getlighting(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;
*val = sd->lighting;
return 0;
}
static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val)
{
struct sd *sd = (struct sd *) gspca_dev;
sd->hflip = val;
if (gspca_dev->streaming) {
if (sd->stop_on_control_change)
sd_stopN(gspca_dev);
cit_set_hflip(gspca_dev);
if (sd->stop_on_control_change)
cit_restart_stream(gspca_dev);
}
return 0;
}
static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val)
{
struct sd *sd = (struct sd *) gspca_dev;
*val = sd->hflip;
return 0;
}
#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
static void cit_check_button(struct gspca_dev *gspca_dev) static void cit_check_button(struct gspca_dev *gspca_dev)
{ {
...@@ -3234,13 +2948,117 @@ static void cit_check_button(struct gspca_dev *gspca_dev) ...@@ -3234,13 +2948,117 @@ static void cit_check_button(struct gspca_dev *gspca_dev)
} }
#endif #endif
static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
{
struct gspca_dev *gspca_dev =
container_of(ctrl->handler, struct gspca_dev, ctrl_handler);
struct sd *sd = (struct sd *)gspca_dev;
gspca_dev->usb_err = 0;
if (!gspca_dev->streaming)
return 0;
if (sd->stop_on_control_change)
sd_stopN(gspca_dev);
switch (ctrl->id) {
case V4L2_CID_BRIGHTNESS:
cit_set_brightness(gspca_dev, ctrl->val);
break;
case V4L2_CID_CONTRAST:
cit_set_contrast(gspca_dev, ctrl->val);
break;
case V4L2_CID_HUE:
cit_set_hue(gspca_dev, ctrl->val);
break;
case V4L2_CID_HFLIP:
cit_set_hflip(gspca_dev, ctrl->val);
break;
case V4L2_CID_SHARPNESS:
cit_set_sharpness(gspca_dev, ctrl->val);
break;
case V4L2_CID_BACKLIGHT_COMPENSATION:
cit_set_lighting(gspca_dev, ctrl->val);
break;
}
if (sd->stop_on_control_change)
cit_restart_stream(gspca_dev);
return gspca_dev->usb_err;
}
static const struct v4l2_ctrl_ops sd_ctrl_ops = {
.s_ctrl = sd_s_ctrl,
};
static int sd_init_controls(struct gspca_dev *gspca_dev)
{
struct sd *sd = (struct sd *)gspca_dev;
struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;
bool has_brightness;
bool has_contrast;
bool has_hue;
bool has_sharpness;
bool has_lighting;
bool has_hflip;
has_brightness = has_contrast = has_hue =
has_sharpness = has_hflip = has_lighting = false;
switch (sd->model) {
case CIT_MODEL0:
has_contrast = has_hflip = true;
break;
case CIT_MODEL1:
has_brightness = has_contrast =
has_sharpness = has_lighting = true;
break;
case CIT_MODEL2:
has_brightness = has_hue = has_lighting = true;
break;
case CIT_MODEL3:
has_brightness = has_contrast = has_sharpness = true;
break;
case CIT_MODEL4:
has_brightness = has_hue = true;
break;
case CIT_IBM_NETCAM_PRO:
has_brightness = has_hue =
has_sharpness = has_hflip = has_lighting = true;
break;
}
gspca_dev->vdev.ctrl_handler = hdl;
v4l2_ctrl_handler_init(hdl, 5);
if (has_brightness)
v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_BRIGHTNESS, 0, 63, 1, 32);
if (has_contrast)
v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_CONTRAST, 0, 20, 1, 10);
if (has_hue)
v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_HUE, 0, 127, 1, 63);
if (has_sharpness)
v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_SHARPNESS, 0, 6, 1, 3);
if (has_lighting)
sd->lighting = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_BACKLIGHT_COMPENSATION, 0, 2, 1, 1);
if (has_hflip)
v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
V4L2_CID_HFLIP, 0, 1, 1, 0);
if (hdl->error) {
pr_err("Could not initialize controls\n");
return hdl->error;
}
return 0;
}
/* 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,
.stop0 = sd_stop0, .stop0 = sd_stop0,
...@@ -3253,10 +3071,9 @@ static const struct sd_desc sd_desc = { ...@@ -3253,10 +3071,9 @@ static const struct sd_desc sd_desc = {
static const struct sd_desc sd_desc_isoc_nego = { static const struct sd_desc sd_desc_isoc_nego = {
.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,
.isoc_init = sd_isoc_init, .isoc_init = sd_isoc_init,
.isoc_nego = sd_isoc_nego, .isoc_nego = sd_isoc_nego,
......
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