diff options
| author | Michael Hunold <devnull@localhost> | 2004-03-15 19:38:14 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2004-03-15 19:38:14 +0000 |
| commit | a0f1c742a8475391645b478e4f6703f38da49ba1 (patch) | |
| tree | e81ab9faa94a1c51f2c3c839c00e97f86ade059a /linux/drivers/media/dvb | |
| parent | ee51ff2a1adca181e9614e0828b2e406e6bdcaa8 (diff) | |
| download | mediapointer-dvb-s2-a0f1c742a8475391645b478e4f6703f38da49ba1.tar.gz mediapointer-dvb-s2-a0f1c742a8475391645b478e4f6703f38da49ba1.tar.bz2 | |
- remove superfluous h_calc and v_field entries from internal saa7146_vv
structure, fix all drivers defining this
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_v4l.c | 24 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/budget-av.c | 10 |
2 files changed, 17 insertions, 17 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110_v4l.c b/linux/drivers/media/dvb/ttpci/av7110_v4l.c index c2cd7e3c4..a70fdaa46 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/linux/drivers/media/dvb/ttpci/av7110_v4l.c @@ -627,13 +627,13 @@ int av7110_exit_v4l(struct av7110 *av7110) static struct saa7146_standard standard[] = { { .name = "PAL", .id = V4L2_STD_PAL_BG, - .v_offset = 0x15, .v_field = 288, .v_calc = 576, - .h_offset = 0x48, .h_pixels = 708, .h_calc = 708, + .v_offset = 0x15, .v_field = 288, + .h_offset = 0x48, .h_pixels = 708, .v_max_out = 576, .h_max_out = 768, }, { .name = "NTSC", .id = V4L2_STD_NTSC, - .v_offset = 0x10, .v_field = 244, .v_calc = 480, - .h_offset = 0x40, .h_pixels = 708, .h_calc = 708, + .v_offset = 0x10, .v_field = 244, + .h_offset = 0x40, .h_pixels = 708, .v_max_out = 480, .h_max_out = 640, } }; @@ -641,13 +641,13 @@ static struct saa7146_standard standard[] = { static struct saa7146_standard analog_standard[] = { { .name = "PAL", .id = V4L2_STD_PAL_BG, - .v_offset = 0x1b, .v_field = 288, .v_calc = 576, - .h_offset = 0x08, .h_pixels = 708, .h_calc = 708, + .v_offset = 0x1b, .v_field = 288, + .h_offset = 0x08, .h_pixels = 708, .v_max_out = 576, .h_max_out = 768, }, { .name = "NTSC", .id = V4L2_STD_NTSC, - .v_offset = 0x10, .v_field = 244, .v_calc = 480, - .h_offset = 0x40, .h_pixels = 708, .h_calc = 708, + .v_offset = 0x10, .v_field = 244, + .h_offset = 0x40, .h_pixels = 708, .v_max_out = 480, .h_max_out = 640, } }; @@ -655,13 +655,13 @@ static struct saa7146_standard analog_standard[] = { static struct saa7146_standard dvb_standard[] = { { .name = "PAL", .id = V4L2_STD_PAL_BG, - .v_offset = 0x14, .v_field = 288, .v_calc = 576, - .h_offset = 0x48, .h_pixels = 708, .h_calc = 708, + .v_offset = 0x14, .v_field = 288, + .h_offset = 0x48, .h_pixels = 708, .v_max_out = 576, .h_max_out = 768, }, { .name = "NTSC", .id = V4L2_STD_NTSC, - .v_offset = 0x10, .v_field = 244, .v_calc = 480, - .h_offset = 0x40, .h_pixels = 708, .h_calc = 708, + .v_offset = 0x10, .v_field = 244, + .h_offset = 0x40, .h_pixels = 708, .v_max_out = 480, .h_max_out = 640, } }; diff --git a/linux/drivers/media/dvb/ttpci/budget-av.c b/linux/drivers/media/dvb/ttpci/budget-av.c index 926d95f91..e51daed59 100644 --- a/linux/drivers/media/dvb/ttpci/budget-av.c +++ b/linux/drivers/media/dvb/ttpci/budget-av.c @@ -333,13 +333,13 @@ static int av_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg) static struct saa7146_standard standard[] = { { .name = "PAL", .id = V4L2_STD_PAL, - .v_offset = 0x17, .v_field = 288, .v_calc = 576, - .h_offset = 0x14, .h_pixels = 680, .h_calc = 680+1, - .v_max_out = 576, .h_max_out = 768, + .v_offset = 0x17, .v_field = 288, + .h_offset = 0x14, .h_pixels = 680, + .v_max_out = 576, .h_max_out = 768 }, { .name = "NTSC", .id = V4L2_STD_NTSC, - .v_offset = 0x16, .v_field = 240, .v_calc = 480, - .h_offset = 0x06, .h_pixels = 708, .h_calc = 708+1, + .v_offset = 0x16, .v_field = 240, + .h_offset = 0x06, .h_pixels = 708, .v_max_out = 480, .h_max_out = 640, } }; |