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

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

V4L/DVB (8008): cx18: remove duplicate audio and video input enums 



cx18-cards.h had a copy of the audio and video input enums
from cx18-av-core.h, but with different prefixes. Removed
that copy and used the ones from cx18-av-core.h.

Thanks to Andy Walls <awalls@radix.net> for the report.

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

drivers/media/video/cx18/cx18-cards.c

+31 −30
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include "cx18-driver.h"

#include "cx18-cards.h"

#include "cx18-av-core.h"

#include "cx18-i2c.h"

#include <media/cs5345.h>
@@ -54,22 +55,22 @@ static const struct cx18_card cx18_card_hvr1600_esmt = { 
	.hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER |

		  CX18_HW_CS5345 | CX18_HW_DVB,

	.video_inputs = {

		{ CX18_CARD_INPUT_VID_TUNER,  0, CX23418_COMPOSITE7 },

		{ CX18_CARD_INPUT_SVIDEO1,    1, CX23418_SVIDEO1    },

		{ CX18_CARD_INPUT_COMPOSITE1, 1, CX23418_COMPOSITE3 },

		{ CX18_CARD_INPUT_SVIDEO2,    2, CX23418_SVIDEO2    },

		{ CX18_CARD_INPUT_COMPOSITE2, 2, CX23418_COMPOSITE4 },

		{ CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE7 },

		{ CX18_CARD_INPUT_SVIDEO1,    1, CX18_AV_SVIDEO1    },

		{ CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE3 },

		{ CX18_CARD_INPUT_SVIDEO2,    2, CX18_AV_SVIDEO2    },

		{ CX18_CARD_INPUT_COMPOSITE2, 2, CX18_AV_COMPOSITE4 },

	},

	.audio_inputs = {

		{ CX18_CARD_INPUT_AUD_TUNER,

		  CX23418_AUDIO8, CS5345_IN_1 | CS5345_MCLK_1_5 },

		  CX18_AV_AUDIO8, CS5345_IN_1 | CS5345_MCLK_1_5 },

		{ CX18_CARD_INPUT_LINE_IN1,

		  CX23418_AUDIO_SERIAL, CS5345_IN_2 },

		  CX18_AV_AUDIO_SERIAL, CS5345_IN_2 },

		{ CX18_CARD_INPUT_LINE_IN2,

		  CX23418_AUDIO_SERIAL, CS5345_IN_2 },

		  CX18_AV_AUDIO_SERIAL, CS5345_IN_2 },

	},

	.radio_input = { CX18_CARD_INPUT_AUD_TUNER,

			 CX23418_AUDIO_SERIAL, 0 },

			 CX18_AV_AUDIO_SERIAL, 0 },

	.ddr = {

		/* ESMT M13S128324A-5B memory */

		.chip_config = 0x003,
@@ -94,22 +95,22 @@ static const struct cx18_card cx18_card_hvr1600_samsung = { 
	.hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER |

		  CX18_HW_CS5345 | CX18_HW_DVB,

	.video_inputs = {

		{ CX18_CARD_INPUT_VID_TUNER,  0, CX23418_COMPOSITE7 },

		{ CX18_CARD_INPUT_SVIDEO1,    1, CX23418_SVIDEO1    },

		{ CX18_CARD_INPUT_COMPOSITE1, 1, CX23418_COMPOSITE3 },

		{ CX18_CARD_INPUT_SVIDEO2,    2, CX23418_SVIDEO2    },

		{ CX18_CARD_INPUT_COMPOSITE2, 2, CX23418_COMPOSITE4 },

		{ CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE7 },

		{ CX18_CARD_INPUT_SVIDEO1,    1, CX18_AV_SVIDEO1    },

		{ CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE3 },

		{ CX18_CARD_INPUT_SVIDEO2,    2, CX18_AV_SVIDEO2    },

		{ CX18_CARD_INPUT_COMPOSITE2, 2, CX18_AV_COMPOSITE4 },

	},

	.audio_inputs = {

		{ CX18_CARD_INPUT_AUD_TUNER,

		  CX23418_AUDIO8, CS5345_IN_1 | CS5345_MCLK_1_5 },

		  CX18_AV_AUDIO8, CS5345_IN_1 | CS5345_MCLK_1_5 },

		{ CX18_CARD_INPUT_LINE_IN1,

		  CX23418_AUDIO_SERIAL, CS5345_IN_2 },

		  CX18_AV_AUDIO_SERIAL, CS5345_IN_2 },

		{ CX18_CARD_INPUT_LINE_IN2,

		  CX23418_AUDIO_SERIAL, CS5345_IN_2 },

		  CX18_AV_AUDIO_SERIAL, CS5345_IN_2 },

	},

	.radio_input = { CX18_CARD_INPUT_AUD_TUNER,

			 CX23418_AUDIO_SERIAL, 0 },

			 CX18_AV_AUDIO_SERIAL, 0 },

	.ddr = {

		/* Samsung K4D263238G-VC33 memory */

		.chip_config = 0x003,
@@ -141,19 +142,19 @@ static const struct cx18_card cx18_card_h900 = { 
	.hw_audio_ctrl = CX18_HW_CX23418,

	.hw_all = CX18_HW_TUNER,

	.video_inputs = {

		{ CX18_CARD_INPUT_VID_TUNER,  0, CX23418_COMPOSITE2 },

		{ CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE2 },

		{ CX18_CARD_INPUT_SVIDEO1,    1,

			CX23418_SVIDEO_LUMA3 | CX23418_SVIDEO_CHROMA4 },

		{ CX18_CARD_INPUT_COMPOSITE1, 1, CX23418_COMPOSITE1 },

			CX18_AV_SVIDEO_LUMA3 | CX18_AV_SVIDEO_CHROMA4 },

		{ CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE1 },

	},

	.audio_inputs = {

		{ CX18_CARD_INPUT_AUD_TUNER,

		  CX23418_AUDIO8, 0 },

		  CX18_AV_AUDIO8, 0 },

		{ CX18_CARD_INPUT_LINE_IN1,

		  CX23418_AUDIO_SERIAL, 0 },

		  CX18_AV_AUDIO_SERIAL, 0 },

	},

	.radio_input = { CX18_CARD_INPUT_AUD_TUNER,

			 CX23418_AUDIO_SERIAL, 0 },

			 CX18_AV_AUDIO_SERIAL, 0 },

	.tuners = {

		{ .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },

	},
