Commit 7b1f41e0 authored by Corentin Labbe's avatar Corentin Labbe Committed by Mauro Carvalho Chehab
Browse files

media: zoran: use ZR_NORM 



Instead of using hardcoded numbers, let's use some define for ZR NORM.

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 88698680

drivers/staging/media/zoran/zoran.h

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ 
#include <media/v4l2-ctrls.h>

#include <media/v4l2-fh.h>



#define ZR_NORM_PAL 0

#define ZR_NORM_NTSC 1

#define ZR_NORM_SECAM 2



struct zoran_sync {

	unsigned long frame;	/* number of buffer that has been free'd */

	unsigned long length;	/* number of code bytes in buffer (capture only) */

drivers/staging/media/zoran/zoran_card.c

+4 −4
Original line number Diff line number Diff line
@@ -911,18 +911,18 @@ static int zr36057_init(struct zoran *zr) 
		default_norm = 0;

	if (default_norm == 0) {

		zr->norm = V4L2_STD_PAL;

		zr->timing = zr->card.tvn[0];

		zr->timing = zr->card.tvn[ZR_NORM_PAL];

	} else if (default_norm == 1) {

		zr->norm = V4L2_STD_NTSC;

		zr->timing = zr->card.tvn[1];

		zr->timing = zr->card.tvn[ZR_NORM_NTSC];

	} else {

		zr->norm = V4L2_STD_SECAM;

		zr->timing = zr->card.tvn[2];

		zr->timing = zr->card.tvn[ZR_NORM_SECAM];

	}

	if (!zr->timing) {

		pci_warn(zr->pci_dev, "%s - default TV standard not supported by hardware. PAL will be used.\n", __func__);

		zr->norm = V4L2_STD_PAL;

		zr->timing = zr->card.tvn[0];

		zr->timing = zr->card.tvn[ZR_NORM_PAL];

	}



	if (default_input > zr->card.inputs - 1) {

drivers/staging/media/zoran/zoran_driver.c

+3 −3
Original line number Diff line number Diff line
@@ -1033,11 +1033,11 @@ static int zoran_set_norm(struct zoran *zr, v4l2_std_id norm) 
	}



	if (norm & V4L2_STD_SECAM)

		zr->timing = zr->card.tvn[2];

		zr->timing = zr->card.tvn[ZR_NORM_SECAM];

	else if (norm & V4L2_STD_NTSC)

		zr->timing = zr->card.tvn[1];

		zr->timing = zr->card.tvn[ZR_NORM_NTSC];

	else

		zr->timing = zr->card.tvn[0];

		zr->timing = zr->card.tvn[ZR_NORM_PAL];



	decoder_call(zr, video, s_std, norm);

	encoder_call(zr, video, s_std_output, norm);

CRA Git | Maintained and supported by SUSTech CRA and CCSE