|
@@ -32,8 +32,6 @@ MODULE_LICENSE("GPL");
|
|
|
struct sd {
|
|
|
struct gspca_dev gspca_dev; /* !! must be the first item */
|
|
|
|
|
|
- u8 brightness;
|
|
|
-
|
|
|
u8 subtype;
|
|
|
#define CreativeVista 0
|
|
|
#define HamaUSBSightcam 1
|
|
@@ -43,27 +41,6 @@ struct sd {
|
|
|
#define ViewQuestVQ110 5
|
|
|
};
|
|
|
|
|
|
-/* 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 const struct ctrl sd_ctrls[] = {
|
|
|
- {
|
|
|
- {
|
|
|
- .id = V4L2_CID_BRIGHTNESS,
|
|
|
- .type = V4L2_CTRL_TYPE_INTEGER,
|
|
|
- .name = "Brightness",
|
|
|
- .minimum = 0,
|
|
|
- .maximum = 255,
|
|
|
- .step = 1,
|
|
|
-#define BRIGHTNESS_DEF 128
|
|
|
- .default_value = BRIGHTNESS_DEF,
|
|
|
- },
|
|
|
- .set = sd_setbrightness,
|
|
|
- .get = sd_getbrightness,
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
static const struct v4l2_pix_format sif_mode[] = {
|
|
|
{160, 120, V4L2_PIX_FMT_SPCA508, V4L2_FIELD_NONE,
|
|
|
.bytesperline = 160,
|
|
@@ -1411,7 +1388,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
|
|
|
cam->nmodes = ARRAY_SIZE(sif_mode);
|
|
|
|
|
|
sd->subtype = id->driver_info;
|
|
|
- sd->brightness = BRIGHTNESS_DEF;
|
|
|
|
|
|
init_data = init_data_tb[sd->subtype];
|
|
|
return write_vector(gspca_dev, init_data);
|
|
@@ -1471,11 +1447,8 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-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;
|
|
|
- u8 brightness = sd->brightness;
|
|
|
-
|
|
|
/* MX seem contrast */
|
|
|
reg_write(gspca_dev->dev, 0x8651, brightness);
|
|
|
reg_write(gspca_dev->dev, 0x8652, brightness);
|
|
@@ -1483,31 +1456,50 @@ static void setbrightness(struct gspca_dev *gspca_dev)
|
|
|
reg_write(gspca_dev->dev, 0x8654, brightness);
|
|
|
}
|
|
|
|
|
|
-static int sd_setbrightness(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->brightness = val;
|
|
|
- if (gspca_dev->streaming)
|
|
|
- setbrightness(gspca_dev);
|
|
|
- return 0;
|
|
|
+ gspca_dev->usb_err = 0;
|
|
|
+
|
|
|
+ if (!gspca_dev->streaming)
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ switch (ctrl->id) {
|
|
|
+ case V4L2_CID_BRIGHTNESS:
|
|
|
+ setbrightness(gspca_dev, ctrl->val);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ return gspca_dev->usb_err;
|
|
|
}
|
|
|
|
|
|
-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
|
|
|
+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;
|
|
|
|
|
|
- *val = sd->brightness;
|
|
|
+ gspca_dev->vdev.ctrl_handler = hdl;
|
|
|
+ v4l2_ctrl_handler_init(hdl, 5);
|
|
|
+ v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,
|
|
|
+ V4L2_CID_BRIGHTNESS, 0, 255, 1, 128);
|
|
|
+
|
|
|
+ if (hdl->error) {
|
|
|
+ pr_err("Could not initialize controls\n");
|
|
|
+ return hdl->error;
|
|
|
+ }
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
/* sub-driver description */
|
|
|
static const struct sd_desc sd_desc = {
|
|
|
.name = MODULE_NAME,
|
|
|
- .ctrls = sd_ctrls,
|
|
|
- .nctrls = ARRAY_SIZE(sd_ctrls),
|
|
|
.config = sd_config,
|
|
|
.init = sd_init,
|
|
|
+ .init_controls = sd_init_controls,
|
|
|
.start = sd_start,
|
|
|
.stopN = sd_stopN,
|
|
|
.pkt_scan = sd_pkt_scan,
|