Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3b4d2c6 authored by Jean-François Moine's avatar Jean-François Moine Committed by Mauro Carvalho Chehab
Browse files

[media] gspca - mars: Use the new video control mechanism 



Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2e0544a8

drivers/media/video/gspca/mars.c

+75 −131
Original line number Diff line number Diff line
@@ -28,14 +28,21 @@ MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); 
MODULE_DESCRIPTION("GSPCA/Mars USB Camera Driver");

MODULE_LICENSE("GPL");



/* controls */

enum e_ctrl {

	BRIGHTNESS,

	COLORS,

	GAMMA,

	SHARPNESS,

	NCTRLS		/* number of controls */

};



/* specific webcam descriptor */

struct sd {

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



	u8 brightness;

	u8 colors;

	u8 gamma;

	u8 sharpness;

	struct gspca_ctrl ctrls[NCTRLS];



	u8 quality;

#define QUALITY_MIN 40

#define QUALITY_MAX 70
@@ -45,17 +52,13 @@ struct sd { 
};



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

static int sd_getcolors(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 const struct ctrl sd_ctrls[] = {

	{

static void setbrightness(struct gspca_dev *gspca_dev);

static void setcolors(struct gspca_dev *gspca_dev);

static void setgamma(struct gspca_dev *gspca_dev);

static void setsharpness(struct gspca_dev *gspca_dev);



static const struct ctrl sd_ctrls[NCTRLS] = {

[BRIGHTNESS] = {

	    {

		.id      = V4L2_CID_BRIGHTNESS,

		.type    = V4L2_CTRL_TYPE_INTEGER,
@@ -63,13 +66,11 @@ static const struct ctrl sd_ctrls[] = { 
		.minimum = 0,

		.maximum = 30,

		.step    = 1,

#define BRIGHTNESS_DEF 15

		.default_value = BRIGHTNESS_DEF,

		.default_value = 15,

	    },

	    .set = sd_setbrightness,

	    .get = sd_getbrightness,

	    .set_control = setbrightness

	},

	{

[COLORS] = {

	    {

		.id      = V4L2_CID_SATURATION,

		.type    = V4L2_CTRL_TYPE_INTEGER,
@@ -77,13 +78,11 @@ static const struct ctrl sd_ctrls[] = { 
		.minimum = 1,

		.maximum = 255,

		.step    = 1,

#define COLOR_DEF 200

		.default_value = COLOR_DEF,

		.default_value = 200,

	    },

	    .set = sd_setcolors,

	    .get = sd_getcolors,

	    .set_control = setcolors

	},

	{

[GAMMA] = {

	    {

		.id      = V4L2_CID_GAMMA,

		.type    = V4L2_CTRL_TYPE_INTEGER,
@@ -91,13 +90,11 @@ static const struct ctrl sd_ctrls[] = { 
		.minimum = 0,

		.maximum = 3,

		.step    = 1,

#define GAMMA_DEF 1

		.default_value = GAMMA_DEF,

		.default_value = 1,

	    },

	    .set = sd_setgamma,

	    .get = sd_getgamma,

	    .set_control = setgamma

	},

	{

[SHARPNESS] = {

	    {

		.id	 = V4L2_CID_SHARPNESS,

		.type    = V4L2_CTRL_TYPE_INTEGER,
@@ -105,11 +102,9 @@ static const struct ctrl sd_ctrls[] = { 
		.minimum = 0,

		.maximum = 2,

		.step    = 1,

#define SHARPNESS_DEF 1

		.default_value = SHARPNESS_DEF,

		.default_value = 1,

	    },

	    .set = sd_setsharpness,

	    .get = sd_getsharpness,

	    .set_control = setsharpness

	},

};
@@ -167,6 +162,45 @@ static void mi_w(struct gspca_dev *gspca_dev, 
	reg_w(gspca_dev, 4);

}



static void setbrightness(struct gspca_dev *gspca_dev)

{

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



	gspca_dev->usb_buf[0] = 0x61;

	gspca_dev->usb_buf[1] = sd->ctrls[BRIGHTNESS].val;

	reg_w(gspca_dev, 2);

}



static void setcolors(struct gspca_dev *gspca_dev)

{

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

	s16 val;



	val = sd->ctrls[COLORS].val;

	gspca_dev->usb_buf[0] = 0x5f;

	gspca_dev->usb_buf[1] = val << 3;

	gspca_dev->usb_buf[2] = ((val >> 2) & 0xf8) | 0x04;

	reg_w(gspca_dev, 3);

}



static void setgamma(struct gspca_dev *gspca_dev)

{

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



	gspca_dev->usb_buf[0] = 0x06;

	gspca_dev->usb_buf[1] = sd->ctrls[GAMMA].val * 0x40;

	reg_w(gspca_dev, 2);

}



static void setsharpness(struct gspca_dev *gspca_dev)

{

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



	gspca_dev->usb_buf[0] = 0x67;

	gspca_dev->usb_buf[1] = sd->ctrls[SHARPNESS].val * 4 + 3;

	reg_w(gspca_dev, 2);

}



/* this function is called at probe time */

static int sd_config(struct gspca_dev *gspca_dev,

			const struct usb_device_id *id)
@@ -177,10 +211,7 @@ static int sd_config(struct gspca_dev *gspca_dev, 
	cam = &gspca_dev->cam;

	cam->cam_mode = vga_mode;

	cam->nmodes = ARRAY_SIZE(vga_mode);

	sd->brightness = BRIGHTNESS_DEF;

	sd->colors = COLOR_DEF;

	sd->gamma = GAMMA_DEF;

	sd->sharpness = SHARPNESS_DEF;

	cam->ctrls = sd->ctrls;

	sd->quality = QUALITY_DEF;

	gspca_dev->nbalt = 9;		/* use the altsetting 08 */

	return 0;
@@ -223,7 +254,7 @@ static int sd_start(struct gspca_dev *gspca_dev) 
	data[5] = 0x30;		/* reg 4, MI, PAS5101 :

				 *	0x30 for 24mhz , 0x28 for 12mhz */

	data[6] = 0x02;		/* reg 5, H start - was 0x04 */

	data[7] = sd->gamma * 0x40;	/* reg 0x06: gamma */

	data[7] = sd->ctrls[GAMMA].val * 0x40;	/* reg 0x06: gamma */

	data[8] = 0x01;		/* reg 7, V start - was 0x03 */

/*	if (h_size == 320 ) */

/*		data[9]= 0x56;	 * reg 8, 24MHz, 2:1 scale down */
@@ -261,9 +292,9 @@ static int sd_start(struct gspca_dev *gspca_dev) 
				/* reg 0x5f/0x60 (LE) = saturation */

				/* h (60): xxxx x100

				 * l (5f): xxxx x000 */

	data[2] = sd->colors << 3;

	data[3] = ((sd->colors >> 2) & 0xf8) | 0x04;

	data[4] = sd->brightness; /* reg 0x61 = brightness */

	data[2] = sd->ctrls[COLORS].val << 3;

	data[3] = ((sd->ctrls[COLORS].val >> 2) & 0xf8) | 0x04;

	data[4] = sd->ctrls[BRIGHTNESS].val; /* reg 0x61 = brightness */

	data[5] = 0x00;



	err_code = reg_w(gspca_dev, 6);
@@ -272,7 +303,7 @@ static int sd_start(struct gspca_dev *gspca_dev) 


	data[0] = 0x67;

/*jfm: from win trace*/

	data[1] = sd->sharpness * 4 + 3;

	data[1] = sd->ctrls[SHARPNESS].val * 4 + 3;

	data[2] = 0x14;

	err_code = reg_w(gspca_dev, 3);

	if (err_code < 0)
@@ -352,93 +383,6 @@ 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) {

		gspca_dev->usb_buf[0] = 0x61;

		gspca_dev->usb_buf[1] = val;

		reg_w(gspca_dev, 2);

	}

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

{

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



	sd->colors = val;

	if (gspca_dev->streaming) {



		/* see sd_start */

		gspca_dev->usb_buf[0] = 0x5f;

		gspca_dev->usb_buf[1] = sd->colors << 3;

		gspca_dev->usb_buf[2] = ((sd->colors >> 2) & 0xf8) | 0x04;

		reg_w(gspca_dev, 3);

	}

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

		gspca_dev->usb_buf[0] = 0x06;

		gspca_dev->usb_buf[1] = val * 0x40;

		reg_w(gspca_dev, 2);

	}

	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;

}



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

		gspca_dev->usb_buf[0] = 0x67;

		gspca_dev->usb_buf[1] = val * 4 + 3;

		reg_w(gspca_dev, 2);

	}

	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_set_jcomp(struct gspca_dev *gspca_dev,

			struct v4l2_jpegcompression *jcomp)

{
@@ -471,7 +415,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev, 
static const struct sd_desc sd_desc = {

	.name = MODULE_NAME,

	.ctrls = sd_ctrls,

	.nctrls = ARRAY_SIZE(sd_ctrls),

	.nctrls = NCTRLS,

	.config = sd_config,

	.init = sd_init,

	.start = sd_start,