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

Commit 51513353 authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: gspca_cpia1: Add basic v4l2 illuminator controls for the Intel Play QX3 



This patch adds basic V4L2 controls for the illuminators on the Intel
Play QX3 microscope.

Signed-off-by: default avatarAndy Walls <awalls@md.metrocast.net>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 008d35f2

drivers/media/video/gspca/cpia1.c

+98 −2
Original line number Diff line number Diff line
@@ -373,6 +373,10 @@ static int sd_setfreq(struct gspca_dev *gspca_dev, __s32 val); 
static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val);

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

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

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

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

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

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



static const struct ctrl sd_ctrls[] = {

	{
@@ -432,6 +436,34 @@ static const struct ctrl sd_ctrls[] = { 
		.set = sd_setfreq,

		.get = sd_getfreq,

	},

	{

		{

			.id	 = V4L2_CID_ILLUMINATORS_1,

			.type    = V4L2_CTRL_TYPE_BOOLEAN,

			.name    = "Illuminator 1",

			.minimum = 0,

			.maximum = 1,

			.step    = 1,

#define ILLUMINATORS_1_DEF 0

			.default_value = ILLUMINATORS_1_DEF,

		},

		.set = sd_setilluminator1,

		.get = sd_getilluminator1,

	},

	{

		{

			.id	 = V4L2_CID_ILLUMINATORS_2,

			.type    = V4L2_CTRL_TYPE_BOOLEAN,

			.name    = "Illuminator 2",

			.minimum = 0,

			.maximum = 1,

			.step    = 1,

#define ILLUMINATORS_2_DEF 0

			.default_value = ILLUMINATORS_2_DEF,

		},

		.set = sd_setilluminator2,

		.get = sd_getilluminator2,

	},

	{

		{

#define V4L2_CID_COMP_TARGET V4L2_CID_PRIVATE_BASE
@@ -1059,7 +1091,6 @@ static int command_resume(struct gspca_dev *gspca_dev) 
			  0, sd->params.streamStartLine, 0, 0);

}



#if 0 /* Currently unused */

static int command_setlights(struct gspca_dev *gspca_dev)

{

	struct sd *sd = (struct sd *) gspca_dev;
@@ -1079,7 +1110,6 @@ static int command_setlights(struct gspca_dev *gspca_dev) 
	return do_command(gspca_dev, CPIA_COMMAND_WriteMCPort, 2, 0,

			  p1 | p2 | 0xE0, 0);

}

#endif



static int set_flicker(struct gspca_dev *gspca_dev, int on, int apply)

{
@@ -1929,6 +1959,72 @@ static int sd_getcomptarget(struct gspca_dev *gspca_dev, __s32 *val) 
	return 0;

}



static int sd_setilluminator(struct gspca_dev *gspca_dev, __s32 val, int n)

{

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

	int ret;



	if (!sd->params.qx3.qx3_detected)

		return -EINVAL;



	switch (n) {

	case 1:

		sd->params.qx3.bottomlight = val ? 1 : 0;

		break;

	case 2:

		sd->params.qx3.toplight = val ? 1 : 0;

		break;

	default:

		return -EINVAL;

	}



	ret = command_setlights(gspca_dev);

	if (ret && ret != -EINVAL)

		ret = -EBUSY;



	return ret;

}



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

{

	return sd_setilluminator(gspca_dev, val, 1);

}



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

{

	return sd_setilluminator(gspca_dev, val, 2);

}



static int sd_getilluminator(struct gspca_dev *gspca_dev, __s32 *val, int n)

{

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



	if (!sd->params.qx3.qx3_detected)

		return -EINVAL;



	switch (n) {

	case 1:

		*val = sd->params.qx3.bottomlight;

		break;

	case 2:

		*val = sd->params.qx3.toplight;

		break;

	default:

		return -EINVAL;

	}

	return 0;

}



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

{

	return sd_getilluminator(gspca_dev, val, 1);

}



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

{

	return sd_getilluminator(gspca_dev, val, 2);

}



static int sd_querymenu(struct gspca_dev *gspca_dev,

			struct v4l2_querymenu *menu)

{