Commit 4ea8b196 authored by Corentin Labbe's avatar Corentin Labbe Committed by Mauro Carvalho Chehab
Browse files

media: zoran: constify struct tvnorm 



The structure tvnorm could be consified.

Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 30a97818

drivers/staging/media/zoran/videocodec.h

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ struct videocodec { 
	// set compression or decompression (or freeze, stop, standby, etc)

	int (*set_mode)(struct videocodec *codec, int mode);

	// setup picture size and norm (for the codec's video frontend)

	int (*set_video)(struct videocodec *codec, struct tvnorm *norm,

	int (*set_video)(struct videocodec *codec, const struct tvnorm *norm,

			 struct vfe_settings *cap, struct vfe_polarity *pol);

	// other control commands, also mmap setup etc.

	int (*control)(struct videocodec *codec, int type, int size, void *data);

drivers/staging/media/zoran/zoran.h

+2 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ struct card_info { 
	} input[BUZ_MAX_INPUT];



	v4l2_std_id norms;

	struct tvnorm *tvn[3];	/* supported TV norms */

	const struct tvnorm *tvn[3];	/* supported TV norms */



	u32 jpeg_int;		/* JPEG interrupt */

	u32 vsync_int;		/* VSYNC interrupt */
@@ -266,7 +266,7 @@ struct zoran { 
	u8 initialized;		/* flag if zoran has been correctly initialized */

	int user;		/* number of current users */

	struct card_info card;

	struct tvnorm *timing;

	const struct tvnorm *timing;



	unsigned short id;	/* number of this device */

	char name[32];		/* name of this device */

drivers/staging/media/zoran/zoran_card.c

+12 −12
Original line number Diff line number Diff line
@@ -277,24 +277,24 @@ static char *codecid_to_modulename(u16 codecid) 
//      u16 Wt, Wa, HStart, HSyncStart, Ht, Ha, VStart;

// };



static struct tvnorm f50sqpixel = { 944, 768, 83, 880, 625, 576, 16 };

static struct tvnorm f60sqpixel = { 780, 640, 51, 716, 525, 480, 12 };

static struct tvnorm f50ccir601 = { 864, 720, 75, 804, 625, 576, 18 };

static struct tvnorm f60ccir601 = { 858, 720, 57, 788, 525, 480, 16 };

static const struct tvnorm f50sqpixel = { 944, 768, 83, 880, 625, 576, 16 };

static const struct tvnorm f60sqpixel = { 780, 640, 51, 716, 525, 480, 12 };

static const struct tvnorm f50ccir601 = { 864, 720, 75, 804, 625, 576, 18 };

static const struct tvnorm f60ccir601 = { 858, 720, 57, 788, 525, 480, 16 };



static struct tvnorm f50ccir601_lml33 = { 864, 720, 75 + 34, 804, 625, 576, 18 };

static struct tvnorm f60ccir601_lml33 = { 858, 720, 57 + 34, 788, 525, 480, 16 };

static const struct tvnorm f50ccir601_lml33 = { 864, 720, 75 + 34, 804, 625, 576, 18 };

static const struct tvnorm f60ccir601_lml33 = { 858, 720, 57 + 34, 788, 525, 480, 16 };



/* The DC10 (57/16/50) uses VActive as HSync, so HStart must be 0 */

static struct tvnorm f50sqpixel_dc10 = { 944, 768, 0, 880, 625, 576, 0 };

static struct tvnorm f60sqpixel_dc10 = { 780, 640, 0, 716, 525, 480, 12 };

static const struct tvnorm f50sqpixel_dc10 = { 944, 768, 0, 880, 625, 576, 0 };

static const struct tvnorm f60sqpixel_dc10 = { 780, 640, 0, 716, 525, 480, 12 };



/*

 * FIXME: I cannot swap U and V in saa7114, so i do one pixel left shift in zoran (75 -> 74)

 * (Maxim Yevtyushkin <max@linuxmedialabs.com>)

 */

static struct tvnorm f50ccir601_lm33r10 = { 864, 720, 74 + 54, 804, 625, 576, 18 };

static struct tvnorm f60ccir601_lm33r10 = { 858, 720, 56 + 54, 788, 525, 480, 16 };

static const struct tvnorm f50ccir601_lm33r10 = { 864, 720, 74 + 54, 804, 625, 576, 18 };

static const struct tvnorm f60ccir601_lm33r10 = { 858, 720, 56 + 54, 788, 525, 480, 16 };



/*

 * FIXME: The ks0127 seem incapable of swapping U and V, too, which is why I copy Maxim's left
@@ -303,8 +303,8 @@ static struct tvnorm f60ccir601_lm33r10 = { 858, 720, 56 + 54, 788, 525, 480, 16 
 * Christer's driver used the unshifted norms, though...

 * /Sam

 */

static struct tvnorm f50ccir601_avs6eyes = { 864, 720, 74, 804, 625, 576, 18 };

static struct tvnorm f60ccir601_avs6eyes = { 858, 720, 56, 788, 525, 480, 16 };

static const struct tvnorm f50ccir601_avs6eyes = { 864, 720, 74, 804, 625, 576, 18 };

static const struct tvnorm f60ccir601_avs6eyes = { 858, 720, 56, 788, 525, 480, 16 };



static const unsigned short vpx3220_addrs[] = { 0x43, 0x47, I2C_CLIENT_END };

static const unsigned short saa7110_addrs[] = { 0x4e, 0x4f, I2C_CLIENT_END };

drivers/staging/media/zoran/zoran_device.c

+2 −2
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static void zr36057_adjust_vfe(struct zoran *zr, enum zoran_codec_mode mode) 
static void zr36057_set_vfe(struct zoran *zr, int video_width, int video_height,

			    const struct zoran_format *format)

{

	struct tvnorm *tvn;

	const struct tvnorm *tvn;

	unsigned int HStart, HEnd, VStart, VEnd;

	unsigned int DispMode;

	unsigned int VidWinWid, VidWinHt;
@@ -510,7 +510,7 @@ static void init_jpeg_queue(struct zoran *zr) 


static void zr36057_set_jpg(struct zoran *zr, enum zoran_codec_mode mode)

{

	struct tvnorm *tvn;

	const struct tvnorm *tvn;

	u32 reg;



	tvn = zr->timing;

drivers/staging/media/zoran/zr36016.c

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static int zr36016_set_mode(struct videocodec *codec, int mode) 
}



/* set picture size */

static int zr36016_set_video(struct videocodec *codec, struct tvnorm *norm,

static int zr36016_set_video(struct videocodec *codec, const struct tvnorm *norm,

			     struct vfe_settings *cap, struct vfe_polarity *pol)

{

	struct zr36016 *ptr = (struct zr36016 *)codec->data;

CRA Git | Maintained and supported by SUSTech CRA and CCSE