diff options
author | Markus Rechberger <mrechberger@gmail.com> | 2005-11-09 00:38:05 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:23 -0500 |
commit | 30556b23f31973ca311341277c4e4b128c0528bb (patch) | |
tree | fcfdd616a70d5cb443a0121cf49b0ddd800f0256 /drivers/media/video/em28xx/em28xx.h | |
parent | 08eca13dc407c389f04ce295144bb3fcd996a10d (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.h | 14 |
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) | |||
493 | } | 493 | } |
494 | 494 | ||
495 | /*FIXME: maxw should be dependent of alt mode */ | 495 | /*FIXME: maxw should be dependent of alt mode */ |
496 | #define norm_maxw(dev) 720 | 496 | inline static unsigned int norm_maxw(struct em2820 *dev) |
497 | { | ||
498 | switch(dev->model){ | ||
499 | case (EM2820_BOARD_MSI_VOX_USB_2): return(640); | ||
500 | default: return(720); | ||
501 | } | ||
502 | } | ||
503 | |||
497 | inline static unsigned int norm_maxh(struct em2820 *dev) | 504 | inline static unsigned int norm_maxh(struct em2820 *dev) |
498 | { | 505 | { |
499 | return (dev->tvnorm->id & V4L2_STD_625_50) ? 576 : 480; | 506 | switch(dev->model){ |
507 | case (EM2820_BOARD_MSI_VOX_USB_2): return(480); | ||
508 | default: return (dev->tvnorm->id & V4L2_STD_625_50) ? 576 : 480; | ||
509 | } | ||
500 | } | 510 | } |
501 | 511 | ||
502 | #endif | 512 | #endif |