@@ -188,18 +189,18 @@ static const struct cx18_card cx18_card_mpc718 = { 
	.hw_audio_ctrl = CX18_HW_CX23418,

	.hw_all = CX18_HW_TUNER,

	.video_inputs = {

		{ CX18_CARD_INPUT_VID_TUNER,  0, CX23418_COMPOSITE7 },

		{ CX18_CARD_INPUT_SVIDEO1,    1, CX23418_SVIDEO1    },

		{ CX18_CARD_INPUT_COMPOSITE1, 1, CX23418_COMPOSITE3 },

		{ CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE7 },

		{ CX18_CARD_INPUT_SVIDEO1,    1, CX18_AV_SVIDEO1    },

		{ CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE3 },

	},

	.audio_inputs = {

		{ CX18_CARD_INPUT_AUD_TUNER,

		  CX23418_AUDIO8, 0 },

		  CX18_AV_AUDIO8, 0 },

		{ CX18_CARD_INPUT_LINE_IN1,

		  CX23418_AUDIO_SERIAL, 0 },

		  CX18_AV_AUDIO_SERIAL, 0 },

	},

	.radio_input = { CX18_CARD_INPUT_AUD_TUNER,

			 CX23418_AUDIO_SERIAL, 0 },

			 CX18_AV_AUDIO_SERIAL, 0 },

	.tuners = {

		/* XC3028 tuner */

		{ .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },

drivers/media/video/cx18/cx18-cards.h

+0 −40
Original line number Diff line number Diff line
@@ -36,36 +36,6 @@ 
#define	CX18_CARD_INPUT_COMPOSITE2 	5

#define	CX18_CARD_INPUT_COMPOSITE3 	6



enum cx34180_video_input {

	/* Composite video inputs In1-In8 */

	CX23418_COMPOSITE1 = 1,

	CX23418_COMPOSITE2,

	CX23418_COMPOSITE3,

	CX23418_COMPOSITE4,

	CX23418_COMPOSITE5,

	CX23418_COMPOSITE6,

	CX23418_COMPOSITE7,

	CX23418_COMPOSITE8,



	/* S-Video inputs consist of one luma input (In1-In4) ORed with one

	   chroma input (In5-In8) */

	CX23418_SVIDEO_LUMA1 = 0x10,

	CX23418_SVIDEO_LUMA2 = 0x20,

	CX23418_SVIDEO_LUMA3 = 0x30,

	CX23418_SVIDEO_LUMA4 = 0x40,

	CX23418_SVIDEO_CHROMA4 = 0x400,

	CX23418_SVIDEO_CHROMA5 = 0x500,

	CX23418_SVIDEO_CHROMA6 = 0x600,

	CX23418_SVIDEO_CHROMA7 = 0x700,

	CX23418_SVIDEO_CHROMA8 = 0x800,



	/* S-Video aliases for common luma/chroma combinations */

	CX23418_SVIDEO1 = 0x510,

	CX23418_SVIDEO2 = 0x620,

	CX23418_SVIDEO3 = 0x730,

	CX23418_SVIDEO4 = 0x840,

};



/* audio inputs */

#define	CX18_CARD_INPUT_AUD_TUNER	1

#define	CX18_CARD_INPUT_LINE_IN1 	2
@@ -75,16 +45,6 @@ enum cx34180_video_input { 
#define CX18_CARD_MAX_AUDIO_INPUTS 3

#define CX18_CARD_MAX_TUNERS  	   2



enum cx23418_audio_input {

	/* Audio inputs: serial or In4-In8 */

	CX23418_AUDIO_SERIAL,

	CX23418_AUDIO4 = 4,

	CX23418_AUDIO5,

	CX23418_AUDIO6,

	CX23418_AUDIO7,

	CX23418_AUDIO8,

};



/* V4L2 capability aliases */

#define CX18_CAP_ENCODER (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER | \

			  V4L2_CAP_AUDIO | V4L2_CAP_READWRITE)