aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx231xx/cx231xx.h
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@hauppauge.com>2010-07-09 12:29:31 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:17:21 -0400
commit435b4f7897b7e2f233c313e65ac82bd1d3599c43 (patch)
treeceba75faf996b25a98677ca56b44dd04b3cc6431 /drivers/media/video/cx231xx/cx231xx.h
parentd5a1754d523f5145a6e4ec8fa3a592cc57400467 (diff)
[media] cx231xx: make video scaler work properly
Move the responsibility for setting up the horizontal and vertical scalers entirely to the cx25840 driver. The cx231xx-avcore was actually programming garbage into the HSCALE_CTRL and VSCALE_CTRL registers (because of differences in how the em28xx driver worked, which the cx231xx driver was derived from). The net effect is that the scaler now works properly (tested with both PAL and NTSC under mplayer and tvtime). This patch also gets rid of cx25840 errors showing up in dmesg which say "720x480 is not a valid size" (since we now properly setup the size of the active video area). Signed-off-by: Devin Heitmueller <dheitmueller@hauppauge.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx.h')
-rw-r--r--drivers/media/video/cx231xx/cx231xx.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h
index 634d595818d8..aa273428d021 100644
--- a/drivers/media/video/cx231xx/cx231xx.h
+++ b/drivers/media/video/cx231xx/cx231xx.h
@@ -645,8 +645,6 @@ struct cx231xx {
645 /* frame properties */ 645 /* frame properties */
646 int width; /* current frame width */ 646 int width; /* current frame width */
647 int height; /* current frame height */ 647 int height; /* current frame height */
648 unsigned hscale; /* horizontal scale factor (see datasheet) */
649 unsigned vscale; /* vertical scale factor (see datasheet) */
650 int interlaced; /* 1=interlace fileds, 0=just top fileds */ 648 int interlaced; /* 1=interlace fileds, 0=just top fileds */
651 649
652 struct cx231xx_audio adev; 650 struct cx231xx_audio adev;
@@ -876,7 +874,6 @@ int cx231xx_set_audio_decoder_input(struct cx231xx *dev,
876 enum AUDIO_INPUT audio_input); 874 enum AUDIO_INPUT audio_input);
877 875
878int cx231xx_capture_start(struct cx231xx *dev, int start, u8 media_type); 876int cx231xx_capture_start(struct cx231xx *dev, int start, u8 media_type);
879int cx231xx_resolution_set(struct cx231xx *dev);
880int cx231xx_set_video_alternate(struct cx231xx *dev); 877int cx231xx_set_video_alternate(struct cx231xx *dev);
881int cx231xx_set_alt_setting(struct cx231xx *dev, u8 index, u8 alt); 878int cx231xx_set_alt_setting(struct cx231xx *dev, u8 index, u8 alt);
882int is_fw_load(struct cx231xx *dev); 879int is_fw_load(struct cx231xx *dev);