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

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

V4L/DVB (4192): Use control helpers for saa7115, cx25840, msp3400. 



Replace hardcoded control description by the standard ones supplied
by v4l2-common.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 5d1a9ae6

drivers/media/video/cx25840/cx25840-core.c

+19 −100
Original line number Diff line number Diff line
@@ -617,95 +617,6 @@ static int set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt) 


/* ----------------------------------------------------------------------- */



static struct v4l2_queryctrl cx25836_qctrl[] = {

	{

		.id            = V4L2_CID_BRIGHTNESS,

		.type          = V4L2_CTRL_TYPE_INTEGER,

		.name          = "Brightness",

		.minimum       = 0,

		.maximum       = 255,

		.step          = 1,

		.default_value = 128,

		.flags         = 0,

	}, {

		.id            = V4L2_CID_CONTRAST,

		.type          = V4L2_CTRL_TYPE_INTEGER,

		.name          = "Contrast",

		.minimum       = 0,

		.maximum       = 127,

		.step          = 1,

		.default_value = 64,

		.flags         = 0,

	}, {

		.id            = V4L2_CID_SATURATION,

		.type          = V4L2_CTRL_TYPE_INTEGER,

		.name          = "Saturation",

		.minimum       = 0,

		.maximum       = 127,

		.step          = 1,

		.default_value = 64,

		.flags         = 0,

	}, {

		.id            = V4L2_CID_HUE,

		.type          = V4L2_CTRL_TYPE_INTEGER,

		.name          = "Hue",

		.minimum       = -128,

		.maximum       = 127,

		.step          = 1,

		.default_value = 0,

		.flags 	       = 0,

	},

};



static struct v4l2_queryctrl cx25840_qctrl[] = {

	{

		.id            = V4L2_CID_AUDIO_VOLUME,

		.type          = V4L2_CTRL_TYPE_INTEGER,

		.name          = "Volume",

		.minimum       = 0,

		.maximum       = 65535,

		.step          = 65535/100,

		.default_value = 58880,

		.flags         = 0,

	}, {

		.id            = V4L2_CID_AUDIO_BALANCE,

		.type          = V4L2_CTRL_TYPE_INTEGER,

		.name          = "Balance",

		.minimum       = 0,

		.maximum       = 65535,

		.step          = 65535/100,

		.default_value = 32768,

		.flags         = 0,

	}, {

		.id            = V4L2_CID_AUDIO_MUTE,

		.type          = V4L2_CTRL_TYPE_BOOLEAN,

		.name          = "Mute",

		.minimum       = 0,

		.maximum       = 1,

		.step          = 1,

		.default_value = 1,

		.flags         = 0,

	}, {

		.id            = V4L2_CID_AUDIO_BASS,

		.type          = V4L2_CTRL_TYPE_INTEGER,

		.name          = "Bass",

		.minimum       = 0,

		.maximum       = 65535,

		.step          = 65535/100,

		.default_value = 32768,

	}, {

		.id            = V4L2_CID_AUDIO_TREBLE,

		.type          = V4L2_CTRL_TYPE_INTEGER,

		.name          = "Treble",

		.minimum       = 0,

		.maximum       = 65535,

		.step          = 65535/100,

		.default_value = 32768,

	},

};



/* ----------------------------------------------------------------------- */



static int cx25840_command(struct i2c_client *client, unsigned int cmd,

			   void *arg)

