summaryrefslogtreecommitdiff
path: root/drivers/media/video/em28xx/em28xx.h
diff options
context:
space:
mode:
authorMarkus Rechberger <mrechberger@gmail.com>2005-11-08 21:38:05 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:23 -0800
commit30556b23f31973ca311341277c4e4b128c0528bb (patch)
treefcfdd616a70d5cb443a0121cf49b0ddd800f0256 /drivers/media/video/em28xx/em28xx.h
parent08eca13dc407c389f04ce295144bb3fcd996a10d (diff)
[PATCH] v4l: 840: fixed settings for msi vox usb 2.0 saa7114 is missing atm
- Fixed settings for MSI Vox USB 2.0 (saa7114 is missing atm) Signed-off-by: Markus Rechberger <mrechberger@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r--drivers/media/video/em28xx/em28xx.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 5ff308261a7e..15760d3d753d 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -493,10 +493,20 @@ inline static int em2820_gamma_set(struct em2820 *dev, s32 val)
}
/*FIXME: maxw should be dependent of alt mode */
-#define norm_maxw(dev) 720
+inline static unsigned int norm_maxw(struct em2820 *dev)
+{
+ switch(dev->model){
+ case (EM2820_BOARD_MSI_VOX_USB_2): return(640);
+ default: return(720);
+ }
+}
+
inline static unsigned int norm_maxh(struct em2820 *dev)
{
- return (dev->tvnorm->id & V4L2_STD_625_50) ? 576 : 480;
+ switch(dev->model){
+ case (EM2820_BOARD_MSI_VOX_USB_2): return(480);
+ default: return (dev->tvnorm->id & V4L2_STD_625_50) ? 576 : 480;
+ }
}
#endif