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

Commit b1706b91 authored by Torsten Seeboth's avatar Torsten Seeboth Committed by Linus Torvalds
Browse files

[PATCH] v4l: 648: some clean up in cx88 tvaudio c 



- Some clean up in cx88-tvaudio.c

Signed-off-by: default avatarTorsten Seeboth <Torsten.Seeboth@t-online.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c35d4b84

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

+5 −5
Original line number Diff line number Diff line
@@ -845,19 +845,19 @@ static int set_tvaudio(struct cx88_core *core) 
		return 0;



	if (V4L2_STD_PAL_BG & norm->id) {

		core->tvaudio = nicam ? WW_NICAM_BGDKL : WW_A2_BG;

		core->tvaudio = WW_BG;



	} else if (V4L2_STD_PAL_DK & norm->id) {

		core->tvaudio = nicam ? WW_NICAM_BGDKL : WW_A2_DK;

		core->tvaudio = WW_DK;



	} else if (V4L2_STD_PAL_I & norm->id) {

		core->tvaudio = WW_NICAM_I;

		core->tvaudio = WW_I;



	} else if (V4L2_STD_SECAM_L & norm->id) {

		core->tvaudio = WW_SYSTEM_L_AM;

		core->tvaudio = WW_L;



	} else if (V4L2_STD_SECAM_DK & norm->id) {

		core->tvaudio = WW_A2_DK;

		core->tvaudio = WW_DK;



	} else if ((V4L2_STD_NTSC_M & norm->id) ||

		   (V4L2_STD_PAL_M  & norm->id)) {

drivers/media/video/cx88/cx88-tvaudio.c

+311 −332

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/video/cx88/cx88.h

+9 −10
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ struct cx88_core { 
	u32                        audiomode_current;

	u32                        input;

	u32                        astat;

	u32			   use_nicam;



	/* IR remote control state */

	struct cx88_IR             *ir;
@@ -527,22 +528,20 @@ extern void cx88_card_setup(struct cx88_core *core); 


#define WW_NONE		 1

#define WW_BTSC		 2

#define WW_NICAM_I	 3

#define WW_NICAM_BGDKL	 4

#define WW_A1		 5

#define WW_A2_BG	 6

#define WW_A2_DK	 7

#define WW_A2_M		 8

#define WW_EIAJ		 9

#define WW_SYSTEM_L_AM	10

#define WW_I2SPT	11

#define WW_FM		12

#define WW_BG		 3

#define WW_DK		 4

#define WW_I		 5

#define WW_L		 6

#define WW_EIAJ		 7

#define WW_I2SPT	 8

#define WW_FM		 9



void cx88_set_tvaudio(struct cx88_core *core);

void cx88_newstation(struct cx88_core *core);

void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t);

void cx88_set_stereo(struct cx88_core *core, u32 mode, int manual);

int cx88_audio_thread(void *data);

int cx88_detect_nicam(struct cx88_core *core);



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

/* cx88-input.c                                                */