Commit 705881e3 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] spca501: 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 9bf0c43e

drivers/media/video/gspca/spca501.c

+60 −181
Original line number Diff line number Diff line
@@ -61,79 +61,6 @@ static int sd_getblue_balance(struct gspca_dev *gspca_dev, __s32 *val); 
static int sd_setred_balance(struct gspca_dev *gspca_dev, __s32 val);

static int sd_getred_balance(struct gspca_dev *gspca_dev, __s32 *val);



static const struct ctrl sd_ctrls[] = {

#define MY_BRIGHTNESS 0

	{

	    {

		.id      = V4L2_CID_BRIGHTNESS,

		.type    = V4L2_CTRL_TYPE_INTEGER,

		.name    = "Brightness",

		.minimum = 0,

		.maximum = 127,

		.step    = 1,

		.default_value = 0,

	    },

	    .set = sd_setbrightness,

	    .get = sd_getbrightness,

	},

#define MY_CONTRAST 1

	{

	    {

		.id      = V4L2_CID_CONTRAST,

		.type    = V4L2_CTRL_TYPE_INTEGER,

		.name    = "Contrast",

		.minimum = 0,

		.maximum = 64725,

		.step    = 1,

		.default_value = 64725,

	    },

	    .set = sd_setcontrast,

	    .get = sd_getcontrast,

	},

#define MY_COLOR 2

	{

	    {

		.id      = V4L2_CID_SATURATION,

		.type    = V4L2_CTRL_TYPE_INTEGER,

		.name    = "Color",

		.minimum = 0,

		.maximum = 63,

		.step    = 1,

		.default_value = 20,

	    },

	    .set = sd_setcolors,

	    .get = sd_getcolors,

	},

#define MY_BLUE_BALANCE 3

	{

	    {

		.id      = V4L2_CID_BLUE_BALANCE,

		.type    = V4L2_CTRL_TYPE_INTEGER,

		.name    = "Blue Balance",

		.minimum = 0,

		.maximum = 127,

		.step    = 1,

		.default_value = 0,

	    },

	    .set = sd_setblue_balance,

	    .get = sd_getblue_balance,

	},

#define MY_RED_BALANCE 4

	{

	    {

		.id      = V4L2_CID_RED_BALANCE,

		.type    = V4L2_CTRL_TYPE_INTEGER,

		.name    = "Red Balance",

		.minimum = 0,

		.maximum = 127,

		.step    = 1,

		.default_value = 0,

	    },

	    .set = sd_setred_balance,

	    .get = sd_getred_balance,

	},

};



static const struct v4l2_pix_format vga_mode[] = {

	{160, 120, V4L2_PIX_FMT_SPCA501, V4L2_FIELD_NONE,

		.bytesperline = 160,
@@ -1878,42 +1805,32 @@ static int write_vector(struct gspca_dev *gspca_dev, 
	return 0;

}



static void setbrightness(struct gspca_dev *gspca_dev)

static void setbrightness(struct gspca_dev *gspca_dev, s32 val)

{

	struct sd *sd = (struct sd *) gspca_dev;



	reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x12, sd->brightness);

	reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x12, val);

}



static void setcontrast(struct gspca_dev *gspca_dev)

static void setcontrast(struct gspca_dev *gspca_dev, s32 val)

{

	struct sd *sd = (struct sd *) gspca_dev;



	reg_write(gspca_dev->dev, 0x00, 0x00,

				  (sd->contrast >> 8) & 0xff);

				  (val >> 8) & 0xff);

	reg_write(gspca_dev->dev, 0x00, 0x01,

				  sd->contrast & 0xff);

				  val & 0xff);

}



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;



	reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x0c, sd->colors);

	reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x0c, val);

}



static void setblue_balance(struct gspca_dev *gspca_dev)

static void setblue_balance(struct gspca_dev *gspca_dev, s32 val)

{

	struct sd *sd = (struct sd *) gspca_dev;



	reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x11, sd->blue_balance);

	reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x11, val);

}



static void setred_balance(struct gspca_dev *gspca_dev)

static void setred_balance(struct gspca_dev *gspca_dev, s32 val)

{

	struct sd *sd = (struct sd *) gspca_dev;



	reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x13, sd->red_balance);

	reg_write(gspca_dev->dev, SPCA501_REG_CCDSP, 0x13, val);

}



