diff options
author | Michael Hunold <devnull@localhost> | 2003-01-09 10:27:22 +0000 |
---|---|---|
committer | Michael Hunold <devnull@localhost> | 2003-01-09 10:27:22 +0000 |
commit | 096166622785876bd4360f2cdb1495665ca03c6c (patch) | |
tree | 9a152955f0010e8dcb74aed11528d55f3c5747c6 /linux/drivers/media/common/saa7146_vbi.c | |
parent | d943bbf1e37291d4aa2aacd696898ae8a596bb1c (diff) | |
download | mediapointer-dvb-s2-096166622785876bd4360f2cdb1495665ca03c6c.tar.gz mediapointer-dvb-s2-096166622785876bd4360f2cdb1495665ca03c6c.tar.bz2 |
Fixes for 2.5.55 all over the place:
- removed the patches, they are not needed any more. you can now
use a vanilla 2.5.55 kernel
- created a new backport for video-buf and videodev from the 2.5.55
sources
- necessary fixes to the saa7146 driver due to changes in 2.5.55
- the core budget functions are now provided by a module called
"budget-core.o". (otherwise static compilation is not possible...)
- removed #ifdef MODULE crap from all files
Misc.
- "xawtv" (using xv extension) resulted in wrong colors. the problem
is within "xawtv". Gerd Knorr told me, that it'll be fixed in the
next release.
I tested this version with 2.4.20, 2.5.55 (modules) and 2.5.55
(static).
Diffstat (limited to 'linux/drivers/media/common/saa7146_vbi.c')
-rw-r--r-- | linux/drivers/media/common/saa7146_vbi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/common/saa7146_vbi.c b/linux/drivers/media/common/saa7146_vbi.c index baee2669f..664d8a484 100644 --- a/linux/drivers/media/common/saa7146_vbi.c +++ b/linux/drivers/media/common/saa7146_vbi.c @@ -212,7 +212,7 @@ int buffer_activate(struct saa7146_dev *dev, } static -int buffer_prepare(struct file *file, struct videobuf_buffer *vb) +int buffer_prepare(struct file *file, struct videobuf_buffer *vb,enum v4l2_field field) { struct saa7146_fh *fh = file->private_data; struct saa7146_dev *dev = fh->dev; @@ -239,6 +239,7 @@ int buffer_prepare(struct file *file, struct videobuf_buffer *vb) buf->vb.width = llength; buf->vb.height = lines; buf->vb.size = size; + buf->vb.field = field; // FIXME: check this saa7146_pgtable_free(dev->pci, &buf->pt[2]); saa7146_pgtable_alloc(dev->pci, &buf->pt[2]); @@ -379,6 +380,7 @@ void vbi_open(struct saa7146_dev *dev, struct saa7146_fh *fh) videobuf_queue_init(&fh->vbi_q, &vbi_qops, dev->pci, &dev->slock, V4L2_BUF_TYPE_VBI_CAPTURE, + V4L2_FIELD_SEQ_TB, // FIXME: does this really work? sizeof(struct saa7146_buf)); init_MUTEX(&fh->vbi_q.lock); |