diff options
Diffstat (limited to 'drivers/media/video/zoran_device.c')
-rw-r--r-- | drivers/media/video/zoran_device.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c index 4e15afdec4c9..c690b2ee880a 100644 --- a/drivers/media/video/zoran_device.c +++ b/drivers/media/video/zoran_device.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Media Labs LML33/LML33R10. | 4 | * Media Labs LML33/LML33R10. |
5 | * | 5 | * |
6 | * This part handles device access (PCI/I2C/codec/...) | 6 | * This part handles device access (PCI/I2C/codec/...) |
7 | * | 7 | * |
8 | * Copyright (C) 2000 Serguei Miridonov <mirsev@cicese.mx> | 8 | * Copyright (C) 2000 Serguei Miridonov <mirsev@cicese.mx> |
9 | * | 9 | * |
10 | * Currently maintained by: | 10 | * Currently maintained by: |
@@ -492,7 +492,7 @@ zr36057_set_vfe (struct zoran *zr, | |||
492 | /* (Ronald) don't write this if overlay_mask = NULL */ | 492 | /* (Ronald) don't write this if overlay_mask = NULL */ |
493 | if (zr->overlay_mask) { | 493 | if (zr->overlay_mask) { |
494 | /* Write overlay clipping mask data, but don't enable overlay clipping */ | 494 | /* Write overlay clipping mask data, but don't enable overlay clipping */ |
495 | /* RJ: since this makes only sense on the screen, we use | 495 | /* RJ: since this makes only sense on the screen, we use |
496 | * zr->overlay_settings.width instead of video_width */ | 496 | * zr->overlay_settings.width instead of video_width */ |
497 | 497 | ||
498 | mask_line_size = (BUZ_MAX_WIDTH + 31) / 32; | 498 | mask_line_size = (BUZ_MAX_WIDTH + 31) / 32; |
@@ -819,12 +819,12 @@ zr36057_set_jpg (struct zoran *zr, | |||
819 | if (zr->card.vfe_pol.hsync_pol) | 819 | if (zr->card.vfe_pol.hsync_pol) |
820 | btor(ZR36057_VFEHCR_HSPol, ZR36057_VFEHCR); | 820 | btor(ZR36057_VFEHCR_HSPol, ZR36057_VFEHCR); |
821 | else | 821 | else |
822 | btand(~ZR36057_VFEHCR_HSPol, ZR36057_VFEHCR); | 822 | btand(~ZR36057_VFEHCR_HSPol, ZR36057_VFEHCR); |
823 | reg = ((tvn->HSyncStart) << ZR36057_HSP_HsyncStart) | | 823 | reg = ((tvn->HSyncStart) << ZR36057_HSP_HsyncStart) | |
824 | (tvn->Wt << ZR36057_HSP_LineTot); | 824 | (tvn->Wt << ZR36057_HSP_LineTot); |
825 | btwrite(reg, ZR36057_HSP); | 825 | btwrite(reg, ZR36057_HSP); |
826 | reg = ((zr->jpg_settings.img_x + | 826 | reg = ((zr->jpg_settings.img_x + |
827 | tvn->HStart + 4) << ZR36057_FHAP_NAX) | | 827 | tvn->HStart + 4) << ZR36057_FHAP_NAX) | |
828 | (zr->jpg_settings.img_width << ZR36057_FHAP_PAX); | 828 | (zr->jpg_settings.img_width << ZR36057_FHAP_PAX); |
829 | btwrite(reg, ZR36057_FHAP); | 829 | btwrite(reg, ZR36057_FHAP); |
830 | 830 | ||
@@ -1272,15 +1272,15 @@ error_handler (struct zoran *zr, | |||
1272 | if (zr->JPEG_error != 1) { | 1272 | if (zr->JPEG_error != 1) { |
1273 | /* | 1273 | /* |
1274 | * First entry: error just happened during normal operation | 1274 | * First entry: error just happened during normal operation |
1275 | * | 1275 | * |
1276 | * In BUZ_MODE_MOTION_COMPRESS: | 1276 | * In BUZ_MODE_MOTION_COMPRESS: |
1277 | * | 1277 | * |
1278 | * Possible glitch in TV signal. In this case we should | 1278 | * Possible glitch in TV signal. In this case we should |
1279 | * stop the codec and wait for good quality signal before | 1279 | * stop the codec and wait for good quality signal before |
1280 | * restarting it to avoid further problems | 1280 | * restarting it to avoid further problems |
1281 | * | 1281 | * |
1282 | * In BUZ_MODE_MOTION_DECOMPRESS: | 1282 | * In BUZ_MODE_MOTION_DECOMPRESS: |
1283 | * | 1283 | * |
1284 | * Bad JPEG frame: we have to mark it as processed (codec crashed | 1284 | * Bad JPEG frame: we have to mark it as processed (codec crashed |
1285 | * and was not able to do it itself), and to remove it from queue. | 1285 | * and was not able to do it itself), and to remove it from queue. |
1286 | */ | 1286 | */ |