/* this function is called at probe time */
@@ -1927,9 +1844,6 @@ static int sd_config(struct gspca_dev *gspca_dev, 
	cam->cam_mode = vga_mode;

	cam->nmodes = ARRAY_SIZE(vga_mode);

	sd->subtype = id->driver_info;

	sd->brightness = sd_ctrls[MY_BRIGHTNESS].qctrl.default_value;

	sd->contrast = sd_ctrls[MY_CONTRAST].qctrl.default_value;

	sd->colors = sd_ctrls[MY_COLOR].qctrl.default_value;



	return 0;

}
@@ -2012,9 +1926,7 @@ static int sd_start(struct gspca_dev *gspca_dev) 
	 * brightness / contrast / color set otherwise it assumes what seems

	 * max contrast. Note that strange enough setting any of these is

	 * enough to fix the max contrast problem, to be sure we set all 3 */

	setbrightness(gspca_dev);

	setcontrast(gspca_dev);

	setcolors(gspca_dev);

	v4l2_ctrl_handler_setup(&gspca_dev->ctrl_handler);

	return 0;

}
@@ -2053,103 +1965,70 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, 
	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)

		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 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)

		setcontrast(gspca_dev);

	return 0;

}



static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)

static int sd_s_ctrl(struct v4l2_ctrl *ctrl)

{

	struct sd *sd = (struct sd *) gspca_dev;



	*val = sd->contrast;

	return 0;

}

	struct gspca_dev *gspca_dev =

		container_of(ctrl->handler, struct gspca_dev, ctrl_handler);



static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)

{

	struct sd *sd = (struct sd *) gspca_dev;

	gspca_dev->usb_err = 0;



	sd->colors = val;

	if (gspca_dev->streaming)

		setcolors(gspca_dev);

	if (!gspca_dev->streaming)

		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;

	switch (ctrl->id) {

	case V4L2_CID_BRIGHTNESS:

		setbrightness(gspca_dev, ctrl->val);

		break;

	case V4L2_CID_CONTRAST:

		setcontrast(gspca_dev, ctrl->val);

		break;

	case V4L2_CID_SATURATION:

		setcolors(gspca_dev, ctrl->val);

		break;

	case V4L2_CID_BLUE_BALANCE:

		setblue_balance(gspca_dev, ctrl->val);

		break;

	case V4L2_CID_RED_BALANCE:

		setred_balance(gspca_dev, ctrl->val);

		break;

	}



static int sd_setblue_balance(struct gspca_dev *gspca_dev, __s32 val)

{

	struct sd *sd = (struct sd *) gspca_dev;



	sd->blue_balance = val;

	if (gspca_dev->streaming)

		setblue_balance(gspca_dev);

	return 0;

	return gspca_dev->usb_err;

}



static int sd_getblue_balance(struct gspca_dev *gspca_dev, __s32 *val)

{

	struct sd *sd = (struct sd *) gspca_dev;



	*val = sd->blue_balance;

	return 0;

}

static const struct v4l2_ctrl_ops sd_ctrl_ops = {

	.s_ctrl = sd_s_ctrl,

};



static int sd_setred_balance(struct gspca_dev *gspca_dev, __s32 val)

static int sd_init_controls(struct gspca_dev *gspca_dev)

{

	struct sd *sd = (struct sd *) gspca_dev;



	sd->red_balance = val;

	if (gspca_dev->streaming)

		setred_balance(gspca_dev);

	return 0;

	struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;



	gspca_dev->vdev.ctrl_handler = hdl;

	v4l2_ctrl_handler_init(hdl, 5);

	v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,

			V4L2_CID_BRIGHTNESS, 0, 127, 1, 0);

	v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,

			V4L2_CID_CONTRAST, 0, 64725, 1, 64725);

	v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,

			V4L2_CID_SATURATION, 0, 63, 1, 20);

	v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,

			V4L2_CID_BLUE_BALANCE, 0, 127, 1, 0);

	v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,

			V4L2_CID_RED_BALANCE, 0, 127, 1, 0);



	if (hdl->error) {

		pr_err("Could not initialize controls\n");

		return hdl->error;

	}



static int sd_getred_balance(struct gspca_dev *gspca_dev, __s32 *val)

{

	struct sd *sd = (struct sd *) gspca_dev;



	*val = sd->red_balance;

	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,

	.stop0 = sd_stop0,