iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: zoran: use ZR_NORM

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

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Corentin Labbe 2020-09-25 20:30:34 +02:00 committed by Mauro Carvalho Chehab
parent 886986804a
commit 7b1f41e037
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/media/zoran/zoran.h
View File

@ -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) */

8
drivers/staging/media/zoran/zoran_card.c
View File

@ -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) {

6
drivers/staging/media/zoran/zoran_driver.c
View File

@ -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);