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

Commit 45270a15 authored Jun 07, 2008 by Hans Verkuil Committed by Mauro Carvalho Chehab Jun 26, 2008

V4L/DVB (8007): cx18/cx25840: the S-Video LUMA input can use all In1-In8 inputs



The S-Video LUMA input was restricted to the In1-In4 inputs, but it
turns out that it can use the full range of In1-In8.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

parent bf67cac1

drivers/media/video/cx18/cx18-av-core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -228,7 +228,7 @@ static int set_input(struct cx18 *cx, enum cx18_av_video_input vid_input,

		if ((vid_input & ~0xff0) \|\|
		luma < CX18_AV_SVIDEO_LUMA1 \|\|
		luma > CX18_AV_SVIDEO_LUMA4 \|\|
		luma > CX18_AV_SVIDEO_LUMA8 \|\|
		chroma < CX18_AV_SVIDEO_CHROMA4 \|\|
		chroma > CX18_AV_SVIDEO_CHROMA8) {
		CX18_ERR("0x%04x is not a valid video input!\n",

drivers/media/video/cx18/cx18-av-core.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -37,12 +37,16 @@ enum cx18_av_video_input {
		CX18_AV_COMPOSITE7,
		CX18_AV_COMPOSITE8,

		/* S-Video inputs consist of one luma input (In1-In4) ORed with one
		/* S-Video inputs consist of one luma input (In1-In8) ORed with one
		chroma input (In5-In8) */
		CX18_AV_SVIDEO_LUMA1 = 0x10,
		CX18_AV_SVIDEO_LUMA2 = 0x20,
		CX18_AV_SVIDEO_LUMA3 = 0x30,
		CX18_AV_SVIDEO_LUMA4 = 0x40,
		CX18_AV_SVIDEO_LUMA5 = 0x50,
		CX18_AV_SVIDEO_LUMA6 = 0x60,
		CX18_AV_SVIDEO_LUMA7 = 0x70,
		CX18_AV_SVIDEO_LUMA8 = 0x80,
		CX18_AV_SVIDEO_CHROMA4 = 0x400,
		CX18_AV_SVIDEO_CHROMA5 = 0x500,
		CX18_AV_SVIDEO_CHROMA6 = 0x600,

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -433,7 +433,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
		int chroma = vid_input & 0xf00;

		if ((vid_input & ~0xff0) \|\|
		luma < CX25840_SVIDEO_LUMA1 \|\| luma > CX25840_SVIDEO_LUMA4 \|\|
		luma < CX25840_SVIDEO_LUMA1 \|\| luma > CX25840_SVIDEO_LUMA8 \|\|
		chroma < CX25840_SVIDEO_CHROMA4 \|\| chroma > CX25840_SVIDEO_CHROMA8) {
		v4l_err(client, "0x%04x is not a valid video input!\n",
		vid_input);

include/media/cx25840.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -32,12 +32,16 @@ enum cx25840_video_input {
		CX25840_COMPOSITE7,
		CX25840_COMPOSITE8,

		/* S-Video inputs consist of one luma input (In1-In4) ORed with one
		/* S-Video inputs consist of one luma input (In1-In8) ORed with one
		chroma input (In5-In8) */
		CX25840_SVIDEO_LUMA1 = 0x10,
		CX25840_SVIDEO_LUMA2 = 0x20,
		CX25840_SVIDEO_LUMA3 = 0x30,
		CX25840_SVIDEO_LUMA4 = 0x40,
		CX25840_SVIDEO_LUMA5 = 0x50,
		CX25840_SVIDEO_LUMA6 = 0x60,
		CX25840_SVIDEO_LUMA7 = 0x70,
		CX25840_SVIDEO_LUMA8 = 0x80,
		CX25840_SVIDEO_CHROMA4 = 0x400,
		CX25840_SVIDEO_CHROMA5 = 0x500,
		CX25840_SVIDEO_CHROMA6 = 0x600,