diff options
28 files changed, 103 insertions, 171 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index e7d623dc4..2bf20707a 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-core.c,v 1.27 2005/06/08 01:28:09 mchehab Exp $ + * $Id: cx88-core.c,v 1.28 2005/06/12 04:19:19 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * driver core @@ -552,7 +552,7 @@ void cx88_sram_channel_dump(struct cx88_core *core, core->name,cx_read(ch->cnt2_reg)); } -char *cx88_pci_irqs[32] = { +static char *cx88_pci_irqs[32] = { "vid", "aud", "ts", "vip", "hst", "5", "6", "tm1", "src_dma", "dst_dma", "risc_rd_err", "risc_wr_err", "brdg_err", "src_dma_err", "dst_dma_err", "ipb_dma_err", @@ -1239,7 +1239,6 @@ void cx88_core_put(struct cx88_core *core, struct pci_dev *pci) /* ------------------------------------------------------------------ */ EXPORT_SYMBOL(cx88_print_ioctl); -EXPORT_SYMBOL(cx88_pci_irqs); EXPORT_SYMBOL(cx88_vid_irqs); EXPORT_SYMBOL(cx88_mpeg_irqs); EXPORT_SYMBOL(cx88_print_irqbits); diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 02b33a6a9..1dac9f641 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-dvb.c,v 1.32 2005/05/22 19:23:39 nsh Exp $ + * $Id: cx88-dvb.c,v 1.33 2005/06/12 04:19:19 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -91,7 +91,7 @@ static void dvb_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb cx88_free_buffer(dev->pci, (struct cx88_buffer*)vb); } -struct videobuf_queue_ops dvb_qops = { +static struct videobuf_queue_ops dvb_qops = { .buf_setup = dvb_buf_setup, .buf_prepare = dvb_buf_prepare, .buf_queue = dvb_buf_queue, diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c index 39e14d509..e20adefcf 100644 --- a/linux/drivers/media/video/cx88/cx88-i2c.c +++ b/linux/drivers/media/video/cx88/cx88-i2c.c @@ -1,5 +1,5 @@ /* - $Id: cx88-i2c.c,v 1.22 2005/06/12 01:36:14 mchehab Exp $ + $Id: cx88-i2c.c,v 1.23 2005/06/12 04:19:19 mchehab Exp $ cx88-i2c.c -- all the i2c code is here @@ -45,7 +45,7 @@ MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time"); /* ----------------------------------------------------------------------- */ -void cx8800_bit_setscl(void *data, int state) +static void cx8800_bit_setscl(void *data, int state) { struct cx88_core *core = data; @@ -57,7 +57,7 @@ void cx8800_bit_setscl(void *data, int state) cx_read(MO_I2C); } -void cx8800_bit_setsda(void *data, int state) +static void cx8800_bit_setsda(void *data, int state) { struct cx88_core *core = data; diff --git a/linux/drivers/media/video/cx88/cx88-vbi.c b/linux/drivers/media/video/cx88/cx88-vbi.c index 471e508b0..320d57888 100644 --- a/linux/drivers/media/video/cx88/cx88-vbi.c +++ b/linux/drivers/media/video/cx88/cx88-vbi.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-vbi.c,v 1.16 2004/12/10 12:33:39 kraxel Exp $ + * $Id: cx88-vbi.c,v 1.17 2005/06/12 04:19:19 mchehab Exp $ */ #include <linux/kernel.h> #include <linux/module.h> @@ -46,7 +46,7 @@ void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f) } } -int cx8800_start_vbi_dma(struct cx8800_dev *dev, +static int cx8800_start_vbi_dma(struct cx8800_dev *dev, struct cx88_dmaqueue *q, struct cx88_buffer *buf) { 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, diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 5f16f42e9..9ff3cbd9a 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -1,5 +1,5 @@ /* - * $Id: cx88.h,v 1.61 2005/06/08 01:28:09 mchehab Exp $ + * $Id: cx88.h,v 1.62 2005/06/12 04:19:19 mchehab Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -494,9 +494,11 @@ extern void cx88_core_put(struct cx88_core *core, /* cx88-vbi.c */ void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f); +/* int cx8800_start_vbi_dma(struct cx8800_dev *dev, struct cx88_dmaqueue *q, struct cx88_buffer *buf); +*/ int cx8800_stop_vbi_dma(struct cx8800_dev *dev); int cx8800_restart_vbi_queue(struct cx8800_dev *dev, struct cx88_dmaqueue *q); diff --git a/linux/drivers/media/video/msp3400.h b/linux/drivers/media/video/msp3400.h index d70a954e1..023f33056 100644 --- a/linux/drivers/media/video/msp3400.h +++ b/linux/drivers/media/video/msp3400.h @@ -1,3 +1,7 @@ +/* + * $Id: msp3400.h,v 1.3 2005/06/12 04:19:19 mchehab Exp $ + */ + #ifndef MSP3400_H #define MSP3400_H diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index 9a36835c8..7d5531883 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-dvb.c,v 1.12 2005/02/18 12:28:29 kraxel Exp $ + * $Id: saa7134-dvb.c,v 1.13 2005/06/12 04:19:19 mchehab Exp $ * * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] * @@ -172,7 +172,7 @@ static int fe_request_firmware(struct dvb_frontend* fe, return request_firmware(fw, name, &dev->pci->dev); } -struct tda1004x_config medion_cardbus = { +static struct tda1004x_config medion_cardbus = { .demod_address = 0x08, /* not sure this is correct */ .invert = 0, .invert_oclk = 0, diff --git a/linux/drivers/media/video/tda7432.c b/linux/drivers/media/video/tda7432.c index e164e034d..ca8b765f5 100644 --- a/linux/drivers/media/video/tda7432.c +++ b/linux/drivers/media/video/tda7432.c @@ -547,7 +547,6 @@ static struct i2c_driver driver = { static struct i2c_client client_template = { I2C_DEVNAME("tda7432"), - .id = -1, .driver = &driver, }; diff --git a/linux/drivers/media/video/tda9875.c b/linux/drivers/media/video/tda9875.c index b56dbda9a..347d71659 100644 --- a/linux/drivers/media/video/tda9875.c +++ b/linux/drivers/media/video/tda9875.c @@ -418,7 +418,6 @@ static struct i2c_driver driver = { static struct i2c_client client_template = { I2C_DEVNAME("tda9875"), - .id = -1, .driver = &driver, }; diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c index e5c9dd850..ac5ea20ca 100644 --- a/linux/drivers/media/video/tvaudio.c +++ b/linux/drivers/media/video/tvaudio.c @@ -1251,17 +1251,17 @@ static int ta8874z_checkit(struct CHIPSTATE *chip) /* audio chip descriptions - struct CHIPDESC */ /* insmod options to enable/disable individual audio chips */ -int tda8425 = 1; -int tda9840 = 1; -int tda9850 = 1; -int tda9855 = 1; -int tda9873 = 1; -int tda9874a = 1; -int tea6300 = 0; // address clash with msp34xx -int tea6320 = 0; // address clash with msp34xx -int tea6420 = 1; -int pic16c54 = 1; -int ta8874z = 0; // address clash with tda9840 +static int tda8425 = 1; +static int tda9840 = 1; +static int tda9850 = 1; +static int tda9855 = 1; +static int tda9873 = 1; +static int tda9874a = 1; +static int tea6300 = 0; // address clash with msp34xx +static int tea6320 = 0; // address clash with msp34xx +static int tea6420 = 1; +static int pic16c54 = 1; +static int ta8874z = 0; // address clash with tda9840 module_param(tda8425, int, 0444); module_param(tda9840, int, 0444); diff --git a/linux/drivers/media/video/tvmixer.c b/linux/drivers/media/video/tvmixer.c index c1250cdad..9b3c01252 100644 --- a/linux/drivers/media/video/tvmixer.c +++ b/linux/drivers/media/video/tvmixer.c @@ -1,3 +1,7 @@ +/* + * $Id: tvmixer.c,v 1.8 2005/06/12 04:19:19 mchehab Exp $ + */ + #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/kernel.h> diff --git a/linux/drivers/media/video/v4l1-compat.c b/linux/drivers/media/video/v4l1-compat.c index b4719ddca..3f866c5aa 100644 --- a/linux/drivers/media/video/v4l1-compat.c +++ b/linux/drivers/media/video/v4l1-compat.c @@ -1,4 +1,6 @@ /* + * $Id: v4l1-compat.c,v 1.9 2005/06/12 04:19:19 mchehab Exp $ + * * Video for Linux Two * Backward Compatibility Layer * diff --git a/linux/include/media/audiochip.h b/linux/include/media/audiochip.h index d3e9e3060..f345a61c3 100644 --- a/linux/include/media/audiochip.h +++ b/linux/include/media/audiochip.h @@ -1,3 +1,7 @@ +/* + * $Id: audiochip.h,v 1.3 2005/06/12 04:19:19 mchehab Exp $ + */ + #ifndef AUDIOCHIP_H #define AUDIOCHIP_H diff --git a/linux/include/media/i2c-compat.h b/linux/include/media/i2c-compat.h index 4e93d6ea0..4f8fbd022 100644 --- a/linux/include/media/i2c-compat.h +++ b/linux/include/media/i2c-compat.h @@ -1,4 +1,6 @@ /* + * $Id: i2c-compat.h,v 1.2 2005/06/12 04:19:19 mchehab Exp $ + * * some i2c layer compatibility stuff -- to avoid cluttering up the * i2c modules with tons of #ifdefs */ diff --git a/linux/include/media/id.h b/linux/include/media/id.h index 1b0320dc8..a39a64239 100644 --- a/linux/include/media/id.h +++ b/linux/include/media/id.h @@ -1,3 +1,7 @@ +/* + * $Id: id.h,v 1.4 2005/06/12 04:19:19 mchehab Exp $ + */ + /* FIXME: this temporarely, until these are included in linux/i2c-id.h */ /* drivers */ diff --git a/linux/include/media/tveeprom.h b/linux/include/media/tveeprom.h index 627603e56..5c4fe30e8 100644 --- a/linux/include/media/tveeprom.h +++ b/linux/include/media/tveeprom.h @@ -1,3 +1,7 @@ +/* + * $Id: tveeprom.h,v 1.2 2005/06/12 04:19:19 mchehab Exp $ + */ + struct tveeprom { u32 has_radio; diff --git a/linux/include/media/video-buf-dvb.h b/linux/include/media/video-buf-dvb.h index 94bd33619..cd636be00 100644 --- a/linux/include/media/video-buf-dvb.h +++ b/linux/include/media/video-buf-dvb.h @@ -1,3 +1,7 @@ +/* + * $Id: video-buf-dvb.h,v 1.5 2005/06/12 04:19:19 mchehab Exp $ + */ + #include <dvbdev.h> #include <dmxdev.h> #include <dvb_demux.h> diff --git a/v4l/.buildpatch b/v4l/.buildpatch index dc5a5630b..acbce9ad0 100644 --- a/v4l/.buildpatch +++ b/v4l/.buildpatch @@ -1,67 +1,3 @@ -srcdiff ir-kbd-i2c.c drivers/media/video/ir-kbd-i2c.c -srcdiff ir-kbd-gpio.c drivers/media/video/ir-kbd-gpio.c -srcdiff bt848.h drivers/media/video/bt848.h -srcdiff bttv.h drivers/media/video/bttv.h -srcdiff bttvp.h drivers/media/video/bttvp.h -srcdiff bttv-driver.c drivers/media/video/bttv-driver.c -srcdiff bttv-cards.c drivers/media/video/bttv-cards.c -srcdiff bttv-if.c drivers/media/video/bttv-if.c -srcdiff bttv-risc.c drivers/media/video/bttv-risc.c -srcdiff bttv-vbi.c drivers/media/video/bttv-vbi.c -srcdiff bttv-gpio.c drivers/media/video/bttv-gpio.c -srcdiff bttv-i2c.c drivers/media/video/bttv-i2c.c - -srcdiff btcx-risc.h drivers/media/video/btcx-risc.h -srcdiff btcx-risc.c drivers/media/video/btcx-risc.c -srcdiff cx88.h drivers/media/video/cx88/cx88.h -srcdiff cx88-reg.h drivers/media/video/cx88/cx88-reg.h - -srcdiff cx88-cards.c drivers/media/video/cx88/cx88-cards.c -srcdiff cx88-core.c drivers/media/video/cx88/cx88-core.c -srcdiff cx88-i2c.c drivers/media/video/cx88/cx88-i2c.c -srcdiff cx88-tvaudio.c drivers/media/video/cx88/cx88-tvaudio.c -srcdiff cx88-video.c drivers/media/video/cx88/cx88-video.c -srcdiff cx88-vbi.c drivers/media/video/cx88/cx88-vbi.c -srcdiff cx88-input.c drivers/media/video/cx88/cx88-input.c - -srcdiff cx88-mpeg.c drivers/media/video/cx88/cx88-mpeg.c -srcdiff cx88-dvb.c drivers/media/video/cx88/cx88-dvb.c -srcdiff cx88-blackbird.c drivers/media/video/cx88/cx88-blackbird.c -srcdiff cx22702.h drivers/media/dvb/frontends/cx22702.h -srcdiff cx22702.c drivers/media/dvb/frontends/cx22702.c -srcdiff mt352.h drivers/media/dvb/frontends/mt352.h -srcdiff mt352.c drivers/media/dvb/frontends/mt352.c -srcdiff or51132.h drivers/media/dvb/frontends/or51132.h -srcdiff or51132.c drivers/media/dvb/frontends/or51132.c -srcdiff dvb-pll.h drivers/media/dvb/frontends/dvb-pll.h -srcdiff dvb-pll.c drivers/media/dvb/frontends/dvb-pll.c -srcdiff bt832.c drivers/media/video/bt832.c -srcdiff bt832.h drivers/media/video/bt832.h -srcdiff ir-common.h include/media/ir-common.h -srcdiff ir-common.c drivers/media/common/ir-common.c -srcdiff audiochip.h include/media/audiochip.h -srcdiff id.h include/media/id.h -srcdiff msp3400.c drivers/media/video/msp3400.c -srcdiff msp3400.h drivers/media/video/msp3400.h -srcdiff tda7432.c drivers/media/video/tda7432.c -srcdiff tda9875.c drivers/media/video/tda9875.c -srcdiff tvaudio.h drivers/media/video/tvaudio.h -srcdiff tvaudio.c drivers/media/video/tvaudio.c -srcdiff tvmixer.c drivers/media/video/tvmixer.c -srcdiff tuner.h include/media/tuner.h -srcdiff tuner-core.c drivers/media/video/tuner-core.c -srcdiff tuner-simple.c drivers/media/video/tuner-simple.c -srcdiff mt20xx.c drivers/media/video/mt20xx.c -srcdiff tda8290.c drivers/media/video/tda8290.c -srcdiff tda9887.c drivers/media/video/tda9887.c -srcdiff tea6757.c drivers/media/video/tea6757.c - -srcdiff tuner.h include/media/tuner.h -srcdiff tuner-core.c drivers/media/video/tuner-core.c -srcdiff tuner-simple.c drivers/media/video/tuner-simple.c -srcdiff mt20xx.c drivers/media/video/mt20xx.c -srcdiff tda8290.c drivers/media/video/tda8290.c -srcdiff tda9887.c drivers/media/video/tda9887.c srcdiff saa7134.h drivers/media/video/saa7134/saa7134.h srcdiff saa7134-reg.h drivers/media/video/saa7134/saa7134-reg.h @@ -84,74 +20,4 @@ srcdiff tveeprom.h include/media/tveeprom.h srcdiff tveeprom.c drivers/media/video/tveeprom.c srcdiff videodev.h include/linux/videodev.h srcdiff videodev2.h include/linux/videodev2.h -#srcdiff videodev.c drivers/media/video/videodev.c -srcdiff v4l1-compat.c drivers/media/video/v4l1-compat.c -srcdiff v4l2-common.c drivers/media/video/v4l2-common.c -# bttv -srcdiff doc/README.bttv Documentation/video4linux/bttv/README -srcdiff doc/insmod-options Documentation/video4linux/bttv/Insmod-options -srcdiff doc/MAKEDEV Documentation/video4linux/bttv/MAKEDEV -srcdiff doc/Sound-FAQ Documentation/video4linux/bttv/Sound-FAQ -srcdiff doc/Tuners Documentation/video4linux/bttv/Tuners -srcdiff doc/Cards Documentation/video4linux/bttv/Cards - -# other -srcdiff /dev/null Documentation/video4linux/MAKEDEV -srcdiff /dev/null Documentation/video4linux/bttv/CARDLIST -srcdiff doc/README.cx88 Documentation/video4linux/README.cx88 -srcdiff doc/README.saa7134 Documentation/video4linux/README.saa7134 -srcdiff doc/README.ir Documentation/video4linux/README.ir -srcdiff doc/not-in-cx2388x-datasheet.txt Documentation/video4linux/not-in-cx2388x-datasheet.txt - -# cardlists -srcdiff doc/CARDLIST.bttv Documentation/video4linux/CARDLIST.bttv -srcdiff doc/CARDLIST.saa7134 Documentation/video4linux/CARDLIST.saa7134 -srcdiff doc/CARDLIST.tuner Documentation/video4linux/CARDLIST.tuner -srcdiff doc/CARDLIST.cx88 Documentation/video4linux/CARDLIST.cx88 - -# API -srcdiff /dev/null Docummentation/video4linux/API.html -srcdiff doc/V4L1_API.html Docummentation/video4linux/V4L1_API.html -srcdiff doc/V4L2_API.html Docummentation/video4linux/V4L2_API.html - -# obsolete / fixme -#srcdiff doc/Specs Documentation/video4linux/bttv/Specs -#srcdiff README.freeze Documentation/video4linux/bttv/README.freeze -#srcdiff README.quirks Documentation/video4linux/bttv/README.quirks -#srcdiff Modules.conf Documentation/video4linux/bttv/Modules.conf -# bttv -srcdiff doc/README.bttv Documentation/video4linux/bttv/README -srcdiff doc/insmod-options Documentation/video4linux/bttv/Insmod-options -srcdiff doc/MAKEDEV Documentation/video4linux/bttv/MAKEDEV -srcdiff doc/Sound-FAQ Documentation/video4linux/bttv/Sound-FAQ -srcdiff doc/Tuners Documentation/video4linux/bttv/Tuners -srcdiff doc/Cards Documentation/video4linux/bttv/Cards - -# other -srcdiff /dev/null Documentation/video4linux/MAKEDEV -srcdiff /dev/null Documentation/video4linux/bttv/CARDLIST -srcdiff doc/README.cx88 Documentation/video4linux/README.cx88 -srcdiff doc/README.saa7134 Documentation/video4linux/README.saa7134 -srcdiff doc/README.ir Documentation/video4linux/README.ir -srcdiff doc/not-in-cx2388x-datasheet.txt Documentation/video4linux/not-in-cx2388x-datasheet.txt - -# cardlists -srcdiff doc/CARDLIST.bttv Documentation/video4linux/CARDLIST.bttv -srcdiff doc/CARDLIST.saa7134 Documentation/video4linux/CARDLIST.saa7134 -srcdiff doc/CARDLIST.tuner Documentation/video4linux/CARDLIST.tuner -srcdiff doc/CARDLIST.cx88 Documentation/video4linux/CARDLIST.cx88 - -# API -srcdiff /dev/null Docummentation/video4linux/API.html -srcdiff doc/V4L1_API.html Docummentation/video4linux/V4L1_API.html -srcdiff doc/V4L2_API.html Docummentation/video4linux/V4L2_API.html -# obsolete / fixme -#srcdiff doc/Specs Documentation/video4linux/bttv/Specs -#srcdiff README.freeze Documentation/video4linux/bttv/README.freeze -#srcdiff README.quirks Documentation/video4linux/bttv/README.quirks -#srcdiff Modules.conf Documentation/video4linux/bttv/Modules.conf -srcdiff video-buf.h include/media/video-buf.h -srcdiff video-buf-dvb.h include/media/video-buf-dvb.h -srcdiff video-buf.c drivers/media/video/video-buf.c -srcdiff video-buf-dvb.c drivers/media/video/video-buf-dvb.c diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 1eb90ba34..4aea77658 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,17 @@ +2005-06-12 04:08 mchehab + * 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. + 2005-06-12 01:35 mchehab * tuner-core.c: @@ -5,7 +19,7 @@ - Solved a problem compiling without CONFIG_TUNER_MULTI_I2C - - cx88-i2c.c, saa7134-i2c.c: + * cx88-i2c.c, saa7134-i2c.c: - Make it compatible with kernel 2.6.12-rc6-mm1 diff --git a/v4l/compat.h b/v4l/compat.h index c88ae1f98..c81154aff 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,3 +1,7 @@ +/* + * $Id: compat.h,v 1.11 2005/06/12 04:19:19 mchehab Exp $ + */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23) # define irqreturn_t void # define IRQ_RETVAL(foobar) diff --git a/v4l/i2c-compat.h b/v4l/i2c-compat.h index 4e93d6ea0..4f8fbd022 100644 --- a/v4l/i2c-compat.h +++ b/v4l/i2c-compat.h @@ -1,4 +1,6 @@ /* + * $Id: i2c-compat.h,v 1.2 2005/06/12 04:19:19 mchehab Exp $ + * * some i2c layer compatibility stuff -- to avoid cluttering up the * i2c modules with tons of #ifdefs */ diff --git a/v4l/or51132.c b/v4l/or51132.c index 219ac7474..97b876149 100644 --- a/v4l/or51132.c +++ b/v4l/or51132.c @@ -454,7 +454,7 @@ unsigned int i100x20log10[] = { 3964, 3969, 3973, 3978, 3982, 3986, 3991, 3995, 4000, 4004, }; -unsigned int denom[] = {1,1,100,1000,10000,100000,1000000,10000000,100000000}; +static unsigned int denom[] = {1,1,100,1000,10000,100000,1000000,10000000,100000000}; unsigned int i20Log10(unsigned short val) { diff --git a/v4l/or51132.h b/v4l/or51132.h index 622cdd183..9450bd568 100644 --- a/v4l/or51132.h +++ b/v4l/or51132.h @@ -1,4 +1,6 @@ /* + * $Id: or51132.h,v 1.5 2005/06/12 04:19:19 mchehab Exp $ + * * Support for OR51132 (pcHDTV HD-3000) - VSB/QAM * * Copyright (C) 2005 Kirk Lapray <kirk_lapray@bigfoot.com> diff --git a/v4l_experimental/dpl3518.c b/v4l_experimental/dpl3518.c index c3442e35f..3ce052c53 100644 --- a/v4l_experimental/dpl3518.c +++ b/v4l_experimental/dpl3518.c @@ -1,4 +1,6 @@ /* + * $Id: dpl3518.c,v 1.3 2005/06/12 04:19:19 mchehab Exp $ + * * programming the dpl3518a Dolby Pro Logic Processor * * WARNING: THIS DRIVER WILL LOAD WITHOUT COMPLAINTS EVEN IF A DIFFERENT diff --git a/v4l_experimental/dpl3518.h b/v4l_experimental/dpl3518.h index c43fe8226..3841cdc77 100644 --- a/v4l_experimental/dpl3518.h +++ b/v4l_experimental/dpl3518.h @@ -1,3 +1,7 @@ +/* + * $Id: dpl3518.h,v 1.3 2005/06/12 04:19:19 mchehab Exp $ + */ + #ifndef DPL3518_H #define DPL3518_H diff --git a/v4l_experimental/plx9054.h b/v4l_experimental/plx9054.h index 666236069..c1816e30f 100644 --- a/v4l_experimental/plx9054.h +++ b/v4l_experimental/plx9054.h @@ -1,3 +1,7 @@ +/* + * $Id: plx9054.h,v 1.3 2005/06/12 04:19:19 mchehab Exp $ + */ + #ifndef _PLX9054_H_ #define _PLX9054_H_ diff --git a/v4l_experimental/rds-saa6588.c b/v4l_experimental/rds-saa6588.c index e8687067e..69d66e5f1 100644 --- a/v4l_experimental/rds-saa6588.c +++ b/v4l_experimental/rds-saa6588.c @@ -1,4 +1,6 @@ /* + * $Id: rds-saa6588.c,v 1.3 2005/06/12 04:19:19 mchehab Exp $ + * * poll i2c RDS receiver [Philips saa6588] * */ |