diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-06-12 04:19:19 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-06-12 04:19:19 +0000 |
| commit | 5e95607f7812f11cd1a49479c7de4e61087942f3 (patch) | |
| tree | 7c8a0e5ad8f88d386a67bea9181bd42565dd5f64 /linux/drivers/media/video/cx88/cx88-video.c | |
| parent | 32aa3a176791b7bd47139faa6152266515912cb6 (diff) | |
| download | mediapointer-dvb-s2-5e95607f7812f11cd1a49479c7de4e61087942f3.tar.gz mediapointer-dvb-s2-5e95607f7812f11cd1a49479c7de4e61087942f3.tar.bz2 | |
* audiochip.h, compat.h, cx22702.h, cx88-core.c, cx88-dvb.c,
cx88-i2c.c, cx88-vbi.c, cx88-video.c, dpl3518.c, dpl3518.h,
i2c-compat.h, id.h, msp3400.h, or51132.c, or51132.h, plx9054.h,
rds-saa6588.c, saa7134-dvb.c, tda7432.c, tda9875.c, tvaudio.c,
tveeprom.h, tvmixer.c, v4l1-compat.c, video-buf-dvb.h:
- Minor changes to synchronize with -mm series;
- PAL-60 code maintained for SAA7134. However, -mm has different
values;
- Now, every .c or .h file has cvs field ID.
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-video.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index e1e1d469b..7c0fcd89b 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.62 2005/06/10 10:57:18 mchehab Exp $ + * $Id: cx88-video.c,v 1.63 2005/06/12 04:19:19 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -332,7 +332,7 @@ static struct cx88_ctrl cx8800_ctls[] = { .shift = 0, } }; -const int CX8800_CTLS = ARRAY_SIZE(cx8800_ctls); +static const int CX8800_CTLS = ARRAY_SIZE(cx8800_ctls); /* ------------------------------------------------------------------- */ /* resource management */ @@ -672,7 +672,7 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb) cx88_free_buffer(fh->dev->pci,buf); } -struct videobuf_queue_ops cx8800_video_qops = { +static struct videobuf_queue_ops cx8800_video_qops = { .buf_setup = buffer_setup, .buf_prepare = buffer_prepare, .buf_queue = buffer_queue, @@ -1357,7 +1357,9 @@ static int video_do_ioctl(struct inode *inode, struct file *file, V4L2_CAP_READWRITE | V4L2_CAP_STREAMING | V4L2_CAP_VBI_CAPTURE | +#if 0 V4L2_TUNER_CAP_LOW | +#endif #if 0 V4L2_CAP_VIDEO_OVERLAY | #endif @@ -1719,8 +1721,11 @@ static int radio_do_ioctl(struct inode *inode, struct file *file, sizeof(cap->card)); sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci)); cap->version = CX88_VERSION_CODE; - cap->capabilities = V4L2_CAP_TUNER | - V4L2_TUNER_CAP_LOW; + cap->capabilities = V4L2_CAP_TUNER +#if 0 + | V4L2_TUNER_CAP_LOW +#endif + ; return 0; } case VIDIOC_G_TUNER: @@ -1948,7 +1953,7 @@ static struct file_operations video_fops = .llseek = no_llseek, }; -struct video_device cx8800_video_template = +static struct video_device cx8800_video_template = { .name = "cx8800-video", .type = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES, @@ -1957,7 +1962,7 @@ struct video_device cx8800_video_template = .minor = -1, }; -struct video_device cx8800_vbi_template = +static struct video_device cx8800_vbi_template = { .name = "cx8800-vbi", .type = VID_TYPE_TELETEXT|VID_TYPE_TUNER, @@ -1975,7 +1980,7 @@ static struct file_operations radio_fops = .llseek = no_llseek, }; -struct video_device cx8800_radio_template = +static struct video_device cx8800_radio_template = { .name = "cx8800-radio", .type = VID_TYPE_TUNER, @@ -2270,7 +2275,7 @@ static int cx8800_resume(struct pci_dev *pci_dev) /* ----------------------------------------------------------- */ -struct pci_device_id cx8800_pci_tbl[] = { +static struct pci_device_id cx8800_pci_tbl[] = { { .vendor = 0x14f1, .device = 0x8800, |