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

[media] spca506: 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 2aed6c1b

drivers/media/video/gspca/spca506.c

+51 −157
Original line number Diff line number Diff line
@@ -33,83 +33,10 @@ MODULE_LICENSE("GPL"); 
struct sd {

	struct gspca_dev gspca_dev;	/* !! must be the first item */



	unsigned char brightness;

	unsigned char contrast;

	unsigned char colors;

	unsigned char hue;

	char norme;

	char channel;

};



/* 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_sethue(struct gspca_dev *gspca_dev, __s32 val);

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



static const struct ctrl sd_ctrls[] = {

#define SD_BRIGHTNESS 0

	{

	    {

		.id      = V4L2_CID_BRIGHTNESS,

		.type    = V4L2_CTRL_TYPE_INTEGER,

		.name    = "Brightness",

		.minimum = 0,

		.maximum = 0xff,

		.step    = 1,

		.default_value = 0x80,

	    },

	    .set = sd_setbrightness,

	    .get = sd_getbrightness,

	},

#define SD_CONTRAST 1

	{

	    {

		.id      = V4L2_CID_CONTRAST,

		.type    = V4L2_CTRL_TYPE_INTEGER,

		.name    = "Contrast",

		.minimum = 0,

		.maximum = 0xff,

		.step    = 1,

		.default_value = 0x47,

	    },

	    .set = sd_setcontrast,

	    .get = sd_getcontrast,

	},

#define SD_COLOR 2

	{

	    {

		.id      = V4L2_CID_SATURATION,

		.type    = V4L2_CTRL_TYPE_INTEGER,

		.name    = "Saturation",

		.minimum = 0,

		.maximum = 0xff,

		.step    = 1,

		.default_value = 0x40,

	    },

	    .set = sd_setcolors,

	    .get = sd_getcolors,

	},

#define SD_HUE 3

	{

	    {

		.id      = V4L2_CID_HUE,

		.type    = V4L2_CTRL_TYPE_INTEGER,

		.name    = "Hue",

		.minimum = 0,

		.maximum = 0xff,

		.step    = 1,

		.default_value = 0,

	    },

	    .set = sd_sethue,

	    .get = sd_gethue,

	},

};



static const struct v4l2_pix_format vga_mode[] = {

	{160, 120, V4L2_PIX_FMT_SPCA505, V4L2_FIELD_NONE,

		.bytesperline = 160,
@@ -281,16 +208,11 @@ static void spca506_Setsize(struct gspca_dev *gspca_dev, __u16 code, 
static int sd_config(struct gspca_dev *gspca_dev,

			const struct usb_device_id *id)

{

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

	struct cam *cam;



	cam = &gspca_dev->cam;

	cam->cam_mode = vga_mode;

	cam->nmodes = ARRAY_SIZE(vga_mode);

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

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

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

	sd->hue = sd_ctrls[SD_HUE].qctrl.default_value;

	return 0;

}
@@ -564,121 +486,93 @@ 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 val)

{

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



	spca506_Initi2c(gspca_dev);

	spca506_WriteI2c(gspca_dev, sd->brightness, SAA7113_bright);

	spca506_WriteI2c(gspca_dev, val, SAA7113_bright);

	spca506_WriteI2c(gspca_dev, 0x01, 0x09);

}



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;



	spca506_Initi2c(gspca_dev);

	spca506_WriteI2c(gspca_dev, sd->contrast, SAA7113_contrast);

	spca506_WriteI2c(gspca_dev, val, SAA7113_contrast);

	spca506_WriteI2c(gspca_dev, 0x01, 0x09);

}



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;



	spca506_Initi2c(gspca_dev);

	spca506_WriteI2c(gspca_dev, sd->colors, SAA7113_saturation);

	spca506_WriteI2c(gspca_dev, val, SAA7113_saturation);

	spca506_WriteI2c(gspca_dev, 0x01, 0x09);

}



static void sethue(struct gspca_dev *gspca_dev)

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

{

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



	spca506_Initi2c(gspca_dev);

	spca506_WriteI2c(gspca_dev, sd->hue, SAA7113_hue);

	spca506_WriteI2c(gspca_dev, val, SAA7113_hue);

	spca506_WriteI2c(gspca_dev, 0x01, 0x09);

}



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;



	sd->brightness = val;

	if (gspca_dev->streaming)

		setbrightness(gspca_dev);

	return 0;

}

	struct gspca_dev *gspca_dev =

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



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

{

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

	gspca_dev->usb_err = 0;



	*val = sd->brightness;

	if (!gspca_dev->streaming)

		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;

	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_HUE:

		sethue(gspca_dev, ctrl->val);

		break;

	}



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

{

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



	*val = sd->contrast;

	return 0;

	return gspca_dev->usb_err;

}



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 const struct v4l2_ctrl_ops sd_ctrl_ops = {

	.s_ctrl = sd_s_ctrl,

};



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

static int sd_init_controls(struct gspca_dev *gspca_dev)

{

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



	*val = sd->colors;

	return 0;

}

	struct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;



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

{

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

	gspca_dev->vdev.ctrl_handler = hdl;

	v4l2_ctrl_handler_init(hdl, 4);

	v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,

			V4L2_CID_BRIGHTNESS, 0, 255, 1, 128);

	v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,

			V4L2_CID_CONTRAST, 0, 255, 1, 0x47);

	v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,

			V4L2_CID_SATURATION, 0, 255, 1, 0x40);

	v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,

			V4L2_CID_HUE, 0, 255, 1, 0);



	sd->hue = val;

	if (gspca_dev->streaming)

		sethue(gspca_dev);

	return 0;

	if (hdl->error) {

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

		return hdl->error;

	}



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

{

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



	*val = sd->hue;

	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,