diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-12 09:23:23 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-24 13:03:22 -0400 |
commit | c43221df762c33e832e8855cae77989b6bf69fa6 (patch) | |
tree | 4d5f278f1a3f04321e813a00500a8436dcd57e94 /drivers | |
parent | 641f75caa874fffd679b64f850adee37103b0c0f (diff) |
V4L/DVB (12233): em28xx: rename is_27xx to is_webcam
Just renames the flag, to use a clearer name. Later patches will use
this flag to properly set some drivers behaviors for webcams.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 4 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-core.c | 4 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 4 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index ebd24a25fb8..8f869468280 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -450,7 +450,7 @@ struct em28xx_board em28xx_boards[] = { | |||
450 | [EM2820_BOARD_SILVERCREST_WEBCAM] = { | 450 | [EM2820_BOARD_SILVERCREST_WEBCAM] = { |
451 | .name = "Silvercrest Webcam 1.3mpix", | 451 | .name = "Silvercrest Webcam 1.3mpix", |
452 | .tuner_type = TUNER_ABSENT, | 452 | .tuner_type = TUNER_ABSENT, |
453 | .is_27xx = 1, | 453 | .is_webcam = 1, |
454 | .decoder = EM28XX_MT9V011, | 454 | .decoder = EM28XX_MT9V011, |
455 | .input = { { | 455 | .input = { { |
456 | .type = EM28XX_VMUX_COMPOSITE1, | 456 | .type = EM28XX_VMUX_COMPOSITE1, |
@@ -1772,7 +1772,7 @@ void em28xx_pre_card_setup(struct em28xx *dev) | |||
1772 | em28xx_info("chip ID is em2750\n"); | 1772 | em28xx_info("chip ID is em2750\n"); |
1773 | break; | 1773 | break; |
1774 | case CHIP_ID_EM2820: | 1774 | case CHIP_ID_EM2820: |
1775 | if (dev->board.is_27xx) | 1775 | if (dev->board.is_webcam) |
1776 | em28xx_info("chip is em2710\n"); | 1776 | em28xx_info("chip is em2710\n"); |
1777 | else | 1777 | else |
1778 | em28xx_info("chip ID is em2820\n"); | 1778 | em28xx_info("chip ID is em2820\n"); |
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index 079ab4d563a..8649bdb7eb9 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c | |||
@@ -652,7 +652,7 @@ int em28xx_set_outfmt(struct em28xx *dev) | |||
652 | 652 | ||
653 | outfmt = dev->format->reg; | 653 | outfmt = dev->format->reg; |
654 | 654 | ||
655 | if (dev->board.is_27xx) { | 655 | if (dev->board.is_webcam) { |
656 | vinmode = 0x0d; | 656 | vinmode = 0x0d; |
657 | vinctl = 0x00; | 657 | vinctl = 0x00; |
658 | } else { | 658 | } else { |
@@ -707,7 +707,7 @@ static int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v) | |||
707 | u8 mode; | 707 | u8 mode; |
708 | /* the em2800 scaler only supports scaling down to 50% */ | 708 | /* the em2800 scaler only supports scaling down to 50% */ |
709 | 709 | ||
710 | if (dev->board.is_27xx) { | 710 | if (dev->board.is_webcam) { |
711 | /* FIXME: Don't use the scaler yet */ | 711 | /* FIXME: Don't use the scaler yet */ |
712 | mode = 0; | 712 | mode = 0; |
713 | } else if (dev->board.is_em2800) { | 713 | } else if (dev->board.is_em2800) { |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 14316c91217..89ab2e3b9a2 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -726,7 +726,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, | |||
726 | return -EINVAL; | 726 | return -EINVAL; |
727 | } | 727 | } |
728 | 728 | ||
729 | if (dev->board.is_27xx) { | 729 | if (dev->board.is_webcam) { |
730 | /* FIXME: This is the only supported fmt */ | 730 | /* FIXME: This is the only supported fmt */ |
731 | width = 640; | 731 | width = 640; |
732 | height = 480; | 732 | height = 480; |
@@ -768,7 +768,7 @@ static int em28xx_set_video_format(struct em28xx *dev, unsigned int fourcc, | |||
768 | struct em28xx_fmt *fmt; | 768 | struct em28xx_fmt *fmt; |
769 | 769 | ||
770 | /* FIXME: This is the only supported fmt */ | 770 | /* FIXME: This is the only supported fmt */ |
771 | if (dev->board.is_27xx) { | 771 | if (dev->board.is_webcam) { |
772 | width = 640; | 772 | width = 640; |
773 | height = 480; | 773 | height = 480; |
774 | } | 774 | } |
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index d90fef46376..dc92e9ef85a 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -390,7 +390,7 @@ struct em28xx_board { | |||
390 | unsigned int max_range_640_480:1; | 390 | unsigned int max_range_640_480:1; |
391 | unsigned int has_dvb:1; | 391 | unsigned int has_dvb:1; |
392 | unsigned int has_snapshot_button:1; | 392 | unsigned int has_snapshot_button:1; |
393 | unsigned int is_27xx:1; | 393 | unsigned int is_webcam:1; |
394 | unsigned int valid:1; | 394 | unsigned int valid:1; |
395 | 395 | ||
396 | unsigned char xclk, i2c_speed; | 396 | unsigned char xclk, i2c_speed; |