{
@@ -773,20 +684,28 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd, 
	case VIDIOC_QUERYCTRL:

	{

		struct v4l2_queryctrl *qc = arg;

		int i;



		for (i = 0; i < ARRAY_SIZE(cx25836_qctrl); i++)

			if (qc->id && qc->id == cx25836_qctrl[i].id) {

				memcpy(qc, &cx25836_qctrl[i], sizeof(*qc));

				return 0;

		switch (qc->id) {

			case V4L2_CID_BRIGHTNESS:

			case V4L2_CID_CONTRAST:

			case V4L2_CID_SATURATION:

			case V4L2_CID_HUE:

				return v4l2_ctrl_query_fill_std(qc);

			default:

				break;

		}

		if (state->is_cx25836)

			return -EINVAL;



		for (i = 0; i < ARRAY_SIZE(cx25840_qctrl); i++)

			if (qc->id && qc->id == cx25840_qctrl[i].id) {

				memcpy(qc, &cx25840_qctrl[i], sizeof(*qc));

				return 0;

		switch (qc->id) {

			case V4L2_CID_AUDIO_VOLUME:

			case V4L2_CID_AUDIO_MUTE:

			case V4L2_CID_AUDIO_BALANCE:

			case V4L2_CID_AUDIO_BASS:

			case V4L2_CID_AUDIO_TREBLE:

				return v4l2_ctrl_query_fill_std(qc);

			default:

				return -EINVAL;

		}

		return -EINVAL;

	}

drivers/media/video/msp3400-driver.c

+16 −73
Original line number Diff line number Diff line
@@ -385,67 +385,6 @@ static int msp_mode_v4l1_to_v4l2(int mode) 
	return V4L2_TUNER_MODE_MONO;

}



static struct v4l2_queryctrl msp_qctrl_std[] = {

	{

		.id            = V4L2_CID_AUDIO_VOLUME,

		.name          = "Volume",

		.minimum       = 0,

		.maximum       = 65535,

		.step          = 65535/100,

		.default_value = 58880,

		.flags         = 0,

		.type          = V4L2_CTRL_TYPE_INTEGER,

	},{

		.id            = V4L2_CID_AUDIO_MUTE,

		.name          = "Mute",

		.minimum       = 0,

		.maximum       = 1,

		.step          = 1,

		.default_value = 1,

		.flags         = 0,

		.type          = V4L2_CTRL_TYPE_BOOLEAN,

	},

};



static struct v4l2_queryctrl msp_qctrl_sound_processing[] = {

	{

		.id            = V4L2_CID_AUDIO_BALANCE,

		.name          = "Balance",

		.minimum       = 0,

		.maximum       = 65535,

		.step          = 65535/100,

		.default_value = 32768,

		.flags         = 0,

		.type          = V4L2_CTRL_TYPE_INTEGER,

	},{

		.id            = V4L2_CID_AUDIO_BASS,

		.name          = "Bass",

		.minimum       = 0,

		.maximum       = 65535,

		.step          = 65535/100,

		.default_value = 32768,

		.type          = V4L2_CTRL_TYPE_INTEGER,

	},{

		.id            = V4L2_CID_AUDIO_TREBLE,

		.name          = "Treble",

		.minimum       = 0,

		.maximum       = 65535,

		.step          = 65535/100,

		.default_value = 32768,

		.type          = V4L2_CTRL_TYPE_INTEGER,

	},{

		.id            = V4L2_CID_AUDIO_LOUDNESS,

		.name          = "Loudness",

		.minimum       = 0,

		.maximum       = 1,

		.step          = 1,

		.default_value = 1,

		.flags         = 0,

		.type          = V4L2_CTRL_TYPE_BOOLEAN,

	},

};





static int msp_get_ctrl(struct i2c_client *client, struct v4l2_control *ctrl)

{

	struct msp_state *state = i2c_get_clientdata(client);
@@ -753,22 +692,26 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) 
	case VIDIOC_QUERYCTRL:

	{

		struct v4l2_queryctrl *qc = arg;

		int i;



		for (i = 0; i < ARRAY_SIZE(msp_qctrl_std); i++)

			if (qc->id && qc->id == msp_qctrl_std[i].id) {

				memcpy(qc, &msp_qctrl_std[i], sizeof(*qc));

				return 0;

		switch (qc->id) {

			case V4L2_CID_AUDIO_VOLUME:

			case V4L2_CID_AUDIO_MUTE:

				return v4l2_ctrl_query_fill_std(qc);

			default:

				break;

		}

		if (!state->has_sound_processing)

			return -EINVAL;

		for (i = 0; i < ARRAY_SIZE(msp_qctrl_sound_processing); i++)

			if (qc->id && qc->id == msp_qctrl_sound_processing[i].id) {

				memcpy(qc, &msp_qctrl_sound_processing[i], sizeof(*qc));

				return 0;

			}

		switch (qc->id) {

			case V4L2_CID_AUDIO_LOUDNESS:

			case V4L2_CID_AUDIO_BALANCE:

			case V4L2_CID_AUDIO_BASS:

			case V4L2_CID_AUDIO_TREBLE:

				return v4l2_ctrl_query_fill_std(qc);

			default:

				return -EINVAL;

		}

	}



	case VIDIOC_G_CTRL:

		return msp_get_ctrl(client, arg);

drivers/media/video/saa7115.c

+9 −49
Original line number Diff line number Diff line
@@ -1090,48 +1090,6 @@ static void saa7115_decode_vbi_line(struct i2c_client *client, 


/* ============ SAA7115 AUDIO settings (end) ============= */



static struct v4l2_queryctrl saa7115_qctrl[] = {

	{

		.id            = V4L2_CID_BRIGHTNESS,

		.type          = V4L2_CTRL_TYPE_INTEGER,

		.name          = "Brightness",

		.minimum       = 0,

		.maximum       = 255,

		.step          = 1,

		.default_value = 128,

		.flags         = 0,

	}, {

		.id            = V4L2_CID_CONTRAST,

		.type          = V4L2_CTRL_TYPE_INTEGER,

		.name          = "Contrast",

		.minimum       = 0,

		.maximum       = 127,

		.step          = 1,

		.default_value = 64,

		.flags         = 0,

	}, {

		.id            = V4L2_CID_SATURATION,

		.type          = V4L2_CTRL_TYPE_INTEGER,

		.name          = "Saturation",

		.minimum       = 0,

		.maximum       = 127,

		.step          = 1,

		.default_value = 64,

		.flags         = 0,

	}, {

		.id            = V4L2_CID_HUE,

		.type          = V4L2_CTRL_TYPE_INTEGER,

		.name          = "Hue",

		.minimum       = -128,

		.maximum       = 127,

		.step          = 1,

		.default_value = 0,

		.flags 	       = 0,

	},

};



/* ----------------------------------------------------------------------- */



static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *arg)

{

	struct saa7115_state *state = i2c_get_clientdata(client);
@@ -1175,15 +1133,17 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar 
	case VIDIOC_QUERYCTRL:

	{

		struct v4l2_queryctrl *qc = arg;

		int i;



		for (i = 0; i < ARRAY_SIZE(saa7115_qctrl); i++)

			if (qc->id && qc->id == saa7115_qctrl[i].id) {

				memcpy(qc, &saa7115_qctrl[i], sizeof(*qc));

				return 0;

			}

		switch (qc->id) {

			case V4L2_CID_BRIGHTNESS:

			case V4L2_CID_CONTRAST:

			case V4L2_CID_SATURATION:

			case V4L2_CID_HUE:

				return v4l2_ctrl_query_fill_std(qc);

			default:

				return -EINVAL;

		}

	}



	case VIDIOC_G_STD:

		*(v4l2_std_id *)arg = saa7115_get_v4lstd(client);