diff options
Diffstat (limited to 'drivers/media/video/zr36120.c')
-rw-r--r-- | drivers/media/video/zr36120.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/drivers/media/video/zr36120.c b/drivers/media/video/zr36120.c index d4c633b8a7f5..9d340aa443c3 100644 --- a/drivers/media/video/zr36120.c +++ b/drivers/media/video/zr36120.c | |||
@@ -316,7 +316,7 @@ DEBUG(printk(CARD_DEBUG "%p added to queue\n",CARD,item)); | |||
316 | item->status = FBUFFER_BUSY; | 316 | item->status = FBUFFER_BUSY; |
317 | if (!lastitem) | 317 | if (!lastitem) |
318 | ztv->workqueue = item; | 318 | ztv->workqueue = item; |
319 | else | 319 | else |
320 | lastitem->next = item; | 320 | lastitem->next = item; |
321 | lastitem = item; | 321 | lastitem = item; |
322 | } | 322 | } |
@@ -516,7 +516,7 @@ DEBUG(printk(KERN_DEBUG " %d: clip(%d,%d,%d,%d)\n", i,vp->x,vp->y,vp->widt | |||
516 | zraor((ztv->vidInterlace*ystep)<<0,~ZORAN_OCR_MASKSTRIDE,ZORAN_OCR); | 516 | zraor((ztv->vidInterlace*ystep)<<0,~ZORAN_OCR_MASKSTRIDE,ZORAN_OCR); |
517 | } | 517 | } |
518 | 518 | ||
519 | struct tvnorm | 519 | struct tvnorm |
520 | { | 520 | { |
521 | u16 Wt, Wa, Ht, Ha, HStart, VStart; | 521 | u16 Wt, Wa, Ht, Ha, HStart, VStart; |
522 | }; | 522 | }; |
@@ -660,7 +660,7 @@ DEBUG(printk(KERN_DEBUG " Y: scale=0, start=%d, end=%d\n", Hstart, Hend)); | |||
660 | int HorDcm = 64-X; | 660 | int HorDcm = 64-X; |
661 | int hcrop1 = 2*(Wa-We)/4; | 661 | int hcrop1 = 2*(Wa-We)/4; |
662 | /* | 662 | /* |
663 | * BUGFIX: Juha Nurmela <junki@qn-lpr2-165.quicknet.inet.fi> | 663 | * BUGFIX: Juha Nurmela <junki@qn-lpr2-165.quicknet.inet.fi> |
664 | * found the solution to the color phase shift. | 664 | * found the solution to the color phase shift. |
665 | * See ChangeLog for the full explanation) | 665 | * See ChangeLog for the full explanation) |
666 | */ | 666 | */ |
@@ -812,12 +812,12 @@ void zoran_close(struct video_device* dev) | |||
812 | 812 | ||
813 | zoran_common_close(ztv); | 813 | zoran_common_close(ztv); |
814 | 814 | ||
815 | /* | 815 | /* |
816 | * This is sucky but right now I can't find a good way to | 816 | * This is sucky but right now I can't find a good way to |
817 | * be sure its safe to free the buffer. We wait 5-6 fields | 817 | * be sure its safe to free the buffer. We wait 5-6 fields |
818 | * which is more than sufficient to be sure. | 818 | * which is more than sufficient to be sure. |
819 | */ | 819 | */ |
820 | msleep(100); /* Wait 1/10th of a second */ | 820 | msleep(100); /* Wait 1/10th of a second */ |
821 | 821 | ||
822 | /* free the allocated framebuffer */ | 822 | /* free the allocated framebuffer */ |
823 | bfree(ztv->fbuffer, ZORAN_MAX_FBUFSIZE); | 823 | bfree(ztv->fbuffer, ZORAN_MAX_FBUFSIZE); |
@@ -1436,7 +1436,7 @@ int zoran_ioctl(struct video_device* dev, unsigned int cmd, void *arg) | |||
1436 | 1436 | ||
1437 | /* Why isn't this in the API? | 1437 | /* Why isn't this in the API? |
1438 | * And why doesn't it take a buffer number? | 1438 | * And why doesn't it take a buffer number? |
1439 | case BTTV_FIELDNR: | 1439 | case BTTV_FIELDNR: |
1440 | { | 1440 | { |
1441 | unsigned long v = ztv->lastfieldnr; | 1441 | unsigned long v = ztv->lastfieldnr; |
1442 | if (copy_to_user(arg,&v,sizeof(v))) | 1442 | if (copy_to_user(arg,&v,sizeof(v))) |
@@ -1557,12 +1557,12 @@ void vbi_close(struct video_device *dev) | |||
1557 | 1557 | ||
1558 | zoran_common_close(ztv); | 1558 | zoran_common_close(ztv); |
1559 | 1559 | ||
1560 | /* | 1560 | /* |
1561 | * This is sucky but right now I can't find a good way to | 1561 | * This is sucky but right now I can't find a good way to |
1562 | * be sure its safe to free the buffer. We wait 5-6 fields | 1562 | * be sure its safe to free the buffer. We wait 5-6 fields |
1563 | * which is more than sufficient to be sure. | 1563 | * which is more than sufficient to be sure. |
1564 | */ | 1564 | */ |
1565 | msleep(100); /* Wait 1/10th of a second */ | 1565 | msleep(100); /* Wait 1/10th of a second */ |
1566 | 1566 | ||
1567 | for (item=ztv->readinfo; item!=ztv->readinfo+ZORAN_VBI_BUFFERS; item++) | 1567 | for (item=ztv->readinfo; item!=ztv->readinfo+ZORAN_VBI_BUFFERS; item++) |
1568 | { | 1568 | { |
@@ -1620,7 +1620,7 @@ long vbi_read(struct video_device* dev, char* buf, unsigned long count, int nonb | |||
1620 | write_unlock_irq(&ztv->lock); | 1620 | write_unlock_irq(&ztv->lock); |
1621 | return -EWOULDBLOCK; | 1621 | return -EWOULDBLOCK; |
1622 | } | 1622 | } |
1623 | 1623 | ||
1624 | /* mark the unused buffer as wanted */ | 1624 | /* mark the unused buffer as wanted */ |
1625 | unused->status = FBUFFER_BUSY; | 1625 | unused->status = FBUFFER_BUSY; |
1626 | unused->next = 0; | 1626 | unused->next = 0; |
@@ -1671,7 +1671,7 @@ long vbi_read(struct video_device* dev, char* buf, unsigned long count, int nonb | |||
1671 | if (count == 2*19*2048) { | 1671 | if (count == 2*19*2048) { |
1672 | /* | 1672 | /* |
1673 | * Extreme HACK, old VBI programs expect 2048 points | 1673 | * Extreme HACK, old VBI programs expect 2048 points |
1674 | * of data, and we only got 864 orso. Double each | 1674 | * of data, and we only got 864 orso. Double each |
1675 | * datapoint and clear the rest of the line. | 1675 | * datapoint and clear the rest of the line. |
1676 | * This way we have appear to have a | 1676 | * This way we have appear to have a |
1677 | * sample_frequency of 29.5 Mc. | 1677 | * sample_frequency of 29.5 Mc. |
@@ -1956,7 +1956,7 @@ int __init init_zoran(int card) | |||
1956 | zrand(~ZORAN_VDC_TRICOM, ZORAN_VDC); | 1956 | zrand(~ZORAN_VDC_TRICOM, ZORAN_VDC); |
1957 | 1957 | ||
1958 | /* external FL determines TOP frame */ | 1958 | /* external FL determines TOP frame */ |
1959 | zror(ZORAN_VFEC_EXTFL, ZORAN_VFEC); | 1959 | zror(ZORAN_VFEC_EXTFL, ZORAN_VFEC); |
1960 | 1960 | ||
1961 | /* set HSpol */ | 1961 | /* set HSpol */ |
1962 | if (ztv->card->hsync_pos) | 1962 | if (ztv->card->hsync_pos) |
@@ -2012,7 +2012,7 @@ void release_zoran(int max) | |||
2012 | struct zoran *ztv; | 2012 | struct zoran *ztv; |
2013 | int i; | 2013 | int i; |
2014 | 2014 | ||
2015 | for (i=0;i<max; i++) | 2015 | for (i=0;i<max; i++) |
2016 | { | 2016 | { |
2017 | ztv = &zorans[i]; | 2017 | ztv = &zorans[i]; |
2018 | 2018 | ||
@@ -2029,7 +2029,7 @@ void release_zoran(int max) | |||
2029 | 2029 | ||
2030 | /* free it */ | 2030 | /* free it */ |
2031 | free_irq(ztv->dev->irq,ztv); | 2031 | free_irq(ztv->dev->irq,ztv); |
2032 | 2032 | ||
2033 | /* unregister i2c_bus */ | 2033 | /* unregister i2c_bus */ |
2034 | i2c_unregister_bus((&ztv->i2c)); | 2034 | i2c_unregister_bus((&ztv->i2c)); |
2035 | 2035 | ||
@@ -2050,7 +2050,7 @@ void __exit zr36120_exit(void) | |||
2050 | int __init zr36120_init(void) | 2050 | int __init zr36120_init(void) |
2051 | { | 2051 | { |
2052 | int card; | 2052 | int card; |
2053 | 2053 | ||
2054 | handle_chipset(); | 2054 | handle_chipset(); |
2055 | zoran_cards = find_zoran(); | 2055 | zoran_cards = find_zoran(); |
2056 | if (zoran_cards<0) | 2056 | if (zoran_cards<0) |
@@ -2063,7 +2063,7 @@ int __init zr36120_init(void) | |||
2063 | /* only release the zorans we have registered */ | 2063 | /* only release the zorans we have registered */ |
2064 | release_zoran(card); | 2064 | release_zoran(card); |
2065 | return -EIO; | 2065 | return -EIO; |
2066 | } | 2066 | } |
2067 | } | 2067 | } |
2068 | return 0; | 2068 | return 0; |
2069 | } | 2069 | } |