V4L/DVB updates part 1
Subsystems (2)
cover V4L/DVB updates part 1
This patch series is also available under v4l-dvb.git tree at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
Linus, please pull these from master branch.
It contains the following stuff:
- Add PCI ID for DigitalNow DVB-T Dual, rebranded DViCO FusionHDTV DVB-T Dual.
- Hauppauge Grey Remote support
- Move all IR keymaps to ir-common module
- Remove duplicated keymaps and add keymap for KWorld LTV883IR.
- Fix handling of VIDIOC_G_TUNER audmode in msp3400
- Add probe check for the tda9840.
- VIDEO_CX88_ALSA must select SND_PCM
- Fixes tvp5150a/am1 detection.
- Added credits for em28xx-video.c
- added some code for VBI processing and cleanup debug dump
- Included new sliced VBI types to videodev2.h and tvp5150
- Mark Typhoon cards as Lifeview OEM's
- Implemented sliced VBI set on VIDIOC_S_FMT
- group dvb-bt8xx Subsystem ID's together, in order.
- Kill nxt2002 in favor of the nxt200x module
- rename dvb_pll_tbmv30111in to dvb_pll_samsung_tbmv
- Recognise Hauppauge card #34519
- make VP-3054 Secondary I2C Bus Support a Kconfig option.
- Cause tda9887 to use I2C_DRIVERID_TDA9887
- added some VBI macros and moved minor definitions to header file
- Added iocls to configure VBI on tvp5150
- Several fixes to prepare for VBI
- Implemented VIDIOC_G_FMT/S_FMT for sliced VBI
- CodingStyle fixes.
- audmode and rxsubchans fixes (VIDIOC_G/S_TUNER)
- drivers/media/dvb/ possible cleanups
- Missing break statement on tuner-core
- Add new internal VIDIOC_INT commands
- fixed spelling error, exectuted --> executed.
- Hauppauge HVR 900 Composite support
- Fix printk type warning
- changed comment in tuner-core.c
- rename cb variable names in tuner structures for global consistency
- move config byte from tuner_params to tuner_range struct.
- removed duplicated tuner_ranges
- media video stradis memory fix
- Allow tristate build for cx88-vp3054-i2c
- Alters MAINTAINERS file to point to newer v4l-dvb email
- Add count to tunertype struct
- Fix NICAM buzz on analog sound
- Add support for the Avermedia 777 DVB-T card
- Move video std detection to top of set_tv_freq function
- Allow multiple tuner params in each tuner definition
- Tuner_dbg will show tuner param and range selected
- Update tuner comments
- Allow SAA7134 to fall back to AM sound when there is NICAM-L
- Added terratec hybrid xs and kworld 2800rf support
- Use default tuner_params if desired_type not available
- Show debug for tuners trying to use unsupported video standards
- Changed description of KWorld PVR TV 2800RF
- Added signal detection support to tvp5150
- Fix [Bug 5895] to correct snd_87x autodetect
- Add IR support to KWorld DVB-T (cx22702-based)
- Kconfig: DVB_USB_CXUSB depends on DVB_LGDT330X and DVB_MT352
- Add standard for South Korean NTSC-M using A2 audio.
- Added support for the LifeView FlyDVB-T LR301 card
- TDA8290 update
- TDA10046 Driver update
- Added support for the ADS Instant TV DUO Cardbus PTV331
- Fixed i2c return value, conversion mdelay to msleep
- Support for Galaxis DVB-S rev1.3
- Use parallel transport for FusionHDTV Dual Digital USB
- Use MT352 parallel transport function for all Bluebird FusionHDTV DVB-T boxes.
- FIX: Multiple usage of VP7045-based devices
- FIX: Check if FW was downloaded or not + new firmware file
- Fixed em28xx based system lockup
- Added support for the Tevion DVB-T 220RF card
- Add initial support for KWorld HardwareMpegTV XPert
- Makes Some symbols static.
- sem2mutex: drivers/media/, #2
- fix saa7146 kobject register failure
- DVB: remove the at76c651/tda80xx frontends
- Fix Samsung tuner frequency ranges
- Disabled debug on by default in tvp5150
- Adding support for Terratec Prodigy XS
- Removing personal email from DVB maintainers
- .gitignore should also ignore StGit generated dirs
- Added support for xc3028 analogue tuner (Hauppauge HVR900, Terratec Hybrid XS)
- Fixed xc3028 firmware extractor, added terratec fw support
- Fixed amux hauppauge hvr900/terratec hybrid xs
- XC3028 code marked with an special define option
- Added ET61X251 fourcc type
- Fix in-kernel build
- Bt8xx documentation authors fix
- Drivers/media/dvb/frontends/mt312.c: cleanups
- Make a struct static
- Upstream sync - make 2 structs static
- KWorld HardwareMpegTV XPert: Add radio support
- KWorld HardwareMpegTV XPert must set gpio2
- Add saa713x card: ELSA EX-VISION 700TV (saa7130)
- Pinnacle PCTV 40i: add filtered Composite2 input
- Fixed saa7134 ALSA initialization with multiple cards
- Remote control codes for BTTV_BOARD_CONTVFMI
- Cxusb: fix lgdt3303 naming
- Fix maximum for the saturation and contrast controls.
- Add support for Kworld ATSC110
- KWorld ATSC110: implement set_pll_input
- Kworld ATSC110: enable composite and svideo inputs
- Kworld ATSC110: cleanups
- Kworld ATSC110: initialize the tuner for analog mode on module load
- KWorld HardwareMpegTV XPert: update comments
- LifeView FlyDVB-T Duo: add support for remote control
- Add debug to ioctl arguments.
- Fix a small bug when constructing fps and line numbers
- Debug messages for ioctl improved
- Adds debuging v4l2_memory enum
- Add AUDIO_GET_PTS and VIDEO_GET_PTS ioctls
- Add cpia2 camera support
- Support for Satelco EasyWatch DVB-S light
- Restore power on defaults of tda9887 after tda8290 probe
- TUV1236d: declare buffer as static const
- Fix stv0297 for qam128 on tt c1500 (saa7146)
- Dvb: fix __init/__exit section references in av7110 driver
- Dvb-core: remove dead code
- Ignore DiSEqC messages > 6 and < 3
- Fix broken IF-OUT Relay handling
- Fix module parameters
- Documentation update
- Do a RESYNC for all cards
- XC3028 code removed from -git versions
- Cx88: reduce excessive logging
- Bttv: correct bttv_risc_packed buffer size
- Fixed Pinnacle 300i DVB-T support
- Add DVB-T support for the LifeView DVB Trio PCI card
- ELSA EX-VISION 700TV: fix incorrect PCI subsystem ID
- ELSA EX-VISION 500TV: fix incorrect PCI subsystem ID
- IR keymaps are exported by the ir-common module now
- cpia2/cpia2_v4l.c cleanups
- Fixes for Lifeview Trio non fatal bugs
- Coding style fixes in saa7134-dvb.c
- Workaround to fix initialization for Nexus CA
- Refactored LNBP21 and BSBE1 support
- TechnoTrend S-1500 card handling moved from budget.c to budget-ci.c
- Use refactored LNBP21 and BSBE1 code
- DViCO FusionHDTV DVB-T Hybrid and ZL10353-based FusionHDTV DVB-T Plus support
- Kconfig: fix in-kernel build for cx88-dvb: zl10353 frontend
- Move DViCO hybrid initialisation data from stack.
- FE6600 is a Thomson tuner
- Typos grab bag of the month
- Saa7134: document that there's also a 220RF from KWorld
- Msp3400-kthreads.c: make 3 functions static
Cheers,
Mauro.
V4L/DVB development is hosted at http://linuxtv.org
Development Mercurial trees are available at http://linuxtv.org/hg
---
.gitignore | 2 Documentation/dvb/avermedia.txt | 10 Documentation/dvb/bt8xx.txt | 6 Documentation/dvb/get_dvb_firmware | 23 Documentation/dvb/readme.txt | 32 Documentation/video4linux/CARDLIST.cx88 | 4 Documentation/video4linux/CARDLIST.em28xx | 3 Documentation/video4linux/CARDLIST.saa7134 | 22 Documentation/video4linux/CARDLIST.tuner | 4 Documentation/video4linux/README.cpia2 | 132 Documentation/video4linux/cpia2_overview.txt | 38 MAINTAINERS | 12 drivers/media/common/Makefile | 1 drivers/media/common/ir-common.c | 519 -- drivers/media/common/ir-functions.c | 272 + drivers/media/common/ir-keymaps.c | 1731 ++++++++- drivers/media/common/saa7146_core.c | 6 drivers/media/common/saa7146_fops.c | 18 drivers/media/common/saa7146_i2c.c | 4 drivers/media/common/saa7146_vbi.c | 2 drivers/media/common/saa7146_video.c | 30 drivers/media/dvb/b2c2/Kconfig | 2 drivers/media/dvb/b2c2/flexcop-common.h | 6 drivers/media/dvb/b2c2/flexcop-dma.c | 35 drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 13 drivers/media/dvb/b2c2/flexcop-i2c.c | 6 drivers/media/dvb/b2c2/flexcop-misc.c | 6 drivers/media/dvb/b2c2/flexcop-pci.c | 6 drivers/media/dvb/b2c2/flexcop-reg.h | 4 drivers/media/dvb/bt8xx/bt878.c | 50 drivers/media/dvb/bt8xx/bt878.h | 21 drivers/media/dvb/bt8xx/dst.c | 16 drivers/media/dvb/bt8xx/dst_ca.c | 6 drivers/media/dvb/bt8xx/dst_common.h | 3 drivers/media/dvb/bt8xx/dvb-bt8xx.c | 47 drivers/media/dvb/bt8xx/dvb-bt8xx.h | 3 drivers/media/dvb/cinergyT2/cinergyT2.c | 47 drivers/media/dvb/dvb-core/demux.h | 2 drivers/media/dvb/dvb-core/dmxdev.c | 105 drivers/media/dvb/dvb-core/dmxdev.h | 14 drivers/media/dvb/dvb-core/dvb_demux.c | 104 drivers/media/dvb/dvb-core/dvb_demux.h | 4 drivers/media/dvb/dvb-core/dvb_frontend.c | 21 drivers/media/dvb/dvb-core/dvb_frontend.h | 1 drivers/media/dvb/dvb-core/dvb_net.c | 14 drivers/media/dvb/dvb-usb/Kconfig | 12 drivers/media/dvb/dvb-usb/cxusb.c | 24 drivers/media/dvb/dvb-usb/dibusb-common.c | 4 drivers/media/dvb/dvb-usb/digitv.c | 17 drivers/media/dvb/dvb-usb/dvb-usb-firmware.c | 8 drivers/media/dvb/dvb-usb/dvb-usb-init.c | 6 drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 4 drivers/media/dvb/dvb-usb/dvb-usb.h | 12 drivers/media/dvb/dvb-usb/vp702x.c | 10 drivers/media/dvb/dvb-usb/vp702x.h | 2 drivers/media/dvb/dvb-usb/vp7045-fe.c | 6 drivers/media/dvb/dvb-usb/vp7045.c | 4 drivers/media/dvb/frontends/Kconfig | 32 drivers/media/dvb/frontends/Makefile | 4 drivers/media/dvb/frontends/at76c651.c | 450 -- drivers/media/dvb/frontends/at76c651.h | 47 drivers/media/dvb/frontends/bcm3510.c | 9 drivers/media/dvb/frontends/bsbe1.h | 123 drivers/media/dvb/frontends/cx24110.c | 13 drivers/media/dvb/frontends/cx24110.h | 1 drivers/media/dvb/frontends/dvb-pll.c | 75 drivers/media/dvb/frontends/dvb-pll.h | 11 drivers/media/dvb/frontends/lnbp21.h | 139 drivers/media/dvb/frontends/mt312.c | 116 drivers/media/dvb/frontends/mt312.h | 6 drivers/media/dvb/frontends/nxt2002.c | 706 --- drivers/media/dvb/frontends/nxt2002.h | 23 drivers/media/dvb/frontends/nxt200x.c | 58 drivers/media/dvb/frontends/stv0297.c | 4 drivers/media/dvb/frontends/tda1004x.c | 25 drivers/media/dvb/frontends/tda1004x.h | 3 drivers/media/dvb/frontends/tda80xx.c | 734 ---- drivers/media/dvb/frontends/tda80xx.h | 51 drivers/media/dvb/frontends/zl10353.c | 311 + drivers/media/dvb/frontends/zl10353.h | 43 drivers/media/dvb/frontends/zl10353_priv.h | 42 drivers/media/dvb/ttpci/av7110.c | 160 drivers/media/dvb/ttpci/av7110.h | 9 drivers/media/dvb/ttpci/av7110_hw.c | 43 drivers/media/dvb/ttpci/av7110_ir.c | 30 drivers/media/dvb/ttpci/budget-av.c | 4 drivers/media/dvb/ttpci/budget-ci.c | 18 drivers/media/dvb/ttpci/budget.c | 156 drivers/media/dvb/ttpci/budget.h | 4 drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 32 drivers/media/dvb/ttusb-dec/ttusb_dec.c | 31 drivers/media/radio/miropcm20-rds-core.c | 11 drivers/media/radio/radio-aimslab.c | 20 drivers/media/radio/radio-aztech.c | 12 drivers/media/radio/radio-maestro.c | 11 drivers/media/radio/radio-maxiradio.c | 11 drivers/media/radio/radio-sf16fmi.c | 22 drivers/media/radio/radio-sf16fmr2.c | 22 drivers/media/radio/radio-typhoon.c | 12 drivers/media/radio/radio-zoltrix.c | 26 drivers/media/video/Kconfig | 10 drivers/media/video/Makefile | 5 drivers/media/video/arv.c | 16 drivers/media/video/bttv-cards.c | 6 drivers/media/video/bttv-driver.c | 50 drivers/media/video/bttv-input.c | 248 - drivers/media/video/bttv-risc.c | 12 drivers/media/video/bw-qcam.c | 16 drivers/media/video/bw-qcam.h | 2 drivers/media/video/c-qcam.c | 19 drivers/media/video/cpia.c | 104 drivers/media/video/cpia.h | 5 drivers/media/video/cpia2/Makefile | 3 drivers/media/video/cpia2/cpia2.h | 497 ++ drivers/media/video/cpia2/cpia2_core.c | 2525 ++++++++++++++ drivers/media/video/cpia2/cpia2_registers.h | 476 ++ drivers/media/video/cpia2/cpia2_usb.c | 907 +++++ drivers/media/video/cpia2/cpia2_v4l.c | 2135 +++++++++++ drivers/media/video/cpia2/cpia2dev.h | 50 drivers/media/video/cpia2/cpia2patch.h | 233 + drivers/media/video/cx25840/cx25840-core.c | 100 drivers/media/video/cx25840/cx25840-vbi.c | 6 drivers/media/video/cx25840/cx25840.h | 1 drivers/media/video/cx88/Kconfig | 23 drivers/media/video/cx88/Makefile | 6 drivers/media/video/cx88/cx88-alsa.c | 6 drivers/media/video/cx88/cx88-cards.c | 114 drivers/media/video/cx88/cx88-core.c | 16 drivers/media/video/cx88/cx88-dvb.c | 110 drivers/media/video/cx88/cx88-input.c | 339 - drivers/media/video/cx88/cx88-video.c | 40 drivers/media/video/cx88/cx88.h | 6 drivers/media/video/em28xx/em28xx-cards.c | 250 - drivers/media/video/em28xx/em28xx-core.c | 17 drivers/media/video/em28xx/em28xx-i2c.c | 9 drivers/media/video/em28xx/em28xx-input.c | 85 drivers/media/video/em28xx/em28xx-video.c | 1561 ++++---- drivers/media/video/em28xx/em28xx.h | 11 drivers/media/video/hexium_orion.c | 2 drivers/media/video/ir-kbd-i2c.c | 52 drivers/media/video/meye.c | 112 drivers/media/video/meye.h | 4 drivers/media/video/msp3400-driver.c | 80 drivers/media/video/msp3400-kthreads.c | 361 -- drivers/media/video/msp3400.h | 12 drivers/media/video/mxb.c | 4 drivers/media/video/planb.c | 8 drivers/media/video/planb.h | 2 drivers/media/video/pms.c | 28 drivers/media/video/saa5246a.c | 10 drivers/media/video/saa5249.c | 10 drivers/media/video/saa7115.c | 10 drivers/media/video/saa7134/saa7134-alsa.c | 10 drivers/media/video/saa7134/saa7134-cards.c | 289 + drivers/media/video/saa7134/saa7134-core.c | 2 drivers/media/video/saa7134/saa7134-dvb.c | 198 + drivers/media/video/saa7134/saa7134-empress.c | 8 drivers/media/video/saa7134/saa7134-input.c | 513 -- drivers/media/video/saa7134/saa7134-oss.c | 40 drivers/media/video/saa7134/saa7134-tvaudio.c | 14 drivers/media/video/saa7134/saa7134-video.c | 40 drivers/media/video/saa7134/saa7134.h | 14 drivers/media/video/stradis.c | 15 drivers/media/video/tda8290.c | 16 drivers/media/video/tda9887.c | 9 drivers/media/video/tuner-core.c | 92 drivers/media/video/tuner-simple.c | 179 drivers/media/video/tuner-types.c | 679 +-- drivers/media/video/tvaudio.c | 35 drivers/media/video/tvp5150.c | 829 ++-- drivers/media/video/tvp5150_reg.h | 125 drivers/media/video/v4l2-common.c | 592 +++ drivers/media/video/video-buf-dvb.c | 10 drivers/media/video/video-buf.c | 42 drivers/media/video/videocodec.h | 2 drivers/media/video/videodev.c | 22 drivers/media/video/vino.c | 33 drivers/media/video/zr36050.c | 2 drivers/media/video/zr36060.c | 2 drivers/media/video/zr36120_i2c.c | 2 include/linux/dvb/audio.h | 13 include/linux/dvb/video.h | 13 include/linux/videodev2.h | 97 include/media/ir-common.h | 48 include/media/saa7146.h | 21 include/media/tuner-types.h | 3 include/media/tuner.h | 8 include/media/v4l2-common.h | 65 include/media/video-buf-dvb.h | 2 include/media/video-buf.h | 2 190 files changed, 14518 insertions(+), 7458 deletions(-)
PATCH 1/141 V4L/DVB (3392): Add PCI ID for DigitalNow DVB-T Dual, rebranded DViCO FusionHDTV DVB-T Dual.
From: Michael Krufky <[email protected]>
Date: 1137477023 -0200
- Add PCI ID for DigitalNow DVB-T Dual,
rebranded DViCO FusionHDTV DVB-T Dual.
---
Documentation/video4linux/CARDLIST.cx88 +0 -0
Documentation/video4linux/CARDLIST.cx88 +1 -1
@@ -42,4 +42,4 @@ 41 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile) [0070:9800,0070:9802] 42 -> digitalnow DNTV Live! DVB-T Pro [1822:0025] 43 -> KWorld/VStream XPert DVB-T with cx22702 [17de:08a1] - 44 -> DViCO FusionHDTV DVB-T Dual Digital [18ac:db50] + 44 -> DViCO FusionHDTV DVB-T Dual Digital [18ac:db50,18ac:db54]
drivers/media/video/cx88/cx88-cards.c +0 -0
drivers/media/video/cx88/cx88-cards.c +5 -0
@@ -1246,6 +1246,11 @@ struct cx88_subid cx88_subids[] = { .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL, },{ .subvendor = 0x18ac, + .subdevice = 0xdb54, + .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL, + /* Re-branded DViCO: DigitalNow DVB-T Dual */ + },{ + .subvendor = 0x18ac, .subdevice = 0xdb11, .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS, /* Re-branded DViCO: UltraView DVB-T Plus */
PATCH 3/141 V4L/DVB (3393): Move all IR keymaps to ir-common module
In reply to [email protected]From: Ricardo Cerqueira <[email protected]>
Date: 1138016526 -0200
- All the keymaps have the same structure, and can be shared between different chips, so it makes no sense having them scattered between the input files. This aggregates them all at ir-common module.
- Added new Hauppauge remote (Hauppauge grey), contributed by J.O. Aho <[email protected]> (with some small changes)
Changed KEY_KPx (keypad numerals) references to KEY_x, to avoid problems when NumLock is off (suggested by Peter Missel <[email protected]>)
- Some cleanups at IR code
---
drivers/media/common/Makefile +0 -0
drivers/media/common/Makefile +1 -0
@@ -1,5 +1,6 @@ saa7146-objs := saa7146_i2c.o saa7146_core.o saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o +ir-common-objs := ir-functions.o ir-keymaps.o obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o
drivers/media/common/ir-common.c +0 -0
drivers/media/common/ir-common.c deleted +0 -519
519 lines not on this page · raw message
drivers/media/common/ir-keymaps.c +0 -0
drivers/media/common/ir-keymaps.c new file +1537 -0
1,537 lines not on this page · raw message
drivers/media/video/bttv-input.c +0 -0
drivers/media/video/bttv-input.c +0 -245
251 lines not on this page · raw message
drivers/media/video/cx88/cx88-input.c +0 -0
drivers/media/video/cx88/cx88-input.c +0 -331
337 lines not on this page · raw message
drivers/media/video/em28xx/em28xx-input.c +0 -0
drivers/media/video/em28xx/em28xx-input.c +0 -85
91 lines not on this page · raw message
drivers/media/video/ir-kbd-i2c.c +0 -0
drivers/media/video/ir-kbd-i2c.c +1 -40
53 lines not on this page · raw message
drivers/media/video/saa7134/saa7134-input.c +0 -0
drivers/media/video/saa7134/saa7134-input.c +11 -490
206 lines not on this page · raw message
include/media/ir-common.h +0 -0
include/media/ir-common.h +35 -7
42 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
PATCH 5/141 V4L/DVB (3402): Fix handling of VIDIOC_G_TUNER audmode in msp3400
In reply to [email protected]From: Hans Verkuil <[email protected]>
Date: 1138016762 -0200
- Fix handling of VIDIOC_G_TUNER audmode in msp3400: audmode is only changed by the user with S_TUNER, never by the driver.
---
drivers/media/video/msp3400-driver.c +0 -0
drivers/media/video/msp3400-driver.c +5 -16
@@ -653,7 +653,6 @@ static int msp_command(struct i2c_client }if (scart) { state->rxsubchans =V4L2_TUNER_SUB_STEREO ; - state->audmode =V4L2_TUNER_MODE_STEREO ;msp_set_scart (client, scart,0 );msp_write_dsp (client,0x000d ,0x1900 );if (state->opmode !=OPMODE_AUTOSELECT )
@@ -831,11 +830,8 @@ static int msp_command(struct i2c_clientreturn -EINVAL ; } -msp_any_detect_stereo (client); -if (state->audmode ==V4L2_TUNER_MODE_STEREO ) { - a->capability =V4L2_AUDCAP_STEREO ; - } - + a->capability =V4L2_AUDCAP_STEREO ; + a->mode =0 ;/* TODO: add support for AVL */ break ; }
@@ -865,15 +861,9 @@ static int msp_command(struct i2c_client }if (scart) { state->rxsubchans =V4L2_TUNER_SUB_STEREO ; - state->audmode =V4L2_TUNER_MODE_STEREO ;msp_set_scart (client, scart,0 );msp_write_dsp (client,0x000d ,0x1900 ); } -if (sarg->capability ==V4L2_AUDCAP_STEREO ) { - state->audmode =V4L2_TUNER_MODE_STEREO ; - }else { - state->audmode &= ~V4L2_TUNER_MODE_STEREO ; - }msp_any_set_audmode (client, state->audmode);msp_wake_thread (client);break ;
@@ -898,11 +888,10 @@ static int msp_command(struct i2c_client {struct v4l2_tuner *vt = (struct v4l2_tuner *)arg; -if (state->radio) +if (state->radio)/* TODO: add mono/stereo support for radio */ break ;/* only set audmode */ -if (vt->audmode !=-1 && vt->audmode !=0 ) -msp_any_set_audmode (client, vt->audmode); +msp_any_set_audmode (client, vt->audmode);break ; }
@@ -927,7 +916,6 @@ static int msp_command(struct i2c_clientreturn -EINVAL ; }break ; - }case VIDIOC_S_AUDOUT :
@@ -1094,6 +1082,7 @@ static int msp_attach(struct i2c_adaptermemset (state,0 ,sizeof (*state)); state->v4l2_std =V4L2_STD_NTSC ; + state->audmode =V4L2_TUNER_MODE_STEREO ; state->volume =58880 ;/* 0db gain */ state->balance =32768 ;/* 0db gain */ state->bass =32768 ;
drivers/media/video/msp3400-kthreads.c +0 -0
drivers/media/video/msp3400-kthreads.c +11 -14
@@ -170,7 +170,6 @@ void msp3400c_setmode(struct i2c_clientv4l_dbg (1 , msp_debug, client,"setmode: %d\n" , type); state->mode = type; - state->audmode =V4L2_TUNER_MODE_MONO ; state->rxsubchans =V4L2_TUNER_SUB_MONO ;msp_write_dem (client,0x00bb , msp3400c_init_data[type].ad_cv);
@@ -210,7 +209,7 @@ void msp3400c_setmode(struct i2c_client }/* turn on/off nicam + stereo */ -void msp3400c_setstereo (struct i2c_client *client,int mode) +void msp3400c_setstereo (struct i2c_client *client,int audmode) {static char *strmode[] = {"mono" ,"stereo" ,"lang2" ,"lang1" };struct msp_state *state =i2c_get_clientdata (client);
@@ -222,16 +221,16 @@ void msp3400c_setstereo(struct i2c_clien* it's never called */ v4l_dbg (1 , msp_debug, client,"setstereo called with mode=%d instead of set_source (ignored)\n" , - mode); + audmode);return ; }/* switch demodulator */ switch (state->mode) {case MSP_MODE_FM_TERRA : -v4l_dbg (1 , msp_debug, client,"FM setstereo: %s\n" , strmode[mode]); +v4l_dbg (1 , msp_debug, client,"FM setstereo: %s\n" , strmode[audmode]);msp3400c_setcarrier (client, state->second, state->main); -switch (mode) { +switch (audmode) {case V4L2_TUNER_MODE_STEREO :msp_write_dsp (client,0x000e ,0x3001 );break ;
@@ -243,8 +242,8 @@ void msp3400c_setstereo(struct i2c_clien }break ;case MSP_MODE_FM_SAT : -v4l_dbg (1 , msp_debug, client,"SAT setstereo: %s\n" , strmode[mode]); -switch (mode) { +v4l_dbg (1 , msp_debug, client,"SAT setstereo: %s\n" , strmode[audmode]); +switch (audmode) {case V4L2_TUNER_MODE_MONO :msp3400c_setcarrier (client,MSP_CARRIER (6.5 ),MSP_CARRIER (6.5 ));break ;
@@ -262,21 +261,21 @@ void msp3400c_setstereo(struct i2c_cliencase MSP_MODE_FM_NICAM1 :case MSP_MODE_FM_NICAM2 :case MSP_MODE_AM_NICAM : -v4l_dbg (1 , msp_debug, client,"NICAM setstereo: %s\n" ,strmode[mode]); +v4l_dbg (1 , msp_debug, client,"NICAM setstereo: %s\n" ,strmode[audmode]);msp3400c_setcarrier (client,state->second,state->main);if (state->nicam_on) nicam=0x0100 ;break ;case MSP_MODE_BTSC : -v4l_dbg (1 , msp_debug, client,"BTSC setstereo: %s\n" ,strmode[mode]); +v4l_dbg (1 , msp_debug, client,"BTSC setstereo: %s\n" ,strmode[audmode]); nicam=0x0300 ;break ;case MSP_MODE_EXTERN : -v4l_dbg (1 , msp_debug, client,"extern setstereo: %s\n" ,strmode[mode]); +v4l_dbg (1 , msp_debug, client,"extern setstereo: %s\n" ,strmode[audmode]); nicam =0x0200 ;break ;case MSP_MODE_FM_RADIO : -v4l_dbg (1 , msp_debug, client,"FM-Radio setstereo: %s\n" ,strmode[mode]); +v4l_dbg (1 , msp_debug, client,"FM-Radio setstereo: %s\n" ,strmode[audmode]);break ;default :v4l_dbg (1 , msp_debug, client,"mono setstereo\n" );
@@ -284,7 +283,7 @@ void msp3400c_setstereo(struct i2c_clien }/* switch audio */ -switch (mode) { +switch (audmode) {case V4L2_TUNER_MODE_STEREO : src =0x0020 | nicam;break ;
@@ -759,7 +758,6 @@ int msp3410d_thread(void *data)case 0x0040 :/* FM radio */ state->mode =MSP_MODE_FM_RADIO ; state->rxsubchans =V4L2_TUNER_SUB_STEREO ; - state->audmode =V4L2_TUNER_MODE_STEREO ; state->nicam_on =0 ; state->watch_stereo =0 ;/* not needed in theory if we have radio, but
@@ -779,7 +777,6 @@ int msp3410d_thread(void *data)case 0x0005 : state->mode =MSP_MODE_FM_TERRA ; state->rxsubchans =V4L2_TUNER_SUB_MONO ; - state->audmode =V4L2_TUNER_MODE_MONO ; state->nicam_on =0 ; state->watch_stereo =1 ;break ;
PATCH 6/141 V4L/DVB (3403): Add probe check for the tda9840.
In reply to [email protected]From: Hans Verkuil <[email protected]>
Date: 1138016860 -0200
- Add probe check for the tda9840 to prevent misdetection of a Micronas dpl3518a as a tda9840.
---
drivers/media/video/tvaudio.c +0 -0
drivers/media/video/tvaudio.c +9 -0
@@ -390,6 +390,14 @@ static void tda9840_setmode(struct CHIPSchip_write (chip,TDA9840_SW , t); } +static int tda9840_checkit (struct CHIPSTATE *chip) +{ +int rc; + rc =chip_read (chip); +/* lower 5 bits should be 0 */ +return ((rc &0x1f ) ==0 ) ?1 :0 ; +} +/* ---------------------------------------------------------------------- */ /* audio chip descriptions - defines+functions for tda985x */
@@ -1264,6 +1272,7 @@ static struct CHIPDESC chiplist[] = { .addr_hi = I2C_TDA9840 >> 1, .registers = 5, + .checkit = tda9840_checkit, .getmode = tda9840_getmode, .setmode = tda9840_setmode, .checkmode = generic_checkmode,
PATCH 7/141 V4L/DVB: VIDEO_CX88_ALSA must select SND_PCM
In reply to [email protected]From: Adrian Bunk <[email protected]>
Date: 1138016882 -0200
V4L/DVB: VIDEO_CX88_ALSA must select SND_PCM
- VIDEO_CX88_ALSA must select SND_PCM
---
drivers/media/video/cx88/Kconfig +0 -0
drivers/media/video/cx88/Kconfig +1 -0
@@ -32,6 +32,7 @@ config VIDEO_CX88_DVB config VIDEO_CX88_ALSA tristate "ALSA DMA audio support" depends on VIDEO_CX88 && SND && EXPERIMENTAL + select SND_PCM ---help--- This is a video4linux driver for direct (DMA) audio on Conexant 2388x based TV cards.
PATCH 8/141 V4L/DVB (3405): Fixes tvp5150a/am1 detection.
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1138016914 -0200
- Tvp5150 type were determined by a secondary register instead of using ROM code.
- tvp5150am1 have ROM=4.0, while tvp5150a have ROM=3.33 (decimal). All other ROM versions are reported as unknown tvp5150.
- Except for reporting, current code doesn't enable any special feature for tvp5150am1 or tvp5150a. Code should work for both models (but were tested only for tvp5150am1).
---
drivers/media/video/tvp5150.c +0 -0
drivers/media/video/tvp5150.c +12 -9
@@ -746,24 +746,27 @@ static int tvp5150_set_std(struct i2c_clstatic inline void tvp5150_reset (struct i2c_client *c) { -u8 type, ver_656, msb_id, lsb_id, msb_rom, lsb_rom; +u8 msb_id, lsb_id, msb_rom, lsb_rom;struct tvp5150 *decoder =i2c_get_clientdata (c); - type=tvp5150_read (c,TVP5150_AUTOSW_MSK ); msb_id=tvp5150_read (c,TVP5150_MSB_DEV_ID ); lsb_id=tvp5150_read (c,TVP5150_LSB_DEV_ID ); msb_rom=tvp5150_read (c,TVP5150_ROM_MAJOR_VER ); lsb_rom=tvp5150_read (c,TVP5150_ROM_MINOR_VER ); -if (type==0xdc ) { - ver_656=tvp5150_read (c,TVP5150_REV_SELECT ); -tvp5150_info ("tvp%02x%02xam1 detected 656 version is %d.\n" ,msb_id, lsb_id,ver_656); - }else if (type==0xfc ) { -tvp5150_info ("tvp%02x%02xa detected.\n" ,msb_id, lsb_id); +if ((msb_rom==4 )&&(lsb_rom==0 )) {/* Is TVP5150AM1 */ +tvp5150_info ("tvp%02x%02xam1 detected.\n" ,msb_id, lsb_id); + +/* ITU-T BT.656.4 timing */ +tvp5150_write (c,TVP5150_REV_SELECT ,0 ); }else { -tvp5150_info ("unknown tvp%02x%02x chip detected(%d).\n" ,msb_id,lsb_id,type); +if ((msb_rom==3 )||(lsb_rom==0x21 )) {/* Is TVP5150A */ +tvp5150_info ("tvp%02x%02xa detected.\n" ,msb_id, lsb_id); + }else { +tvp5150_info ("*** unknown tvp%02x%02x chip detected.\n" ,msb_id,lsb_id); +tvp5150_info ("*** Rom ver is %d.%d\n" ,msb_rom,lsb_rom); + } } -tvp5150_info ("Rom ver is %d.%d\n" ,msb_rom,lsb_rom);/* Initializes TVP5150 to its default values */ tvp5150_write_inittab (c, tvp5150_init_default);
PATCH 9/141 V4L/DVB (3406): Added credits for em28xx-video.c
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1138043454 -0200
- Added credits for sn9c102 kernel module and his author as some parts of em28xx-video were based.
---
drivers/media/video/em28xx/em28xx-video.c +0 -0
drivers/media/video/em28xx/em28xx-video.c +3 -0
@@ -6,6 +6,9 @@ Mauro Carvalho Chehab <[email protected]> Sascha Sommer <[email protected]> + Some parts based on SN9C10x PC Camera Controllers GPL driver made + by Luca Risolia <[email protected]> + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or
PATCH 10/141 V4L/DVB (3407): added some code for VBI processing and cleanup debug dump
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1138043465 -0200
- Renamed some registers and improved register debug message
- Some cleanups at register dump
- Added code to set VBI processor (VDP)
- VBI code still incomplete
---
drivers/media/video/tvp5150.c +0 -0
drivers/media/video/tvp5150.c +207 -286
608 lines not on this page · raw message
drivers/media/video/tvp5150_reg.h +0 -0
drivers/media/video/tvp5150_reg.h +31 -87
130 lines not on this page · raw message
PATCH 11/141 V4L/DVB (3408): Included new sliced VBI types to videodev2.h and tvp5150
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1138043465 -0200
- Added other sliced VBI types to videodev2.h
- tvp5150 now uses standard V4L2 API codes from videodev2.h
- Implemented VIDIOC_G_SLICED_VBI_CAP for tvp5150. This is dynamically filled based on defined VDP C-RAM values filled by the driver.
---
drivers/media/video/cx25840/cx25840-vbi.c +0 -0
drivers/media/video/cx25840/cx25840-vbi.c +3 -3
@@ -151,7 +151,7 @@ int cx25840_vbi(struct i2c_client *cliencase VIDIOC_G_FMT : {static u16 lcr2vbi[] = { -0 ,V4L2_SLICED_TELETEXT_B ,0 ,/* 1 */ +0 ,V4L2_SLICED_TELETEXT_PAL_B ,0 ,/* 1 */ 0 ,V4L2_SLICED_WSS_625 ,0 ,/* 4 */ V4L2_SLICED_CAPTION_525 ,/* 6 */ 0 ,0 ,V4L2_SLICED_VPS ,0 ,0 ,/* 9 */
@@ -231,7 +231,7 @@ int cx25840_vbi(struct i2c_client *clienfor (i =7 ; i <=23 ; i++) {for (x =0 ; x <=1 ; x++) {switch (svbi->service_lines[1 -x][i]) { -case V4L2_SLICED_TELETEXT_B : +case V4L2_SLICED_TELETEXT_PAL_B : lcr[i] |=1 << (4 * x);break ;case V4L2_SLICED_WSS_625 :
@@ -282,7 +282,7 @@ int cx25840_vbi(struct i2c_client *clienswitch (id2) {case 1 : - id2 =V4L2_SLICED_TELETEXT_B ; + id2 =V4L2_SLICED_TELETEXT_PAL_B ;break ;case 4 : id2 =V4L2_SLICED_WSS_625 ;
drivers/media/video/saa7115.c +0 -0
drivers/media/video/saa7115.c +3 -3
@@ -791,7 +791,7 @@ static void saa7115_set_lcr(struct i2c_ccase 0 : lcr[i] |=0xf << (4 * x);break ; -case V4L2_SLICED_TELETEXT_B : +case V4L2_SLICED_TELETEXT_PAL_B : lcr[i] |=1 << (4 * x);break ;case V4L2_SLICED_CAPTION_525 :
@@ -820,7 +820,7 @@ static void saa7115_set_lcr(struct i2c_cstatic int saa7115_get_v4lfmt (struct i2c_client *client,struct v4l2_format *fmt) {static u16 lcr2vbi[] = { -0 ,V4L2_SLICED_TELETEXT_B ,0 ,/* 1 */ +0 ,V4L2_SLICED_TELETEXT_PAL_B ,0 ,/* 1 */ 0 ,V4L2_SLICED_CAPTION_525 ,/* 4 */ V4L2_SLICED_WSS_625 ,0 ,/* 5 */ V4L2_SLICED_VPS ,0 ,0 ,0 ,0 ,/* 7 */
@@ -985,7 +985,7 @@ static void saa7115_decode_vbi_line(stru/* decode payloads */ switch (id2) {case 1 : - vbi->type =V4L2_SLICED_TELETEXT_B ; + vbi->type =V4L2_SLICED_TELETEXT_PAL_B ;break ;case 4 :if (!saa7115_odd_parity (p[0 ]) || !saa7115_odd_parity (p[1 ]))
drivers/media/video/tvp5150.c +0 -0
drivers/media/video/tvp5150.c +116 -69
249 lines not on this page · raw message
drivers/media/video/tvp5150_reg.h +0 -0
drivers/media/video/tvp5150_reg.h +7 -0
@@ -1,3 +1,10 @@ +/* +* tvp5150 - Texas Instruments TVP5150A/AM1 video decoder registers +* +* Copyright (c) 2005,2006 Mauro Carvalho Chehab ([email protected]) +* This code is placed under the terms of the GNU General Public License v2 +*/ +#define TVP5150_VD_IN_SRC_SEL_1 0x00/* Video input source selection #1 */ #define TVP5150_ANAL_CHL_CTL 0x01/* Analog channel controls */ #define TVP5150_OP_MODE_CTL 0x02/* Operation mode controls */
include/linux/videodev2.h +0 -0
include/linux/videodev2.h +44 -7
57 lines not on this page · raw message
PATCH 13/141 V4L/DVB (3410): Implemented sliced VBI set on VIDIOC_S_FMT
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1138043466 -0200
- Implemented sliced VBI set on VIDIOC_S_FMT
---
drivers/media/video/tvp5150.c +0 -0
drivers/media/video/tvp5150.c +42 -5
77 lines not on this page · raw message
PATCH 14/141 V4L/DVB (3411): group dvb-bt8xx Subsystem ID's together, in order.
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1138043466 -0200
- group dvb-bt8xx Subsystem ID's together, in order.
---
drivers/media/video/bttv-cards.c +0 -0
drivers/media/video/bttv-cards.c +3 -3
@@ -275,7 +275,6 @@ static struct CARD { { 0x03116000, BTTV_BOARD_SENSORAY311, "Sensoray 311" }, { 0x00790e11, BTTV_BOARD_WINDVR, "Canopus WinDVR PCI" }, { 0xa0fca1a0, BTTV_BOARD_ZOLTRIX, "Face to Face Tvmax" }, - { 0x20007063, BTTV_BOARD_PC_HDTV, "pcHDTV HD-2000 TV"}, { 0x82b2aa6a, BTTV_BOARD_SIMUS_GVC1100, "SIMUS GVC1100" }, { 0x146caa0c, BTTV_BOARD_PV951, "ituner spectra8" }, { 0x200a1295, BTTV_BOARD_PXC200, "ImageNation PXC200A" },
@@ -297,13 +296,14 @@ static struct CARD {* { 0x13eb0070, BTTV_BOARD_HAUPPAUGE_IMPACTVCB, "Hauppauge ImpactVCB" }, */ /* DVB cards (using pci function .1 for mpeg data xfer) */ - { 0x01010071, BTTV_BOARD_NEBULA_DIGITV, "Nebula Electronics DigiTV" }, - { 0x07611461, BTTV_BOARD_AVDVBT_761, "AverMedia AverTV DVB-T 761" }, { 0x001c11bd, BTTV_BOARD_PINNACLESAT, "Pinnacle PCTV Sat" }, + { 0x01010071, BTTV_BOARD_NEBULA_DIGITV, "Nebula Electronics DigiTV" }, + { 0x20007063, BTTV_BOARD_PC_HDTV, "pcHDTV HD-2000 TV"}, { 0x002611bd, BTTV_BOARD_TWINHAN_DST, "Pinnacle PCTV SAT CI" }, { 0x00011822, BTTV_BOARD_TWINHAN_DST, "Twinhan VisionPlus DVB" }, { 0xfc00270f, BTTV_BOARD_TWINHAN_DST, "ChainTech digitop DST-1000 DVB-S" }, { 0x07711461, BTTV_BOARD_AVDVBT_771, "AVermedia AverTV DVB-T 771" }, + { 0x07611461, BTTV_BOARD_AVDVBT_761, "AverMedia AverTV DVB-T 761" }, { 0xdb1018ac, BTTV_BOARD_DVICO_DVBT_LITE, "DViCO FusionHDTV DVB-T Lite" }, { 0xd50018ac, BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE, "DViCO FusionHDTV 5 Lite" },
PATCH 15/141 V4L/DVB (3413): Kill nxt2002 in favor of the nxt200x module
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1138043466 -0200
- Kill nxt2002 module in favor of nxt200x.
- Repair broken nxt2002 support in the nxt200x module.
- Make the flexcop driver use nxt200x instead of the nxt2002 module for the Air2PC 2nd generation PCI card.
- Remove the nxt2002 module from cvs and kernel build.
---
drivers/media/dvb/b2c2/Kconfig +0 -0
drivers/media/dvb/b2c2/Kconfig +1 -1
@@ -4,7 +4,7 @@ config DVB_B2C2_FLEXCOP select DVB_STV0299 select DVB_MT352 select DVB_MT312 - select DVB_NXT2002 + select DVB_NXT200X select DVB_STV0297 select DVB_BCM3510 select DVB_LGDT330X
drivers/media/dvb/b2c2/flexcop-fe-tuner.c +0 -0
drivers/media/dvb/b2c2/flexcop-fe-tuner.c +5 -4
@@ -9,7 +9,7 @@#include "stv0299.h" #include "mt352.h" -#include "nxt2002.h" +#include "nxt200x.h" #include "bcm3510.h" #include "stv0297.h" #include "mt312.h"
@@ -343,9 +343,10 @@ static struct lgdt330x_config air2pc_ats .clock_polarity_flip = 1, }; -static struct nxt2002_config samsung_tbmv_config = { +static struct nxt200x_config samsung_tbmv_config = { .demod_address =0x0a , - .request_firmware = flexcop_fe_request_firmware, + .pll_address =0xc2 , + .pll_desc = &dvb_pll_tbmv30111in, };static struct bcm3510_config air2pc_atsc_first_gen_config = {
@@ -505,7 +506,7 @@ int flexcop_frontend_init(struct flexcopinfo ("found the mt352 at i2c address: 0x%02x" ,samsung_tdtc9251dh0_config.demod_address); }else /* try the air atsc 2nd generation (nxt2002) */ -if ((fc->fe =nxt2002_attach (&samsung_tbmv_config, &fc->i2c_adap)) !=NULL ) { +if ((fc->fe =nxt200x_attach (&samsung_tbmv_config, &fc->i2c_adap)) !=NULL ) { fc->dev_type =FC_AIR_ATSC2 ;info ("found the nxt2002 at i2c address: 0x%02x" ,samsung_tbmv_config.demod_address); }else
drivers/media/dvb/frontends/Kconfig +0 -0
drivers/media/dvb/frontends/Kconfig +0 -12
@@ -166,18 +166,6 @@ config DVB_STV0297 comment "ATSC (North American/Korean Terresterial DTV) frontends" depends on DVB_CORE -config DVB_NXT2002 - tristate "Nxt2002 based" - depends on DVB_CORE - select FW_LOADER - help - An ATSC 8VSB tuner module. Say Y when you want to support this frontend. - - This driver needs external firmware. Please use the command - "<kerneldir>/Documentation/dvb/get_dvb_firmware nxt2002" to - download/extract it, and then copy it to /usr/lib/hotplug/firmware - or /lib/firmware (depending on configuration of firmware hotplug). - config DVB_NXT200X tristate "Nextwave NXT2002/NXT2004 based" depends on DVB_CORE
drivers/media/dvb/frontends/Makefile +0 -0
drivers/media/dvb/frontends/Makefile +0 -1
@@ -25,7 +25,6 @@ obj-$(CONFIG_DVB_CX22702) += cx22702.o obj-$(CONFIG_DVB_TDA80XX) += tda80xx.o obj-$(CONFIG_DVB_TDA10021) += tda10021.o obj-$(CONFIG_DVB_STV0297) += stv0297.o -obj-$(CONFIG_DVB_NXT2002) += nxt2002.o obj-$(CONFIG_DVB_NXT200X) += nxt200x.o obj-$(CONFIG_DVB_OR51211) += or51211.o obj-$(CONFIG_DVB_OR51132) += or51132.o
drivers/media/dvb/frontends/dvb-pll.c +0 -0
drivers/media/dvb/frontends/dvb-pll.c +1 -1
@@ -326,7 +326,7 @@ struct dvb_pll_desc dvb_pll_tuv1236d = { };EXPORT_SYMBOL (dvb_pll_tuv1236d); -/* Samsung TBMV30111IN +/* Samsung TBMV30111IN / TBMV30712IN1 * used in Air2PC ATSC - 2nd generation (nxt2002) */ struct dvb_pll_desc dvb_pll_tbmv30111in = {
drivers/media/dvb/frontends/nxt2002.c +0 -0
drivers/media/dvb/frontends/nxt2002.c deleted +0 -706
706 lines not on this page · raw message
drivers/media/dvb/frontends/nxt2002.h +0 -0
drivers/media/dvb/frontends/nxt2002.h deleted +0 -23
@@ -1,23 +0,0 @@ -/* -Driver for the Nxt2002 demodulator -*/ - -#ifndef NXT2002_H -#define NXT2002_H - -#include <linux/dvb/frontend.h> -#include <linux/firmware.h> - -struct nxt2002_config -{ -/* the demodulator's i2c address */ -u8 demod_address; - -/* request firmware for device */ -int (*request_firmware)(struct dvb_frontend * fe,const struct firmware **fw,char * name); -}; - -extern struct dvb_frontend *nxt2002_attach (const struct nxt2002_config * config, -struct i2c_adapter * i2c); - -#endif // NXT2002_H
drivers/media/dvb/frontends/nxt200x.c +0 -0
drivers/media/dvb/frontends/nxt200x.c +50 -8
95 lines not on this page · raw message
PATCH 16/141 V4L/DVB (3414): rename dvb_pll_tbmv30111in to dvb_pll_samsung_tbmv
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1138043467 -0200
- rename dvb_pll_tbmv30111in to dvb_pll_samsung_tbmv
---
drivers/media/dvb/b2c2/flexcop-fe-tuner.c +0 -0
drivers/media/dvb/b2c2/flexcop-fe-tuner.c +1 -1
@@ -346,7 +346,7 @@ static struct lgdt330x_config air2pc_atsstatic struct nxt200x_config samsung_tbmv_config = { .demod_address =0x0a , .pll_address =0xc2 , - .pll_desc = &dvb_pll_tbmv30111in, + .pll_desc = &dvb_pll_samsung_tbmv, };static struct bcm3510_config air2pc_atsc_first_gen_config = {
drivers/media/dvb/frontends/dvb-pll.c +0 -0
drivers/media/dvb/frontends/dvb-pll.c +3 -3
@@ -329,8 +329,8 @@ EXPORT_SYMBOL(dvb_pll_tuv1236d);/* Samsung TBMV30111IN / TBMV30712IN1 * used in Air2PC ATSC - 2nd generation (nxt2002) */ -struct dvb_pll_desc dvb_pll_tbmv30111in = { - .name ="Samsung TBMV30111IN" , +struct dvb_pll_desc dvb_pll_samsung_tbmv = { + .name ="Samsung TBMV30111IN / TBMV30712IN1" , .min =54000000 , .max =860000000 , .count =6 ,
@@ -343,7 +343,7 @@ struct dvb_pll_desc dvb_pll_tbmv30111in { 999999999, 44000000, 166666, 0xfc, 0x02 }, } }; -EXPORT_SYMBOL (dvb_pll_tbmv30111in); +EXPORT_SYMBOL (dvb_pll_samsung_tbmv);/* * Philips SD1878 Tuner.
drivers/media/dvb/frontends/dvb-pll.h +0 -0
drivers/media/dvb/frontends/dvb-pll.h +1 -1
@@ -38,7 +38,7 @@ extern struct dvb_pll_desc dvb_pll_tded4extern struct dvb_pll_desc dvb_pll_tuv1236d;extern struct dvb_pll_desc dvb_pll_tdhu2; -extern struct dvb_pll_desc dvb_pll_tbmv30111in; +extern struct dvb_pll_desc dvb_pll_samsung_tbmv;extern struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261; int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
PATCH 17/141 V4L/DVB (3416): Recognise Hauppauge card #34519
In reply to [email protected]From: Ian Pickworth <[email protected]>
Date: 1138043467 -0200
- Recognise Hauppauge card #34519
---
drivers/media/video/cx88/cx88-cards.c +0 -0
drivers/media/video/cx88/cx88-cards.c +1 -0
@@ -1298,6 +1298,7 @@ static void hauppauge_eeprom(struct cx88switch (tv.model) {case 28552 :/* WinTV-PVR 'Roslyn' (No IR) */ +case 34519 :/* WinTV-PCI-FM */ case 90002 :/* Nova-T-PCI (9002) */ case 92001 :/* Nova-S-Plus (Video and IR) */ case 92002 :/* Nova-S-Plus (Video and IR) */
PATCH 18/141 V4L/DVB (3417): make VP-3054 Secondary I2C Bus Support a Kconfig option.
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1138043467 -0200
- make VP-3054 Secondary I2C Bus Support a Kconfig option.
---
drivers/media/video/cx88/Kconfig +0 -0
drivers/media/video/cx88/Kconfig +11 -0
@@ -49,6 +49,7 @@ config VIDEO_CX88_DVB_ALL_FRONTENDS default y depends on VIDEO_CX88_DVB select DVB_MT352 + select VIDEO_CX88_VP3054 select DVB_OR51132 select DVB_CX22702 select DVB_LGDT330X
@@ -70,6 +71,16 @@ config VIDEO_CX88_DVB_MT352 This adds DVB-T support for cards based on the Connexant 2388x chip and the MT352 demodulator. +config VIDEO_CX88_VP3054 + tristate "VP-3054 Secondary I2C Bus Support" + default m + depends on DVB_MT352 + ---help--- + This adds DVB-T support for cards based on the + Connexant 2388x chip and the MT352 demodulator, + which also require support for the VP-3054 + Secondary I2C bus, such at DNTV Live! DVB-T Pro. + config VIDEO_CX88_DVB_OR51132 bool "OR51132 ATSC Support" default y
drivers/media/video/cx88/Makefile +0 -0
drivers/media/video/cx88/Makefile +1 -1
@@ -18,6 +18,6 @@ extra-cflags-$(CONFIG_DVB_LGDT330X) += extra-cflags-$(CONFIG_DVB_MT352) += -DHAVE_MT352=1 extra-cflags-$(CONFIG_DVB_NXT200X) += -DHAVE_NXT200X=1 extra-cflags-$(CONFIG_DVB_CX24123) += -DHAVE_CX24123=1 -extra-cflags-$(CONFIG_VIDEO_CX88_DVB)+= -DHAVE_VP3054_I2C=1 +extra-cflags-$(CONFIG_VIDEO_CX88_VP3054)+= -DHAVE_VP3054_I2C=1 EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
PATCH 19/141 V4L/DVB (3418): Cause tda9887 to use I2C_DRIVERID_TDA9887
In reply to [email protected]From: Mike Isely <[email protected]>
Date: 1138043467 -0200
- The tda9887 has an I2C id reserved for it, but it hasn't been using it. Probably an oversight. Fixed with this patch.
---
drivers/media/video/tda9887.c +0 -0
drivers/media/video/tda9887.c +1 -1
@@ -876,7 +876,7 @@ static int tda9887_resume(struct device/* ----------------------------------------------------------------------- */ static struct i2c_driver driver = { - .id =-1 ,/* FIXME */ + .id =I2C_DRIVERID_TDA9887 , .attach_adapter = tda9887_probe, .detach_client = tda9887_detach, .command = tda9887_command,
PATCH 20/141 V4L/DVB (3419): added some VBI macros and moved minor definitions to header file
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1138043467 -0200
- Moved some hardcoded minor numbers to videodev2.h
- Included more comments for sliced VBI standards
- Included some VBI macros to group similar standards
---
drivers/media/video/videodev.c +0 -0
drivers/media/video/videodev.c +8 -8
@@ -279,23 +279,23 @@ int video_register_device(struct video_dswitch (type) {case VFL_TYPE_GRABBER : - base=0 ; - end=64 ; + base=MINOR_VFL_TYPE_GRABBER_MIN ; + end=MINOR_VFL_TYPE_GRABBER_MAX +1 ; name_base ="video" ;break ;case VFL_TYPE_VTX : - base=192 ; - end=224 ; + base=MINOR_VFL_TYPE_VTX_MIN ; + end=MINOR_VFL_TYPE_VTX_MAX +1 ; name_base ="vtx" ;break ;case VFL_TYPE_VBI : - base=224 ; - end=256 ; + base=MINOR_VFL_TYPE_VBI_MIN ; + end=MINOR_VFL_TYPE_VBI_MAX +1 ; name_base ="vbi" ;break ;case VFL_TYPE_RADIO : - base=64 ; - end=128 ; + base=MINOR_VFL_TYPE_RADIO_MIN ; + end=MINOR_VFL_TYPE_RADIO_MAX +1 ; name_base ="radio" ;break ;default :
include/linux/videodev2.h +0 -0
include/linux/videodev2.h +33 -5
@@ -21,7 +21,7 @@#include <linux/compiler.h> /* need __user */ -#define OBSOLETE_OWNER 1/* It will be removed for 2.6.15 */ +#define OBSOLETE_OWNER 1/* It will be removed for 2.6.17 */ #define HAVE_V4L2 1/*
@@ -48,6 +48,16 @@#ifdef __KERNEL__ +/* Minor device allocation */ +#define MINOR_VFL_TYPE_GRABBER_MIN 0 +#define MINOR_VFL_TYPE_GRABBER_MAX 63 +#define MINOR_VFL_TYPE_RADIO_MIN 64 +#define MINOR_VFL_TYPE_RADIO_MAX 127 +#define MINOR_VFL_TYPE_VTX_MIN 192 +#define MINOR_VFL_TYPE_VTX_MAX 223 +#define MINOR_VFL_TYPE_VBI_MIN 224 +#define MINOR_VFL_TYPE_VBI_MAX 255 +#define VFL_TYPE_GRABBER 0#define VFL_TYPE_VBI 1#define VFL_TYPE_RADIO 2
@@ -949,13 +959,15 @@ struct v4l2_sliced_vbi_format__u32 reserved[2 ];/* must be zero */ }; -/* Teletext WST, defined on ITU-R BT.653-2 */ +/* Teletext World System Teletext +(WST), defined on ITU-R BT.653-2 */ #define V4L2_SLICED_TELETEXT_PAL_B (0x000001)#define V4L2_SLICED_TELETEXT_PAL_C (0x000002)#define V4L2_SLICED_TELETEXT_NTSC_B (0x000010)#define V4L2_SLICED_TELETEXT_SECAM (0x000020) -/* Teletext NABTS, defined on ITU-R BT.653-2 */ +/* Teletext North American Broadcast Teletext Specification +(NABTS), defined on ITU-R BT.653-2 */ #define V4L2_SLICED_TELETEXT_NTSC_C (0x000040)#define V4L2_SLICED_TELETEXT_NTSC_D (0x000080)
@@ -976,8 +988,24 @@ struct v4l2_sliced_vbi_format#define V4l2_SLICED_VITC_625 (0x010000)#define V4l2_SLICED_VITC_525 (0x020000) -/* Compat macro - Should be removed for 2.6.18 */ -#define V4L2_SLICED_TELETEXT_B V4L2_SLICED_TELETEXT_PAL_B +#define V4L2_SLICED_TELETEXT_B (V4L2_SLICED_TELETEXT_PAL_B |\ + V4L2_SLICED_TELETEXT_NTSC_B) + +#define V4L2_SLICED_TELETEXT (V4L2_SLICED_TELETEXT_PAL_B |\ + V4L2_SLICED_TELETEXT_PAL_C |\ + V4L2_SLICED_TELETEXT_SECAM |\ + V4L2_SLICED_TELETEXT_NTSC_B |\ + V4L2_SLICED_TELETEXT_NTSC_C |\ + V4L2_SLICED_TELETEXT_NTSC_D) + +#define V4L2_SLICED_CAPTION (V4L2_SLICED_CAPTION_525 |\ + V4L2_SLICED_CAPTION_625) + +#define V4L2_SLICED_WSS (V4L2_SLICED_WSS_525 |\ + V4L2_SLICED_WSS_625) + +#define V4L2_SLICED_VITC (V4L2_SLICED_VITC_525 |\ + V4L2_SLICED_VITC_625)#define V4L2_SLICED_VBI_525 (V4L2_SLICED_TELETEXT_NTSC_B |\ V4L2_SLICED_TELETEXT_NTSC_C |\
PATCH 21/141 V4L/DVB (3420): Added iocls to configure VBI on tvp5150
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1138043468 -0200
- Added iocls to configure VBI on tvp5150
---
drivers/media/video/tvp5150.c +0 -0
drivers/media/video/tvp5150.c +68 -2
103 lines not on this page · raw message
include/media/v4l2-common.h +0 -0
include/media/v4l2-common.h +2 -1
@@ -160,7 +160,8 @@ struct msp_matrix {/* Used to generate VBI signals on a video signal. v4l2_sliced_vbi_data is filled with the data packets that should be output. Note that if you set -the line field to 0, then that VBI signal is disabled. */ +the line field to 0, then that VBI signal is disabled. If no +valid VBI data was found, then the type field is set to 0 on return. */ #define VIDIOC_INT_S_VBI_DATA _IOW ('d', 105, struct v4l2_sliced_vbi_data)/* Used to obtain the sliced VBI packet from a readback register. Not all
PATCH 22/141 V4L/DVB (3421): Several fixes to prepare for VBI
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1138043468 -0200
- Fixed VBI compilation.
- Included capacity to specify vbi and video number.
- Added a better control for using more than one em28xx device.
- VIDIOC_G_FMT now calls a function.
---
drivers/media/video/em28xx/em28xx-video.c +0 -0
drivers/media/video/em28xx/em28xx-video.c +180 -76
473 lines not on this page · raw message
drivers/media/video/em28xx/em28xx.h +0 -0
drivers/media/video/em28xx/em28xx.h +1 -0
@@ -209,6 +209,7 @@ struct em28xx {/* generic device properties */ char name[30 ];/* name (including minor) of the device */ int model;/* index in the device_data struct */ +int devno;/* marks the number of this device */ unsigned int is_em2800;int video_inputs;/* number of video inputs */ struct list_head devlist;
PATCH 23/141 V4L/DVB (3422): Implemented VIDIOC_G_FMT/S_FMT for sliced VBI
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1138043468 -0200
- Implemented VIDIOC_G_FMT/S_FMT for sliced VBI
- VIDIOC_S_FMT now calls a function
---
drivers/media/video/em28xx/em28xx-video.c +0 -0
drivers/media/video/em28xx/em28xx-video.c +155 -153
343 lines not on this page · raw message
PATCH 24/141 V4L/DVB (3423): CodingStyle fixes.
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1138043469 -0200
- CodingStyle fixes.
---
drivers/media/video/em28xx/em28xx-video.c +0 -0
drivers/media/video/em28xx/em28xx-video.c +427 -442
1,008 lines not on this page · raw message
PATCH 25/141 V4L/DVB (3427): audmode and rxsubchans fixes (VIDIOC_G/S_TUNER)
In reply to [email protected]From: Hans Verkuil <[email protected]>
Date: 1138043469 -0200
- Audmode and rxsubchans fixes in msp3400, tuner, tvaudio and cx25840.
- msp3400 cleanups
---
drivers/media/video/cx25840/cx25840-core.c +0 -0
drivers/media/video/cx25840/cx25840-core.c +26 -20
89 lines not on this page · raw message
drivers/media/video/cx25840/cx25840.h +0 -0
drivers/media/video/cx25840/cx25840.h +1 -0
@@ -78,6 +78,7 @@ struct cx25840_state {enum cx25840_video_input vid_input;enum cx25840_audio_input aud_input;u32 audclk_freq; +int audmode; };/* ----------------------------------------------------------------------- */
drivers/media/video/msp3400-driver.c +0 -0
drivers/media/video/msp3400-driver.c +15 -44
133 lines not on this page · raw message
drivers/media/video/msp3400-kthreads.c +0 -0
drivers/media/video/msp3400-kthreads.c +163 -167
674 lines not on this page · raw message
drivers/media/video/msp3400.h +0 -0
drivers/media/video/msp3400.h +5 -6
@@ -104,14 +104,13 @@ int msp_sleep(struct msp_state *state, i/* msp3400-kthreads.c */ const char *msp_standard_std_name (int std); -void msp3400c_setcarrier (struct i2c_client *client,int cdo1,int cdo2); -void msp3400c_setmode (struct i2c_client *client,int type); -void msp3400c_setstereo (struct i2c_client *client,int mode); -int autodetect_stereo (struct i2c_client *client); +void msp_set_source (struct i2c_client *client,u16 src); +void msp_set_audmode (struct i2c_client *client); +void msp_detect_stereo (struct i2c_client *client);int msp3400c_thread (void *data);int msp3410d_thread (void *data);int msp34xxg_thread (void *data); -void msp34xxg_detect_stereo (struct i2c_client *client); -void msp34xxg_set_audmode (struct i2c_client *client,int audmode); +void msp3400c_set_mode (struct i2c_client *client,int mode); +void msp3400c_set_carrier (struct i2c_client *client,int cdo1,int cdo2);#endif /* MSP3400_H */
drivers/media/video/tuner-core.c +0 -0
drivers/media/video/tuner-core.c +33 -35
91 lines not on this page · raw message
drivers/media/video/tvaudio.c +0 -0
drivers/media/video/tvaudio.c +12 -14
@@ -130,6 +130,7 @@ struct CHIPSTATE {struct timer_list wt;int done;int watch_stereo; +int audmode; };/* ---------------------------------------------------------------------- */
@@ -1514,6 +1515,7 @@ static int chip_attach(struct i2c_adapte chip->type = desc-chiplist; chip->shadow.count = desc->registers+1 ; chip->prevmode =-1 ; + chip->audmode =V4L2_TUNER_MODE_LANG1 ;/* register */ i2c_attach_client (&chip->c);
@@ -1671,6 +1673,8 @@ static int chip_command(struct i2c_clienstruct v4l2_tuner *vt = arg;int mode =0 ; +if (chip->radio) +break ;switch (vt->audmode) {case V4L2_TUNER_MODE_MONO : mode =VIDEO_SOUND_MONO ;
@@ -1685,8 +1689,9 @@ static int chip_command(struct i2c_clien mode =VIDEO_SOUND_LANG2 ;break ;default : -break ; +return -EINVAL ; } + chip->audmode = vt->audmode;if (desc->setmode && mode) { chip->watch_stereo =0 ;
@@ -1704,7 +1709,7 @@ static int chip_command(struct i2c_clienif (chip->radio)break ; - vt->audmode =0 ; + vt->audmode = chip->audmode; vt->rxsubchans =0 ; vt->capability =V4L2_TUNER_CAP_STEREO |V4L2_TUNER_CAP_LANG1 |V4L2_TUNER_CAP_LANG2 ;
@@ -1716,19 +1721,12 @@ static int chip_command(struct i2c_clien vt->rxsubchans |=V4L2_TUNER_SUB_MONO ;if (mode &VIDEO_SOUND_STEREO ) vt->rxsubchans |=V4L2_TUNER_SUB_STEREO ; +/* Note: for SAP it should be mono/lang2 or stereo/lang2. +When this module is converted fully to v4l2, then this +should change for those chips that can detect SAP. */ if (mode &VIDEO_SOUND_LANG1 ) - vt->rxsubchans |=V4L2_TUNER_SUB_LANG1 | -V4L2_TUNER_SUB_LANG2 ; - - mode = chip->mode; -if (mode &VIDEO_SOUND_MONO ) - vt->audmode =V4L2_TUNER_MODE_MONO ; -if (mode &VIDEO_SOUND_STEREO ) - vt->audmode =V4L2_TUNER_MODE_STEREO ; -if (mode &VIDEO_SOUND_LANG1 ) - vt->audmode =V4L2_TUNER_MODE_LANG1 ; -if (mode &VIDEO_SOUND_LANG2 ) - vt->audmode =V4L2_TUNER_MODE_LANG2 ; + vt->rxsubchans =V4L2_TUNER_SUB_LANG1 | +V4L2_TUNER_SUB_LANG2 ;break ; }
PATCH 26/141 V4L/DVB (3428): drivers/media/dvb/ possible cleanups
In reply to [email protected]From: Adrian Bunk <[email protected]>
Date: 1138043469 -0200
- Make needlessly global code static
- #if 0 the following unused global functions:
- b2c2/flexcop-dma.c: flexcop_dma_control_packet_irq()
- b2c2/flexcop-dma.c: flexcop_dma_config_packet_count()
---
drivers/media/dvb/b2c2/flexcop-common.h +0 -0
drivers/media/dvb/b2c2/flexcop-common.h +0 -2
@@ -116,11 +116,9 @@ void flexcop_dma_free(struct flexcop_dmaint flexcop_dma_control_timer_irq (struct flexcop_device *fc,flexcop_dma_index_t no,int onoff);int flexcop_dma_control_size_irq (struct flexcop_device *fc,flexcop_dma_index_t no,int onoff); -int flexcop_dma_control_packet_irq (struct flexcop_device *fc,flexcop_dma_index_t no,int onoff);int flexcop_dma_config (struct flexcop_device *fc,struct flexcop_dma *dma,flexcop_dma_index_t dma_idx);int flexcop_dma_xfer_control (struct flexcop_device *fc,flexcop_dma_index_t dma_idx,flexcop_dma_addr_index_t index,int onoff);int flexcop_dma_config_timer (struct flexcop_device *fc,flexcop_dma_index_t dma_idx,u8 cycles); -int flexcop_dma_config_packet_count (struct flexcop_device *fc,flexcop_dma_index_t dma_idx,u8 packets);/* from flexcop-eeprom.c */ /* the PCI part uses this call to get the MAC address, the USB part has its own */
drivers/media/dvb/b2c2/flexcop-dma.c +0 -0
drivers/media/dvb/b2c2/flexcop-dma.c +0 -35
@@ -169,38 +169,3 @@ int flexcop_dma_config_timer(struct flex }EXPORT_SYMBOL (flexcop_dma_config_timer); -/* packet IRQ does not exist in FCII or FCIIb - according to data book and tests */ -int flexcop_dma_control_packet_irq (struct flexcop_device *fc, -flexcop_dma_index_t no, -int onoff) -{ -flexcop_ibi_value v = fc->read_ibi_reg (fc,ctrl_208); - -deb_rdump ("reg: %03x: %x\n" ,ctrl_208,v.raw); -if (no &FC_DMA_1 ) - v.ctrl_208.DMA1_Size_IRQ_Enable_sig = onoff; - -if (no &FC_DMA_2 ) - v.ctrl_208.DMA2_Size_IRQ_Enable_sig = onoff; - - fc->write_ibi_reg (fc,ctrl_208,v); -deb_rdump ("reg: %03x: %x\n" ,ctrl_208,v.raw); - -return 0 ; -} -EXPORT_SYMBOL (flexcop_dma_control_packet_irq); - -int flexcop_dma_config_packet_count (struct flexcop_device *fc, -flexcop_dma_index_t dma_idx, -u8 packets) -{ -flexcop_ibi_register r = (dma_idx &FC_DMA_1 ) ? dma1_004 : dma2_014; -flexcop_ibi_value v = fc->read_ibi_reg (fc,r); - -flexcop_dma_remap (fc,dma_idx,1 ); - - v.dma_0x4_remap.DMA_maxpackets = packets; - fc->write_ibi_reg (fc,r,v); -return 0 ; -} -EXPORT_SYMBOL (flexcop_dma_config_packet_count);
drivers/media/dvb/b2c2/flexcop-misc.c +0 -0
drivers/media/dvb/b2c2/flexcop-misc.c +3 -3
@@ -36,14 +36,14 @@ void flexcop_determine_revision(struct f/* bus parts have to decide if hw pid filtering is used or not. */ } -const char *flexcop_revision_names[] = { +static const char *flexcop_revision_names[] = {"Unkown chip" ,"FlexCopII" ,"FlexCopIIb" ,"FlexCopIII" , }; -const char *flexcop_device_names[] = { +static const char *flexcop_device_names[] = {"Unkown device" ,"Air2PC/AirStar 2 DVB-T" ,"Air2PC/AirStar 2 ATSC 1st generation" ,
@@ -54,7 +54,7 @@ const char *flexcop_device_names[] = { "Air2PC/AirStar 2 ATSC 3rd generation (HD5000)", }; -const char *flexcop_bus_names[] = { +static const char *flexcop_bus_names[] = {"USB" ,"PCI" , };
drivers/media/dvb/b2c2/flexcop-reg.h +0 -0
drivers/media/dvb/b2c2/flexcop-reg.h +0 -4
@@ -16,8 +16,6 @@ typedef enum {FLEXCOP_III , } flexcop_revision_t; -extern const char *flexcop_revision_names[]; - typedef enum { FC_UNK = 0, FC_AIR_DVB,
@@ -34,8 +32,6 @@ typedef enum {FC_PCI , } flexcop_bus_t; -extern const char *flexcop_device_names[]; -/* FlexCop IBI Registers */ #if defined(__LITTLE_ENDIAN)#include "flexcop_ibi_value_le.h"
drivers/media/dvb/dvb-usb/cxusb.c +0 -0
drivers/media/dvb/dvb-usb/cxusb.c +4 -4
@@ -184,7 +184,7 @@ static int cxusb_rc_query(struct dvb_usbreturn 0 ; } -struct dvb_usb_rc_key dvico_mce_rc_keys[] = { +static struct dvb_usb_rc_key dvico_mce_rc_keys[] = { {0xfe ,0x02 ,KEY_TV }, {0xfe ,0x0e ,KEY_MP3 }, {0xfe ,0x1a ,KEY_DVD },
@@ -273,7 +273,7 @@ static int cxusb_mt352_demod_init(structreturn 0 ; } -struct cx22702_config cxusb_cx22702_config = { +static struct cx22702_config cxusb_cx22702_config = { .demod_address =0x63 , .output_mode =CX22702_PARALLEL_OUTPUT ,
@@ -282,13 +282,13 @@ struct cx22702_config cxusb_cx22702_conf .pll_set = dvb_usb_pll_set_i2c, }; -struct lgdt330x_config cxusb_lgdt330x_config = { +static struct lgdt330x_config cxusb_lgdt330x_config = { .demod_address =0x0e , .demod_chip =LGDT3303 , .pll_set = dvb_usb_pll_set_i2c, }; -struct mt352_config cxusb_dee1601_config = { +static struct mt352_config cxusb_dee1601_config = { .demod_address =0x0f , .demod_init = cxusb_dee1601_demod_init, .pll_set = dvb_usb_pll_set,
drivers/media/dvb/dvb-usb/dvb-usb-firmware.c +0 -0
drivers/media/dvb/dvb-usb/dvb-usb-firmware.c +5 -3
@@ -24,6 +24,9 @@ static struct usb_cypress_controller cyp { .id = CYPRESS_FX2, .name = "Cypress FX2", .cpu_cs_register = 0xe600 }, }; +static int dvb_usb_get_hexline (const struct firmware *fw,struct hexline *hx, +int *pos); +/* * load a firmware packet to the device */
@@ -112,7 +115,8 @@ int dvb_usb_download_firmware(struct usbreturn ret; } -int dvb_usb_get_hexline (const struct firmware *fw,struct hexline *hx,int *pos) +static int dvb_usb_get_hexline (const struct firmware *fw,struct hexline *hx, +int *pos) {u8 *b = (u8 *) &fw->data[*pos];int data_offs =4 ;
@@ -142,5 +146,3 @@ int dvb_usb_get_hexline(const struct firreturn *pos; } -EXPORT_SYMBOL (dvb_usb_get_hexline); -
drivers/media/dvb/dvb-usb/dvb-usb.h +0 -0
drivers/media/dvb/dvb-usb/dvb-usb.h +0 -1
@@ -341,7 +341,6 @@ struct hexline {u8 data[255 ]; u8 chk; }; -extern int dvb_usb_get_hexline (const struct firmware *,struct hexline *,int *);extern int usb_cypress_load_firmware (struct usb_device *udev,const struct firmware *fw,int type);#endif
drivers/media/dvb/dvb-usb/vp702x.c +0 -0
drivers/media/dvb/dvb-usb/vp702x.c +4 -2
@@ -53,7 +53,8 @@ int vp702x_usb_in_op(struct dvb_usb_devireturn ret; } -int vp702x_usb_out_op (struct dvb_usb_device *d,u8 req,u16 value,u16 index,u8 *b,int blen) +static int vp702x_usb_out_op (struct dvb_usb_device *d,u8 req,u16 value, +u16 index,u8 *b,int blen) {deb_xfer ("out: req. %x, val: %x, ind: %x, buffer: " ,req,value,index);debug_dump (b,blen,deb_xfer);
@@ -88,7 +89,8 @@ unlock:return ret; } -int vp702x_usb_inout_cmd (struct dvb_usb_device *d,u8 cmd,u8 *o,int olen,u8 *i,int ilen,int msec) +static int vp702x_usb_inout_cmd (struct dvb_usb_device *d,u8 cmd,u8 *o, +int olen,u8 *i,int ilen,int msec) {u8 bout[olen+2 ];u8 bin[ilen+1 ];
drivers/media/dvb/dvb-usb/vp702x.h +0 -0
drivers/media/dvb/dvb-usb/vp702x.h +0 -2
@@ -101,8 +101,6 @@ extern int dvb_usb_vp702x_debug;extern struct dvb_frontend *vp702x_fe_attach (struct dvb_usb_device *d);extern int vp702x_usb_inout_op (struct dvb_usb_device *d,u8 *o,int olen,u8 *i,int ilen,int msec); -extern int vp702x_usb_inout_cmd (struct dvb_usb_device *d,u8 cmd,u8 *o,int olen,u8 *i,int ilen,int msec);extern int vp702x_usb_in_op (struct dvb_usb_device *d,u8 req,u16 value,u16 index,u8 *b,int blen); -extern int vp702x_usb_out_op (struct dvb_usb_device *d,u8 req,u16 value,u16 index,u8 *b,int blen);#endif
drivers/media/dvb/ttpci/av7110.h +0 -0
drivers/media/dvb/ttpci/av7110.h +0 -2
@@ -273,8 +273,6 @@ struct av7110 {extern int ChangePIDs (struct av7110 *av7110,u16 vpid,u16 apid,u16 ttpid,u16 subpid,u16 pcrpid); -extern int av7110_setup_irc_config (struct av7110 *av7110,u32 ir_config); -extern int av7110_ir_init (struct av7110 *av7110);extern void av7110_ir_exit (struct av7110 *av7110);
drivers/media/dvb/ttpci/av7110_ir.c +0 -0
drivers/media/dvb/ttpci/av7110_ir.c +13 -13
@@ -155,6 +155,19 @@ static void input_repeat_key(unsigned lo } +static int av7110_setup_irc_config (struct av7110 *av7110,u32 ir_config) +{ +int ret =0 ; + +dprintk (4 ,"%p\n" , av7110); +if (av7110) { + ret =av7110_fw_cmd (av7110,COMTYPE_PIDFILTER , SetIR,1 , ir_config); + av7110->ir_config = ir_config; + } +return ret; +} + +static int av7110_ir_write_proc (struct file *file,const char __user *buffer,unsigned long count,void *data) {
@@ -187,19 +200,6 @@ static int av7110_ir_write_proc(struct f } -int av7110_setup_irc_config (struct av7110 *av7110,u32 ir_config) -{ -int ret =0 ; - -dprintk (4 ,"%p\n" , av7110); -if (av7110) { - ret =av7110_fw_cmd (av7110,COMTYPE_PIDFILTER , SetIR,1 , ir_config); - av7110->ir_config = ir_config; - } -return ret; -} - -static void ir_handler (struct av7110 *av7110,u32 ircom) {dprintk (4 ,"ircommand = %08x\n" , ircom);
PATCH 27/141 V4L/DVB (3429): Missing break statement on tuner-core
In reply to [email protected]From: Markus Rechberger <[email protected]>
Date: 1138043469 -0200
- default_tuner_init was called twice due to a missing break statement.
---
drivers/media/video/tuner-core.c +0 -0
drivers/media/video/tuner-core.c +1 -0
@@ -216,6 +216,7 @@ static void set_type(struct i2c_client * buffer[3 ] =0xa4 ;i2c_master_send (c,buffer,4 );default_tuner_init (c); +break ;default :default_tuner_init (c);break ;
PATCH 28/141 V4L/DVB (3430): Add new internal VIDIOC_INT commands
In reply to [email protected]From: Hans Verkuil <[email protected]>
Date: 1138043470 -0200
- Add new internal VIDIOC_INT commands for setting the tuner mode, for putting a chip into standby mode and to set/get the routing of inputs/outputs of audio or video of a chip. These new commands will replace older commands that are no longer up to the task.
---
include/media/v4l2-common.h +0 -0
include/media/v4l2-common.h +44 -7
72 lines not on this page · raw message
PATCH 29/141 V4L/DVB (3431): fixed spelling error, exectuted --> executed.
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1138043470 -0200
- fixed spelling error, exectuted --> executed.
---
drivers/media/video/em28xx/em28xx-core.c +0 -0
drivers/media/video/em28xx/em28xx-core.c +1 -1
@@ -253,7 +253,7 @@ int em28xx_write_ac97(struct em28xx *devif ((ret =em28xx_read_reg (dev,AC97BUSY_REG )) <0 )return ret;else if (((u8 ) ret) &0x01 ) { -em28xx_warn ("AC97 command still being exectuted: not handled properly!\n" ); +em28xx_warn ("AC97 command still being executed: not handled properly!\n" ); }return 0 ; }
PATCH 30/141 V4L/DVB (3432): Hauppauge HVR 900 Composite support
In reply to [email protected]From: Markus Rechberger <[email protected]>
Date: 1138043470 -0200
- Hauppauge HVR 900 Composite support
---
drivers/media/video/em28xx/em28xx-cards.c +0 -0
drivers/media/video/em28xx/em28xx-cards.c +53 -14
89 lines not on this page · raw message
drivers/media/video/em28xx/em28xx-video.c +0 -0
drivers/media/video/em28xx/em28xx-video.c +1 -0
@@ -1766,6 +1766,7 @@ static int em28xx_init_dev(struct em28xx dev->vpic.depth =16 ; dev->vpic.palette =VIDEO_PALETTE_YUV422 ; +em28xx_pre_card_setup (dev);#ifdef CONFIG_MODULES /* request some modules */ if (dev->decoder ==EM28XX_SAA7113 || dev->decoder ==EM28XX_SAA7114 )
drivers/media/video/em28xx/em28xx.h +0 -0
drivers/media/video/em28xx/em28xx.h +2 -0
@@ -41,6 +41,7 @@#define EM2800_BOARD_LEADTEK_WINFAST_USBII 7#define EM2800_BOARD_KWORLD_USB2800 8#define EM2820_BOARD_PINNACLE_DVC_90 9 +#define EM2880_BOARD_WINTV_HVR_900 10#define UNSET -1
@@ -327,6 +328,7 @@ int em28xx_set_alternate(struct em28xx */* Provided by em28xx-cards.c */ extern int em2800_variant_detect (struct usb_device * udev,int model); +extern void em28xx_pre_card_setup (struct em28xx *dev);extern void em28xx_card_setup (struct em28xx *dev);extern struct em28xx_board em28xx_boards[];extern struct usb_device_id em28xx_id_table[];
PATCH 31/141 V4L/DVB (3433): Fix printk type warning
In reply to [email protected]From: Randy Dunlap <[email protected]>
Date: 1138043470 -0200
- Fix printk type warning:drivers/media/dvb/b2c2/flexcop-pci.c:164: warning:
format '%08x' expects type 'unsigned int', but argument 4 has type 'dma_addr_t'
---
drivers/media/dvb/b2c2/flexcop-pci.c +0 -0
drivers/media/dvb/b2c2/flexcop-pci.c +4 -2
@@ -161,8 +161,10 @@ static irqreturn_t flexcop_pci_isr(int i fc->read_ibi_reg (fc,dma1_008).dma_0x8.dma_cur_addr <<2 ;u32 cur_pos = cur_addr - fc_pci->dma[0 ].dma_addr0; -deb_irq ("%u irq: %08x cur_addr: %08x: cur_pos: %08x, last_cur_pos: %08x " , -jiffies_to_usecs (jiffies - fc_pci->last_irq),v.raw,cur_addr,cur_pos,fc_pci->last_dma1_cur_pos); +deb_irq ("%u irq: %08x cur_addr: %llx: cur_pos: %08x, last_cur_pos: %08x " , +jiffies_to_usecs (jiffies - fc_pci->last_irq), + v.raw, (unsigned long long )cur_addr, cur_pos, + fc_pci->last_dma1_cur_pos); fc_pci->last_irq = jiffies;/* buffer end was reached, restarted from the beginning
PATCH 32/141 V4L/DVB (3434): changed comment in tuner-core.c
In reply to [email protected]From: Markus Rechberger <[email protected]>
Date: 1138043471 -0200
- changed comment in tuner-core.c
---
drivers/media/video/tuner-core.c +0 -0
drivers/media/video/tuner-core.c +1 -1
@@ -450,7 +450,7 @@ static int tuner_attach(struct i2c_adaptprintk ("%02x " ,buffer[i]);printk ("\n" ); } -/* TEA5767 autodetection code - only for addr = 0xc0 */ +/* autodetection code based on the i2c addr */ if (!no_autodetect) {switch (addr) {case 0x42 :
PATCH 33/141 V4L/DVB (3435): rename cb variable names in tuner structures for global consistency
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1138043471 -0200
- rename cb variable names in tuner structures for global consistency
---
drivers/media/dvb/frontends/dvb-pll.c +0 -0
drivers/media/dvb/frontends/dvb-pll.c +2 -2
@@ -391,8 +391,8 @@ int dvb_pll_configure(struct dvb_pll_des div = (freq + desc->entries[i].offset) / desc->entries[i].stepsize; buf[0 ] = div >>8 ; buf[1 ] = div &0xff ; - buf[2 ] = desc->entries[i].cb1; - buf[3 ] = desc->entries[i].cb2; + buf[2 ] = desc->entries[i].config; + buf[3 ] = desc->entries[i].cb;if (desc->setbw) desc->setbw (buf, freq, bandwidth);
drivers/media/dvb/frontends/dvb-pll.h +0 -0
drivers/media/dvb/frontends/dvb-pll.h +2 -2
@@ -15,8 +15,8 @@ struct dvb_pll_desc {u32 limit;u32 offset;u32 stepsize; -u8 cb1; -u8 cb2; +u8 config; +u8 cb; } entries[12 ]; };
drivers/media/video/tuner-simple.c +0 -0
drivers/media/video/tuner-simple.c +20 -20
@@ -133,7 +133,7 @@ static int tuner_stereo(struct i2c_clienstatic void default_set_tv_freq (struct i2c_client *c,unsigned int freq) {struct tuner *t =i2c_get_clientdata (c); -u8 config, tuneraddr; +u8 cb, tuneraddr;u16 div;struct tunertype *tun;u8 buffer[4 ];
@@ -152,7 +152,7 @@ static void default_set_tv_freq(struct i freq, tun->params[j].ranges[i - 1].limit); freq = tun->params[j].ranges[--i].limit; } - config = tun->params[j].ranges[i].cb; + cb = tun->params[j].ranges[i].cb;/* i == 0 -> VHF_LO */ /* i == 1 -> VHF_HI */ /* i == 2 -> UHF */
@@ -164,40 +164,40 @@ static void default_set_tv_freq(struct i/* 0x01 -> ??? no change ??? */ /* 0x02 -> PAL BDGHI / SECAM L */ /* 0x04 -> ??? PAL others / SECAM others ??? */ - config &= ~0x02 ; + cb &= ~0x02 ;if (t->std &V4L2_STD_SECAM ) - config |=0x02 ; + cb |=0x02 ;break ;case TUNER_TEMIC_4046FM5 : - config &= ~0x0f ; + cb &= ~0x0f ;if (t->std &V4L2_STD_PAL_BG ) { - config |=TEMIC_SET_PAL_BG ; + cb |=TEMIC_SET_PAL_BG ; }else if (t->std &V4L2_STD_PAL_I ) { - config |=TEMIC_SET_PAL_I ; + cb |=TEMIC_SET_PAL_I ; }else if (t->std &V4L2_STD_PAL_DK ) { - config |=TEMIC_SET_PAL_DK ; + cb |=TEMIC_SET_PAL_DK ; }else if (t->std &V4L2_STD_SECAM_L ) { - config |=TEMIC_SET_PAL_L ; + cb |=TEMIC_SET_PAL_L ; }break ;case TUNER_PHILIPS_FQ1216ME : - config &= ~0x0f ; + cb &= ~0x0f ;if (t->std & (V4L2_STD_PAL_BG |V4L2_STD_PAL_DK )) { - config |=PHILIPS_SET_PAL_BGDK ; + cb |=PHILIPS_SET_PAL_BGDK ; }else if (t->std &V4L2_STD_PAL_I ) { - config |=PHILIPS_SET_PAL_I ; + cb |=PHILIPS_SET_PAL_I ; }else if (t->std &V4L2_STD_SECAM_L ) { - config |=PHILIPS_SET_PAL_L ; + cb |=PHILIPS_SET_PAL_L ; }break ;
@@ -207,9 +207,9 @@ static void default_set_tv_freq(struct i/* 0x01 -> ATSC antenna input 2 */ /* 0x02 -> NTSC antenna input 1 */ /* 0x03 -> NTSC antenna input 2 */ - config &= ~0x03 ; + cb &= ~0x03 ;if (!(t->std &V4L2_STD_ATSC )) - config |=2 ; + cb |=2 ;/* FIXME: input */ break ;
@@ -227,9 +227,9 @@ static void default_set_tv_freq(struct i buffer[1 ] =0x00 ; buffer[2 ] =0x17 ; buffer[3 ] =0x00 ; - config &= ~0x40 ; + cb &= ~0x40 ;if (t->std &V4L2_STD_ATSC ) { - config |=0x40 ; + cb |=0x40 ; buffer[1 ] =0x04 ; }/* set to the correct mode (analog or digital) */
@@ -277,14 +277,14 @@ static void default_set_tv_freq(struct iif (tuners[t->type].params->cb_first_if_lower_freq && div < t->last_div) { buffer[0 ] = tun->params[j].config; - buffer[1 ] = config; + buffer[1 ] = cb; buffer[2 ] = (div>>8 ) &0x7f ; buffer[3 ] = div &0xff ; }else { buffer[0 ] = (div>>8 ) &0x7f ; buffer[1 ] = div &0xff ; buffer[2 ] = tun->params[j].config; - buffer[3 ] = config; + buffer[3 ] = cb; } t->last_div = div; tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n",
@@ -316,7 +316,7 @@ static void default_set_tv_freq(struct i buffer[0 ] = (div>>8 ) &0x7f ; buffer[1 ] = div &0xff ; buffer[2 ] = tun->params[j].config; - buffer[3 ] = config; + buffer[3 ] = cb;tuner_dbg ("tv 0x%02x 0x%02x 0x%02x 0x%02x\n" , buffer[0 ],buffer[1 ],buffer[2 ],buffer[3 ]);
PATCH 34/141 V4L/DVB (3436): move config byte from tuner_params to tuner_range struct.
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1138043471 -0200
- Move config byte from tuner_params to tuner_range struct.
- dvb tuners must be able to set different config byte for each range.
---
drivers/media/video/tuner-simple.c +0 -0
drivers/media/video/tuner-simple.c +8 -7
@@ -133,7 +133,7 @@ static int tuner_stereo(struct i2c_clienstatic void default_set_tv_freq (struct i2c_client *c,unsigned int freq) {struct tuner *t =i2c_get_clientdata (c); -u8 cb, tuneraddr; +u8 config, cb, tuneraddr;u16 div;struct tunertype *tun;u8 buffer[4 ];
@@ -152,6 +152,7 @@ static void default_set_tv_freq(struct i freq, tun->params[j].ranges[i - 1].limit); freq = tun->params[j].ranges[--i].limit; } + config = tun->params[j].ranges[i].config; cb = tun->params[j].ranges[i].cb;/* i == 0 -> VHF_LO */ /* i == 1 -> VHF_HI */
@@ -215,7 +216,7 @@ static void default_set_tv_freq(struct icase TUNER_MICROTUNE_4042FI5 :/* Set the charge pump for fast tuning */ - tun->params[j].config |=TUNER_CHARGE_PUMP ; + config |=TUNER_CHARGE_PUMP ;break ;case TUNER_PHILIPS_TUV1236D :
@@ -276,14 +277,14 @@ static void default_set_tv_freq(struct i div);if (tuners[t->type].params->cb_first_if_lower_freq && div < t->last_div) { - buffer[0 ] = tun->params[j].config; + buffer[0 ] = config; buffer[1 ] = cb; buffer[2 ] = (div>>8 ) &0x7f ; buffer[3 ] = div &0xff ; }else { buffer[0 ] = (div>>8 ) &0x7f ; buffer[1 ] = div &0xff ; - buffer[2 ] = tun->params[j].config; + buffer[2 ] = config; buffer[3 ] = cb; } t->last_div = div;
@@ -312,10 +313,10 @@ static void default_set_tv_freq(struct i }/* Set the charge pump for optimized phase noise figure */ - tun->params[j].config &= ~TUNER_CHARGE_PUMP ; + config &= ~TUNER_CHARGE_PUMP ; buffer[0 ] = (div>>8 ) &0x7f ; buffer[1 ] = div &0xff ; - buffer[2 ] = tun->params[j].config; + buffer[2 ] = config; buffer[3 ] = cb;tuner_dbg ("tv 0x%02x 0x%02x 0x%02x 0x%02x\n" , buffer[0 ],buffer[1 ],buffer[2 ],buffer[3 ]);
@@ -337,7 +338,7 @@ static void default_set_radio_freq(struc j =TUNER_PARAM_ANALOG ; div = (20 * freq /16000 ) + (int )(20 *10.7 );/* IF 10.7 MHz */ - buffer[2 ] = (tun->params[j].config & ~TUNER_RATIO_MASK ) |TUNER_RATIO_SELECT_50 ;/* 50 kHz step */ + buffer[2 ] = (tun->params[j].ranges[0 ].config & ~TUNER_RATIO_MASK ) |TUNER_RATIO_SELECT_50 ;/* 50 kHz step */ switch (t->type) {case TUNER_TENA_9533_DI :
drivers/media/video/tuner-types.c +0 -0
drivers/media/video/tuner-types.c +167 -228
1,109 lines not on this page · raw message
include/media/tuner-types.h +0 -0
include/media/tuner-types.h +1 -1
@@ -14,6 +14,7 @@ enum param_type {struct tuner_range {unsigned short limit; +unsigned char config;unsigned char cb; };
@@ -38,7 +39,6 @@ struct tuner_params {* static unless the control byte was sent first. */ unsigned int cb_first_if_lower_freq:1; -unsigned char config;/* to be moved into struct tuner_range for dvb-pll merge */ unsigned int count;struct tuner_range *ranges;
PATCH 35/141 V4L/DVB (3439): removed duplicated tuner_ranges
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1138043471 -0200
- removed duplicated tuner_ranges
---
drivers/media/video/tuner-types.c +0 -0
drivers/media/video/tuner-types.c +31 -91
265 lines not on this page · raw message
PATCH 36/141 V4L/DVB (3439a): media video stradis memory fix
In reply to [email protected]From: Jiri Slaby <[email protected]>
Date: 1138137306 -0800
memset clears once set structure, there is actually no need for memset, because configure function do it for us. Next, vfree(NULL) is legal, so avoid useless labels.
Thanks Dave Jones for reporting this.
---
drivers/media/video/stradis.c +0 -0
drivers/media/video/stradis.c +5 -10
@@ -2012,7 +2012,6 @@ static int __devinit init_saa7146(struct {struct saa7146 *saa =pci_get_drvdata (pdev); -memset (saa,0 ,sizeof (*saa)); saa->user =0 ;/* reset the saa7146 */ saawrite (0xffff0000 ,SAA7146_MC1 );
@@ -2062,16 +2061,16 @@ static int __devinit init_saa7146(struct }if (saa->audbuf ==NULL && (saa->audbuf =vmalloc (65536 )) ==NULL ) {dev_err (&pdev->dev,"%d: malloc failed\n" , saa->nr); - goto errvid; + goto errfree; }if (saa->osdbuf ==NULL && (saa->osdbuf =vmalloc (131072 )) ==NULL ) {dev_err (&pdev->dev,"%d: malloc failed\n" , saa->nr); - goto erraud; + goto errfree; }/* allocate 81920 byte buffer for clipping */ if ((saa->dmavid2 =kzalloc (VIDEO_CLIPMAP_SIZE ,GFP_KERNEL )) ==NULL ) {dev_err (&pdev->dev,"%d: clip kmalloc failed\n" , saa->nr); - goto errosd; + goto errfree; }/* setup clipping registers */ saawrite (virt_to_bus (saa->dmavid2),SAA7146_BASE_EVEN2 );
@@ -2085,15 +2084,11 @@ static int __devinit init_saa7146(structI2CBusScan (saa);return 0 ; -errosd: +errfree:vfree (saa->osdbuf); - saa->osdbuf =NULL ; -erraud:vfree (saa->audbuf); - saa->audbuf =NULL ; -errvid:vfree (saa->vidbuf); - saa->vidbuf =NULL ; + saa->audbuf = saa->osdbuf = saa->vidbuf =NULL ; err:return -ENOMEM ; }
PATCH 37/141 V4L/DVB (3442): Allow tristate build for cx88-vp3054-i2c
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1138257439 -0200
- allow tristate build for cx88-vp3054-i2c
---
drivers/media/video/cx88/Makefile +0 -0
drivers/media/video/cx88/Makefile +2 -1
@@ -4,8 +4,9 @@ cx8800-objs := cx88-video.o cx88-vbi.o cx8802-objs := cx88-mpeg.o obj-$(CONFIG_VIDEO_CX88) += cx88xx.o cx8800.o cx8802.o cx88-blackbird.o -obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o cx88-vp3054-i2c.o +obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o obj-$(CONFIG_VIDEO_CX88_ALSA) += cx88-alsa.o +obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o EXTRA_CFLAGS += -I$(src)/.. EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
PATCH 38/141 V4L/DVB (3453a): Alters MAINTAINERS file to point to newer v4l-dvb email
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1138386722 -0200
- V4L/DVB Maintainers list changed. This patch alters the email to the new address.
# Acked-By: Johannes Stezenbach <[email protected]>
---
MAINTAINERS +0 -0
MAINTAINERS +7 -4
@@ -540,7 +540,8 @@ S: Supported BTTV VIDEO4LINUX DRIVER P: Mauro Carvalho Chehab -M: [email protected] +M: [email protected] +M: [email protected] L: [email protected] W: http://linuxtv.org T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
@@ -836,11 +837,12 @@ S: Maintained DVB SUBSYSTEM AND DRIVERS P: LinuxTV.org Project -M: [email protected] +M: [email protected] +M: [email protected] L: [email protected] (subscription required) W: http://linuxtv.org/ T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git -S: Supported +S: Maintained EATA-DMA SCSI DRIVER P: Michael Neuffer
@@ -2946,7 +2948,8 @@ S: Maintained VIDEO FOR LINUX P: Mauro Carvalho Chehab -M: [email protected] +M: [email protected] +M: [email protected] L: [email protected] W: http://linuxtv.org T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
PATCH 39/141 V4L/DVB (3265): Add count to tunertype struct
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1139224511 -0200
The tuner_params element is an array of undefined length, with each array member being a set of parameters for each video standard type.
The number of members in the tuner_params array will be stored in tuners[]->count
---
drivers/media/video/tuner-types.c +0 -0
drivers/media/video/tuner-types.c +67 -0
359 lines not on this page · raw message
include/media/tuner-types.h +0 -0
include/media/tuner-types.h +1 -0
@@ -46,6 +46,7 @@ struct tuner_params {struct tunertype {char *name; +unsigned int count;struct tuner_params *params; };
PATCH 40/141 V4L/DVB (3266): Fix NICAM buzz on analog sound
In reply to [email protected]From: Marcin Rudowski <[email protected]>
Date: 1139224514 -0200
Apparently, having the number of lines fixed at 4 reduces (or even kills) the buzz found in NICAM stereo with analog sound.
---
drivers/media/video/cx88/cx88-core.c +0 -0
drivers/media/video/cx88/cx88-core.c +6 -4
@@ -787,12 +787,14 @@ static int set_pll(struct cx88_core *corint cx88_start_audio_dma (struct cx88_core *core) { +/* constant 128 made buzz in analog Nicam-stereo for bigger fifo_size */ +int bpl = cx88_sram_channels[SRAM_CH25 ].fifo_size/4 ;/* setup fifo + format */ -cx88_sram_channel_setup (core, &cx88_sram_channels[SRAM_CH25 ],128 ,0 ); -cx88_sram_channel_setup (core, &cx88_sram_channels[SRAM_CH26 ],128 ,0 ); +cx88_sram_channel_setup (core, &cx88_sram_channels[SRAM_CH25 ], bpl,0 ); +cx88_sram_channel_setup (core, &cx88_sram_channels[SRAM_CH26 ], bpl,0 ); -cx_write (MO_AUDD_LNGTH ,128 );/* fifo bpl size */ -cx_write (MO_AUDR_LNGTH ,128 );/* fifo bpl size */ +cx_write (MO_AUDD_LNGTH , bpl);/* fifo bpl size */ +cx_write (MO_AUDR_LNGTH , bpl);/* fifo bpl size */ /* start dma */ cx_write (MO_AUD_DMACNTRL ,0x0003 );/* Up and Down fifo enable */
PATCH 41/141 V4L/DVB (3267): Add support for the Avermedia 777 DVB-T card
In reply to [email protected]From: Jose Alberto Reguero <[email protected]>
Date: 1139300714 -0200
---
Documentation/video4linux/CARDLIST.saa7134 +0 -0
Documentation/video4linux/CARDLIST.saa7134 +1 -0
@@ -83,3 +83,4 @@ 82 -> MSI TV@Anywhere plus [1462:6231] 83 -> Terratec Cinergy 250 PCI TV [153b:1160] 84 -> LifeView FlyDVB Trio [5168:0319] + 85 -> AverTV DVB-T 777 [1461:2c05]
drivers/media/dvb/frontends/dvb-pll.c +0 -0
drivers/media/dvb/frontends/dvb-pll.c +42 -0
48 lines not on this page · raw message
drivers/media/dvb/frontends/dvb-pll.h +0 -0
drivers/media/dvb/frontends/dvb-pll.h +1 -0
@@ -40,6 +40,7 @@ extern struct dvb_pll_desc dvb_pll_tuv12extern struct dvb_pll_desc dvb_pll_tdhu2;extern struct dvb_pll_desc dvb_pll_samsung_tbmv;extern struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261; +extern struct dvb_pll_desc dvb_pll_philips_td1316;int dvb_pll_configure (struct dvb_pll_desc *desc,u8 *buf,u32 freq,int bandwidth);
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +24 -0
@@ -2619,6 +2619,24 @@ struct saa7134_board saa7134_boards[] = .gpio = 0x000000, /* GPIO21=Low for FM radio antenna */ }, }, + [SAA7134_BOARD_AVERMEDIA_777 ] = { + .name ="AverTV DVB-T 777" , + .audio_clock =0x00187de7 , + .tuner_type =TUNER_ABSENT , + .radio_type =UNSET , + .tuner_addr =ADDR_UNSET , + .radio_addr =ADDR_UNSET , + .mpeg =SAA7134_MPEG_DVB , + .inputs = {{ + .name = name_comp1, + .vmux =0 , + .amux =LINE1 , + },{ + .name = name_svideo, + .vmux =8 , + .amux =LINE1 , + }}, + }, };const unsigned int saa7134_bcount =ARRAY_SIZE (saa7134_boards);
@@ -3090,6 +3108,12 @@ struct pci_device_id saa7134_pci_tbl[] = .subdevice = 0x0319, .driver_data = SAA7134_BOARD_FLYDVB_TRIO, },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7134, /* SAA 7131E */ + .subvendor = 0x1461, + .subdevice = 0x2c05, + .driver_data = SAA7134_BOARD_AVERMEDIA_777, + },{/* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
drivers/media/video/saa7134/saa7134-dvb.c +0 -0
drivers/media/video/saa7134/saa7134-dvb.c +40 -1
77 lines not on this page · raw message
drivers/media/video/saa7134/saa7134.h +0 -0
drivers/media/video/saa7134/saa7134.h +1 -0
@@ -210,6 +210,7 @@ struct saa7134_format {#define SAA7134_BOARD_MSI_TVATANYWHERE_PLUS 82#define SAA7134_BOARD_CINERGY250PCI 83#define SAA7134_BOARD_FLYDVB_TRIO 84 +#define SAA7134_BOARD_AVERMEDIA_777 85#define SAA7134_MAXBOARDS 8#define SAA7134_INPUT_MAX 8
PATCH 42/141 V4L/DVB (3268): Move video std detection to top of set_tv_freq function
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1139300733 -0200
- move video std detection to top of set_tv_freq function
- we must detect video std first, so that we can choose the correct tuner_params
---
drivers/media/video/tuner-simple.c +0 -0
drivers/media/video/tuner-simple.c +34 -34
88 lines not on this page · raw message
PATCH 43/141 V4L/DVB (3269): Allow multiple tuner params in each tuner definition
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1139300734 -0200
- allow multiple tuner params in each tuner definition.
- the correct tuner_params element will be chosen based on current video standard.
---
drivers/media/video/tuner-simple.c +0 -0
drivers/media/video/tuner-simple.c +23 -9
@@ -79,14 +79,13 @@ MODULE_PARM_DESC(offset,"Allows to speci#define TUNER_PLL_LOCKED 0x40#define TUNER_STEREO_MK3 0x04 -#define TUNER_PARAM_ANALOG 0/* to be removed */ /* FIXME: * Right now, all tuners are using the first tuner_params[] array element * for analog mode. In the future, we will be merging similar tuner * definitions together, such that each tuner definition will have a * tuner_params struct for each available video standard. At that point, -* TUNER_PARAM_ANALOG will be removed, and the tuner_params[] array -* element will be chosen based on the video standard in use. +* the tuner_params[] array element will be chosen based on the video +* standard in use. * */
@@ -138,9 +137,9 @@ static void default_set_tv_freq(struct istruct tunertype *tun;u8 buffer[4 ];int rc, IFPCoff, i, j; +enum param_type desired_type; tun = &tuners[t->type]; - j =TUNER_PARAM_ANALOG ;/* IFPCoff = Video Intermediate Frequency - Vif: 940 =16*58.75 NTSC/J (Japan)
@@ -155,16 +154,25 @@ static void default_set_tv_freq(struct i*/ if (t->std ==V4L2_STD_NTSC_M_JP ) { - IFPCoff =940 ; + IFPCoff =940 ; + desired_type =TUNER_PARAM_TYPE_NTSC ; }else if ((t->std &V4L2_STD_MN ) && !(t->std & ~V4L2_STD_MN )) { - IFPCoff =732 ; + IFPCoff =732 ; + desired_type =TUNER_PARAM_TYPE_NTSC ; }else if (t->std ==V4L2_STD_SECAM_LC ) { - IFPCoff =543 ; + IFPCoff =543 ; + desired_type =TUNER_PARAM_TYPE_SECAM ; }else { - IFPCoff =623 ; + IFPCoff =623 ; + desired_type =TUNER_PARAM_TYPE_PAL ; } +for (j =0 ; j < tun->count-1 ; j++) { +if (desired_type != tun->params[j].type) +continue ; +break ; + }for (i =0 ; i < tun->params[j].count; i++) {if (freq > tun->params[j].ranges[i].limit)continue ;
@@ -333,9 +341,15 @@ static void default_set_radio_freq(strucu8 buffer[4 ];u16 div;int rc, j; +enum param_type desired_type =TUNER_PARAM_TYPE_RADIO ; tun = &tuners[t->type]; - j =TUNER_PARAM_ANALOG ; + +for (j =0 ; j < tun->count-1 ; j++) { +if (desired_type != tun->params[j].type) +continue ; +break ; + } div = (20 * freq /16000 ) + (int )(20 *10.7 );/* IF 10.7 MHz */ buffer[2 ] = (tun->params[j].ranges[0 ].config & ~TUNER_RATIO_MASK ) |TUNER_RATIO_SELECT_50 ;/* 50 kHz step */
PATCH 44/141 V4L/DVB (3270): Tuner_dbg will show tuner param and range selected
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1139300735 -0200
- tuner_dbg will show tuner param and range selected
---
drivers/media/video/tuner-simple.c +0 -0
drivers/media/video/tuner-simple.c +1 -1
@@ -188,7 +188,7 @@ static void default_set_tv_freq(struct i/* i == 0 -> VHF_LO * i == 1 -> VHF_HI * i == 2 -> UHF */ -tuner_dbg ("tv: range %d\n" ,i); +tuner_dbg ("tv: param %d, range %d\n" ,j,i); div=freq + IFPCoff + offset;
PATCH 45/141 V4L/DVB (3271): Update tuner comments
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1139300736 -0200
Right now, all tuners are using the first tuner_params[] array element for analog mode. We are now ready to begin merging similar tuner definitions together, such that each tuner definition will have a tuner_params struct for each available video standard. The tuner_params[] array element will be chosen based on the video standard in use.
---
drivers/media/video/tuner-simple.c +0 -0
drivers/media/video/tuner-simple.c +0 -10
@@ -79,16 +79,6 @@ MODULE_PARM_DESC(offset,"Allows to speci#define TUNER_PLL_LOCKED 0x40#define TUNER_STEREO_MK3 0x04 -/* FIXME: -* Right now, all tuners are using the first tuner_params[] array element -* for analog mode. In the future, we will be merging similar tuner -* definitions together, such that each tuner definition will have a -* tuner_params struct for each available video standard. At that point, -* the tuner_params[] array element will be chosen based on the video -* standard in use. -* -*/ -/* ---------------------------------------------------------------------- */ static int tuner_getstatus (struct i2c_client *c)
drivers/media/video/tuner-types.c +0 -0
drivers/media/video/tuner-types.c +9 -6
@@ -23,13 +23,16 @@* Each tuner_params array may contain one or more elements, one * for each video standard. * -* FIXME: Some tuner_range definitions are duplicated, and -* should be eliminated. +* FIXME: tuner_params struct contains an element, tda988x. We must +* set this for all tuners that contain a tda988x chip, and then we +* can remove this setting from the various card structs. * -* FIXME: tunertype struct contains an element, has_tda988x. -* We must set this for all tunertypes that contain a tda988x -* chip, and then we can remove this setting from the various -* card structs. +* FIXME: Right now, all tuners are using the first tuner_params[] +* array element for analog mode. In the future, we will be merging +* similar tuner definitions together, such that each tuner definition +* will have a tuner_params struct for each available video standard. +* At that point, the tuner_params[] array element will be chosen +* based on the video standard in use. */ /* 0-9 */
PATCH 46/141 V4L/DVB (3275): Allow SAA7134 to fall back to AM sound when there is NICAM-L
In reply to [email protected]From: Hartmut Hackmann <[email protected]>
Date: 1139300737 -0200
This patch allows to select AM sound even if NICAM is detected. Proposed by Alain Frappin
---
drivers/media/video/saa7134/saa7134-tvaudio.c +0 -0
drivers/media/video/saa7134/saa7134-tvaudio.c +14 -0
@@ -140,6 +140,12 @@ static struct saa7134_tvaudio tvaudio[] .carr2 = 5850, .mode = TVAUDIO_NICAM_AM, },{ + .name = "SECAM-L MONO", + .std = V4L2_STD_SECAM, + .carr1 = 6500, + .carr2 = -1, + .mode = TVAUDIO_AM_MONO, + },{ .name = "SECAM-D/K", .std = V4L2_STD_SECAM, .carr1 = 6500,
@@ -334,6 +340,12 @@ static void tvaudio_setmode(struct saa71saa_writeb (SAA7134_STEREO_DAC_OUTPUT_SELECT ,0xa1 );saa_writeb (SAA7134_NICAM_CONFIG ,0x00 );break ; +case TVAUDIO_AM_MONO : +saa_writeb (SAA7134_DEMODULATOR ,0x12 ); +saa_writeb (SAA7134_DCXO_IDENT_CTRL ,0x00 ); +saa_writeb (SAA7134_FM_DEEMPHASIS ,0x44 ); +saa_writeb (SAA7134_STEREO_DAC_OUTPUT_SELECT ,0xa0 ); +break ;case TVAUDIO_FM_SAT_STEREO :/* not implemented (yet) */ break ;
@@ -414,6 +426,7 @@ static int tvaudio_getstereo(struct saa7switch (audio->mode) {case TVAUDIO_FM_MONO : +case TVAUDIO_AM_MONO :return V4L2_TUNER_SUB_MONO ;case TVAUDIO_FM_K_STEREO :case TVAUDIO_FM_BG_STEREO :
@@ -480,6 +493,7 @@ static int tvaudio_setstereo(struct saa7switch (audio->mode) {case TVAUDIO_FM_MONO : +case TVAUDIO_AM_MONO :/* nothing to do ... */ break ;case TVAUDIO_FM_K_STEREO :
drivers/media/video/saa7134/saa7134.h +0 -0
drivers/media/video/saa7134/saa7134.h +1 -0
@@ -60,6 +60,7 @@ enum saa7134_tvaudio_mode {TVAUDIO_FM_K_STEREO =4 ,TVAUDIO_NICAM_AM =5 ,TVAUDIO_NICAM_FM =6 , +TVAUDIO_AM_MONO =7 }; enum saa7134_audio_in {
PATCH 47/141 V4L/DVB (3276): Added terratec hybrid xs and kworld 2800rf support
In reply to [email protected]From: Markus Rechberger <[email protected]>
Date: 1139300739 -0200
- Added terratec hybrid xs product/vendorid
- Added gpio audio initialization for kworld pvr 2800rf
---
Documentation/video4linux/CARDLIST.em28xx +0 -0
Documentation/video4linux/CARDLIST.em28xx +1 -0
@@ -8,3 +8,4 @@ 7 -> Leadtek Winfast USB II (em2800) 8 -> Kworld USB2800 (em2800) 9 -> Pinnacle Dazzle DVC 90 (em2820/em2840) [2304:0207] + 12 -> Unknown EM2820/2840 video grabber (em2820/em2840)
drivers/media/video/em28xx/em28xx-cards.c +0 -0
drivers/media/video/em28xx/em28xx-cards.c +52 -4
86 lines not on this page · raw message
drivers/media/video/em28xx/em28xx.h +0 -0
drivers/media/video/em28xx/em28xx.h +3 -1
@@ -41,7 +41,9 @@#define EM2800_BOARD_LEADTEK_WINFAST_USBII 7#define EM2800_BOARD_KWORLD_USB2800 8#define EM2820_BOARD_PINNACLE_DVC_90 9 -#define EM2880_BOARD_WINTV_HVR_900 10 +#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 10 +#define EM2880_BOARD_TERRATEC_HYBRID_XS 11 +#define EM2820_BOARD_KWORLD_PVRTV2800RF 12#define UNSET -1
PATCH 48/141 V4L/DVB (3277): Use default tuner_params if desired_type not available
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1139300739 -0200
If a given tuner definition contains more than one tuner_params array members, it will try to select the appropriate tuner_params based on the video standard in use. If there is no tuner_params defined for the current video standard, it will select the default, tuner_params[0]
---
drivers/media/video/tuner-simple.c +0 -0
drivers/media/video/tuner-simple.c +7 -0
@@ -163,6 +163,10 @@ static void default_set_tv_freq(struct icontinue ;break ; } +/* use default tuner_params if desired_type not available */ +if (desired_type != tun->params[j].type) + j =0 ; +for (i =0 ; i < tun->params[j].count; i++) {if (freq > tun->params[j].ranges[i].limit)continue ;
@@ -340,6 +344,9 @@ static void default_set_radio_freq(struccontinue ;break ; } +/* use default tuner_params if desired_type not available */ +if (desired_type != tun->params[j].type) + j =0 ; div = (20 * freq /16000 ) + (int )(20 *10.7 );/* IF 10.7 MHz */ buffer[2 ] = (tun->params[j].ranges[0 ].config & ~TUNER_RATIO_MASK ) |TUNER_RATIO_SELECT_50 ;/* 50 kHz step */
PATCH 49/141 V4L/DVB (3278): Show debug for tuners trying to use unsupported video standards
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1139300740 -0200
With tuner_debug enabled, if a tuner tries to use a video standard that doesn't have a matching tuner_params defined, the IFPCoff value and tuner number will be displayed, and the default tuner_params entry will be used.
---
drivers/media/video/tuner-simple.c +0 -0
drivers/media/video/tuner-simple.c +4 -1
@@ -164,8 +164,11 @@ static void default_set_tv_freq(struct ibreak ; }/* use default tuner_params if desired_type not available */ -if (desired_type != tun->params[j].type) +if (desired_type != tun->params[j].type) { +tuner_dbg ("IFPCoff = %d: tuner_params undefined for tuner %d\n" , + IFPCoff,t->type); j =0 ; + }for (i =0 ; i < tun->params[j].count; i++) {if (freq > tun->params[j].ranges[i].limit)
PATCH 50/141 V4L/DVB (3280): Changed description of KWorld PVR TV 2800RF
In reply to [email protected]From: Markus Rechberger <[email protected]>
Date: 1139300741 -0200
Changed description of KWorld PVR TV 2800RF
---
Documentation/video4linux/CARDLIST.em28xx +0 -0
Documentation/video4linux/CARDLIST.em28xx +1 -1
@@ -8,4 +8,4 @@ 7 -> Leadtek Winfast USB II (em2800) 8 -> Kworld USB2800 (em2800) 9 -> Pinnacle Dazzle DVC 90 (em2820/em2840) [2304:0207] - 12 -> Unknown EM2820/2840 video grabber (em2820/em2840) + 12 -> Kworld PVR TV 2800 RF (em2820/em2840)
drivers/media/video/em28xx/em28xx-cards.c +0 -0
drivers/media/video/em28xx/em28xx-cards.c +1 -1
@@ -73,7 +73,7 @@ struct em28xx_board em28xx_boards[] = { }}, }, [EM2820_BOARD_KWORLD_PVRTV2800RF] = { - .name = "Unknown EM2820/2840 video grabber", + .name = "Kworld PVR TV 2800 RF", .is_em2800 = 0, .vchannels = 2, .norm = VIDEO_MODE_PAL,
PATCH 51/141 V4L/DVB (3281): Added signal detection support to tvp5150
In reply to [email protected]From: Markus Rechberger <[email protected]>
Date: 1139301504 -0200
- added signal detection support to tvp5150
---
drivers/media/video/tvp5150.c +0 -0
drivers/media/video/tvp5150.c +11 -0
@@ -967,6 +967,17 @@ static int tvp5150_command(struct i2c_cl }case DECODER_GET_STATUS : { +int *iarg = arg; +int status; +int res=0 ; + status =tvp5150_read (c,0x88 ); +if (status&0x08 ){ + res |=DECODER_STATUS_COLOR ; + } +if (status&0x04 && status&0x02 ){ + res |=DECODER_STATUS_GOOD ; + } + *iarg=res;break ; }
PATCH 52/141 V4L/DVB (3294): Fix [Bug 5895] to correct snd_87x autodetect
In reply to [email protected]From: Manu Abraham <[email protected]>
Date: 1139301930 -0200
With DVB drivers enabled snd_87x (ALSA) don't detect.
---
drivers/media/dvb/bt8xx/bt878.c +0 -0
drivers/media/dvb/bt8xx/bt878.c +43 -1
73 lines not on this page · raw message
drivers/media/dvb/bt8xx/bt878.h +0 -0
drivers/media/dvb/bt8xx/bt878.h +17 -0
@@ -88,6 +88,23 @@#define BT878_RISC_SYNC_MASK (1 << 15) + +#define BTTV_BOARD_UNKNOWN 0x00 +#define BTTV_BOARD_PINNACLESAT 0x5e +#define BTTV_BOARD_NEBULA_DIGITV 0x68 +#define BTTV_BOARD_PC_HDTV 0x70 +#define BTTV_BOARD_TWINHAN_DST 0x71 +#define BTTV_BOARD_AVDVBT_771 0x7b +#define BTTV_BOARD_AVDVBT_761 0x7c +#define BTTV_BOARD_DVICO_DVBT_LITE 0x80 +#define BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE 0x87 + +struct cards { +__u32 pci_id; +__u16 card_id; +char *name; +}; +extern int bt878_num;struct bt878 {
PATCH 53/141 V4L/DVB (3297): Add IR support to KWorld DVB-T (cx22702-based)
In reply to [email protected]From: Marco Manenti <[email protected]>
Date: 1139301933 -0200
add IR support to KWorld DVB-T (cx22702-based)
---
drivers/media/video/cx88/cx88-input.c +0 -0
drivers/media/video/cx88/cx88-input.c +1 -0
@@ -151,6 +151,7 @@ int cx88_ir_init(struct cx88_core *core,switch (core->board) {case CX88_BOARD_DNTV_LIVE_DVB_T :case CX88_BOARD_KWORLD_DVB_T : +case CX88_BOARD_KWORLD_DVB_T_CX22702 : ir_codes = ir_codes_dntv_live_dvb_t; ir->gpio_addr =MO_GP1_IO ; ir->mask_keycode =0x1f ;
PATCH 54/141 V4L/DVB (3299): Kconfig: DVB_USB_CXUSB depends on DVB_LGDT330X and DVB_MT352
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1139301933 -0200
- rename DVB_USB_CXUSB one-liner description to:
Conexant USB2.0 hybrid reference design support.
- with the addition of bluebird support to dvb-usb-cxusb, it now depends on lgdt330x and mt352 modules.
---
drivers/media/dvb/dvb-usb/Kconfig +0 -0
drivers/media/dvb/dvb-usb/Kconfig +9 -3
@@ -83,12 +83,18 @@ config DVB_USB_UMT_010 Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver. config DVB_USB_CXUSB - tristate "Medion MD95700 hybrid USB2.0 (Conexant) support" + tristate "Conexant USB2.0 hybrid reference design support" depends on DVB_USB select DVB_CX22702 + select DVB_LGDT330X + select DVB_MT352 help - Say Y here to support the Medion MD95700 hybrid USB2.0 device. Currently - only the DVB-T part is supported. + Say Y here to support the Conexant USB2.0 hybrid reference design. + Currently, only DVB and ATSC modes are supported, analog mode + shall be added in the future. Devices that require this module: + + Medion MD95700 hybrid USB2.0 device. + DViCO FusionHDTV (Bluebird) USB2.0 devices config DVB_USB_DIGITV tristate "Nebula Electronics uDigiTV DVB-T USB2.0 support"
PATCH 55/141 V4L/DVB (3300): Add standard for South Korean NTSC-M using A2 audio.
In reply to [email protected]From: Hans Verkuil <[email protected]>
Date: 1139302120 -0200
South Korea uses NTSC-M but with A2 audio instead of BTSC. Several audio chips need this information in order to set the correct audio processing registers.
---
drivers/media/video/bttv-driver.c +0 -0
drivers/media/video/bttv-driver.c +1 -1
@@ -214,7 +214,7 @@ const struct bttv_tvnorm bttv_tvnorms[]we can capture, of the first and second field. */ .vbistart = { 7,320 }, },{ - .v4l2_id =V4L2_STD_NTSC_M , + .v4l2_id =V4L2_STD_NTSC_M |V4L2_STD_NTSC_M_KR , .name = "NTSC", .Fsc = 28636363, .swidth = 768,
drivers/media/video/cx25840/cx25840-core.c +0 -0
drivers/media/video/cx25840/cx25840-core.c +20 -30
77 lines not on this page · raw message
drivers/media/video/tda9887.c +0 -0
drivers/media/video/tda9887.c +6 -1
@@ -231,7 +231,7 @@ static struct tvnorm tvnorms[] = { cAudioIF_6_5 | cVideoIF_38_90 ), },{ - .std = V4L2_STD_NTSC_M, + .std = V4L2_STD_NTSC_M | V4L2_STD_NTSC_M_KR, .name = "NTSC-M", .b = ( cNegativeFmTV | cQSS ),
@@ -619,6 +619,11 @@ static int tda9887_fixup_std(struct tda9tda9887_dbg ("insmod fixup: NTSC => NTSC_M_JP\n" ); t->std =V4L2_STD_NTSC_M_JP ;break ; +case 'k' : +case 'K' : +tda9887_dbg ("insmod fixup: NTSC => NTSC_M_KR\n" ); + t->std =V4L2_STD_NTSC_M_KR ; +break ;case '-' :/* default parameter, do nothing */ break ;
drivers/media/video/tuner-core.c +0 -0
drivers/media/video/tuner-core.c +5 -0
@@ -366,6 +366,11 @@ static int tuner_fixup_std(struct tunertuner_dbg ("insmod fixup: NTSC => NTSC_M_JP\n" ); t->std =V4L2_STD_NTSC_M_JP ;break ; +case 'k' : +case 'K' : +tuner_dbg ("insmod fixup: NTSC => NTSC_M_KR\n" ); + t->std =V4L2_STD_NTSC_M_KR ; +break ;case '-' :/* default parameter, do nothing */ break ;
include/linux/videodev2.h +0 -0
include/linux/videodev2.h +3 -1
@@ -638,6 +638,7 @@ typedef __u64 v4l2_std_id;#define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000)#define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000)#define V4L2_STD_NTSC_443 ((v4l2_std_id)0x00004000) +#define V4L2_STD_NTSC_M_KR ((v4l2_std_id)0x00008000)#define V4L2_STD_SECAM_B ((v4l2_std_id)0x00010000)#define V4L2_STD_SECAM_D ((v4l2_std_id)0x00020000)
@@ -670,7 +671,8 @@ typedef __u64 v4l2_std_id; V4L2_STD_PAL_H |\ V4L2_STD_PAL_I)#define V4L2_STD_NTSC (V4L2_STD_NTSC_M |\ - V4L2_STD_NTSC_M_JP) + V4L2_STD_NTSC_M_JP |\ + V4L2_STD_NTSC_M_KR)#define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\ V4L2_STD_SECAM_K |\ V4L2_STD_SECAM_K1)
PATCH 56/141 V4L/DVB (3302): Added support for the LifeView FlyDVB-T LR301 card
In reply to [email protected]From: Giampiero Giancipoli <[email protected]>
Date: 1139302149 -0200
Additionally to the card support, this changeset adds the option tda10046lifeview to get_dvb_firmware to download tda10046 firmware from LifeView's site.
---
Documentation/dvb/get_dvb_firmware +0 -0
Documentation/dvb/get_dvb_firmware +21 -2
@@ -21,8 +21,9 @@ use File::Temp qw/ tempdir /; use IO::Handle; -@components = ( "sp8870", "sp887x", "tda10045", "tda10046", "av7110", "dec2000t", - "dec2540t", "dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004", +@components = ( "sp8870", "sp887x", "tda10045", "tda10046", + "tda10046lifeview", "av7110", "dec2000t", "dec2540t", + "dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004", "or51211", "or51132_qam", "or51132_vsb", "bluebird"); # Check args
@@ -126,6 +127,24 @@ sub tda10046 { $outfile; } +sub tda10046lifeview { + my $sourcefile = "Drv_2.11.02.zip"; + my $url = "http://www.lifeview.com.tw/drivers/pci_card/FlyDVB-T/$sourcefile"; + my $hash = "1ea24dee4eea8fe971686981f34fd2e0"; + my $outfile = "dvb-fe-tda10046.fw"; + my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1); + + checkstandard(); + + wgetfile($sourcefile, $url); + unzip($sourcefile, $tmpdir); + extract("$tmpdir/LVHybrid.sys", 0x8b088, 24602, "$tmpdir/fwtmp"); + verify("$tmpdir/fwtmp", $hash); + copy("$tmpdir/fwtmp", $outfile); + + $outfile; +} + sub av7110 { my $sourcefile = "dvb-ttpci-01.fw-261d"; my $url = "http://www.linuxtv.org/downloads/firmware/$sourcefile";
Documentation/video4linux/CARDLIST.saa7134 +0 -0
Documentation/video4linux/CARDLIST.saa7134 +1 -0
@@ -84,3 +84,4 @@ 83 -> Terratec Cinergy 250 PCI TV [153b:1160] 84 -> LifeView FlyDVB Trio [5168:0319] 85 -> AverTV DVB-T 777 [1461:2c05] + 86 -> LifeView FlyDVB-T [5168:0301]
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +28 -0
@@ -2637,6 +2637,27 @@ struct saa7134_board saa7134_boards[] = .amux = LINE1, }}, }, + [SAA7134_BOARD_FLYDVBT_LR301 ] = { +/* LifeView FlyDVB-T */ +/* Giampiero Giancipoli <[email protected]> */ + .name ="LifeView FlyDVB-T" , + .audio_clock =0x00200000 , + .tuner_type =TUNER_ABSENT , + .radio_type =UNSET , + .tuner_addr =ADDR_UNSET , + .radio_addr =ADDR_UNSET , + .mpeg =SAA7134_MPEG_DVB , + .inputs = {{ + .name = name_comp1,/* Composite input */ + .vmux =3 , + .amux =LINE2 , + },{ + .name = name_svideo,/* S-Video signal on S-Video input */ + .vmux =8 , + .amux =LINE2 , + }}, + }, + };const unsigned int saa7134_bcount =ARRAY_SIZE (saa7134_boards);
@@ -3114,6 +3135,12 @@ struct pci_device_id saa7134_pci_tbl[] = .subdevice = 0x2c05, .driver_data = SAA7134_BOARD_AVERMEDIA_777, },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7134, + .subvendor = 0x5168, + .subdevice = 0x0301, + .driver_data = SAA7134_BOARD_FLYDVBT_LR301, + },{/* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -3213,6 +3240,7 @@ int saa7134_board_init1(struct saa7134_dcase SAA7134_BOARD_GOTVIEW_7135 :case SAA7134_BOARD_KWORLD_TERMINATOR :case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS : +case SAA7134_BOARD_FLYDVBT_LR301 : dev->has_remote =SAA7134_REMOTE_GPIO ;break ;case SAA7134_BOARD_MD5044 :
drivers/media/video/saa7134/saa7134-dvb.c +0 -0
drivers/media/video/saa7134/saa7134-dvb.c +4 -0
@@ -924,6 +924,10 @@ static int dvb_init(struct saa7134_dev * dev->dvb.frontend =tda10046_attach (&philips_tiger_config, &dev->i2c_adap);break ; +case SAA7134_BOARD_FLYDVBT_LR301 : + dev->dvb.frontend =tda10046_attach (&tda827x_lifeview_config, + &dev->i2c_adap); +break ;#endif #ifdef HAVE_NXT200X case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180 :
drivers/media/video/saa7134/saa7134-input.c +0 -0
drivers/media/video/saa7134/saa7134-input.c +5 -0
@@ -230,6 +230,11 @@ int saa7134_input_init1(struct saa7134_d mask_keycode =0x003F00 ; mask_keyup =0x040000 ;break ; +case SAA7134_BOARD_FLYDVBT_LR301 : + ir_codes = ir_codes_flydvb; + mask_keycode =0x0001F00 ; + mask_keydown =0x0040000 ; +break ; }if (NULL == ir_codes) { printk("%s: Oops: IR config error [card=%d]\n",
drivers/media/video/saa7134/saa7134.h +0 -0
drivers/media/video/saa7134/saa7134.h +1 -0
@@ -212,6 +212,7 @@ struct saa7134_format {#define SAA7134_BOARD_CINERGY250PCI 83#define SAA7134_BOARD_FLYDVB_TRIO 84#define SAA7134_BOARD_AVERMEDIA_777 85 +#define SAA7134_BOARD_FLYDVBT_LR301 86#define SAA7134_MAXBOARDS 8#define SAA7134_INPUT_MAX 8
PATCH 57/141 V4L/DVB (3303): TDA8290 update
In reply to [email protected]From: Hartmut Hackmann <[email protected]>
Date: 1139302149 -0200
This patch
- works around a bug in the I2C bridge that makes the initialization of the TDA10046 fail on recent LifeView cards
- puts the AGC output to tristate in sleep mode. This is necessary for recent hybrid cards that switch the AGC via tristateing.
---
drivers/media/video/tda8290.c +0 -0
drivers/media/video/tda8290.c +6 -2
@@ -281,7 +281,7 @@ static void tda827xa_agcf(struct i2c_clistatic void tda8290_i2c_bridge (struct i2c_client *c,int close) {unsigned char enable[2 ] = {0x21 ,0xC0 }; -unsigned char disable[2 ] = {0x21 ,0x80 }; +unsigned char disable[2 ] = {0x21 ,0x00 };unsigned char *msg;if (close) { msg = enable;
@@ -302,6 +302,7 @@ static int tda8290_tune(struct i2c_clienunsigned char soft_reset[] = {0x00 ,0x00 };unsigned char easy_mode[] = {0x01 , t->tda8290_easy_mode };unsigned char expert_mode[] = {0x01 ,0x80 }; +unsigned char agc_out_on[] = {0x02 ,0x00 };unsigned char gainset_off[] = {0x28 ,0x14 };unsigned char if_agc_spd[] = {0x0f ,0x88 };unsigned char adc_head_6[] = {0x05 ,0x04 };
@@ -320,6 +321,7 @@ static int tda8290_tune(struct i2c_clien pll_stat;i2c_master_send (c, easy_mode,2 ); +i2c_master_send (c, agc_out_on,2 );i2c_master_send (c, soft_reset,2 );msleep (1 );
@@ -470,6 +472,7 @@ static void standby(struct i2c_client *cstruct tuner *t =i2c_get_clientdata (c);unsigned char cb1[] = {0x30 ,0xD0 };unsigned char tda8290_standby[] = {0x00 ,0x02 }; +unsigned char tda8290_agc_tri[] = {0x02 ,0x20 };struct i2c_msg msg = {.addr = t->tda827x_addr, .flags=0 , .buf=cb1, .len =2 };tda8290_i2c_bridge (c,1 );
@@ -477,6 +480,7 @@ static void standby(struct i2c_client *c cb1[1 ] =0x90 ;i2c_transfer (c->adapter, &msg,1 );tda8290_i2c_bridge (c,0 ); +i2c_master_send (c, tda8290_agc_tri,2 );i2c_master_send (c, tda8290_standby,2 ); }
@@ -565,7 +569,7 @@ int tda8290_init(struct i2c_client *c)strlcpy (c->name,"tda8290+75a" ,sizeof (c->name)); t->tda827x_ver =2 ; } -tuner_info ("tuner: type set to %s\n" , c->name); +tuner_info ("type set to %s\n" , c->name); t->set_tv_freq = set_tv_freq; t->set_radio_freq = set_radio_freq;
PATCH 58/141 V4L/DVB (3304): TDA10046 Driver update
In reply to [email protected]From: Hartmut Hackmann <[email protected]>
Date: 1139302150 -0200
- Set outputs to tristate in sleep mode
- Reduce dangerously high firmware download speed with 16MHz xtal
- added tda827x configuration with GPIOs low
- added comments to stupid looking IIC reads that work around bugs in the tda10046.
- some minor updates
---
drivers/media/dvb/frontends/tda1004x.c +0 -0
drivers/media/dvb/frontends/tda1004x.c +21 -4
@@ -229,7 +229,7 @@ static int tda1004x_enable_tuner_i2c(strdprintk ("%s\n" , __FUNCTION__); result =tda1004x_write_mask (state,TDA1004X_CONFC4 ,2 ,2 ); -msleep (1 ); +msleep (20 );return result; }
@@ -502,7 +502,12 @@ static int tda10046_fwupload(struct dvb_const struct firmware *fw;/* reset + wake up chip */ -tda1004x_write_byteI (state,TDA1004X_CONFC4 ,0 ); +if (state->config->xtal_freq ==TDA10046_XTAL_4M ) { +tda1004x_write_byteI (state,TDA1004X_CONFC4 ,0 ); + }else { +dprintk ("%s: 16MHz Xtal, reducing I2C speed\n" , __FUNCTION__); +tda1004x_write_byteI (state,TDA1004X_CONFC4 ,0x80 ); + }tda1004x_write_mask (state,TDA10046H_CONF_TRISTATE1 ,1 ,0 );/* let the clocks recover from sleep */ msleep (5 );
@@ -651,7 +656,7 @@ static int tda10046_init(struct dvb_fron// tda setup tda1004x_write_mask (state,TDA1004X_CONFC4 ,0x20 ,0 );// disable DSP watchdog timer tda1004x_write_byteI (state,TDA1004X_AUTO ,0x87 );// 100 ppm crystal, select HP stream -tda1004x_write_byteI (state,TDA1004X_CONFC1 ,8 );// disable pulse killer +tda1004x_write_byteI (state,TDA1004X_CONFC1 ,0x88 );// enable pulse killer switch (state->config->agc_config) {case TDA10046_AGC_DEFAULT :
@@ -672,6 +677,12 @@ static int tda10046_init(struct dvb_frontda1004x_write_byteI (state,TDA10046H_AGC_RENORM ,0x08 );// Gain Renormalize tda1004x_write_byteI (state,TDA10046H_CONF_POLARITY ,0x6a );// set AGC polarities break ; +case TDA10046_AGC_TDA827X_GPL : +tda1004x_write_byteI (state,TDA10046H_AGC_CONF ,0x02 );// AGC setup +tda1004x_write_byteI (state,TDA10046H_AGC_THR ,0x70 );// AGC Threshold +tda1004x_write_byteI (state,TDA10046H_AGC_RENORM ,0x08 );// Gain Renormalize +tda1004x_write_byteI (state,TDA10046H_CONF_POLARITY ,0x60 );// set AGC polarities +break ; }tda1004x_write_byteI (state,TDA1004X_CONFADC2 ,0x38 );tda1004x_write_byteI (state,TDA10046H_CONF_TRISTATE1 ,0x61 );// Turn both AGC outputs on
@@ -683,6 +694,7 @@ static int tda10046_init(struct dvb_frontda1004x_write_byteI (state,TDA10046H_CVBER_CTRL ,0x1a );// 10^6 VBER measurement bits tda1004x_write_byteI (state,TDA1004X_CONF_TS1 ,7 );// MPEG2 interface config tda1004x_write_byteI (state,TDA1004X_CONF_TS2 ,0xc0 );// MPEG2 interface config +// tda1004x_write_mask(state, 0x50, 0x80, 0x80); // handle out of guard echoes tda1004x_write_mask (state,0x3a ,0x80 , state->config->invert_oclk <<7 ); state->initialised =1 ;
@@ -1027,6 +1039,7 @@ static int tda1004x_read_status(struct dif (status ==-1 )return -EIO ; cber |= (status <<8 ); +// The address 0x20 should be read to cope with a TDA10046 bug tda1004x_read_byte (state,TDA1004X_CBER_RESET );if (cber !=65535 )
@@ -1047,7 +1060,8 @@ static int tda1004x_read_status(struct d status =tda1004x_read_byte (state,TDA1004X_VBER_MSB );if (status ==-1 )return -EIO ; - vber |= ((status <<16 ) &0x0f ); + vber |= (status &0x0f ) <<16 ; +// The CVBER_LUT should be read to cope with TDA10046 hardware bug tda1004x_read_byte (state,TDA1004X_CVBER_LUT );// if RS has passed some valid TS packets, then we must be
@@ -1161,6 +1175,7 @@ static int tda1004x_read_ber(struct dvb_if (tmp <0 )return -EIO ; *ber |= (tmp <<9 ); +// The address 0x20 should be read to cope with a TDA10046 bug tda1004x_read_byte (state,TDA1004X_CBER_RESET );dprintk ("%s: ber=0x%x\n" , __FUNCTION__, *ber);
@@ -1187,6 +1202,8 @@ static int tda1004x_sleep(struct dvb_frotda1004x_disable_tuner_i2c (state); } } +/* set outputs to tristate */ +tda1004x_write_byteI (state,TDA10046H_CONF_TRISTATE1 ,0xff );tda1004x_write_mask (state,TDA1004X_CONFC4 ,1 ,1 );break ; }
drivers/media/dvb/frontends/tda1004x.h +0 -0
drivers/media/dvb/frontends/tda1004x.h +2 -1
@@ -35,7 +35,8 @@ enum tda10046_agc {TDA10046_AGC_DEFAULT ,/* original configuration */ TDA10046_AGC_IFO_AUTO_NEG ,/* IF AGC only, automatic, negtive */ TDA10046_AGC_IFO_AUTO_POS ,/* IF AGC only, automatic, positive */ - TDA10046_AGC_TDA827X, /* IF AGC only, special setup for tda827x */ +TDA10046_AGC_TDA827X ,/* IF AGC only, special setup for tda827x */ + TDA10046_AGC_TDA827X_GPL, /* same as above, but GPIOs 0 */ }; enum tda10046_if {
PATCH 59/141 V4L/DVB (3305): Added support for the ADS Instant TV DUO Cardbus PTV331
In reply to [email protected]From: Hartmut Hackmann <[email protected]>
Date: 1139302150 -0200
Analog and DVB-T are working, Remote not yet.
This card is based on the new LifeView design, there should be many variants.
---
Documentation/video4linux/CARDLIST.saa7134 +0 -0
Documentation/video4linux/CARDLIST.saa7134 +1 -0
@@ -85,3 +85,4 @@ 84 -> LifeView FlyDVB Trio [5168:0319] 85 -> AverTV DVB-T 777 [1461:2c05] 86 -> LifeView FlyDVB-T [5168:0301] + 87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421]
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +35 -1
@@ -2657,7 +2657,23 @@ struct saa7134_board saa7134_boards[] = .amux = LINE2, }}, }, - + [SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 ] = { + .name ="ADS Instant TV Duo Cardbus PTV331" , + .audio_clock =0x00200000 , + .tuner_type =TUNER_PHILIPS_TDA8290 , + .radio_type =UNSET , + .tuner_addr =ADDR_UNSET , + .radio_addr =ADDR_UNSET , + .mpeg =SAA7134_MPEG_DVB , + .gpiomask =0x00600000 ,/* Bit 21 0=Radio, Bit 22 0=TV */ + .inputs = {{ + .name = name_tv, + .vmux =1 , + .amux =TV , + .tv =1 , + .gpio =0x00200000 , + }}, + }, };const unsigned int saa7134_bcount =ARRAY_SIZE (saa7134_boards);
@@ -3141,6 +3157,12 @@ struct pci_device_id saa7134_pci_tbl[] = .subdevice = 0x0301, .driver_data = SAA7134_BOARD_FLYDVBT_LR301, },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x0331, + .subdevice = 0x1421, + .driver_data = SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331, + },{/* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -3263,6 +3285,10 @@ int saa7134_board_init1(struct saa7134_dsaa_writeb (SAA7134_GPIO_GPMODE3 ,0x08 );saa_writeb (SAA7134_GPIO_GPSTATUS3 ,0x06 );break ; +case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 : +saa_writeb (SAA7134_GPIO_GPMODE3 ,0x08 ); +saa_writeb (SAA7134_GPIO_GPSTATUS3 ,0x00 ); +break ;case SAA7134_BOARD_AVERMEDIA_CARDBUS :/* power-up tuner chip */ saa_andorl (SAA7134_GPIO_GPMODE0 >>2 ,0xffffffff ,0xffffffff );
@@ -3413,6 +3439,14 @@ int saa7134_board_init2(struct saa7134_di2c_transfer (&dev->i2c_adap, &msg,1 ); }break ; +case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 : +/* make the tda10046 find its eeprom */ + { +u8 data[] = {0x3c ,0x33 ,0x62 }; +struct i2c_msg msg = {.addr=0x08 , .flags=0 , .buf=data, .len =sizeof (data)}; +i2c_transfer (&dev->i2c_adap, &msg,1 ); + } +break ; }return 0 ; }
drivers/media/video/saa7134/saa7134-dvb.c +0 -0
drivers/media/video/saa7134/saa7134-dvb.c +43 -0
55 lines not on this page · raw message
drivers/media/video/saa7134/saa7134.h +0 -0
drivers/media/video/saa7134/saa7134.h +1 -0
@@ -213,6 +213,7 @@ struct saa7134_format {#define SAA7134_BOARD_FLYDVB_TRIO 84#define SAA7134_BOARD_AVERMEDIA_777 85#define SAA7134_BOARD_FLYDVBT_LR301 86 +#define SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 87#define SAA7134_MAXBOARDS 8#define SAA7134_INPUT_MAX 8
PATCH 60/141 V4L/DVB (3306): Fixed i2c return value, conversion mdelay to msleep
In reply to [email protected]From: Markus Rechberger <[email protected]>
Date: 1139302151 -0200
fixed i2c return value, conversion mdelay to msleep
---
drivers/media/video/em28xx/em28xx-core.c +0 -0
drivers/media/video/em28xx/em28xx-core.c +13 -2
@@ -139,6 +139,9 @@ int em28xx_read_reg_req_len(struct em28x {int ret, byte; +if (dev->state &DEV_DISCONNECTED ) +return (-ENODEV ); +em28xx_regdbg ("req=%02x, reg=%02x " , req, reg); ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), req,
@@ -165,6 +168,9 @@ int em28xx_read_reg_req(struct em28xx *du8 val;int ret; +if (dev->state &DEV_DISCONNECTED ) +return (-ENODEV ); +em28xx_regdbg ("req=%02x, reg=%02x:" , req, reg); ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), req,
@@ -195,7 +201,12 @@ int em28xx_write_regs_req(struct em28xxint ret;/*usb_control_msg seems to expect a kmalloced buffer */ -unsigned char *bufs =kmalloc (len,GFP_KERNEL ); +unsigned char *bufs; + +if (dev->state &DEV_DISCONNECTED ) +return (-ENODEV ); + + bufs =kmalloc (len,GFP_KERNEL );em28xx_regdbg ("req=%02x reg=%02x:" , req, reg);
@@ -212,7 +223,7 @@ int em28xx_write_regs_req(struct em28xx ret =usb_control_msg (dev->udev,usb_sndctrlpipe (dev->udev,0 ), req,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,0x0000 , reg, bufs, len,HZ ); -mdelay (5 );/* FIXME: magic number */ +msleep (5 );/* FIXME: magic number */ kfree (bufs);return ret; }
drivers/media/video/em28xx/em28xx-i2c.c +0 -0
drivers/media/video/em28xx/em28xx-i2c.c +4 -4
@@ -78,7 +78,7 @@ static int em2800_i2c_send_max4(struct e ret = dev->em28xx_read_reg (dev,0x05 );if (ret ==0x80 + len -1 )return len; -mdelay (5 ); +msleep (5 ); }em28xx_warn ("i2c write timed out\n" );return -EIO ;
@@ -138,7 +138,7 @@ static int em2800_i2c_check_for_device(sreturn -ENODEV ; else if (msg == 0x84) return 0; -mdelay (5 ); +msleep (5 ); }return -ENODEV ; }
@@ -278,9 +278,9 @@ static int em28xx_i2c_xfer(struct i2c_ad msgs[i].buf, msgs[i].len, i == num - 1); -if (rc <0 ) - goto err; } +if (rc <0 ) + goto err;if (i2c_debug>=2 )printk ("\n" ); }
PATCH 61/141 V4L/DVB (3307): Support for Galaxis DVB-S rev1.3
In reply to [email protected]From: Oliver Endriss <[email protected]>
Date: 1139302151 -0200
support for Galaxis DVB-S rev1.3 (subsystem 13c2:0004)
---
drivers/media/dvb/ttpci/av7110.c +0 -0
drivers/media/dvb/ttpci/av7110.c +13 -1
@@ -2329,6 +2329,17 @@ static int frontend_init(struct av7110 * av7110->fe =ves1820_attach (&alps_tdbe2_config, &av7110->i2c_adap,read_pwm (av7110));break ; +case 0x0004 :// Galaxis DVB-S rev1.3 +/* ALPS BSRV2 */ + av7110->fe =ves1x93_attach (&alps_bsrv2_config, &av7110->i2c_adap); +if (av7110->fe) { + av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd; + av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst; + av7110->fe->ops->set_tone = av7110_set_tone; + av7110->recover = dvb_s_recover; + } +break ; +case 0x0006 :/* Fujitsu-Siemens DVB-S rev 1.6 */ /* Grundig 29504-451 */ av7110->fe =tda8083_attach (&grundig_29504_451_config, &av7110->i2c_adap);
@@ -2930,6 +2941,7 @@ MAKE_AV7110_INFO(tts_1_3se, "TechnotrenMAKE_AV7110_INFO (ttt,"Technotrend/Hauppauge DVB-T" );MAKE_AV7110_INFO (fsc,"Fujitsu Siemens DVB-C" );MAKE_AV7110_INFO (fss,"Fujitsu Siemens DVB-S rev1.6" ); +MAKE_AV7110_INFO (gxs_1_3,"Galaxis DVB-S rev1.3" );static struct pci_device_id pci_tbl[] = {MAKE_EXTENSION_PCI (fsc,0x110a ,0x0000 ),
@@ -2937,13 +2949,13 @@ static struct pci_device_id pci_tbl[] =MAKE_EXTENSION_PCI (ttt_1_X,0x13c2 ,0x0001 ),MAKE_EXTENSION_PCI (ttc_2_X,0x13c2 ,0x0002 ),MAKE_EXTENSION_PCI (tts_2_X,0x13c2 ,0x0003 ), +MAKE_EXTENSION_PCI (gxs_1_3,0x13c2 ,0x0004 ),MAKE_EXTENSION_PCI (fss,0x13c2 ,0x0006 ),MAKE_EXTENSION_PCI (ttt,0x13c2 ,0x0008 ),MAKE_EXTENSION_PCI (ttc_1_X,0x13c2 ,0x000a ),MAKE_EXTENSION_PCI (tts_2_3,0x13c2 ,0x000e ),MAKE_EXTENSION_PCI (tts_1_3se,0x13c2 ,0x1002 ), -/* MAKE_EXTENSION_PCI(???, 0x13c2, 0x0004), UNDEFINED CARD */ // Galaxis DVB PC-Sat-Carte /* MAKE_EXTENSION_PCI(???, 0x13c2, 0x0005), UNDEFINED CARD */ // Technisat SkyStar1 /* MAKE_EXTENSION_PCI(???, 0x13c2, 0x0009), UNDEFINED CARD */ // TT/Hauppauge WinTV Nexus-CA v????
PATCH 62/141 V4L/DVB (3308): Use parallel transport for FusionHDTV Dual Digital USB
In reply to [email protected]From: Chris Pascoe <[email protected]>
Date: 1139302151 -0200
Use the parallel transport function of the MT352 in USB demodulator of the Dual Digital board.
---
drivers/media/dvb/dvb-usb/cxusb.c +0 -0
drivers/media/dvb/dvb-usb/cxusb.c +1 -1
@@ -234,7 +234,7 @@ static struct dvb_usb_rc_key dvico_mce_rstatic int cxusb_dee1601_demod_init (struct dvb_frontend * fe) { -static u8 clock_config [] = {CLOCK_CTL ,0x38 ,0x38 }; +static u8 clock_config [] = {CLOCK_CTL ,0x38 ,0x28 };static u8 reset [] = {RESET ,0x80 };static u8 adc_ctl_1_cfg [] = {ADC_CTL_1 ,0x40 };static u8 agc_cfg [] = {AGC_TARGET ,0x28 ,0x20 };
PATCH 63/141 V4L/DVB (3310): Use MT352 parallel transport function for all Bluebird FusionHDTV DVB-T boxes.
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1139302152 -0200
Use the parallel transport function of the MT352 demodulator in TH7579 and LGZ201 -based FusionHDTV Bluebird usb boxes.
---
drivers/media/dvb/dvb-usb/cxusb.c +0 -0
drivers/media/dvb/dvb-usb/cxusb.c +1 -1
@@ -255,7 +255,7 @@ static int cxusb_dee1601_demod_init(strustatic int cxusb_mt352_demod_init (struct dvb_frontend * fe) {/* used in both lgz201 and th7579 */ -static u8 clock_config [] = {CLOCK_CTL ,0x38 ,0x39 }; +static u8 clock_config [] = {CLOCK_CTL ,0x38 ,0x29 };static u8 reset [] = {RESET ,0x80 };static u8 adc_ctl_1_cfg [] = {ADC_CTL_1 ,0x40 };static u8 agc_cfg [] = {AGC_TARGET ,0x24 ,0x20 };
PATCH 64/141 V4L/DVB (3312): FIX: Multiple usage of VP7045-based devices
In reply to [email protected]From: Patrick Boettcher <[email protected]>
Date: 1139302152 -0200
Reassigning function pointers in a static led to infinite loops when using multiple VP7045-based device at the same time on one system. Using kmalloc'd copies for reassignments is better.
---
drivers/media/dvb/dvb-usb/vp7045-fe.c +0 -0
drivers/media/dvb/dvb-usb/vp7045-fe.c +4 -2
@@ -23,10 +23,11 @@struct vp7045_fe_state {struct dvb_frontend fe; +struct dvb_frontend_ops ops; +struct dvb_usb_device *d; }; -static int vp7045_fe_read_status (struct dvb_frontend * fe,fe_status_t *status) {struct vp7045_fe_state *state = fe->demodulator_priv;
@@ -150,7 +151,8 @@ struct dvb_frontend * vp7045_fe_attach(s goto error; s->d = d; - s->fe.ops = &vp7045_fe_ops; +memcpy (&s->ops, &vp7045_fe_ops,sizeof (struct dvb_frontend_ops )); + s->fe.ops = &s->ops; s->fe.demodulator_priv = s; goto success;
PATCH 65/141 V4L/DVB (3313): FIX: Check if FW was downloaded or not + new firmware file
In reply to [email protected]From: Patrick Boettcher <[email protected]>
Date: 1139302152 -0200
- When a firmware was downloaded dvb_usb_device_init returns NULL for the dvb_usb_device, then nothing should be done with that pointer and device, because it will re-enumerate.
- A new firmware should be used with digitv devices.
- It should make "slave"-devices work and others, too.
---
drivers/media/dvb/dvb-usb/digitv.c +0 -0
drivers/media/dvb/dvb-usb/digitv.c +8 -5
@@ -175,11 +175,13 @@ static int digitv_probe(struct usb_interif ((ret =dvb_usb_device_init (intf,&digitv_properties,THIS_MODULE ,&d)) ==0 ) {u8 b[4 ] = {0 }; - b[0 ] =1 ; -digitv_ctrl_msg (d,USB_WRITE_REMOTE_TYPE ,0 ,b,4 ,NULL ,0 ); +if (d !=NULL ) {/* do that only when the firmware is loaded */ + b[0 ] =1 ; +digitv_ctrl_msg (d,USB_WRITE_REMOTE_TYPE ,0 ,b,4 ,NULL ,0 ); - b[0 ] =0 ; -digitv_ctrl_msg (d,USB_WRITE_REMOTE ,0 ,b,4 ,NULL ,0 ); + b[0 ] =0 ; +digitv_ctrl_msg (d,USB_WRITE_REMOTE ,0 ,b,4 ,NULL ,0 ); + } }return ret; }
@@ -194,7 +196,7 @@ static struct dvb_usb_properties digitv_ .caps = DVB_USB_IS_AN_I2C_ADAPTER, .usb_ctrl = CYPRESS_FX2, - .firmware = "dvb-usb-digitv-01.fw", + .firmware = "dvb-usb-digitv-02.fw", .size_of_priv = 0,
@@ -229,6 +231,7 @@ static struct dvb_usb_properties digitv_ { &digitv_table[0], NULL }, { NULL }, }, + { NULL }, } };
PATCH 66/141 V4L/DVB (3314): Fixed em28xx based system lockup
In reply to [email protected]From: Markus Rechberger <[email protected]>
Date: 1139302153 -0200
Fixed em28xx based system lockup, device needs to be initialized before starting the isoc transfer otherwise the system will completly lock up.
---
drivers/media/video/em28xx/em28xx-video.c +0 -0
drivers/media/video/em28xx/em28xx-video.c +3 -1
@@ -383,12 +383,14 @@ static int em28xx_v4l2_open(struct inodeem28xx_capture_start (dev,1 );em28xx_resolution_set (dev); +/* device needs to be initialized before isoc transfer */ +video_mux (dev,0 ); +/* start the transfer */ errCode =em28xx_init_isoc (dev);if (errCode) goto err; -video_mux (dev,0 ); } dev->users++;
PATCH 67/141 V4L/DVB (3315): Added support for the Tevion DVB-T 220RF card
In reply to [email protected]From: Peter Hartshorn <[email protected]>
Date: 1139302153 -0200
This is an analog / digital hybrid card.
---
Documentation/video4linux/CARDLIST.saa7134 +0 -0
Documentation/video4linux/CARDLIST.saa7134 +1 -0
@@ -86,3 +86,4 @@ 85 -> AverTV DVB-T 777 [1461:2c05] 86 -> LifeView FlyDVB-T [5168:0301] 87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421] + 88 -> Tevion DVB-T 220RF [17de:7201]
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +37 -1
@@ -2674,6 +2674,33 @@ struct saa7134_board saa7134_boards[] = .gpio = 0x00200000, }}, }, + [SAA7134_BOARD_TEVION_DVBT_220RF ] = { + .name ="Tevion DVB-T 220RF" , + .audio_clock =0x00187de7 , + .tuner_type =TUNER_PHILIPS_TDA8290 , + .radio_type =UNSET , + .tuner_addr =ADDR_UNSET , + .radio_addr =ADDR_UNSET , + .mpeg =SAA7134_MPEG_DVB , + .inputs = {{ + .name = name_tv, + .vmux =1 , + .amux =TV , + .tv =1 , + },{ + .name = name_comp1, + .vmux =3 , + .amux =LINE1 , + },{ + .name = name_svideo, + .vmux =0 , + .amux =LINE1 , + }}, + .radio = { + .name = name_radio, + .amux =LINE1 , + }, + }, };const unsigned int saa7134_bcount =ARRAY_SIZE (saa7134_boards);
@@ -3163,6 +3190,12 @@ struct pci_device_id saa7134_pci_tbl[] = .subdevice = 0x1421, .driver_data = SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331, },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x17de, + .subdevice = 0x7201, + .driver_data = SAA7134_BOARD_TEVION_DVBT_220RF, + },{/* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -3431,8 +3464,11 @@ int saa7134_board_init2(struct saa7134_d }break ;case SAA7134_BOARD_PHILIPS_TIGER : +case SAA7134_BOARD_TEVION_DVBT_220RF :case SAA7134_BOARD_ASUSTeK_P7131_DUAL: -/* this is a hybrid board, initialize to analog mode */ +/* this is a hybrid board, initialize to analog mode +* and configure firmware eeprom address +*/ {u8 data[] = {0x3c ,0x33 ,0x68 };struct i2c_msg msg = {.addr=0x08 , .flags=0 , .buf=data, .len =sizeof (data)};
drivers/media/video/saa7134/saa7134-dvb.c +0 -0
drivers/media/video/saa7134/saa7134-dvb.c +36 -0
@@ -885,6 +885,38 @@ static struct tda1004x_config ads_tech_d .request_firmware = NULL, }; +/* ------------------------------------------------------------------ */ + +static int tevion_dvb220rf_pll_set (struct dvb_frontend *fe,struct dvb_frontend_parameters *params) +{ +int ret; + ret =philips_tda827xa_pll_set (0x60 , fe, params); +return ret; +} + +static int tevion_dvb220rf_pll_init (struct dvb_frontend *fe) +{ +return 0 ; +} + +static void tevion_dvb220rf_pll_sleep (struct dvb_frontend *fe) +{ +philips_tda827xa_pll_sleep (0x61 , fe); +} + +static struct tda1004x_config tevion_dvbt220rf_config = { + .demod_address =0x08 , + .invert =1 , + .invert_oclk =0 , + .xtal_freq =TDA10046_XTAL_16M , + .agc_config =TDA10046_AGC_TDA827X , + .if_freq =TDA10046_FREQ_045 , + .pll_init = tevion_dvb220rf_pll_init, + .pll_set = tevion_dvb220rf_pll_set, + .pll_sleep = tevion_dvb220rf_pll_sleep, + .request_firmware =NULL , +}; +#endif /* ------------------------------------------------------------------ */
@@ -971,6 +1003,10 @@ static int dvb_init(struct saa7134_dev * dev->dvb.frontend =tda10046_attach (&ads_tech_duo_config, &dev->i2c_adap);break ; +case SAA7134_BOARD_TEVION_DVBT_220RF : + dev->dvb.frontend =tda10046_attach (&tevion_dvbt220rf_config, + &dev->i2c_adap); +break ;#endif #ifdef HAVE_NXT200X case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180 :
drivers/media/video/saa7134/saa7134.h +0 -0
drivers/media/video/saa7134/saa7134.h +1 -0
@@ -214,6 +214,7 @@ struct saa7134_format {#define SAA7134_BOARD_AVERMEDIA_777 85#define SAA7134_BOARD_FLYDVBT_LR301 86#define SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 87 +#define SAA7134_BOARD_TEVION_DVBT_220RF 88#define SAA7134_MAXBOARDS 8#define SAA7134_INPUT_MAX 8
PATCH 68/141 V4L/DVB (3316): Add initial support for KWorld HardwareMpegTV XPert
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1139302154 -0200
- Add initial support for KWorld HardwareMpegTV XPert.
- uses silicon tuner: tda8290 + tda8275
- standard video using cx88 broadcast decoder is working.
- blackbird mpeg encoder support (cx23416) not yet working.
- FM radio untested.
- audio is only working correctly in television mode, all other modes disabled.
---
Documentation/video4linux/CARDLIST.cx88 +0 -0
Documentation/video4linux/CARDLIST.cx88 +1 -0
@@ -43,3 +43,4 @@ 42 -> digitalnow DNTV Live! DVB-T Pro [1822:0025] 43 -> KWorld/VStream XPert DVB-T with cx22702 [17de:08a1] 44 -> DViCO FusionHDTV DVB-T Dual Digital [18ac:db50,18ac:db54] + 45 -> KWorld HardwareMpegTV XPert [17de:0840]
drivers/media/video/cx88/cx88-cards.c +0 -0
drivers/media/video/cx88/cx88-cards.c +23 -0
@@ -1048,6 +1048,25 @@ struct cx88_board cx88_boards[] = { }}, .dvb = 1, }, + [CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT] = { +/* FIXME: This card is shipped without a windows tv app, +* so I haven't been able to use regspy to figure out the GPIO +* settings. Standard video using the cx88 broadcast decoder is +* working, but blackbird isn't working yet, audio is only +* working correctly for television mode. S-Video and Composite +* are working for video-only, so I have them disabled for now. +*/ + .name = "KWorld HardwareMpegTV XPert", + .tuner_type = TUNER_PHILIPS_TDA8290, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .input = {{ + .type = CX88_VMUX_TELEVISION, + .vmux = 0, + .gpio0 = 0x07fa, + }}, + }, };const unsigned int cx88_bcount =ARRAY_SIZE (cx88_boards);
@@ -1254,6 +1273,10 @@ struct cx88_subid cx88_subids[] = { .subdevice = 0xdb11, .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS, /* Re-branded DViCO: UltraView DVB-T Plus */ + },{ + .subvendor = 0x17de, + .subdevice = 0x0840, + .card = CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT, }, };const unsigned int cx88_idcount =ARRAY_SIZE (cx88_subids);
drivers/media/video/cx88/cx88.h +0 -0
drivers/media/video/cx88/cx88.h +1 -0
@@ -187,6 +187,7 @@ extern struct sram_channel cx88_sram_cha#define CX88_BOARD_DNTV_LIVE_DVB_T_PRO 42#define CX88_BOARD_KWORLD_DVB_T_CX22702 43#define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL 44 +#define CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT 45enum cx88_itype {CX88_VMUX_COMPOSITE1 =1 ,
PATCH 69/141 V4L/DVB (3318a): Makes Some symbols static.
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1139302154 -0200
Some symbols at cx88-alsa were global. Making those static.
---
drivers/media/video/cx88/cx88-alsa.c +0 -0
drivers/media/video/cx88/cx88-alsa.c +3 -3
@@ -128,7 +128,7 @@ MODULE_PARM_DESC(debug,"enable debug mes* BOARD Specific: Sets audio DMA */ -int _cx88_start_audio_dma (snd_cx88_card_t *chip) +static int _cx88_start_audio_dma (snd_cx88_card_t *chip) {struct cx88_buffer *buf = chip->buf;struct cx88_core *core=chip->core;
@@ -173,7 +173,7 @@ int _cx88_start_audio_dma(snd_cx88_card_/* * BOARD Specific: Resets audio DMA */ -int _cx88_stop_audio_dma (snd_cx88_card_t *chip) +static int _cx88_stop_audio_dma (snd_cx88_card_t *chip) {struct cx88_core *core=chip->core;dprintk (1 ,"Stopping audio DMA\n" );
@@ -613,7 +613,7 @@ static snd_kcontrol_new_t snd_cx88_captu* Only boards with eeprom and byte 1 at eeprom=1 have it */ -struct pci_device_id cx88_audio_pci_tbl[] = { +static struct pci_device_id cx88_audio_pci_tbl[] = { {0x14f1 ,0x8801 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {0x14f1 ,0x8811 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, {0 , }
PATCH 71/141 V4L/DVB (3318c): fix saa7146 kobject register failure
In reply to [email protected]From: Dave Jones <[email protected]>
Date: 1139302155 -0200
Whoops.
kobject_register failed for hexium HV-PCI6/Orion (-13)
[<c01d3eb6>] kobject_register+0x31/0x47 [<c023a996>] bus_add_driver+0x4a/0xfd [<c01de3c1>] __pci_register_driver+0x82/0xa4 [<d083400a>] hexium_init_module+0xa/0x47 [hexium_orion] [<c013bdae>] sys_init_module+0x167b/0x1822 [<c01633f7>] do_sync_read+0xb8/0xf3 [<c0133fa3>] autoremove_wake_function+0x0/0x2d [<c0145390>] audit_syscall_entry+0x118/0x13f [<c0106ae2>] do_syscall_trace+0x104/0x14a [<c0103d21>] syscall_call+0x7/0xb
slashes in kobject names aren't allowed.
---
drivers/media/video/hexium_orion.c +0 -0
drivers/media/video/hexium_orion.c +1 -1
@@ -484,7 +484,7 @@ static struct saa7146_ext_vv vv_data = { };static struct saa7146_extension extension = { - .name ="hexium HV-PCI6/Orion" , + .name ="hexium HV-PCI6 Orion" , .flags =0 ,// SAA7146_USE_I2C_IRQ, .pci_tbl = &pci_tbl[0 ],
PATCH 72/141 V4L/DVB (3318e): DVB: remove the at76c651/tda80xx frontends
In reply to [email protected]From: Adrian Bunk <[email protected]>
Date: 1139302155 -0200
The at76c651 and tda80xx frontends are currently completely unused, IOW their only effect is making the kernel larger for people accitentially enabling them.
The current in-kernel drivers differ from the drivers at cvs.tuxbox.org, and re-adding them when parts of the dbox2 project get merged should be trivial.
---
drivers/media/dvb/frontends/Kconfig +0 -0
drivers/media/dvb/frontends/Kconfig +0 -12
@@ -28,12 +28,6 @@ config DVB_TDA8083 help A DVB-S tuner module. Say Y when you want to support this frontend. -config DVB_TDA80XX - tristate "Philips TDA8044 or TDA8083 based" - depends on DVB_CORE - help - A DVB-S tuner module. Say Y when you want to support this frontend. - config DVB_MT312 tristate "Zarlink MT312 based" depends on DVB_CORE
@@ -139,12 +133,6 @@ config DVB_DIB3000MC comment "DVB-C (cable) frontends" depends on DVB_CORE -config DVB_ATMEL_AT76C651 - tristate "Atmel AT76C651 based" - depends on DVB_CORE - help - A DVB-C tuner module. Say Y when you want to support this frontend. - config DVB_VES1820 tristate "VLSI VES1820 based" depends on DVB_CORE
drivers/media/dvb/frontends/Makefile +0 -0
drivers/media/dvb/frontends/Makefile +0 -2
@@ -8,7 +8,6 @@ obj-$(CONFIG_DVB_CORE) += dvb-pll.o obj-$(CONFIG_DVB_STV0299) += stv0299.o obj-$(CONFIG_DVB_SP8870) += sp8870.o obj-$(CONFIG_DVB_CX22700) += cx22700.o -obj-$(CONFIG_DVB_ATMEL_AT76C651) += at76c651.o obj-$(CONFIG_DVB_CX24110) += cx24110.o obj-$(CONFIG_DVB_TDA8083) += tda8083.o obj-$(CONFIG_DVB_L64781) += l64781.o
@@ -22,7 +21,6 @@ obj-$(CONFIG_DVB_SP887X) += sp887x.o obj-$(CONFIG_DVB_NXT6000) += nxt6000.o obj-$(CONFIG_DVB_MT352) += mt352.o obj-$(CONFIG_DVB_CX22702) += cx22702.o -obj-$(CONFIG_DVB_TDA80XX) += tda80xx.o obj-$(CONFIG_DVB_TDA10021) += tda10021.o obj-$(CONFIG_DVB_STV0297) += stv0297.o obj-$(CONFIG_DVB_NXT200X) += nxt200x.o
drivers/media/dvb/frontends/at76c651.c +0 -0
drivers/media/dvb/frontends/at76c651.c deleted +0 -450
450 lines not on this page · raw message
drivers/media/dvb/frontends/at76c651.h +0 -0
drivers/media/dvb/frontends/at76c651.h deleted +0 -47
47 lines not on this page · raw message
drivers/media/dvb/frontends/tda80xx.c +0 -0
drivers/media/dvb/frontends/tda80xx.c deleted +0 -734
734 lines not on this page · raw message
drivers/media/dvb/frontends/tda80xx.h +0 -0
drivers/media/dvb/frontends/tda80xx.h deleted +0 -51
51 lines not on this page · raw message
PATCH 73/141 V4L/DVB (3324): Fix Samsung tuner frequency ranges
In reply to [email protected]From: Hans Verkuil <[email protected]>
Date: 1139262744 +0200
Forgot to take the NTSC frequency offset into account.
---
drivers/media/video/tuner-types.c +0 -0
drivers/media/video/tuner-types.c +2 -2
@@ -970,8 +970,8 @@ static struct tuner_params tuner_tnf_533/* ------------ TUNER_SAMSUNG_TCPN_2121P30A - Samsung NTSC ------------ */ static struct tuner_range tuner_samsung_tcpn_2121p30a_ntsc_ranges[] = { - {16 *175.75 /*MHz*/ ,0xce ,0x01 , }, - {16 *410.25 /*MHz*/ ,0xce ,0x02 , }, + {16 *130.00 /*MHz*/ ,0xce ,0x01 , }, + {16 *364.50 /*MHz*/ ,0xce ,0x02 , }, {16 *999.99 ,0xce ,0x08 , }, };
PATCH 74/141 V4L/DVB (3325): Disabled debug on by default in tvp5150
In reply to [email protected]From: Markus Rechberger <[email protected]>
Date: 1139281279 +0100
disabled debug on by default in tvp5150
---
drivers/media/video/tvp5150.c +0 -0
drivers/media/video/tvp5150.c +1 -1
@@ -1182,7 +1182,7 @@ static int tvp5150_detect_client(structreturn rv; } -// if (debug > 1) +if (debug >1 )dump_reg (c);return 0 ; }
PATCH 75/141 V4L/DVB (3326): Adding support for Terratec Prodigy XS
In reply to [email protected]From: Markus Rechberger <[email protected]>
Date: 1139289256 +0100
Adding support for Terratec Prodigy XS
---
drivers/media/video/em28xx/em28xx-cards.c +0 -0
drivers/media/video/em28xx/em28xx-cards.c +26 -0
@@ -198,6 +198,30 @@ struct em28xx_board em28xx_boards[] = { .amux = 1, }}, }, +/* maybe there's a reason behind it why Terratec sells the Hybrid XS as Prodigy XS with a +* different PID, let's keep it separated for now maybe we'll need it lateron */ + [EM2880_BOARD_TERRATEC_PRODIGY_XS] = { + .name = "Terratec Prodigy XS", + .vchannels = 3, + .norm = VIDEO_MODE_PAL, + .tda9887_conf = TDA9887_PRESENT, + .has_tuner = 1, + .tuner_type = TUNER_XCEIVE_XC3028, + .decoder = EM28XX_TVP5150, + .input = {{ + .type = EM28XX_VMUX_TELEVISION, + .vmux = 0, + .amux = 0, + },{ + .type = EM28XX_VMUX_COMPOSITE1, + .vmux = 2, + .amux = 1, + },{ + .type = EM28XX_VMUX_SVIDEO, + .vmux = 9, + .amux = 1, + }}, + }, [EM2820_BOARD_MSI_VOX_USB_2] = { .name = "MSI VOX USB 2.0", .vchannels = 3,
@@ -318,6 +342,7 @@ struct usb_device_id em28xx_id_table [] { USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, { USB_DEVICE(0x2040, 0x6500), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 }, { USB_DEVICE(0x0ccd, 0x0042), .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS }, + { USB_DEVICE(0x0ccd, 0x0047), .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS }, { }, };
@@ -325,6 +350,7 @@ void em28xx_pre_card_setup(struct em28xx {/* request some modules */ switch (dev->model){ +case EM2880_BOARD_TERRATEC_PRODIGY_XS :case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 :case EM2880_BOARD_TERRATEC_HYBRID_XS : {
drivers/media/video/em28xx/em28xx.h +0 -0
drivers/media/video/em28xx/em28xx.h +1 -0
@@ -45,6 +45,7 @@#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 10#define EM2880_BOARD_TERRATEC_HYBRID_XS 11#define EM2820_BOARD_KWORLD_PVRTV2800RF 12 +#define EM2880_BOARD_TERRATEC_PRODIGY_XS 13#define UNSET -1
PATCH 76/141 V4L/DVB (3300a): Removing personal email from DVB maintainers
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1141009641 -0300
---
MAINTAINERS +0 -0
MAINTAINERS +0 -1
@@ -837,7 +837,6 @@ S: Maintained DVB SUBSYSTEM AND DRIVERS P: LinuxTV.org Project -M: [email protected] M: [email protected] L: [email protected] (subscription required) W: http://linuxtv.org/
PATCH 77/141 V4L/DVB (3300b): .gitignore should also ignore StGit generated dirs
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1141009644 -0300
StGit genreates patches-* when you run stg export command. It makes no sense to show such directories as changes on git status.
---
.gitignore +0 -0
.gitignore +2 -0
@@ -30,3 +30,5 @@ include/linux/autoconf.h include/linux/compile.h include/linux/version.h +# stgit generated dirs +patches-*
Re: [PATCH 077/141] V4L/DVB (3300b): .gitignore should also ignore StGit generated dirs
Quoted 3 lines · [email protected] wrote:
StGit genreates patches-* when you run stg export command.
It makes no sense to show such directories as changes on git status.
That's not a DVB patch. Things like this should be submitted separately please.
PATCH 78/141 V4L/DVB (3291): Added support for xc3028 analogue tuner (Hauppauge HVR900, Terratec Hybrid XS)
In reply to [email protected]From: Markus Rechberger <[email protected]>
Date: 1141009647 -0300
Added support for xc3028 to v4l which adds support for:
* Terratec Hybrid XS (analogue)
* Hauppauge HVR 900 (analogue)
---
Documentation/video4linux/CARDLIST.tuner +0 -0
Documentation/video4linux/CARDLIST.tuner +1 -0
@@ -69,3 +69,4 @@ tuner=67 - Philips TD1316 Hybrid Tuner tuner=68 - Philips TUV1236D ATSC/NTSC dual in tuner=69 - Tena TNF 5335 MF tuner=70 - Samsung TCPN 2121P30A +tuner=71 - Xceive xc3028
drivers/media/video/Makefile +0 -0
drivers/media/video/Makefile +1 -1
@@ -9,7 +9,7 @@ zoran-objs := zr36120.o zr36120_i2c zr36067-objs := zoran_procfs.o zoran_device.o \ zoran_driver.o zoran_card.o tuner-objs := tuner-core.o tuner-types.o tuner-simple.o \ - mt20xx.o tda8290.o tea5767.o + mt20xx.o tda8290.o tea5767.o xc3028.o msp3400-objs := msp3400-driver.o msp3400-kthreads.o
drivers/media/video/em28xx/em28xx-cards.c +0 -0
drivers/media/video/em28xx/em28xx-cards.c +2 -2
@@ -158,8 +158,8 @@ struct em28xx_board em28xx_boards[] = { .name = "Hauppauge WinTV HVR 900", .vchannels = 3, .norm = VIDEO_MODE_PAL, - .has_tuner = 0, .tda9887_conf = TDA9887_PRESENT, + .tuner_type = TUNER_XCEIVE_XC3028, .has_tuner = 1, .decoder = EM28XX_TVP5150, .input = {{
@@ -180,8 +180,8 @@ struct em28xx_board em28xx_boards[] = { .name = "Terratec Hybrid XS", .vchannels = 3, .norm = VIDEO_MODE_PAL, - .has_tuner = 0, .tda9887_conf = TDA9887_PRESENT, + .tuner_type = TUNER_XCEIVE_XC3028, .has_tuner = 1, .decoder = EM28XX_TVP5150, .input = {{
drivers/media/video/tuner-core.c +0 -0
drivers/media/video/tuner-core.c +3 -0
@@ -217,6 +217,9 @@ static void set_type(struct i2c_client *i2c_master_send (c,buffer,4 );default_tuner_init (c);break ; +case TUNER_XCEIVE_XC3028 : +xc3028_init (c); +break ;default :default_tuner_init (c);break ;
drivers/media/video/tuner-types.c +0 -0
drivers/media/video/tuner-types.c +21 -0
@@ -983,6 +983,23 @@ static struct tuner_params tuner_samsung }, }; +/* ------------ TUNER_XCEIVE_XC3028 - Xceive xc3028 ------------ */ + +static struct tuner_range tuner_xceive_xc3028_ranges[] = { + {16 *140.25 /*MHz*/ ,0x02 , }, + {16 *463.25 /*MHz*/ ,0x04 , }, + {16 *999.99 ,0x01 , }, +}; + +static struct tuner_params tuner_xceive_xc3028_params[] = { + { + .type =TUNER_XCEIVE_XC3028 , + .ranges = tuner_xceive_xc3028_ranges, + .count =ARRAY_SIZE (tuner_xceive_xc3028_ranges), + }, +}; + +/* --------------------------------------------------------------------- */ struct tunertype tuners[] = {
@@ -1350,6 +1367,10 @@ struct tunertype tuners[] = { .params = tuner_samsung_tcpn_2121p30a_params, .count = ARRAY_SIZE(tuner_samsung_tcpn_2121p30a_params), }, + [TUNER_XCEIVE_XC3028] = { /* Xceive 3028 */ + .name = "Xceive xc3028", + .params = tuner_xceive_xc3028_params, + }, };unsigned const int tuner_count =ARRAY_SIZE (tuners);
include/media/tuner.h +0 -0
include/media/tuner.h +3 -0
@@ -117,6 +117,8 @@#define TUNER_TNF_5335MF 69/* Sabrent Bt848 */ #define TUNER_SAMSUNG_TCPN_2121P30A 70/* Hauppauge PVR-500MCE NTSC */ +#define TUNER_XCEIVE_XC3028 71 +/* tv card specific */ #define TDA9887_PRESENT (1<<0)#define TDA9887_PORT1_INACTIVE (1<<1)
@@ -209,6 +211,7 @@ struct tuner {extern unsigned const int tuner_count;extern int microtune_init (struct i2c_client *c); +extern int xc3028_init (struct i2c_client *c);extern int tda8290_init (struct i2c_client *c);extern int tda8290_probe (struct i2c_client *c);extern int tea5767_tuner_init (struct i2c_client *c);
PATCH 79/141 V4L/DVB (3292): Fixed xc3028 firmware extractor, added terratec fw support
In reply to [email protected]From: Markus Rechberger <[email protected]>
Date: 1141009651 -0300
Fixed xc3028 firmware extractor for terratec's emBDA.sys firmware Fixed delay in firmwareupload, now terratec's firmware also works
---
drivers/media/video/em28xx/em28xx-cards.c +0 -0
drivers/media/video/em28xx/em28xx-cards.c +1 -1
@@ -181,8 +181,8 @@ struct em28xx_board em28xx_boards[] = { .vchannels = 3, .norm = VIDEO_MODE_PAL, .tda9887_conf = TDA9887_PRESENT, - .tuner_type = TUNER_XCEIVE_XC3028, .has_tuner = 1, + .tuner_type = TUNER_XCEIVE_XC3028, .decoder = EM28XX_TVP5150, .input = {{ .type = EM28XX_VMUX_COMPOSITE1,
drivers/media/video/em28xx/em28xx-i2c.c +0 -0
drivers/media/video/em28xx/em28xx-i2c.c +0 -1
@@ -420,7 +420,6 @@ static int em28xx_set_tuner(int check_ee tun_setup.mode_mask =T_ANALOG_TV |T_RADIO ; tun_setup.type = dev->tuner_type; tun_setup.addr = dev->tuner_addr; -em28xx_i2c_call_clients (dev,TUNER_SET_TYPE_ADDR , &tun_setup); }
drivers/media/video/tuner-core.c +0 -0
drivers/media/video/tuner-core.c +0 -1
@@ -173,7 +173,6 @@ static void set_type(struct i2c_client * } t->type = type; -switch (t->type) {case TUNER_MT2032 :microtune_init (c);
PATCH 80/141 V4L/DVB (3293): Fixed amux hauppauge hvr900/terratec hybrid xs
In reply to [email protected]From: Markus Rechberger <[email protected]>
Date: 1141009654 -0300
Fixed amux hauppauge hvr900/terratec hybrid xs
---
drivers/media/video/em28xx/em28xx-cards.c +0 -0
drivers/media/video/em28xx/em28xx-cards.c +7 -7
@@ -101,7 +101,7 @@ struct em28xx_board em28xx_boards[] = { .input = {{ .type = EM28XX_VMUX_TELEVISION, .vmux = 2, - .amux = 0, + .amux = 1, },{ .type = EM28XX_VMUX_COMPOSITE1, .vmux = 0,
@@ -165,11 +165,11 @@ struct em28xx_board em28xx_boards[] = { .input = {{ .type = EM28XX_VMUX_COMPOSITE1, .vmux = 2, - .amux = 0, + .amux = 1, },{ .type = EM28XX_VMUX_TELEVISION, .vmux = 0, - .amux = 1, + .amux = 0, },{ .type = EM28XX_VMUX_SVIDEO, .vmux = 9,
@@ -185,12 +185,12 @@ struct em28xx_board em28xx_boards[] = { .tuner_type = TUNER_XCEIVE_XC3028, .decoder = EM28XX_TVP5150, .input = {{ - .type = EM28XX_VMUX_COMPOSITE1, - .vmux = 2, - .amux = 0, - },{ .type = EM28XX_VMUX_TELEVISION, .vmux = 0, + .amux = 0, + },{ + .type = EM28XX_VMUX_COMPOSITE1, + .vmux = 2, .amux = 1, },{ .type = EM28XX_VMUX_SVIDEO,
drivers/media/video/em28xx/em28xx-video.c +0 -0
drivers/media/video/em28xx/em28xx-video.c +7 -7
@@ -222,8 +222,8 @@ static int em28xx_config(struct em28xx */* enable vbi capturing */ -em28xx_write_regs_req (dev,0x00 ,0x0e ,"\xC0" ,1 ); -em28xx_write_regs_req (dev,0x00 ,0x0f ,"\x80" ,1 ); +/* em28xx_write_regs_req(dev,0x00,0x0e,"\xC0",1); audio register */ +/* em28xx_write_regs_req(dev,0x00,0x0f,"\x80",1); clk register */ em28xx_write_regs_req (dev,0x00 ,0x11 ,"\x51" ,1 );em28xx_audio_usb_mute (dev,1 );
@@ -313,11 +313,11 @@ static void video_mux(struct em28xx *devem28xx_audio_source (dev, ainput); }else {switch (dev->ctl_ainput) { -case 0 : - ainput =EM28XX_AUDIO_SRC_TUNER ; -break ; -default : - ainput =EM28XX_AUDIO_SRC_LINE ; +case 0 : + ainput =EM28XX_AUDIO_SRC_TUNER ; +break ; +default : + ainput =EM28XX_AUDIO_SRC_LINE ; }em28xx_audio_source (dev, ainput); }
PATCH 81/141 V4L/DVB (3332): XC3028 code marked with an special define option
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1141009657 -0300
- Current xc3028 support is still experimental, requiring more work to be sent to mainstream. So, it was marked inside some defines, in order to be removed by gentree.pl stript. Script also updated to remove it.
---
drivers/media/video/em28xx/em28xx-cards.c +0 -0
drivers/media/video/em28xx/em28xx-cards.c +4 -0
@@ -154,6 +154,7 @@ struct em28xx_board em28xx_boards[] = { .amux = 1, }}, }, +#ifdef CONFIG_XC3028 [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = { .name = "Hauppauge WinTV HVR 900", .vchannels = 3,
@@ -222,6 +223,7 @@ struct em28xx_board em28xx_boards[] = { .amux = 1, }}, }, +#endif [EM2820_BOARD_MSI_VOX_USB_2] = { .name = "MSI VOX USB 2.0", .vchannels = 3,
@@ -340,9 +342,11 @@ struct usb_device_id em28xx_id_table [] { USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 }, { USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 }, { USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, +#ifdef CONFIG_XC3028 { USB_DEVICE(0x2040, 0x6500), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 }, { USB_DEVICE(0x0ccd, 0x0042), .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS }, { USB_DEVICE(0x0ccd, 0x0047), .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS }, +#endif { }, };
drivers/media/video/tuner-core.c +0 -0
drivers/media/video/tuner-core.c +2 -0
@@ -216,9 +216,11 @@ static void set_type(struct i2c_client *i2c_master_send (c,buffer,4 );default_tuner_init (c);break ; +#ifdef CONFIG_XC3028 case TUNER_XCEIVE_XC3028 :xc3028_init (c);break ; +#endif default :default_tuner_init (c);break ;
drivers/media/video/tuner-types.c +0 -0
drivers/media/video/tuner-types.c +1 -18
@@ -983,23 +983,6 @@ static struct tuner_params tuner_samsung }, }; -/* ------------ TUNER_XCEIVE_XC3028 - Xceive xc3028 ------------ */ - -static struct tuner_range tuner_xceive_xc3028_ranges[] = { - {16 *140.25 /*MHz*/ ,0x02 , }, - {16 *463.25 /*MHz*/ ,0x04 , }, - {16 *999.99 ,0x01 , }, -}; - -static struct tuner_params tuner_xceive_xc3028_params[] = { - { - .type =TUNER_XCEIVE_XC3028 , - .ranges = tuner_xceive_xc3028_ranges, - .count =ARRAY_SIZE (tuner_xceive_xc3028_ranges), - }, -}; - -/* --------------------------------------------------------------------- */ struct tunertype tuners[] = {
@@ -1369,7 +1352,7 @@ struct tunertype tuners[] = { }, [TUNER_XCEIVE_XC3028 ] = {/* Xceive 3028 */ .name ="Xceive xc3028" , - .params = tuner_xceive_xc3028_params, +/* see xc3028.c for details */ }, };
PATCH 82/141 V4L/DVB (3334): Added ET61X251 fourcc type
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1141009660 -0300
---
include/linux/videodev2.h +0 -0
include/linux/videodev2.h +1 -0
@@ -326,6 +326,7 @@ struct v4l2_pix_format#define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S','9','1','0')/* SN9C10x compression */ #define V4L2_PIX_FMT_PWC1 v4l2_fourcc('P','W','C','1')/* pwc older webcam */ #define V4L2_PIX_FMT_PWC2 v4l2_fourcc('P','W','C','2')/* pwc newer webcam */ +#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E','6','2','5')/* ET61X251 compression */ /* * F O R M A T E N U M E R A T I O N
PATCH 83/141 V4L/DVB (3335): Fix in-kernel build
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1141009663 -0300
- remove tuner.ko build dependency on xc3028.o , which will be added again later.
- fix the following build error when using the "make kernel-links" build method to symlink the latest code from the v4l-dvb repository into the kernel source:drivers/media/video/xc3028.c:31:20: em28xx.h: No such file or directory drivers/media/video/xc3028.c: In function `xc3028_init':drivers/media/video/xc3028.c:120: error: dereferencing pointer to incomplete type drivers/media/video/xc3028.c:121: error: dereferencing pointer to incomplete type drivers/media/video/xc3028.c:139: error: dereferencing pointer to incomplete type drivers/media/video/xc3028.c:140: error: dereferencing pointer to incomplete type make[3]: *** [drivers/media/video/xc3028.o] Error 1
---
drivers/media/video/Makefile +0 -0
drivers/media/video/Makefile +1 -1
@@ -9,7 +9,7 @@ zoran-objs := zr36120.o zr36120_i2c zr36067-objs := zoran_procfs.o zoran_device.o \ zoran_driver.o zoran_card.o tuner-objs := tuner-core.o tuner-types.o tuner-simple.o \ - mt20xx.o tda8290.o tea5767.o xc3028.o + mt20xx.o tda8290.o tea5767.o msp3400-objs := msp3400-driver.o msp3400-kthreads.o
PATCH 84/141 V4L/DVB (3336): Bt8xx documentation authors fix
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1141009666 -0300
- use one Author per line, which allows us to add more authors later without creating a mess.
- Add Michael Krufky due to -git commit
2cbeddc976645262dbe036d6ec0825f96af70da3
---
Documentation/dvb/bt8xx.txt +0 -0
Documentation/dvb/bt8xx.txt +5 -1
@@ -111,4 +111,8 @@ source: linux/Documentation/video4linux If you have problems with this please do ask on the mailing list. -- -Authors: Richard Walker, Jamie Honan, Michael Hunold, Manu Abraham +Authors: Richard Walker, + Jamie Honan, + Michael Hunold, + Manu Abraham, + Michael Krufky
PATCH 85/141 V4L/DVB (3337): Drivers/media/dvb/frontends/mt312.c: cleanups
In reply to [email protected]From: Adrian Bunk <[email protected]>
Date: 1141009669 -0300
This patch contains the following possible cleanups:
- update the Kconfig help to mention the VP310
- merge vp310_attach and mt312_attach into a new vp310_mt312_attach to remove some code duplication
---
drivers/media/dvb/b2c2/flexcop-fe-tuner.c +0 -0
drivers/media/dvb/b2c2/flexcop-fe-tuner.c +1 -1
@@ -526,7 +526,7 @@ int flexcop_frontend_init(struct flexcopinfo ("found the stv0297 at i2c address: 0x%02x" ,alps_tdee4_stv0297_config.demod_address); }else /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */ -if ((fc->fe =vp310_attach (&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) !=NULL ) { +if ((fc->fe =vp310_mt312_attach (&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) !=NULL ) { ops = fc->fe->ops; ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd;
drivers/media/dvb/frontends/Kconfig +0 -0
drivers/media/dvb/frontends/Kconfig +1 -1
@@ -29,7 +29,7 @@ config DVB_TDA8083 A DVB-S tuner module. Say Y when you want to support this frontend. config DVB_MT312 - tristate "Zarlink MT312 based" + tristate "Zarlink VP310/MT312 based" depends on DVB_CORE help A DVB-S tuner module. Say Y when you want to support this frontend.
drivers/media/dvb/frontends/mt312.c +0 -0
drivers/media/dvb/frontends/mt312.c +44 -72
131 lines not on this page · raw message
drivers/media/dvb/frontends/mt312.h +0 -0
drivers/media/dvb/frontends/mt312.h +2 -4
@@ -38,10 +38,8 @@ struct mt312_config int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params); }; -extern struct dvb_frontend *mt312_attach (const struct mt312_config * config, -struct i2c_adapter * i2c); +struct dvb_frontend *vp310_mt312_attach (const struct mt312_config * config, +struct i2c_adapter * i2c); -extern struct dvb_frontend *vp310_attach (const struct mt312_config * config, -struct i2c_adapter * i2c);#endif // MT312_H
PATCH 86/141 V4L/DVB (3340): Make a struct static
In reply to [email protected]From: Manu Abraham <[email protected]>
Date: 1141009672 -0300
---
drivers/media/dvb/bt8xx/bt878.c +0 -0
drivers/media/dvb/bt8xx/bt878.c +1 -1
@@ -382,7 +382,7 @@ bt878_device_control(struct bt878 *bt, uEXPORT_SYMBOL (bt878_device_control); -struct cards card_list[]__devinitdata = { +static struct cards card_list[]__devinitdata = { {0x01010071 ,BTTV_BOARD_NEBULA_DIGITV ,"Nebula Electronics DigiTV" }, {0x07611461 ,BTTV_BOARD_AVDVBT_761 ,"AverMedia AverTV DVB-T 761" },
PATCH 87/141 V4L/DVB (3341): Upstream sync - make 2 structs static
In reply to [email protected]From: Adrian Bunk <[email protected]>
Date: 1141009675 -0300
---
drivers/media/dvb/bt8xx/dst.c +0 -0
drivers/media/dvb/bt8xx/dst.c +1 -1
@@ -602,7 +602,7 @@ static int dst_type_print(u8 type)*/ -struct dst_types dst_tlist[] = { +static struct dst_types dst_tlist[] = { { .device_id ="200103A" , .offset =0 ,
PATCH 88/141 V4L/DVB (3343): KWorld HardwareMpegTV XPert: Add radio support
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1141009678 -0300
- add radio support for KWorld HardwareMpegTV XPert
- fix GPIO settings for tv and radio
---
drivers/media/video/cx88/cx88-cards.c +0 -0
drivers/media/video/cx88/cx88-cards.c +5 -1
@@ -1064,8 +1064,12 @@ struct cx88_board cx88_boards[] = { .input = {{ .type = CX88_VMUX_TELEVISION, .vmux = 0, - .gpio0 = 0x07fa, + .gpio0 = 0x3de2, }}, + .radio = { + .type = CX88_RADIO, + .gpio0 = 0x3de6, + }, }, };
PATCH 89/141 V4L/DVB (3344): KWorld HardwareMpegTV XPert must set gpio2
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1141009681 -0300
- KWorld HardwareMpegTV XPert must set gpio2
---
drivers/media/video/cx88/cx88-cards.c +0 -0
drivers/media/video/cx88/cx88-cards.c +2 -0
@@ -1065,10 +1065,12 @@ struct cx88_board cx88_boards[] = { .type = CX88_VMUX_TELEVISION, .vmux = 0, .gpio0 = 0x3de2, + .gpio2 = 0x00ff, }}, .radio = { .type = CX88_RADIO, .gpio0 = 0x3de6, + .gpio2 = 0x00ff, }, },
PATCH 90/141 V4L/DVB (3346): Add saa713x card: ELSA EX-VISION 700TV (saa7130)
In reply to [email protected]From: Tamuki Shoichi <[email protected]>
Date: 1141009684 -0300
Add support for ELSA EX-VISION 700TV, which is the ELSA Japan's flagship model of the software encoding TV capture card. All inputs (Television, Composite1 and S-Video) have been tested.
---
Documentation/video4linux/CARDLIST.saa7134 +0 -0
Documentation/video4linux/CARDLIST.saa7134 +1 -0
@@ -87,3 +87,4 @@ 86 -> LifeView FlyDVB-T [5168:0301] 87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421] 88 -> Tevion DVB-T 220RF [17de:7201] + 89 -> ELSA EX-VISION 700TV [1131:7130]
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +32 -0
@@ -640,6 +640,32 @@ struct saa7134_board saa7134_boards[] = .tv = 1, }}, }, + [SAA7134_BOARD_ELSA_700TV] = { + .name = "ELSA EX-VISION 700TV", + .audio_clock = 0x00187de7, + .tuner_type = TUNER_HITACHI_NTSC, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .inputs = {{ + .name = name_tv, + .vmux = 4, + .amux = LINE2, + .tv = 1, + },{ + .name = name_comp1, + .vmux = 6, + .amux = LINE1, + },{ + .name = name_svideo, + .vmux = 7, + .amux = LINE1, + }}, + .mute = { + .name = name_mute, + .amux = TV, + }, + }, [SAA7134_BOARD_ASUSTeK_TVFM7134] = { .name = "ASUS TV-FM 7134", .audio_clock = 0x00187de7,
@@ -2831,6 +2857,12 @@ struct pci_device_id saa7134_pci_tbl[] = .driver_data = SAA7134_BOARD_ELSA_500TV, },{ .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7130, + .subvendor = 0x1131, + .subdevice = 0x7130, + .driver_data = SAA7134_BOARD_ELSA_700TV, + },{ + .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134, .subvendor = PCI_VENDOR_ID_ASUSTEK, .subdevice = 0x4842,
drivers/media/video/saa7134/saa7134.h +0 -0
drivers/media/video/saa7134/saa7134.h +1 -0
@@ -216,6 +216,7 @@ struct saa7134_format {#define SAA7134_BOARD_FLYDVBT_LR301 86#define SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 87#define SAA7134_BOARD_TEVION_DVBT_220RF 88 +#define SAA7134_BOARD_ELSA_700TV 89#define SAA7134_MAXBOARDS 8#define SAA7134_INPUT_MAX 8
PATCH 91/141 V4L/DVB (3347): Pinnacle PCTV 40i: add filtered Composite2 input
In reply to [email protected]From: Karsten Suehring <[email protected]>
Date: 1141009688 -0300
This patch adds another composite input to the Pinnacle PCTV 100i definition which filters the chrominace signal from the luma input. This improves video quality for Composite signals on the S-Video connector of the card.
In addition the name string of the card is changed to include PCTV 40i and 50i since these cards are identical.
---
Documentation/video4linux/CARDLIST.saa7134 +0 -0
Documentation/video4linux/CARDLIST.saa7134 +1 -1
@@ -75,7 +75,7 @@ 74 -> LifeView FlyTV Platinum Mini2 [14c0:1212] 75 -> AVerMedia AVerTVHD MCE A180 [1461:1044] 76 -> SKNet MonsterTV Mobile [1131:4ee9] - 77 -> Pinnacle PCTV 110i (saa7133) [11bd:002e] + 77 -> Pinnacle PCTV 40i/50i/110i (saa7133) [11bd:002e] 78 -> ASUSTeK P7131 Dual [1043:4862] 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B) 80 -> ASUS Digimatrix TV [1043:0210]
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +5 -1
@@ -2418,7 +2418,7 @@ struct saa7134_board saa7134_boards[] = }}, }, [SAA7134_BOARD_PINNACLE_PCTV_110i] = { - .name = "Pinnacle PCTV 110i (saa7133)", + .name = "Pinnacle PCTV 40i/50i/110i (saa7133)", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_TDA8290, .radio_type = UNSET,
@@ -2433,6 +2433,10 @@ struct saa7134_board saa7134_boards[] = },{ .name = name_comp1, .vmux = 1, + .amux = LINE2, + },{ + .name = name_comp2, + .vmux = 0, .amux = LINE2, },{ .name = name_svideo,
PATCH 92/141 V4L/DVB (3348): Fixed saa7134 ALSA initialization with multiple cards
In reply to [email protected]From: Ricardo Cerqueira <[email protected]>
Date: 1141009691 -0300
When multiple cards were installed, only the first card would have audio initialized, because only the first position in the array parameter defaulted to "1"
To make things worse, the "enable" parameter wasn't enabled, so there was no workaround.
---
drivers/media/video/saa7134/saa7134-alsa.c +0 -0
drivers/media/video/saa7134/saa7134-alsa.c +3 -1
@@ -54,10 +54,12 @@ MODULE_PARM_DESC(debug,"enable debug messtatic int index[SNDRV_CARDS ] =SNDRV_DEFAULT_IDX ;/* Index 0-MAX */ static char *id[SNDRV_CARDS ] =SNDRV_DEFAULT_STR ;/* ID for this card */ -static int enable[SNDRV_CARDS ] = {1 , [1 ... (SNDRV_CARDS -1 )] =0 }; +static int enable[SNDRV_CARDS ] = {1 , [1 ... (SNDRV_CARDS -1 )] =1 };module_param_array (index, int,NULL ,0444 ); +module_param_array (enable, int,NULL ,0444 );MODULE_PARM_DESC (index,"Index value for SAA7134 capture interface(s)." ); +MODULE_PARM_DESC (enable,"Enable (or not) the SAA7134 capture interface(s)." ); #define dprintk(fmt, arg...) if (debug) \ printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ##arg)
PATCH 93/141 V4L/DVB (3349): Remote control codes for BTTV_BOARD_CONTVFMI
In reply to [email protected]From: BoyZonder <[email protected]>
Date: 1141009695 -0300
The remote control interface for this board is the same as the one for BTTV_BOARD_CONCEPTRONIC_CTVFMI2
---
drivers/media/video/bttv-input.c +0 -0
drivers/media/video/bttv-input.c +1 -0
@@ -328,6 +328,7 @@ int bttv_input_init(struct bttv *btv) ir->polling =50 ;// ms break ;case BTTV_BOARD_CONCEPTRONIC_CTVFMI2 : +case BTTV_BOARD_CONTVFMI : ir_codes = ir_codes_pixelview; ir->mask_keycode =0x001F00 ; ir->mask_keyup =0x006000 ;
PATCH 94/141 V4L/DVB (3352): Cxusb: fix lgdt3303 naming
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1141009697 -0300
The following are specific to lgdt3303, and are being renamed to reflect this.
- cxusb_lgdt330x_config renamed to cxusb_lgdt3303_config.
- cxusb_lgdt330x_frontend_attach renamed to cxusb_lgdt3303_frontend_attach.
---
drivers/media/dvb/dvb-usb/cxusb.c +0 -0
drivers/media/dvb/dvb-usb/cxusb.c +4 -4
@@ -282,7 +282,7 @@ static struct cx22702_config cxusb_cx227 .pll_set = dvb_usb_pll_set_i2c, }; -static struct lgdt330x_config cxusb_lgdt330x_config = { +static struct lgdt330x_config cxusb_lgdt3303_config = { .demod_address =0x0e , .demod_chip =LGDT3303 , .pll_set = dvb_usb_pll_set_i2c,
@@ -357,14 +357,14 @@ static int cxusb_cx22702_frontend_attachreturn -EIO ; } -static int cxusb_lgdt330x_frontend_attach (struct dvb_usb_device *d) +static int cxusb_lgdt3303_frontend_attach (struct dvb_usb_device *d) {if (usb_set_interface (d->udev,0 ,7 ) <0 )err ("set interface failed" );cxusb_ctrl_msg (d,CMD_DIGITAL ,NULL ,0 ,NULL ,0 ); -if ((d->fe =lgdt330x_attach (&cxusb_lgdt330x_config, &d->i2c_adap)) !=NULL ) +if ((d->fe =lgdt330x_attach (&cxusb_lgdt3303_config, &d->i2c_adap)) !=NULL )return 0 ;return -EIO ;
@@ -506,7 +506,7 @@ static struct dvb_usb_properties cxusb_b .streaming_ctrl = cxusb_streaming_ctrl, .power_ctrl = cxusb_power_ctrl, - .frontend_attach = cxusb_lgdt330x_frontend_attach, + .frontend_attach = cxusb_lgdt3303_frontend_attach, .tuner_attach = cxusb_lgh064f_tuner_attach, .i2c_algo = &cxusb_i2c_algo,
PATCH 95/141 V4L/DVB (3354): Fix maximum for the saturation and contrast controls.
In reply to [email protected]From: Hans Verkuil <[email protected]>
Date: 1141009700 -0300
---
drivers/media/video/cx25840/cx25840-core.c +0 -0
drivers/media/video/cx25840/cx25840-core.c +2 -2
@@ -567,7 +567,7 @@ static struct v4l2_queryctrl cx25840_qct .type = V4L2_CTRL_TYPE_INTEGER, .name = "Contrast", .minimum = 0, - .maximum = 255, + .maximum = 127, .step = 1, .default_value = 64, .flags = 0,
@@ -576,7 +576,7 @@ static struct v4l2_queryctrl cx25840_qct .type = V4L2_CTRL_TYPE_INTEGER, .name = "Saturation", .minimum = 0, - .maximum = 255, + .maximum = 127, .step = 1, .default_value = 64, .flags = 0,
drivers/media/video/saa7115.c +0 -0
drivers/media/video/saa7115.c +2 -2
@@ -1027,7 +1027,7 @@ static struct v4l2_queryctrl saa7115_qct .type = V4L2_CTRL_TYPE_INTEGER, .name = "Contrast", .minimum = 0, - .maximum = 255, + .maximum = 127, .step = 1, .default_value = 64, .flags = 0,
@@ -1036,7 +1036,7 @@ static struct v4l2_queryctrl saa7115_qct .type = V4L2_CTRL_TYPE_INTEGER, .name = "Saturation", .minimum = 0, - .maximum = 255, + .maximum = 127, .step = 1, .default_value = 64, .flags = 0,
PATCH 96/141 V4L/DVB (3361): Add support for Kworld ATSC110
In reply to [email protected]From: Andrew Burri <[email protected]>
Date: 1141009703 -0300
---
Documentation/video4linux/CARDLIST.saa7134 +0 -0
Documentation/video4linux/CARDLIST.saa7134 +1 -0
@@ -88,3 +88,4 @@ 87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421] 88 -> Tevion DVB-T 220RF [17de:7201] 89 -> ELSA EX-VISION 700TV [1131:7130] + 90 -> KWORLD ATSC110 [17de:7350]
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +22 -0
@@ -2731,6 +2731,22 @@ struct saa7134_board saa7134_boards[] = .amux = LINE1, }, }, + [SAA7134_BOARD_KWORLD_ATSC110 ] = { + .name ="KWORLD ATSC110" , + .audio_clock =0x00187de7 , + .tuner_type =TUNER_PHILIPS_TUV1236D , + .radio_type =UNSET , + .tuner_addr =ADDR_UNSET , + .radio_addr =ADDR_UNSET , + .tda9887_conf =TDA9887_PRESENT , + .mpeg =SAA7134_MPEG_DVB , + .inputs = {{ + .name = name_tv, + .vmux =1 , + .amux =TV , + .tv =1 , + }}, + }, };const unsigned int saa7134_bcount =ARRAY_SIZE (saa7134_boards);
@@ -3232,6 +3248,12 @@ struct pci_device_id saa7134_pci_tbl[] = .subdevice = 0x7201, .driver_data = SAA7134_BOARD_TEVION_DVBT_220RF, },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */ + .subvendor = 0x17de, + .subdevice = 0x7350, + .driver_data = SAA7134_BOARD_KWORLD_ATSC110, + },{/* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
drivers/media/video/saa7134/saa7134-dvb.c +0 -0
drivers/media/video/saa7134/saa7134-dvb.c +9 -0
@@ -927,6 +927,12 @@ static struct nxt200x_config avertvhda18 .pll_address = 0x61, .pll_desc = &dvb_pll_tdhu2, }; + +static struct nxt200x_config kworldatsc110 = { + .demod_address =0x0a , + .pll_address =0x61 , + .pll_desc = &dvb_pll_tuv1236d, +};#endif /* ------------------------------------------------------------------ */
@@ -1012,6 +1018,9 @@ static int dvb_init(struct saa7134_dev *case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180 : dev->dvb.frontend =nxt200x_attach (&avertvhda180, &dev->i2c_adap);break ; +case SAA7134_BOARD_KWORLD_ATSC110 : + dev->dvb.frontend =nxt200x_attach (&kworldatsc110, &dev->i2c_adap); +break ;#endif default :printk ("%s: Huh? unknown DVB card?\n" ,dev->name);
drivers/media/video/saa7134/saa7134.h +0 -0
drivers/media/video/saa7134/saa7134.h +1 -0
@@ -217,6 +217,7 @@ struct saa7134_format {#define SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 87#define SAA7134_BOARD_TEVION_DVBT_220RF 88#define SAA7134_BOARD_ELSA_700TV 89 +#define SAA7134_BOARD_KWORLD_ATSC110 90#define SAA7134_MAXBOARDS 8#define SAA7134_INPUT_MAX 8
PATCH 97/141 V4L/DVB (3362): KWorld ATSC110: implement set_pll_input
In reply to [email protected]From: Curt Meyers <[email protected]>
Date: 1141009707 -0300
- When tuning VSB, use ANT input
- When tuning QAM, use CABLE input
---
drivers/media/video/saa7134/saa7134-dvb.c +0 -0
drivers/media/video/saa7134/saa7134-dvb.c +10 -0
@@ -928,10 +928,20 @@ static struct nxt200x_config avertvhda18 .pll_desc = &dvb_pll_tdhu2, }; +static int nxt200x_set_pll_input (u8 *buf,int input) +{ +if (input) + buf[3 ] |=0x08 ; +else + buf[3 ] &= ~0x08 ; +return 0 ; +} +static struct nxt200x_config kworldatsc110 = { .demod_address =0x0a , .pll_address =0x61 , .pll_desc = &dvb_pll_tuv1236d, + .set_pll_input = nxt200x_set_pll_input, };#endif
Quoted 4 lines · On Mon, 2006-03-20 at 12:08 -0300, [email protected] wrote:
This patch series is also available under v4l-dvb.git tree at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.gitLinus, please pull these from master branch.
please don't send 141 patch series patchbombs to lkml
Quoted 5 lines · On Mon, Mar 20, 2006 at 12:08:19PM -0300, [email protected] wrote:
This patch series is also available under v4l-dvb.git tree at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.gitLinus, please pull these from master branch.
Wow, it would be super nice if you would not patchbomb LKML if you're already sending a pull request... I definitely didn't need 141 emails...
Cheers,
Kyle
PATCH 98/141 V4L/DVB (3363): Kworld ATSC110: enable composite and svideo inputs
In reply to [email protected]From: Curt Meyers <[email protected]>
Date: 1141009712 -0300
- corrected composite input.
- verified s-video input.
---
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +8 -0
@@ -2745,6 +2745,14 @@ struct saa7134_board saa7134_boards[] = .vmux = 1, .amux = TV, .tv = 1, + },{ + .name = name_comp1, + .vmux = 3, + .amux = LINE2, + },{ + .name = name_svideo, + .vmux = 8, + .amux = LINE2, }}, }, };
PATCH 99/141 V4L/DVB (3365): Kworld ATSC110: cleanups
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1141009716 -0300
- There is no radio with this tuner card...
Thanks-to: Dwaine Garden <[email protected]>
- fixed capitalization in card name.
---
Documentation/video4linux/CARDLIST.saa7134 +0 -0
Documentation/video4linux/CARDLIST.saa7134 +1 -1
@@ -88,4 +88,4 @@ 87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421] 88 -> Tevion DVB-T 220RF [17de:7201] 89 -> ELSA EX-VISION 700TV [1131:7130] - 90 -> KWORLD ATSC110 [17de:7350] + 90 -> Kworld ATSC110 [17de:7350]
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +1 -1
@@ -2732,7 +2732,7 @@ struct saa7134_board saa7134_boards[] = }, }, [SAA7134_BOARD_KWORLD_ATSC110] = { - .name = "KWORLD ATSC110", + .name = "Kworld ATSC110", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_TUV1236D, .radio_type = UNSET,
PATCH 100/141 V4L/DVB (3366): Kworld ATSC110: initialize the tuner for analog mode on module load
In reply to [email protected]From: Curt Meyers <[email protected]>
Date: 1141009719 -0300
- Enable the tuv1236 tuner on the Kworld-ATSC110 card so that the tuner can be identified when tuners.ko loads.
- With this change it is no longer necessary to remove and reload the tuner module in order to get the tuv1236 identified.
- This code was copied from the ATI HDTV Wonder init routine (in cx88-cards.c) which also uses the TUV1236D.
---
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +12 -0
@@ -3549,6 +3549,18 @@ int saa7134_board_init2(struct saa7134_di2c_transfer (&dev->i2c_adap, &msg,1 ); }break ; +case SAA7134_BOARD_KWORLD_ATSC110 : + { +/* enable tuner */ +int i; +u8 buffer [] = {0x10 ,0x12 ,0x13 ,0x04 ,0x16 ,0x00 ,0x14 ,0x04 ,0x017 ,0x00 }; + dev->i2c_client.addr =0x0a ; +for (i =0 ; i <5 ; i++) +if (2 !=i2c_master_send (&dev->i2c_client,&buffer[i*2 ],2 )) +printk (KERN_WARNING "%s: Unable to enable tuner(%i).\n" , + dev->name, i); + } +break ; }return 0 ; }
PATCH 101/141 V4L/DVB (3368): KWorld HardwareMpegTV XPert: update comments
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1141009723 -0300
Standard video using the cx88 broadcast decoder is working, but blackbird isn't working yet, audio is only working correctly for television mode. S-Video and Composite are working for video-only, so I have them disabled for now.
---
drivers/media/video/cx88/cx88-cards.c +0 -0
drivers/media/video/cx88/cx88-cards.c +1 -3
@@ -1049,9 +1049,7 @@ struct cx88_board cx88_boards[] = { .dvb = 1, }, [CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT] = { -/* FIXME: This card is shipped without a windows tv app, -* so I haven't been able to use regspy to figure out the GPIO -* settings. Standard video using the cx88 broadcast decoder is +/* FIXME: Standard video using the cx88 broadcast decoder is * working, but blackbird isn't working yet, audio is only * working correctly for television mode. S-Video and Composite * are working for video-only, so I have them disabled for now.
PATCH 102/141 V4L/DVB (3369): LifeView FlyDVB-T Duo: add support for remote control
In reply to [email protected]From: Rudo Thomas <[email protected]>
Date: 1141009726 -0300
The remote controller on the LifeView FlyDVB-T Duo card work flawlessly with the same settings as the LifeView FlyDVB-T LR301 card.
---
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +1 -0
@@ -3362,6 +3362,7 @@ int saa7134_board_init1(struct saa7134_dcase SAA7134_BOARD_KWORLD_TERMINATOR :case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS :case SAA7134_BOARD_FLYDVBT_LR301 : +case SAA7134_BOARD_FLYDVBTDUO : dev->has_remote =SAA7134_REMOTE_GPIO ;break ;case SAA7134_BOARD_MD5044 :
drivers/media/video/saa7134/saa7134-input.c +0 -0
drivers/media/video/saa7134/saa7134-input.c +1 -0
@@ -231,6 +231,7 @@ int saa7134_input_init1(struct saa7134_d mask_keyup =0x040000 ;break ;case SAA7134_BOARD_FLYDVBT_LR301 : +case SAA7134_BOARD_FLYDVBTDUO : ir_codes = ir_codes_flydvb; mask_keycode =0x0001F00 ; mask_keydown =0x0040000 ;
PATCH 103/141 V4L/DVB (3371): Add debug to ioctl arguments.
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1141009729 -0300
Added a new function that allows printing ioctl arguments. This makes easier to include debug code under v4l ioctl handling.
Also fixed some declarations on internal ioctl.
---
drivers/media/video/v4l2-common.c +0 -0
drivers/media/video/v4l2-common.c +524 -0
536 lines not on this page · raw message
include/media/v4l2-common.h +0 -0
include/media/v4l2-common.h +7 -4
@@ -58,6 +58,9 @@/* Prints the ioctl in a human-readable format */ extern void v4l_printk_ioctl (unsigned int cmd); +/* Prints the ioctl and arg in a human-readable format */ +extern void v4l_printk_ioctl_arg (char *s,unsigned int cmd,void *arg); +/* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */ #define v4l_print_ioctl (name, cmd) \ do { \
@@ -185,11 +188,11 @@ struct msp_matrix {register contains invalid or erroneous data -EIO is returned. Note that you must fill in the 'id' member and the 'field' member (to determine whether CC data from the first or second field should be obtained). */ -#define VIDIOC_INT_G_VBI_DATA _IOWR('d', 106, struct v4l2_sliced_vbi_data *) +#define VIDIOC_INT_G_VBI_DATA _IOWR('d', 106, struct v4l2_sliced_vbi_data)/* Returns the chip identifier or V4L2_IDENT_UNKNOWN if no identification can be made. */ -#define VIDIOC_INT_G_CHIP_IDENT _IOR ('d', 107, enum v4l2_chip_ident *) +#define VIDIOC_INT_G_CHIP_IDENT _IOR ('d', 107, enum v4l2_chip_ident)/* Sets I2S speed in bps. This is used to provide a standard way to select I2S clock used by driving digital audio streams at some board designs.
@@ -214,8 +217,8 @@ struct v4l2_routing {These four commands should only be sent directly to an i2c device, they should not be broadcast as the routing is very device specific. */ #define VIDIOC_INT_S_AUDIO_ROUTING _IOW ('d', 109, struct v4l2_routing) -#define VIDIOC_INT_G_AUDIO_ROUTING _IOR ('d', 110, struct v4l2_routing *) +#define VIDIOC_INT_G_AUDIO_ROUTING _IOR ('d', 110, struct v4l2_routing)#define VIDIOC_INT_S_VIDEO_ROUTING _IOW ('d', 111, struct v4l2_routing) -#define VIDIOC_INT_G_VIDEO_ROUTING _IOR ('d', 112, struct v4l2_routing *) +#define VIDIOC_INT_G_VIDEO_ROUTING _IOR ('d', 112, struct v4l2_routing)#endif /* V4L2_COMMON_H_ */
PATCH 104/141 V4L/DVB (3372): Fix a small bug when constructing fps and line numbers
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1141009732 -0300
Previously, only NTSC and PAL/M were associated to 30fps and 525 lines, so, PAL/60 were not handled properly.
---
drivers/media/video/v4l2-common.c +0 -0
drivers/media/video/v4l2-common.c +1 -2
@@ -97,7 +97,7 @@ int v4l2_video_std_construct(struct v4l2memset (vs,0 ,sizeof (struct v4l2_standard )); vs->index = index; vs->id = id; -if (id & (V4L2_STD_NTSC |V4L2_STD_PAL_M )) { +if (id &V4L2_STD_525_60 ) { vs->frameperiod.numerator =1001 ; vs->frameperiod.denominator =30000 ; vs->framelines =525 ;
@@ -110,7 +110,6 @@ int v4l2_video_std_construct(struct v4l2return 0 ; } -/* ----------------------------------------------------------------- */ /* priority handling */
PATCH 105/141 V4L/DVB (3373): Debug messages for ioctl improved
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1141009735 -0300
Adds field and type name to debug message.
Also prints now format for type=capture.
---
drivers/media/video/v4l2-common.c +0 -0
drivers/media/video/v4l2-common.c +27 -7
@@ -323,6 +323,16 @@ static const char *v4l2_int_ioctls[] = { };#define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls) +static void v4l_print_pix_fmt (char *s,struct v4l2_pix_format *fmt) +{ +printk ("%s: width=%d, height=%d, format=%d, field=%s, " +"bytesperline=%d sizeimage=%d, colorspace=%d\n" , s, + fmt->width,fmt->height,fmt->pixelformat, + ((fmt->field>=0 )&&(fmt->field<ARRAY_SIZE (v4l2_field_names)))? + v4l2_field_names[fmt->field]:"unknown" , + fmt->bytesperline,fmt->sizeimage,fmt->colorspace); +}; +/* Common ioctl debug function. This function can be used by external ioctl messages as well as internal V4L ioctl */ void v4l_printk_ioctl (unsigned int cmd)
@@ -449,15 +459,18 @@ void v4l_printk_ioctl_arg(char *s,unsign {struct v4l2_buffer *p=arg;struct v4l2_timecode *tc=&p->timecode; -printk ("%s: %02ld:%02d:%02d.%08ld index=%d, type=%d, " +printk ("%s: %02ld:%02d:%02d.%08ld index=%d, type=%s, " "bytesused=%d, flags=0x%08d, " -"field=%0d, sequence=%d, memory=%d, offset/userptr=0x%08lx," , +"field=%0d, sequence=%d, memory=%d, offset/userptr=0x%08lx\n" , s, (p->timestamp.tv_sec/3600 ), (int )(p->timestamp.tv_sec/60 )%60 , (int )(p->timestamp.tv_sec%60 ), p->timestamp.tv_usec, - p->index,p->type,p->bytesused,p->flags, + p->index, + ((p->type>=0 )&&(p->type<ARRAY_SIZE (v4l2_type_names)))? + v4l2_type_names[p->type]:"unknown" , + p->bytesused,p->flags, p->field,p->sequence,p->memory,p->m.userptr); printk ("%s: timecode= %02d:%02d:%02d type=%d, " "flags=0x%08d, frames=%d, userbits=0x%08x",
@@ -522,17 +535,24 @@ void v4l_printk_ioctl_arg(char *s,unsigncase VIDIOC_TRY_FMT : {struct v4l2_format *p=arg; -/* FIXME: Should be one dump per type*/ -printk ("%s: type=%d\n" , s,p->type); -break ; +printk ("%s: type=%s\n" , s, + ((p->type>=0 )&&(p->type<ARRAY_SIZE (v4l2_type_names)))? + v4l2_type_names[p->type]:"unknown" ); +switch (p->type) { +case V4L2_BUF_TYPE_VIDEO_CAPTURE : +v4l_print_pix_fmt (s, &p->fmt.pix); +break ; +default : +break ; + } }case VIDIOC_G_FBUF :case VIDIOC_S_FBUF : {struct v4l2_framebuffer *p=arg; -/*FIXME: should show also struct v4l2_pix_format p->fmt field */ printk ("%s: capability=%d, flags=%d, base=0x%08lx\n" , s, p->capability,p->flags, (unsigned long )p->base); +v4l_print_pix_fmt (s, &p->fmt);break ; }case VIDIOC_G_FREQUENCY :
PATCH 106/141 V4L/DVB (3374): Adds debuging v4l2_memory enum
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1141009738 -0300
Some cleanup on printing enum names.v4l2_memory now translated also to name.
---
drivers/media/video/v4l2-common.c +0 -0
drivers/media/video/v4l2-common.c +20 -11
@@ -170,7 +170,7 @@ int v4l2_prio_check(struct v4l2_prio_sta/* ----------------------------------------------------------------- */ -/* some arrays for pretty-printing debug messages */ +/* some arrays for pretty-printing debug messages of enum types */ char *v4l2_field_names[] = { [V4L2_FIELD_ANY ] ="any" ,
@@ -191,6 +191,14 @@ char *v4l2_type_names[] = { [V4L2_BUF_TYPE_VBI_OUTPUT] = "vbi-out", }; +static char *v4l2_memory_names[] = { + [V4L2_MEMORY_MMAP ] ="mmap" , + [V4L2_MEMORY_USERPTR ] ="userptr" , + [V4L2_MEMORY_OVERLAY ] ="overlay" , +}; + +#define prt_names (a,arr) (((a)>=0)&&((a)<ARRAY_SIZE(arr)))?arr[a]:"unknown" +/* ------------------------------------------------------------------ */ /* debug help functions */
@@ -328,8 +336,7 @@ static void v4l_print_pix_fmt (char *s,printk ("%s: width=%d, height=%d, format=%d, field=%s, " "bytesperline=%d sizeimage=%d, colorspace=%d\n" , s, fmt->width,fmt->height,fmt->pixelformat, - ((fmt->field>=0 )&&(fmt->field<ARRAY_SIZE (v4l2_field_names)))? - v4l2_field_names[fmt->field]:"unknown" , +prt_names (fmt->field,v4l2_field_names), fmt->bytesperline,fmt->sizeimage,fmt->colorspace); };
@@ -461,17 +468,18 @@ void v4l_printk_ioctl_arg(char *s,unsignstruct v4l2_timecode *tc=&p->timecode;printk ("%s: %02ld:%02d:%02d.%08ld index=%d, type=%s, " "bytesused=%d, flags=0x%08d, " -"field=%0d, sequence=%d, memory=%d, offset/userptr=0x%08lx\n" , +"field=%0d, sequence=%d, memory=%s, offset/userptr=0x%08lx\n" , s, (p->timestamp.tv_sec/3600 ), (int )(p->timestamp.tv_sec/60 )%60 , (int )(p->timestamp.tv_sec%60 ), p->timestamp.tv_usec, p->index, - ((p->type>=0 )&&(p->type<ARRAY_SIZE (v4l2_type_names)))? - v4l2_type_names[p->type]:"unknown" , +prt_names (p->type,v4l2_type_names), p->bytesused,p->flags, - p->field,p->sequence,p->memory,p->m.userptr); + p->field,p->sequence, +prt_names (p->memory,v4l2_memory_names), + p->m.userptr); printk ("%s: timecode= %02d:%02d:%02d type=%d, " "flags=0x%08d, frames=%d, userbits=0x%08x", s,tc->hours,tc->minutes,tc->seconds,
@@ -536,8 +544,7 @@ void v4l_printk_ioctl_arg(char *s,unsign {struct v4l2_format *p=arg;printk ("%s: type=%s\n" , s, - ((p->type>=0 )&&(p->type<ARRAY_SIZE (v4l2_type_names)))? - v4l2_type_names[p->type]:"unknown" ); +prt_names (p->type,v4l2_type_names));switch (p->type) {case V4L2_BUF_TYPE_VIDEO_CAPTURE :v4l_print_pix_fmt (s, &p->fmt.pix);
@@ -646,8 +653,10 @@ void v4l_printk_ioctl_arg(char *s,unsigncase VIDIOC_REQBUFS : {struct v4l2_requestbuffers *p=arg; -printk ("%s: count=%d, type=%d, memory=%d\n" , s, - p->count,p->type,p->memory); +printk ("%s: count=%d, type=%s, memory=%s\n" , s, + p->count, +prt_names (p->type,v4l2_type_names), +prt_names (p->memory,v4l2_memory_names));break ; }case VIDIOC_INT_S_AUDIO_ROUTING :
PATCH 107/141 V4L/DVB (3375): Add AUDIO_GET_PTS and VIDEO_GET_PTS ioctls
In reply to [email protected]From: Andreas Oberritter <[email protected]>
Date: 1141009740 -0300
Add two new ioctls to read the 33 bit presentation time stamp from audio and video devices as defined in ITU T-REC-H.222.0 and ISO/IEC 13818-1.
---
include/linux/dvb/audio.h +0 -0
include/linux/dvb/audio.h +13 -0
@@ -121,4 +121,17 @@ typedef uint16_t audio_attributes_t;#define AUDIO_SET_ATTRIBUTES _IOW('o', 17, audio_attributes_t)#define AUDIO_SET_KARAOKE _IOW('o', 18, audio_karaoke_t) +/** +* AUDIO_GET_PTS +* +* Read the 33 bit presentation time stamp as defined +* in ITU T-REC-H.222.0 / ISO/IEC 13818-1. +* +* The PTS should belong to the currently played +* frame if possible, but may also be a value close to it +* like the PTS of the last decoded frame or the last PTS +* extracted by the PES parser. +*/ +#define AUDIO_GET_PTS _IOR('o', 19, __u64) +#endif /* _DVBAUDIO_H_ */
include/linux/dvb/video.h +0 -0
include/linux/dvb/video.h +13 -0
@@ -200,4 +200,17 @@ typedef uint16_t video_attributes_t;#define VIDEO_GET_SIZE _IOR('o', 55, video_size_t)#define VIDEO_GET_FRAME_RATE _IOR('o', 56, unsigned int) +/** +* VIDEO_GET_PTS +* +* Read the 33 bit presentation time stamp as defined +* in ITU T-REC-H.222.0 / ISO/IEC 13818-1. +* +* The PTS should belong to the currently played +* frame if possible, but may also be a value close to it +* like the PTS of the last decoded frame or the last PTS +* extracted by the PES parser. +*/ +#define VIDEO_GET_PTS _IOR('o', 57, __u64) +#endif /*_DVBVIDEO_H_*/
PATCH 109/141 V4L/DVB (3377): Support for Satelco EasyWatch DVB-S light
In reply to [email protected]From: Thilo Berger <[email protected]>
Date: 1141009748 -0300
Support for Satelco EasyWatch DVB-S light.
---
drivers/media/dvb/ttpci/budget-av.c +0 -0
drivers/media/dvb/ttpci/budget-av.c +4 -0
@@ -1000,6 +1000,7 @@ static u8 read_pwm(struct budget_av *bud#define SUBID_DVBS_TV_STAR 0x0014#define SUBID_DVBS_TV_STAR_CI 0x0016 +#define SUBID_DVBS_EASYWATCH 0x001e#define SUBID_DVBC_KNC1 0x0020#define SUBID_DVBC_KNC1_PLUS 0x0021#define SUBID_DVBC_CINERGY1200 0x1156
@@ -1038,6 +1039,7 @@ static void frontend_init(struct budget_case SUBID_DVBS_TV_STAR :case SUBID_DVBS_TV_STAR_CI :case SUBID_DVBS_CYNERGY1200N : +case SUBID_DVBS_EASYWATCH : fe =stv0299_attach (&philips_sd1878_config, &budget_av->budget.i2c_adap);break ;
@@ -1285,6 +1287,7 @@ MAKE_BUDGET_INFO(knc1s, "KNC1 DVB-S", BUMAKE_BUDGET_INFO (knc1c,"KNC1 DVB-C" ,BUDGET_KNC1C );MAKE_BUDGET_INFO (knc1t,"KNC1 DVB-T" ,BUDGET_KNC1T );MAKE_BUDGET_INFO (kncxs,"KNC TV STAR DVB-S" ,BUDGET_TVSTAR ); +MAKE_BUDGET_INFO (satewpls,"Satelco EasyWatch DVB-S light" ,BUDGET_TVSTAR );MAKE_BUDGET_INFO (knc1sp,"KNC1 DVB-S Plus" ,BUDGET_KNC1SP );MAKE_BUDGET_INFO (knc1cp,"KNC1 DVB-C Plus" ,BUDGET_KNC1CP );MAKE_BUDGET_INFO (knc1tp,"KNC1 DVB-T Plus" ,BUDGET_KNC1TP );
@@ -1300,6 +1303,7 @@ static struct pci_device_id pci_tbl[] =MAKE_EXTENSION_PCI (knc1sp,0x1131 ,0x0011 ),MAKE_EXTENSION_PCI (kncxs,0x1894 ,0x0014 ),MAKE_EXTENSION_PCI (kncxs,0x1894 ,0x0016 ), +MAKE_EXTENSION_PCI (satewpls,0x1894 ,0x001e ),MAKE_EXTENSION_PCI (knc1c,0x1894 ,0x0020 ),MAKE_EXTENSION_PCI (knc1cp,0x1894 ,0x0021 ), MAKE_EXTENSION_PCI(knc1t, 0x1894, 0x0030),
PATCH 110/141 V4L/DVB (3378): Restore power on defaults of tda9887 after tda8290 probe
In reply to [email protected]From: Hartmut Hackmann <[email protected]>
Date: 1141009751 -0300
The probing code for tda8290 changes the state of the tda9887 GP ports. The patch assumes that if probing for tda8290 failed, this must be a tda9887 and restores its power on defaults.
This should solve the module load order issue with some pinnacle cards.
---
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +2 -2
@@ -2213,7 +2213,7 @@ struct saa7134_board saa7134_boards[] = .radio_type = UNSET, .tuner_addr = 0x61, .radio_addr = ADDR_UNSET, - .tda9887_conf = TDA9887_PRESENT, + .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE, .mpeg = SAA7134_MPEG_DVB, .inputs = {{ .name = name_tv,
@@ -2237,7 +2237,7 @@ struct saa7134_board saa7134_boards[] = .radio_type = UNSET, .tuner_addr = 0x61, .radio_addr = ADDR_UNSET, - .tda9887_conf = TDA9887_PRESENT, + .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE, .mpeg = SAA7134_MPEG_DVB, .inputs = {{ .name = name_tv,
drivers/media/video/tda8290.c +0 -0
drivers/media/video/tda8290.c +5 -3
@@ -584,9 +584,10 @@ int tda8290_init(struct i2c_client *c)int tda8290_probe (struct i2c_client *c) { -unsigned char soft_reset[] = {0x00 ,0x00 }; -unsigned char easy_mode_b[] = {0x01 ,0x02 }; -unsigned char easy_mode_g[] = {0x01 ,0x04 }; +unsigned char soft_reset[] = {0x00 ,0x00 }; +unsigned char easy_mode_b[] = {0x01 ,0x02 }; +unsigned char easy_mode_g[] = {0x01 ,0x04 }; +unsigned char restore_9886[] = {0x00 ,0xd6 ,0x30 };unsigned char addr_dto_lsb =0x07 ;unsigned char data;
@@ -603,6 +604,7 @@ int tda8290_probe(struct i2c_client *c)return 0 ; } } +i2c_master_send (c, restore_9886,3 );return -1 ; }
PATCH 111/141 V4L/DVB (3380): TUV1236d: declare buffer as static const
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1141009754 -0300
Make buffer a static const
---
drivers/media/video/cx88/cx88-cards.c +0 -0
drivers/media/video/cx88/cx88-cards.c +1 -1
@@ -1487,7 +1487,7 @@ void cx88_card_setup(struct cx88_core *cif (0 == core->i2c_rc) {/* enable tuner */ int i; -u8 buffer [] = {0x10 ,0x12 ,0x13 ,0x04 ,0x16 ,0x00 ,0x14 ,0x04 ,0x017 ,0x00 }; +static const u8 buffer [] = {0x10 ,0x12 ,0x13 ,0x04 ,0x16 ,0x00 ,0x14 ,0x04 ,0x017 ,0x00 }; core->i2c_client.addr =0x0a ;for (i =0 ; i <5 ; i++)
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +1 -1
@@ -3554,7 +3554,7 @@ int saa7134_board_init2(struct saa7134_d {/* enable tuner */ int i; -u8 buffer [] = {0x10 ,0x12 ,0x13 ,0x04 ,0x16 ,0x00 ,0x14 ,0x04 ,0x017 ,0x00 }; +static const u8 buffer [] = {0x10 ,0x12 ,0x13 ,0x04 ,0x16 ,0x00 ,0x14 ,0x04 ,0x017 ,0x00 }; dev->i2c_client.addr =0x0a ;for (i =0 ; i <5 ; i++)if (2 !=i2c_master_send (&dev->i2c_client,&buffer[i*2 ],2 ))
PATCH 112/141 V4L/DVB (3382): Fix stv0297 for qam128 on tt c1500 (saa7146)
In reply to [email protected]From: Mattias Nordstrom <[email protected]>
Date: 1141009757 -0300
I have a TT C1500 card (saa7146, STV0297) which had problems tuning channels at QAM128 (like the ones in the Finnish HTV / Welho network). A fix which seems to work perfectly so far is to change the delay for QAM128 to the same values as for QAM256 in stv0297_set_frontend(),
---
drivers/media/dvb/frontends/stv0297.c +0 -0
drivers/media/dvb/frontends/stv0297.c +0 -4
@@ -393,10 +393,6 @@ static int stv0297_set_frontend(struct dbreak ;case QAM_128 : - delay =150 ; - sweeprate =1000 ; -break ; -case QAM_256 : delay =200 ; sweeprate =500 ;
PATCH 113/141 V4L/DVB (3385): Dvb: fix __init/__exit section references in av7110 driver
In reply to [email protected]From: Johannes Stezenbach <[email protected]>
Date: 1141009760 -0300
use __devinit/__devexit/__devexit_p() where appropriate
---
drivers/media/dvb/ttpci/av7110.c +0 -0
drivers/media/dvb/ttpci/av7110.c +4 -3
@@ -2476,7 +2476,8 @@ static int frontend_init(struct av7110 ** The same behaviour of missing VSYNC can be duplicated on budget * cards, by seting DD1_INIT trigger mode 7 in 3rd nibble. */ -static int av7110_attach (struct saa7146_dev * dev,struct saa7146_pci_extension_data *pci_ext) +static int __devinit av7110_attach (struct saa7146_dev * dev, +struct saa7146_pci_extension_data *pci_ext) {const int length =TS_WIDTH *TS_HEIGHT ;struct pci_dev *pdev = dev->pci;
@@ -2826,7 +2827,7 @@ err_kfree_0: goto out; } -static int av7110_detach (struct saa7146_dev * saa) +static int __devexit av7110_detach(struct saa7146_dev* saa) {struct av7110 *av7110 = saa->ext_priv;dprintk (4 ,"%p\n" , av7110);
@@ -2973,7 +2974,7 @@ static struct saa7146_extension av7110_e .module = THIS_MODULE, .pci_tbl = &pci_tbl[0], .attach = av7110_attach, - .detach = av7110_detach, + .detach = __devexit_p(av7110_detach), .irq_mask = MASK_19 | MASK_03 | MASK_10, .irq_func = av7110_irq,
drivers/media/dvb/ttpci/av7110_ir.c +0 -0
drivers/media/dvb/ttpci/av7110_ir.c +2 -2
@@ -208,7 +208,7 @@ static void ir_handler(struct av7110 *av } -int __init av7110_ir_init (struct av7110 *av7110) +int __devinit av7110_ir_init (struct av7110 *av7110) {static struct proc_dir_entry *e;
@@ -248,7 +248,7 @@ int __init av7110_ir_init(struct av7110 } -void __exit av7110_ir_exit(struct av7110 *av7110) +void __devexit av7110_ir_exit(struct av7110 *av7110) {int i;
PATCH 114/141 V4L/DVB (3386): Dvb-core: remove dead code
In reply to [email protected]From: Peter Beutner <[email protected]>
Date: 1141009763 -0300
The field "dvr" in struct dmxdev is competely unused. Remove it and code which allocates, initializes and frees it.
---
drivers/media/dvb/dvb-core/dmxdev.c +0 -0
drivers/media/dvb/dvb-core/dmxdev.c +0 -19
@@ -160,13 +160,6 @@ static struct dmx_frontend * get_fe(strureturn NULL ; } -static inline void dvb_dmxdev_dvr_state_set (struct dmxdev_dvr *dmxdevdvr,int state) -{ -spin_lock_irq (&dmxdevdvr->dev->lock); - dmxdevdvr->state=state; -spin_unlock_irq (&dmxdevdvr->dev->lock); -} -static int dvb_dvr_open (struct inode *inode,struct file *file) {struct dvb_device *dvbdev = file->private_data;
@@ -1106,22 +1099,12 @@ dvb_dmxdev_init(struct dmxdev *dmxdev, sif (!dmxdev->filter)return -ENOMEM ; - dmxdev->dvr =vmalloc (dmxdev->filternum*sizeof (struct dmxdev_dvr )); -if (!dmxdev->dvr) { -vfree (dmxdev->filter); - dmxdev->filter =NULL ; -return -ENOMEM ; - } -mutex_init (&dmxdev->mutex);spin_lock_init (&dmxdev->lock);for (i=0 ; i<dmxdev->filternum; i++) { dmxdev->filter[i].dev=dmxdev; dmxdev->filter[i].buffer.data=NULL ;dvb_dmxdev_filter_state_set (&dmxdev->filter[i],DMXDEV_STATE_FREE ); - dmxdev->dvr[i].dev=dmxdev; - dmxdev->dvr[i].buffer.data=NULL ; -dvb_dmxdev_dvr_state_set (&dmxdev->dvr[i],DMXDEV_STATE_FREE ); }dvb_register_device (dvb_adapter, &dmxdev->dvbdev, &dvbdev_demux, dmxdev,DVB_DEVICE_DEMUX );
@@ -1141,8 +1124,6 @@ dvb_dmxdev_release(struct dmxdev *dmxdevvfree (dmxdev->filter); dmxdev->filter=NULL ; -vfree (dmxdev->dvr); - dmxdev->dvr=NULL ; dmxdev->demux->close (dmxdev->demux); }EXPORT_SYMBOL (dvb_dmxdev_release);
drivers/media/dvb/dvb-core/dmxdev.h +0 -0
drivers/media/dvb/dvb-core/dmxdev.h +0 -8
@@ -94,19 +94,11 @@ struct dmxdev_filter { }; -struct dmxdev_dvr { -int state; -struct dmxdev *dev; -struct dmxdev_buffer buffer; -}; - -struct dmxdev {struct dvb_device *dvbdev;struct dvb_device *dvr_dvbdev;struct dmxdev_filter *filter; -struct dmxdev_dvr *dvr;struct dmx_demux *demux;int filternum;
PATCH 115/141 V4L/DVB (3388): Ignore DiSEqC messages > 6 and < 3
In reply to [email protected]From: Manu Abraham <[email protected]>
Date: 1141009765 -0300
Ignore invalid messages on cx24110 frontend.
Thanks to Edgar Toernig
---
drivers/media/dvb/frontends/cx24110.c +0 -0
drivers/media/dvb/frontends/cx24110.c +3 -0
@@ -418,6 +418,9 @@ static int cx24110_send_diseqc_msg(strucstruct cx24110_state *state = fe->demodulator_priv;unsigned long timeout; +if (cmd->msg_len <3 || cmd->msg_len >6 ) +return -EINVAL ;/* not implemented */ +for (i =0 ; i < cmd->msg_len; i++)cx24110_writereg (state,0x79 + i, cmd->msg[i]);
PATCH 116/141 V4L/DVB (3389): Fix broken IF-OUT Relay handling
In reply to [email protected]From: Manu Abraham <[email protected]>
Date: 1141009769 -0300
Fixed broken IF-OUT on pinnacle sat board.
Thanks to Edgar Toernig
---
drivers/media/dvb/bt8xx/dvb-bt8xx.c +0 -0
drivers/media/dvb/bt8xx/dvb-bt8xx.c +15 -0
@@ -239,6 +239,20 @@ static int cx24108_pll_set(struct dvb_frstatic int pinnsat_pll_init (struct dvb_frontend * fe) { +struct dvb_bt8xx_card *card = fe->dvb->priv; + +bttv_gpio_enable (card->bttv_nr,1 ,1 );/* output */ +bttv_write_gpio (card->bttv_nr,1 ,1 );/* relay on */ + +return 0 ; +} + +static int pinnsat_pll_sleep (struct dvb_frontend * fe) +{ +struct dvb_bt8xx_card *card = fe->dvb->priv; + +bttv_write_gpio (card->bttv_nr,1 ,0 );/* relay off */ +return 0 ; }
@@ -246,6 +260,7 @@ static struct cx24110_config pctvsat_con .demod_address = 0x55, .pll_init = pinnsat_pll_init, .pll_set = cx24108_pll_set, + .pll_sleep = pinnsat_pll_sleep, };static int microtune_mt7202dtf_pll_set (struct dvb_frontend * fe,struct dvb_frontend_parameters * params)
drivers/media/dvb/frontends/cx24110.c +0 -0
drivers/media/dvb/frontends/cx24110.c +10 -0
@@ -371,6 +371,15 @@ static int cx24110_initfe(struct dvb_froreturn 0 ; } +static int cx24110_sleep (struct dvb_frontend *fe) +{ +struct cx24110_state *state = fe->demodulator_priv; + +if (state->config->pll_sleep) +return state->config->pll_sleep (fe); +return 0 ; +} +static int cx24110_set_voltage (struct dvb_frontend * fe,fe_sec_voltage_t voltage) {struct cx24110_state *state = fe->demodulator_priv;
@@ -642,6 +651,7 @@ static struct dvb_frontend_ops cx24110_o .release = cx24110_release, .init = cx24110_initfe, + .sleep = cx24110_sleep, .set_frontend = cx24110_set_frontend, .get_frontend = cx24110_get_frontend, .read_status = cx24110_read_status,
drivers/media/dvb/frontends/cx24110.h +0 -0
drivers/media/dvb/frontends/cx24110.h +1 -0
@@ -35,6 +35,7 @@ struct cx24110_config/* PLL maintenance */ int (*pll_init)(struct dvb_frontend * fe);int (*pll_set)(struct dvb_frontend * fe,struct dvb_frontend_parameters * params); +int (*pll_sleep)(struct dvb_frontend * fe); }; extern struct dvb_frontend* cx24110_attach(const struct cx24110_config* config,
PATCH 117/141 V4L/DVB (3390): Fix module parameters
In reply to [email protected]From: Manu Abraham <[email protected]>
Date: 1141009772 -0300
Now, root may change parameters while module is running. Thanks to Edgar Toerning
---
drivers/media/dvb/dvb-core/dvb_frontend.c +0 -0
drivers/media/dvb/dvb-core/dvb_frontend.c +4 -4
@@ -49,13 +49,13 @@ static int dvb_powerdown_on_sleep = 1;module_param_named (frontend_debug, dvb_frontend_debug, int,0644 );MODULE_PARM_DESC (frontend_debug,"Turn on/off frontend core debugging (default:off)." ); -module_param (dvb_shutdown_timeout, int,0444 ); +module_param (dvb_shutdown_timeout, int,0644 );MODULE_PARM_DESC (dvb_shutdown_timeout,"wait <shutdown_timeout> seconds after close() before suspending hardware" ); -module_param (dvb_force_auto_inversion, int,0444 ); +module_param (dvb_force_auto_inversion, int,0644 );MODULE_PARM_DESC (dvb_force_auto_inversion,"0: normal (default), 1: INVERSION_AUTO forced always" ); -module_param (dvb_override_tune_delay, int,0444 ); +module_param (dvb_override_tune_delay, int,0644 );MODULE_PARM_DESC (dvb_override_tune_delay,"0: normal (default), >0 => delay in milliseconds to wait for lock after a tune attempt" ); -module_param (dvb_powerdown_on_sleep, int,0444 ); +module_param (dvb_powerdown_on_sleep, int,0644 );MODULE_PARM_DESC (dvb_powerdown_on_sleep,"0: do not power down, 1: turn LNB volatage off on sleep (default)" );#define dprintk if (dvb_frontend_debug) printk
Re: [PATCH 117/141] V4L/DVB (3390): Fix module parameters
drivers/media/dvb/dvb-core/dvb_frontend.c static int dvb_powerdown_on_sleep = 1; · line 56
Quoted 2 lines
drivers/media/dvb/dvb-core/dvb_frontend.c +1
-1-module_param (dvb_override_tune_delay, int,0444 ); +module_param (dvb_override_tune_delay, int,0644 );
if (dvb_override_tune_delay > 0)
fepriv->min_delay = (dvb_override_tune_delay * HZ) / 1000;
I guess the value of dvb_override_tune_delay could change from non-zero to zero between testing the condition and setting min_delay. Probably this doesn't matter, but still...
Ciao,
D.
Re: [PATCH 117/141] V4L/DVB (3390): Fix module parameters
Quoted 9 lines · Duncan Sands
drivers/media/dvb/dvb-core/dvb_frontend.c static int dvb_powerdown_on_sleep = 1; · line 56
Quoted 3 lines
drivers/media/dvb/dvb-core/dvb_frontend.c +1
-1-module_param (dvb_override_tune_delay, int,0444 ); +module_param (dvb_override_tune_delay, int,0644 );if (
dvb_override_tune_delay> 0)
fepriv->min_delay= (dvb_override_tune_delay* HZ) / 1000;I guess the value of
dvb_override_tune_delaycould change from non-zero to zero between testing the condition and settingmin_delay.
This is within an ioctl and thus protected by the big kernel lock.
Ciao, ET.
Re: [PATCH 117/141] V4L/DVB (3390): Fix module parameters
Quoted 10 lines
Quoted 8 lines
drivers/media/dvb/dvb-core/dvb_frontend.c static int dvb_powerdown_on_sleep = 1; · line 56
Quoted 2 lines
drivers/media/dvb/dvb-core/dvb_frontend.c +1
-1-module_param (dvb_override_tune_delay, int,0444 ); +module_param (dvb_override_tune_delay, int,0644 );if (
dvb_override_tune_delay> 0)
fepriv->min_delay= (dvb_override_tune_delay* HZ) / 1000;I guess the value of
dvb_override_tune_delaycould change from non-zero to zero between testing the condition and settingmin_delay.This is within an ioctl and thus protected by the big kernel lock.
You are right.
Best wishes,
Duncan.
PATCH 118/141 V4L/DVB (3391): Documentation update
In reply to [email protected]From: Uwe Bugla <[email protected]>
Date: 1141009774 -0300
---
Documentation/dvb/avermedia.txt +0 -0
Documentation/dvb/avermedia.txt +3 -7
@@ -1,4 +1,3 @@ - HOWTO: Get An Avermedia DVB-T working under Linux ______________________________________________
@@ -137,11 +136,8 @@ Getting the card going To power up the card, load the following modules in the following order: - * insmod dvb-core.o - * modprobe bttv.o - * insmod bt878.o - * insmod dvb-bt8xx.o - * insmod sp887x.o + * modprobe bttv (normally loaded automatically) + * modprobe dvb-bt8xx (or place dvb-bt8xx in /etc/modules) Insertion of these modules into the running kernel will activate the appropriate DVB device nodes. It is then possible
@@ -302,4 +298,4 @@ Further Update Many thanks to Nigel Pearson for the updates to this document since the recent revision of the driver. - January 29th 2004 + February 14th 2006
Documentation/dvb/readme.txt +0 -0
Documentation/dvb/readme.txt +21 -11
@@ -20,11 +20,23 @@ http://linuxtv.org/downloads/ What's inside this directory: +"avermedia.txt" +contains detailed information about the +Avermedia DVB-T cards. See also "bt8xx.txt". + +"bt8xx.txt" +contains detailed information about the +various bt8xx based "budget" DVB cards. + "cards.txt" contains a list of supported hardware. +"ci.txt" +contains detailed information about the +CI module as part from TwinHan cards and Clones. + "contributors.txt" -is the who-is-who of DVB development +is the who-is-who of DVB development. "faq.txt" contains frequently asked questions and their answers.
@@ -34,19 +46,17 @@ script to download and extract firmware that require it. "ttusb-dec.txt" -contains detailed informations about the +contains detailed information about the TT DEC2000/DEC3000 USB DVB hardware. -"bt8xx.txt" -contains detailed installation instructions for the -various bt8xx based "budget" DVB cards -(Nebula, Pinnacle PCTV, Twinhan DST) - -"README.dibusb" -contains detailed information about adapters -based on DiBcom reference design. - "udev.txt" how to get DVB and udev up and running. +"README.dvb-usb" +contains detailed information about the DVB USB cards. + +"README.flexcop" +contains detailed information about the +Technisat- and Flexcop B2C2 drivers. + Good luck and have fun!
PATCH 119/141 V4L/DVB (3392): Do a RESYNC for all cards
In reply to [email protected]From: Manu Abraham <[email protected]>
Date: 1141009777 -0300
After a FIFO corruptions occurrs (generally due to buffer overflow), FIFO contents needs to be discarted.
---
drivers/media/dvb/bt8xx/dvb-bt8xx.c +0 -0
drivers/media/dvb/bt8xx/dvb-bt8xx.c +9 -9
@@ -813,14 +813,14 @@ static int dvb_bt8xx_probe(struct bttv_s card->gpio_mode =0x0400c060 ;/* should be: BT878_A_GAIN=0,BT878_A_PWRDN,BT878_DA_DPM,BT878_DA_SBR, BT878_DA_IOM=1,BT878_DA_APP to enable serial highspeed mode. */ - card->op_sync_orin =0 ; - card->irq_err_ignore =0 ; + card->op_sync_orin =BT878_RISC_SYNC_MASK ; + card->irq_err_ignore =BT878_AFBUS |BT878_AFDSR ;break ;case BTTV_BOARD_DVICO_DVBT_LITE : card->gpio_mode =0x0400C060 ; - card->op_sync_orin =0 ; - card->irq_err_ignore =0 ; + card->op_sync_orin =BT878_RISC_SYNC_MASK ; + card->irq_err_ignore =BT878_AFBUS |BT878_AFDSR ;/* 26, 15, 14, 6, 5 * A_PWRDN DA_DPM DA_SBR DA_IOM_DA * DA_APP(parallel) */
@@ -835,15 +835,15 @@ static int dvb_bt8xx_probe(struct bttv_scase BTTV_BOARD_NEBULA_DIGITV :case BTTV_BOARD_AVDVBT_761 : card->gpio_mode = (1 <<26 ) | (1 <<14 ) | (1 <<5 ); - card->op_sync_orin =0 ; - card->irq_err_ignore =0 ; + card->op_sync_orin =BT878_RISC_SYNC_MASK ; + card->irq_err_ignore =BT878_AFBUS |BT878_AFDSR ;/* A_PWRDN DA_SBR DA_APP (high speed serial) */ break ;case BTTV_BOARD_AVDVBT_771 ://case 0x07711461: card->gpio_mode =0x0400402B ; card->op_sync_orin =BT878_RISC_SYNC_MASK ; - card->irq_err_ignore =0 ; + card->irq_err_ignore =BT878_AFBUS |BT878_AFDSR ;/* A_PWRDN DA_SBR DA_APP[0] PKTP=10 RISC_ENABLE FIFO_ENABLE*/ break ;
@@ -867,8 +867,8 @@ static int dvb_bt8xx_probe(struct bttv_scase BTTV_BOARD_PC_HDTV : card->gpio_mode =0x0100EC7B ; - card->op_sync_orin =0 ; - card->irq_err_ignore =0 ; + card->op_sync_orin =BT878_RISC_SYNC_MASK ; + card->irq_err_ignore =BT878_AFBUS |BT878_AFDSR ;break ;default :
PATCH 120/141 V4L/DVB (3392a): XC3028 code removed from -git versions
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Date: 1141009781 -0300
- Current xc3028 support is still experimental, requiring more work to be sent to mainstream. It will be kept only at mercurial tree on
http://linuxtv.org/hg until fixed.
---
drivers/media/video/em28xx/em28xx-cards.c +0 -0
drivers/media/video/em28xx/em28xx-cards.c +0 -75
87 lines not on this page · raw message
drivers/media/video/tuner-core.c +0 -0
drivers/media/video/tuner-core.c +0 -5
@@ -216,11 +216,6 @@ static void set_type(struct i2c_client *i2c_master_send (c,buffer,4 );default_tuner_init (c);break ; -#ifdef CONFIG_XC3028 -case TUNER_XCEIVE_XC3028 : -xc3028_init (c); -break ; -#endif default :default_tuner_init (c);break ;
PATCH 121/141 V4L/DVB (3393): Cx88: reduce excessive logging
In reply to [email protected]From: Ian Pickworth <[email protected]>
Date: 1141009785 -0300
- fix temporary debug code by changing printk to dprintk at level 1.
- move CORE_IOCTL messages from level 1 to level 2.
- this should help with selective debugging,
while not filling people's logs up during normal use.
---
drivers/media/dvb/bt8xx/dvb-bt8xx.c +0 -0
drivers/media/dvb/bt8xx/dvb-bt8xx.c +1 -1
@@ -243,7 +243,7 @@ static int pinnsat_pll_init(struct dvb_fbttv_gpio_enable (card->bttv_nr,1 ,1 );/* output */ bttv_write_gpio (card->bttv_nr,1 ,1 );/* relay on */ - +return 0 ; }
drivers/media/video/cx88/cx88-video.c +0 -0
drivers/media/video/cx88/cx88-video.c +7 -7
@@ -918,9 +918,9 @@ static int get_control(struct cx88_core ctl->value = ((value + (c->off << c->shift)) & c->mask) >> c->shift;break ; } -printk ("get_control id=0x%X reg=0x%02x val=0x%02x (mask 0x%02x)%s\n" , - ctl->id, c->reg, ctl->value, - c->mask, c->sreg ?" [shadowed]" :"" ); +dprintk (1 ,"get_control id=0x%X(%s) ctrl=0x%02x, reg=0x%02x val=0x%02x (mask 0x%02x)%s\n" , + ctl->id, c->v.name, ctl->value, c->reg, + value,c->mask, c->sreg ?" [shadowed]" :"" );return 0 ; }
@@ -969,9 +969,9 @@ static int set_control(struct cx88_core value = ((ctl->value - c->off) << c->shift) & c->mask;break ; } -printk ("set_control id=0x%X reg=0x%02x val=0x%02x (mask 0x%02x)%s\n" , - ctl->id, c->reg, value, - mask, c->sreg ?" [shadowed]" :"" ); +dprintk (1 ,"set_control id=0x%X(%s) ctrl=0x%02x, reg=0x%02x val=0x%02x (mask 0x%02x)%s\n" , + ctl->id, c->v.name, ctl->value, c->reg, value, + mask, c->sreg ?" [shadowed]" :"" );if (c->sreg) {cx_sandor (c->sreg, c->reg, mask, value); }else {
@@ -1252,7 +1252,7 @@ int cx88_do_ioctl(struct inode *inode, s {int err; -dprintk (1 ,"CORE IOCTL: 0x%x\n" , cmd ); +dprintk (2 ,"CORE IOCTL: 0x%x\n" , cmd );if (video_debug >1 )v4l_print_ioctl (core->name,cmd);
PATCH 122/141 V4L/DVB (3394): Bttv: correct bttv_risc_packed buffer size
In reply to [email protected]From: Duncan Sands <[email protected]>
Date: 1141009788 -0300
This patch fixes the strange crashes I was seeing after using bttv card, caused by a buffer overflow in bttv_risc_packed. The instruction buffer size calculation contains two errors:
(a) a non-zero padding value can push the start of the next bpl section to just before a page border, leading to more scanline splits and thus additional instructions.
(b) the first DMA region can be smaller than one page, so there can be a scanline split even if bpl*lines is smaller than PAGE_SIZE. For example, consider the case where offset is 0, bpl is 2, padding is 4094, lines is smaller than 2048, the first DMA region has size 1 and all others have size PAGE_SIZE, assumed to equal 4096. Then all bpl regions cross page borders and the number of instructions written is 2*lines+2, rather than lines+2 (the current estimate). With this patch the number of instructions for this example is estimated to be 2*lines+3.
Also, the BUG_ON that was supposed to catch buffer overflows contained a thinko causing it fire only if the buffer was overrun by a factor of 16 or more, so it fixes the the BUG_ON's (using sizeof rather than "4").
---
drivers/media/video/bttv-risc.c +0 -0
drivers/media/video/bttv-risc.c +7 -5
@@ -51,8 +51,10 @@ bttv_risc_packed(struct bttv *btv, strucint rc;/* estimate risc mem: worst case is one write per page border + -one write per scan line + sync + jump (all 2 dwords) */ - instructions = (bpl * lines) /PAGE_SIZE + lines; +one write per scan line + sync + jump (all 2 dwords). padding +can cause next bpl to start close to a page border. First DMA +region may be smaller than PAGE_SIZE */ + instructions =1 + ((bpl + padding) * lines) /PAGE_SIZE + lines; instructions +=2 ;if ((rc =btcx_riscmem_alloc (btv->c.pci,risc,instructions*8 )) <0 )return rc;
@@ -104,7 +106,7 @@ bttv_risc_packed(struct bttv *btv, struc/* save pointer to jmp instruction address */ risc->jmp = rp; -BUG_ON ((risc->jmp - risc->cpu +2 ) /4 > risc->size); +BUG_ON ((risc->jmp - risc->cpu +2 ) *sizeof (*risc->cpu) > risc->size);return 0 ; }
@@ -222,7 +224,7 @@ bttv_risc_planar(struct bttv *btv, struc/* save pointer to jmp instruction address */ risc->jmp = rp; -BUG_ON ((risc->jmp - risc->cpu +2 ) /4 > risc->size); +BUG_ON ((risc->jmp - risc->cpu +2 ) *sizeof (*risc->cpu) > risc->size);return 0 ; }
@@ -307,7 +309,7 @@ bttv_risc_overlay(struct bttv *btv, stru/* save pointer to jmp instruction address */ risc->jmp = rp; -BUG_ON ((risc->jmp - risc->cpu +2 ) /4 > risc->size); +BUG_ON ((risc->jmp - risc->cpu +2 ) *sizeof (*risc->cpu) > risc->size);kfree (skips);return 0 ; }
drivers/media/video/cx88/cx88-core.c +0 -0
drivers/media/video/cx88/cx88-core.c +2 -2
@@ -163,7 +163,7 @@ int cx88_risc_buffer(struct pci_dev *pci/* save pointer to jmp instruction address */ risc->jmp = rp; -BUG_ON ((risc->jmp - risc->cpu +2 ) /4 > risc->size); +BUG_ON ((risc->jmp - risc->cpu +2 ) *sizeof (*risc->cpu) > risc->size);return 0 ; }
@@ -188,7 +188,7 @@ int cx88_risc_databuffer(struct pci_dev/* save pointer to jmp instruction address */ risc->jmp = rp; -BUG_ON ((risc->jmp - risc->cpu +2 ) /4 > risc->size); +BUG_ON ((risc->jmp - risc->cpu +2 ) *sizeof (*risc->cpu) > risc->size);return 0 ; }
PATCH 123/141 V4L/DVB (3395): Fixed Pinnacle 300i DVB-T support
In reply to [email protected]From: Hartmut Hackmann <[email protected]>
Date: 1141398566 -0300
- fixed tda9886 port 2 setting
- turned remote control receiver off via saa7134 GPIO to avoid i2c hangs
- modified tda9886 client calls to direct i2c access to allow proper return to analog mode
- allow mode change to V4L2_TUNER_DIGITAL_TV in tuner VIDIOC_S_FREQUENCY client call
---
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +7 -2
@@ -1003,7 +1003,7 @@ struct saa7134_board saa7134_boards[] = .radio_type = UNSET, .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, - .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_ACTIVE, + .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_INACTIVE, .inputs = {{ .name = name_tv, .vmux = 3,
@@ -1692,7 +1692,7 @@ struct saa7134_board saa7134_boards[] = .radio_type = UNSET, .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, - .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_ACTIVE, + .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_INACTIVE, .mpeg = SAA7134_MPEG_DVB, .inputs = {{ .name = name_tv,
@@ -3375,6 +3375,11 @@ int saa7134_board_init1(struct saa7134_d/* power-up tuner chip */ saa_andorl (SAA7134_GPIO_GPMODE0 >>2 ,0x00040000 ,0x00040000 );saa_andorl (SAA7134_GPIO_GPSTATUS0 >>2 ,0x00040000 ,0x00000000 ); +case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL : +/* this turns the remote control chip off to work around a bug in it */ +saa_writeb (SAA7134_GPIO_GPMODE1 ,0x80 ); +saa_writeb (SAA7134_GPIO_GPSTATUS1 ,0x80 ); +break ;case SAA7134_BOARD_MONSTERTV_MOBILE :/* power-up tuner chip */ saa_andorl (SAA7134_GPIO_GPMODE0 >>2 ,0x00040000 ,0x00040000 );
drivers/media/video/saa7134/saa7134-dvb.c +0 -0
drivers/media/video/saa7134/saa7134-dvb.c +8 -4
@@ -110,6 +110,7 @@ static int mt352_pinnacle_init(struct dvmt352_write (fe, fsm_ctl_cfg,sizeof (fsm_ctl_cfg));mt352_write (fe, scan_ctl_cfg,sizeof (scan_ctl_cfg));mt352_write (fe, irq_cfg,sizeof (irq_cfg)); +return 0 ; }
@@ -135,8 +136,10 @@ static int mt352_pinnacle_pll_set(structstruct dvb_frontend_parameters * params, u8* pllbuf) { - static int on = TDA9887_PRESENT | TDA9887_PORT2_INACTIVE; -static int off =TDA9887_PRESENT |TDA9887_PORT2_ACTIVE ; + u8 off[] = { 0x00, 0xf1}; +u8 on[] = {0x00 ,0x71 }; +struct i2c_msg msg = {.addr=0x43 , .flags=0 , .buf=off, .len =sizeof (off)}; +struct saa7134_dev *dev = fe->dvb->priv;struct v4l2_frequency f;
@@ -144,9 +147,10 @@ static int mt352_pinnacle_pll_set(struct f.tuner =0 ; f.type =V4L2_TUNER_DIGITAL_TV ; f.frequency = params->frequency /1000 *16 /1000 ; -saa7134_i2c_call_clients (dev,TDA9887_SET_CONFIG ,&on); +i2c_transfer (&dev->i2c_adap, &msg,1 );saa7134_i2c_call_clients (dev,VIDIOC_S_FREQUENCY ,&f); -saa7134_i2c_call_clients (dev,TDA9887_SET_CONFIG ,&off); + msg.buf = on; +i2c_transfer (&dev->i2c_adap, &msg,1 );pinnacle_antenna_pwr (dev, antenna_pwr);
drivers/media/video/tuner-core.c +0 -0
drivers/media/video/tuner-core.c +3 -2
@@ -713,8 +713,9 @@ static int tuner_command(struct i2c_cliestruct v4l2_frequency *f = arg;switch_v4l2 (); -if (V4L2_TUNER_RADIO == f->type && -V4L2_TUNER_RADIO != t->mode) { +if ((V4L2_TUNER_RADIO == f->type &&V4L2_TUNER_RADIO != t->mode) + || (V4L2_TUNER_DIGITAL_TV == f->type + &&V4L2_TUNER_DIGITAL_TV != t->mode)) {if (set_mode (client, t, f->type,"VIDIOC_S_FREQUENCY" ) ==EINVAL )return 0 ;
PATCH 124/141 V4L/DVB (3396): Add DVB-T support for the LifeView DVB Trio PCI card
In reply to [email protected]From: Nico Sabbi <[email protected]>
Date: 1141398688 -0300
This patch adds DVB-T support, no DVB-S yet
---
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +2 -0
@@ -2624,6 +2624,7 @@ struct saa7134_board saa7134_boards[] = .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, .gpiomask = 0x00200000, + .mpeg = SAA7134_MPEG_DVB, /* FIXME: DVB not implemented yet */ .inputs = {{ .name = name_tv, /* Analog broadcast/cable TV */ .vmux = 1,
@@ -3547,6 +3548,7 @@ int saa7134_board_init2(struct saa7134_di2c_transfer (&dev->i2c_adap, &msg,1 ); }break ; +case SAA7134_BOARD_FLYDVB_TRIO :case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 :/* make the tda10046 find its eeprom */ {
drivers/media/video/saa7134/saa7134-dvb.c +0 -0
drivers/media/video/saa7134/saa7134-dvb.c +37 -0
@@ -852,6 +852,39 @@ static struct tda1004x_config philips_ti/* ------------------------------------------------------------------ */ +static int lifeview_trio_pll_set (struct dvb_frontend *fe,struct dvb_frontend_parameters *params) +{ +int ret; + + ret =philips_tda827xa_pll_set (0x60 , fe, params); +return ret; +} + +static int lifeview_trio_dvb_mode (struct dvb_frontend *fe) +{ +return 0 ; +} + +static void lifeview_trio_analog_mode (struct dvb_frontend *fe) +{ +philips_tda827xa_pll_sleep (0x60 , fe); +} + +static struct tda1004x_config lifeview_trio_config = { + .demod_address =0x09 , + .invert =1 , + .invert_oclk =0 , + .xtal_freq =TDA10046_XTAL_16M , + .agc_config =TDA10046_AGC_TDA827X_GPL , + .if_freq =TDA10046_FREQ_045 , + .pll_init = lifeview_trio_dvb_mode, + .pll_set = lifeview_trio_pll_set, + .pll_sleep = lifeview_trio_analog_mode, + .request_firmware =NULL , +}; + +/* ------------------------------------------------------------------ */ +static int ads_duo_pll_set (struct dvb_frontend *fe,struct dvb_frontend_parameters *params) {int ret;
@@ -1019,6 +1052,10 @@ static int dvb_init(struct saa7134_dev * dev->dvb.frontend =tda10046_attach (&tda827x_lifeview_config, &dev->i2c_adap);break ; +case SAA7134_BOARD_FLYDVB_TRIO : + dev->dvb.frontend =tda10046_attach (&lifeview_trio_config, + &dev->i2c_adap); +break ;case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 : dev->dvb.frontend =tda10046_attach (&ads_tech_duo_config, &dev->i2c_adap);
PATCH 125/141 V4L/DVB (3398): ELSA EX-VISION 700TV: fix incorrect PCI subsystem ID
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1141061897 -0300
- Corrected autodetection for saa7130 card:
subsystem: 1048:226c, board: ELSA EX-VISION 700TV
---
Documentation/video4linux/CARDLIST.saa7134 +0 -0
Documentation/video4linux/CARDLIST.saa7134 +1 -1
@@ -87,5 +87,5 @@ 86 -> LifeView FlyDVB-T [5168:0301] 87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421] 88 -> Tevion DVB-T 220RF [17de:7201] - 89 -> ELSA EX-VISION 700TV [1131:7130] + 89 -> ELSA EX-VISION 700TV [1048:226c] 90 -> Kworld ATSC110 [17de:7350]
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +2 -2
@@ -2887,8 +2887,8 @@ struct pci_device_id saa7134_pci_tbl[] = },{ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7130, - .subvendor = 0x1131, - .subdevice = 0x7130, + .subvendor = 0x1048, + .subdevice = 0x226c, .driver_data = SAA7134_BOARD_ELSA_700TV, },{ .vendor = PCI_VENDOR_ID_PHILIPS,
PATCH 126/141 V4L/DVB (3399): ELSA EX-VISION 500TV: fix incorrect PCI subsystem ID
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1141064569 -0300
- ELSA EX-VISION 500TV was incorrectly programmed to have the same subsystem ID as ELSA EX-VISION 300TV, (1048:226b)
- This changeset replaces the incorrect subsystem ID (1048:226b) with the correct one (1048:226a) for the ELSA EX-VISION 500TV.
---
Documentation/video4linux/CARDLIST.saa7134 +0 -0
Documentation/video4linux/CARDLIST.saa7134 +1 -1
@@ -13,7 +13,7 @@ 12 -> Medion 7134 [16be:0003] 13 -> Typhoon TV+Radio 90031 14 -> ELSA EX-VISION 300TV [1048:226b] - 15 -> ELSA EX-VISION 500TV [1048:226b] + 15 -> ELSA EX-VISION 500TV [1048:226a] 16 -> ASUS TV-FM 7134 [1043:4842,1043:4830,1043:4840] 17 -> AOPEN VA1000 POWER [1131:7133] 18 -> BMK MPEX No Tuner
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +1 -1
@@ -2882,7 +2882,7 @@ struct pci_device_id saa7134_pci_tbl[] = .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7130, .subvendor = 0x1048, - .subdevice = 0x226b, + .subdevice = 0x226a, .driver_data = SAA7134_BOARD_ELSA_500TV, },{ .vendor = PCI_VENDOR_ID_PHILIPS,
PATCH 127/141 V4L/DVB (3197a): IR keymaps are exported by the ir-common module now
In reply to [email protected]From: Ricardo Cerqueira <[email protected]>
Date: 1141398822 -0300
Moved keymaps to the ir-common module, and export them from there, instead of #including them in each module
Included missing files from V4L/DVB(3197).
---
drivers/media/common/ir-functions.c +0 -0
drivers/media/common/ir-functions.c new file +272 -0
272 lines not on this page · raw message
PATCH 128/141 V4L/DVB (3399a): cpia2/cpia2_v4l.c cleanups
In reply to [email protected]From: Adrian Bunk <[email protected]>
Date: 1141112451 -0300
- make 2 needlessly global functions static
- remove cpia2_setup(): the driver already allows setting parameters through module_param(), and there's no reason for having two different ways for setting the same parameters
---
Documentation/video4linux/README.cpia2 +0 -0
Documentation/video4linux/README.cpia2 +1 -1
@@ -70,7 +70,7 @@ line like this: If the driver is compiled into the kernel, at boot time specify them like this: - cpia2=num_buffers:3,buffer_size:65535 + cpia2.num_buffers=3 cpia2.buffer_size=65535 What buffer size should I use? ------------------------------
drivers/media/video/cpia2/cpia2_v4l.c +0 -0
drivers/media/video/cpia2/cpia2_v4l.c +2 -27
@@ -2053,7 +2053,7 @@ static void __init check_parameters(void* cpia2_init/module_init * *****************************************************************************/ -int __init cpia2_init (void ) +static int __init cpia2_init (void ) {LOG ("%s v%d.%d.%d\n" ,ABOUT ,CPIA2_MAJ_VER ,CPIA2_MIN_VER ,CPIA2_PATCH_VER );
@@ -2068,37 +2068,12 @@ int __init cpia2_init(void)* cpia2_exit/module_exit * *****************************************************************************/ -void __exit cpia2_exit(void) +static void __exit cpia2_exit(void) {cpia2_usb_cleanup ();schedule_timeout (2 *HZ ); } - -int __init cpia2_setup (char *str) -{ -while (str) { -if (!strncmp (str,"buffer_size:" ,12 )) { - buffer_size =simple_strtoul (str +13 , &str,10 ); - }else if (!strncmp (str,"num_buffers:" ,12 )) { - num_buffers =simple_strtoul (str +13 , &str,10 ); - }else if (!strncmp (str,"alternate:" ,10 )) { - alternate =simple_strtoul (str +11 , &str,10 ); - }else if (!strncmp (str,"video_nr:" ,9 )) { - video_nr =simple_strtoul (str +10 , &str,10 ); - }else if (!strncmp (str,"flicker_freq:" ,13 )) { - flicker_freq =simple_strtoul (str +14 , &str,10 ); - }else if (!strncmp (str,"flicker_mode:" ,13 )) { - flicker_mode =simple_strtoul (str +14 , &str,10 ); - }else { - ++str; - } - } -return 1 ; -} - -__setup ("cpia2=" , cpia2_setup); -module_init (cpia2_init);module_exit (cpia2_exit);
PATCH 129/141 V4L/DVB (3400): Fixes for Lifeview Trio non fatal bugs
In reply to [email protected]From: Hartmut Hackmann <[email protected]>
Date: 1141085287 -0300
- Init message was sent to wrong slave address
- Deleted outdated comment
---
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +7 -1
@@ -2624,7 +2624,7 @@ struct saa7134_board saa7134_boards[] = .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, .gpiomask = 0x00200000, - .mpeg = SAA7134_MPEG_DVB, /* FIXME: DVB not implemented yet */ + .mpeg = SAA7134_MPEG_DVB, .inputs = {{ .name = name_tv, /* Analog broadcast/cable TV */ .vmux = 1,
@@ -3549,6 +3549,12 @@ int saa7134_board_init2(struct saa7134_d }break ;case SAA7134_BOARD_FLYDVB_TRIO : + { +u8 data[] = {0x3c ,0x33 ,0x62 }; +struct i2c_msg msg = {.addr=0x09 , .flags=0 , .buf=data, .len =sizeof (data)}; +i2c_transfer (&dev->i2c_adap, &msg,1 ); + } +break ;case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331 :/* make the tda10046 find its eeprom */ {
PATCH 130/141 V4L/DVB (3401): Coding style fixes in saa7134-dvb.c
In reply to [email protected]From: Hartmut Hackmann <[email protected]>
Date: 1141085676 -0300
deleted 2 semicolons at end of functions
---
drivers/media/video/saa7134/saa7134-dvb.c +0 -0
drivers/media/video/saa7134/saa7134-dvb.c +2 -2
@@ -814,7 +814,7 @@ static int philips_tiger_pll_set(struct tda8290_msg.buf = tda8290_open;i2c_transfer (&dev->i2c_adap, &tda8290_msg,1 );return ret; -}; +}static int philips_tiger_dvb_mode (struct dvb_frontend *fe) {
@@ -891,7 +891,7 @@ static int ads_duo_pll_set(struct dvb_fr ret =philips_tda827xa_pll_set (0x61 , fe, params);return ret; -}; +}static int ads_duo_dvb_mode (struct dvb_frontend *fe) {
PATCH 131/141 V4L/DVB (3403): Workaround to fix initialization for Nexus CA
In reply to [email protected]From: Marco Schluessler <[email protected]>
Date: 1140817980 -0300
Workaround for Nexus CA: Debi test fails unless first debi write is repeated.
---
drivers/media/dvb/ttpci/av7110_hw.c +0 -0
drivers/media/dvb/ttpci/av7110_hw.c +3 -0
@@ -245,6 +245,9 @@ int av7110_bootarm(struct av7110 *av7110/* test DEBI */ iwdebi (av7110,DEBISWAP ,DPRAM_BASE ,0x76543210 ,4 ); +/* FIXME: Why does Nexus CA require 2x iwdebi for first init? */ +iwdebi (av7110,DEBISWAP ,DPRAM_BASE ,0x76543210 ,4 ); +if ((ret=irdebi (av7110,DEBINOSWAP ,DPRAM_BASE ,0 ,4 )) !=0x10325476 ) { printk(KERN_ERR "dvb-ttpci: debi test in av7110_bootarm() failed: " "%08x != %08x (check your BIOS 'Plug&Play OS' settings)\n",
PATCH 132/141 V4L/DVB (3404): Refactored LNBP21 and BSBE1 support
In reply to [email protected]From: Oliver Endriss <[email protected]>
Date: 1141129876 -0300
Moved duplicated code to separate files.
LNBP21 stuff rewritten from scratch, BSBE1 copied from av7110.c. Modified budget driver to use the new routines.
---
drivers/media/dvb/dvb-core/dvb_frontend.h +0 -0
drivers/media/dvb/dvb-core/dvb_frontend.h +1 -0
@@ -104,6 +104,7 @@ struct dvb_frontend {struct dvb_adapter *dvb;void * demodulator_priv;void * frontend_priv; +void * misc_priv; }; extern int dvb_register_frontend(struct dvb_adapter* dvb,
drivers/media/dvb/frontends/bsbe1.h +0 -0
drivers/media/dvb/frontends/bsbe1.h new file +123 -0
123 lines not on this page · raw message
drivers/media/dvb/frontends/lnbp21.h +0 -0
drivers/media/dvb/frontends/lnbp21.h new file +139 -0
139 lines not on this page · raw message
drivers/media/dvb/ttpci/budget.c +0 -0
drivers/media/dvb/ttpci/budget.c +4 -137
172 lines not on this page · raw message
PATCH 133/141 V4L/DVB (3405): TechnoTrend S-1500 card handling moved from budget.c to budget-ci.c
In reply to [email protected]From: Perceval Anichini <[email protected]>
Date: 1141131164 -0300
TechnoTrend S-1500 card handling moved from budget.c to budget-ci.c.
---
drivers/media/dvb/ttpci/budget-ci.c +0 -0
drivers/media/dvb/ttpci/budget-ci.c +18 -0
@@ -42,6 +42,8 @@#include "stv0299.h" #include "stv0297.h" #include "tda1004x.h" +#include "lnbp21.h" +#include "bsbe1.h" #define DEBIADDR_IR 0x1234#define DEBIADDR_CICONTROL 0x0000
@@ -1069,6 +1071,20 @@ static void frontend_init(struct budget_break ; }break ; + +case 0x1017 :// TT S-1500 PCI + budget_ci->budget.dvb_frontend =stv0299_attach (&alps_bsbe1_config, &budget_ci->budget.i2c_adap); +if (budget_ci->budget.dvb_frontend) { + budget_ci->budget.dvb_frontend->ops->dishnetwork_send_legacy_command =NULL ; +if (lnbp21_init (budget_ci->budget.dvb_frontend, &budget_ci->budget.i2c_adap,LNBP21_LLC ,0 )) { +printk ("%s: No LNBP21 found!\n" , __FUNCTION__); +if (budget_ci->budget.dvb_frontend->ops->release) + budget_ci->budget.dvb_frontend->ops->release (budget_ci->budget.dvb_frontend); + budget_ci->budget.dvb_frontend =NULL ; + } + } + +break ; }if (budget_ci->budget.dvb_frontend ==NULL ) {
@@ -1146,6 +1162,7 @@ static int budget_ci_detach(struct saa71static struct saa7146_extension budget_extension; +MAKE_BUDGET_INFO (ttbs2,"TT-Budget/S-1500 PCI" ,BUDGET_TT );MAKE_BUDGET_INFO (ttbci,"TT-Budget/WinTV-NOVA-CI PCI" ,BUDGET_TT_HW_DISEQC );MAKE_BUDGET_INFO (ttbt2,"TT-Budget/WinTV-NOVA-T PCI" ,BUDGET_TT );MAKE_BUDGET_INFO (ttbtci,"TT-Budget-T-CI PCI" ,BUDGET_TT );
@@ -1157,6 +1174,7 @@ static struct pci_device_id pci_tbl[] =MAKE_EXTENSION_PCI (ttbcci,0x13c2 ,0x1010 ),MAKE_EXTENSION_PCI (ttbt2,0x13c2 ,0x1011 ),MAKE_EXTENSION_PCI (ttbtci,0x13c2 ,0x1012 ), + MAKE_EXTENSION_PCI(ttbs2, 0x13c2, 0x1017), { .vendor = 0, }
drivers/media/dvb/ttpci/budget.c +0 -0
drivers/media/dvb/ttpci/budget.c +0 -15
@@ -42,7 +42,6 @@#include "tda8083.h" #include "s5h1420.h" #include "lnbp21.h" -#include "bsbe1.h" static void Set22K (struct budget *budget,int state) {
@@ -451,18 +450,6 @@ static u8 read_pwm(struct budget* budgetstatic void frontend_init (struct budget *budget) {switch (budget->dev->pci->subsystem_device) { -case 0x1017 : -// try the ALPS BSBE1 now - budget->dvb_frontend =stv0299_attach (&alps_bsbe1_config, &budget->i2c_adap); -if (budget->dvb_frontend) { - budget->dvb_frontend->ops->dishnetwork_send_legacy_command =NULL ; -if (lnbp21_init (budget->dvb_frontend, &budget->i2c_adap,LNBP21_LLC ,0 )) { -printk ("%s: No LNBP21 found!\n" , __FUNCTION__); - goto error_out; - } - } - -break ;case 0x1003 :// Hauppauge/TT Nova budget (stv0299/ALPS BSRU6(tsa5059) OR ves1893/ALPS BSRV2(sp5659)) case 0x1013 :// try the ALPS BSRV2 first of all
@@ -586,7 +573,6 @@ static int budget_detach (struct saa7146static struct saa7146_extension budget_extension; -MAKE_BUDGET_INFO (ttbs2,"TT-Budget/WinTV-NOVA-S PCI (rev AL/alps bsbe1 lnbp21 frontend)" ,BUDGET_TT );MAKE_BUDGET_INFO (ttbs,"TT-Budget/WinTV-NOVA-S PCI" ,BUDGET_TT );MAKE_BUDGET_INFO (ttbc,"TT-Budget/WinTV-NOVA-C PCI" ,BUDGET_TT );MAKE_BUDGET_INFO (ttbt,"TT-Budget/WinTV-NOVA-T PCI" ,BUDGET_TT );
@@ -599,7 +585,6 @@ static struct pci_device_id pci_tbl[] =MAKE_EXTENSION_PCI (ttbc,0x13c2 ,0x1004 ),MAKE_EXTENSION_PCI (ttbt,0x13c2 ,0x1005 ),MAKE_EXTENSION_PCI (satel,0x13c2 ,0x1013 ), -MAKE_EXTENSION_PCI (ttbs2,0x13c2 ,0x1017 ),MAKE_EXTENSION_PCI (ttbs,0x13c2 ,0x1016 ),MAKE_EXTENSION_PCI (fsacs1,0x1131 ,0x4f60 ), MAKE_EXTENSION_PCI(fsacs0,0x1131, 0x4f61),
PATCH 134/141 V4L/DVB (3406): Use refactored LNBP21 and BSBE1 code
In reply to [email protected]From: Oliver Endriss <[email protected]>
Date: 1141133545 -0300
Use refactored LNBP21/BSBE1 code for Technotrend/Hauppauge DVB-S rev 2.3. As a side effect, FE_ENABLE_HIGH_LNB_VOLTAGE ioctl is supported now.
---
drivers/media/dvb/ttpci/av7110.c +0 -0
drivers/media/dvb/ttpci/av7110.c +12 -102
132 lines not on this page · raw message
PATCH 135/141 V4L/DVB (3408): DViCO FusionHDTV DVB-T Hybrid and ZL10353-based FusionHDTV DVB-T Plus support
In reply to [email protected]From: Chris Pascoe <[email protected]>
Date: 1141126499 -0300
Add support for the FE6600 tuner used on the DVB-T Hybrid board. Add support for the Zarlink ZL10353 DVB-T demodulator, which supersedes the MT352, used on the DViCO FusionHDTV DVB-T Hybrid and later model Plus boards.
---
Documentation/video4linux/CARDLIST.cx88 +0 -0
Documentation/video4linux/CARDLIST.cx88 +1 -0
@@ -44,3 +44,4 @@ 43 -> KWorld/VStream XPert DVB-T with cx22702 [17de:08a1] 44 -> DViCO FusionHDTV DVB-T Dual Digital [18ac:db50,18ac:db54] 45 -> KWorld HardwareMpegTV XPert [17de:0840] + 46 -> DViCO FusionHDTV DVB-T Hybrid [18ac:db40,18ac:db44]
Documentation/video4linux/CARDLIST.tuner +0 -0
Documentation/video4linux/CARDLIST.tuner +1 -0
@@ -70,3 +70,4 @@ tuner=68 - Philips TUV1236D ATSC/NTSC du tuner=69 - Tena TNF 5335 MF tuner=70 - Samsung TCPN 2121P30A tuner=71 - Xceive xc3028 +tuner=72 - FE6600
drivers/media/dvb/frontends/Kconfig +0 -0
drivers/media/dvb/frontends/Kconfig +6 -0
@@ -116,6 +116,12 @@ config DVB_MT352 help A DVB-T tuner module. Say Y when you want to support this frontend. +config DVB_ZL10353 + tristate "Zarlink ZL10353 based" + depends on DVB_CORE + help + A DVB-T tuner module. Say Y when you want to support this frontend. + config DVB_DIB3000MB tristate "DiBcom 3000M-B" depends on DVB_CORE
drivers/media/dvb/frontends/Makefile +0 -0
drivers/media/dvb/frontends/Makefile +1 -0
@@ -20,6 +20,7 @@ obj-$(CONFIG_DVB_TDA1004X) += tda1004x.o obj-$(CONFIG_DVB_SP887X) += sp887x.o obj-$(CONFIG_DVB_NXT6000) += nxt6000.o obj-$(CONFIG_DVB_MT352) += mt352.o +obj-$(CONFIG_DVB_ZL10353) += zl10353.o obj-$(CONFIG_DVB_CX22702) += cx22702.o obj-$(CONFIG_DVB_TDA10021) += tda10021.o obj-$(CONFIG_DVB_STV0297) += stv0297.o
drivers/media/dvb/frontends/dvb-pll.c +0 -0
drivers/media/dvb/frontends/dvb-pll.c +15 -0
@@ -404,6 +404,21 @@ struct dvb_pll_desc dvb_pll_philips_td13 };EXPORT_SYMBOL (dvb_pll_philips_td1316); +/* FE6600 used on DViCO Hybrid */ +struct dvb_pll_desc dvb_pll_unknown_fe6600 = { + .name ="FE6600" , + .min =44250000 , + .max =858000000 , + .count =4 , + .entries = { + {250000000 ,36213333 ,166667 ,0xb4 ,0x12 }, + {455000000 ,36213333 ,166667 ,0xfe ,0x11 }, + {775500000 ,36213333 ,166667 ,0xbc ,0x18 }, + {999999999 ,36213333 ,166667 ,0xf4 ,0x18 }, + } +}; +EXPORT_SYMBOL (dvb_pll_unknown_fe6600); +/* ----------------------------------------------------------- */ /* code */
drivers/media/dvb/frontends/dvb-pll.h +0 -0
drivers/media/dvb/frontends/dvb-pll.h +2 -0
@@ -42,6 +42,8 @@ extern struct dvb_pll_desc dvb_pll_samsuextern struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261;extern struct dvb_pll_desc dvb_pll_philips_td1316; +extern struct dvb_pll_desc dvb_pll_unknown_fe6600; +int dvb_pll_configure (struct dvb_pll_desc *desc,u8 *buf,u32 freq,int bandwidth);
drivers/media/dvb/frontends/zl10353.c +0 -0
drivers/media/dvb/frontends/zl10353.c new file +311 -0
311 lines not on this page · raw message
drivers/media/dvb/frontends/zl10353.h +0 -0
drivers/media/dvb/frontends/zl10353.h new file +43 -0
43 lines not on this page · raw message
drivers/media/dvb/frontends/zl10353_priv.h +0 -0
drivers/media/dvb/frontends/zl10353_priv.h new file +42 -0
42 lines not on this page · raw message
drivers/media/video/cx88/Makefile +0 -0
drivers/media/video/cx88/Makefile +1 -0
@@ -17,6 +17,7 @@ extra-cflags-$(CONFIG_DVB_CX22702) += extra-cflags-$(CONFIG_DVB_OR51132) += -DHAVE_OR51132=1 extra-cflags-$(CONFIG_DVB_LGDT330X) += -DHAVE_LGDT330X=1 extra-cflags-$(CONFIG_DVB_MT352) += -DHAVE_MT352=1 +extra-cflags-$(CONFIG_DVB_ZL10353) += -DHAVE_ZL10353=1 extra-cflags-$(CONFIG_DVB_NXT200X) += -DHAVE_NXT200X=1 extra-cflags-$(CONFIG_DVB_CX24123) += -DHAVE_CX24123=1 extra-cflags-$(CONFIG_VIDEO_CX88_VP3054)+= -DHAVE_VP3054_I2C=1
drivers/media/video/cx88/cx88-cards.c +0 -0
drivers/media/video/cx88/cx88-cards.c +67 -0
96 lines not on this page · raw message
drivers/media/video/cx88/cx88-dvb.c +0 -0
drivers/media/video/cx88/cx88-dvb.c +86 -22
161 lines not on this page · raw message
drivers/media/video/cx88/cx88.h +0 -0
drivers/media/video/cx88/cx88.h +1 -0
@@ -189,6 +189,7 @@ extern struct sram_channel cx88_sram_cha#define CX88_BOARD_KWORLD_DVB_T_CX22702 43#define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL 44#define CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT 45 +#define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID 46enum cx88_itype {CX88_VMUX_COMPOSITE1 =1 ,
drivers/media/video/tuner-types.c +0 -0
drivers/media/video/tuner-types.c +20 -0
@@ -983,6 +983,22 @@ static struct tuner_params tuner_samsung }, }; +/* ------------ TUNER_FE6600 - DViCO Hybrid PAL ------------ */ + +static struct tuner_range tuner_fe6600_ranges[] = { + {16 *160.00 /*MHz*/ ,0xfe ,0x11 , }, + {16 *442.00 /*MHz*/ ,0xf6 ,0x12 , }, + {16 *999.99 ,0xf6 ,0x18 , }, +}; + +static struct tuner_params tuner_fe6600_params[] = { + { + .type =TUNER_PARAM_TYPE_PAL , + .ranges = tuner_fe6600_ranges, + .count =ARRAY_SIZE (tuner_fe6600_ranges), + }, +}; +/* --------------------------------------------------------------------- */ struct tunertype tuners[] = {
@@ -1354,6 +1370,10 @@ struct tunertype tuners[] = { .name = "Xceive xc3028", /* see xc3028.c for details */ }, + [TUNER_FE6600] = { /* */ + .name = "FE6600", + .params = tuner_fe6600_params, + }, };unsigned const int tuner_count =ARRAY_SIZE (tuners);
include/media/tuner.h +0 -0
include/media/tuner.h +2 -1
@@ -116,9 +116,10 @@#define TUNER_PHILIPS_TUV1236D 68/* ATI HDTV Wonder */ #define TUNER_TNF_5335MF 69/* Sabrent Bt848 */ #define TUNER_SAMSUNG_TCPN_2121P30A 70/* Hauppauge PVR-500MCE NTSC */ -#define TUNER_XCEIVE_XC3028 71 +#define TUNER_FE6600 72/* DViCO FusionHDTV DVB-T Hybrid */ +/* tv card specific */ #define TDA9887_PRESENT (1<<0)#define TDA9887_PORT1_INACTIVE (1<<1)
PATCH 136/141 V4L/DVB (3409): Kconfig: fix in-kernel build for cx88-dvb: zl10353 frontend
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1141146135 -0300
- VIDEO_CX88_DVB_ALL_FRONTENDS should select DVB_ZL10353
- created VIDEO_CX88_DVB_ZL10353, for selective zl10353 support in cx88-dvb.
---
drivers/media/video/cx88/Kconfig +0 -0
drivers/media/video/cx88/Kconfig +11 -0
@@ -50,6 +50,7 @@ config VIDEO_CX88_DVB_ALL_FRONTENDS depends on VIDEO_CX88_DVB select DVB_MT352 select VIDEO_CX88_VP3054 + select DVB_ZL10353 select DVB_OR51132 select DVB_CX22702 select DVB_LGDT330X
@@ -81,6 +82,16 @@ config VIDEO_CX88_VP3054 which also require support for the VP-3054 Secondary I2C bus, such at DNTV Live! DVB-T Pro. +config VIDEO_CX88_DVB_ZL10353 + bool "Zarlink ZL10353 DVB-T Support" + default y + depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS + select DVB_ZL10353 + ---help--- + This adds DVB-T support for cards based on the + Connexant 2388x chip and the ZL10353 demodulator, + successor to the Zarlink MT352. + config VIDEO_CX88_DVB_OR51132 bool "OR51132 ATSC Support" default y
PATCH 137/141 V4L/DVB (3410): Move DViCO hybrid initialisation data from stack.
In reply to [email protected]From: Chris Pascoe <[email protected]>
Date: 1141168991 -0300
The init_data array is never changed and need not be on the stack. Turn it into a static variable.
---
drivers/media/video/cx88/cx88-cards.c +0 -0
drivers/media/video/cx88/cx88-cards.c +1 -1
@@ -1435,7 +1435,7 @@ static void dvico_fusionhdtv_hybrid_init {struct i2c_msg msg = { .addr =0x45 , .flags =0 };int i, err; -u8 init_bufs[13 ][5 ] = { +static u8 init_bufs[13 ][5 ] = { {0x10 ,0x00 ,0x20 ,0x01 ,0x03 }, {0x10 ,0x10 ,0x01 ,0x00 ,0x21 }, {0x10 ,0x10 ,0x10 ,0x00 ,0xCA },
PATCH 138/141 V4L/DVB (3411): FE6600 is a Thomson tuner
In reply to [email protected]From: Michael Krufky <[email protected]>
Date: 1141182282 -0300
- The tuner used in DViCO FusionHDTV DVB-T hybrid is made by Thomson
- renamed tuner and dvb_pll structs accordingly
---
Documentation/video4linux/CARDLIST.tuner +0 -0
Documentation/video4linux/CARDLIST.tuner +1 -1
@@ -70,4 +70,4 @@ tuner=68 - Philips TUV1236D ATSC/NTSC du tuner=69 - Tena TNF 5335 MF tuner=70 - Samsung TCPN 2121P30A tuner=71 - Xceive xc3028 -tuner=72 - FE6600 +tuner=72 - Thomson FE6600
drivers/media/dvb/frontends/dvb-pll.c +0 -0
drivers/media/dvb/frontends/dvb-pll.c +3 -3
@@ -405,8 +405,8 @@ struct dvb_pll_desc dvb_pll_philips_td13EXPORT_SYMBOL (dvb_pll_philips_td1316);/* FE6600 used on DViCO Hybrid */ -struct dvb_pll_desc dvb_pll_unknown_fe6600 = { - .name ="FE6600" , +struct dvb_pll_desc dvb_pll_thomson_fe6600 = { + .name ="Thomson FE6600" , .min =44250000 , .max =858000000 , .count =4 ,
@@ -417,7 +417,7 @@ struct dvb_pll_desc dvb_pll_unknown_fe66 { 999999999, 36213333, 166667, 0xf4, 0x18 }, } }; -EXPORT_SYMBOL (dvb_pll_unknown_fe6600); +EXPORT_SYMBOL (dvb_pll_thomson_fe6600);/* ----------------------------------------------------------- */ /* code */
drivers/media/dvb/frontends/dvb-pll.h +0 -0
drivers/media/dvb/frontends/dvb-pll.h +1 -1
@@ -42,7 +42,7 @@ extern struct dvb_pll_desc dvb_pll_samsuextern struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261;extern struct dvb_pll_desc dvb_pll_philips_td1316; -extern struct dvb_pll_desc dvb_pll_unknown_fe6600; +extern struct dvb_pll_desc dvb_pll_thomson_fe6600;int dvb_pll_configure (struct dvb_pll_desc *desc,u8 *buf,u32 freq,int bandwidth);
drivers/media/video/cx88/cx88-cards.c +0 -0
drivers/media/video/cx88/cx88-cards.c +1 -1
@@ -1073,7 +1073,7 @@ struct cx88_board cx88_boards[] = { }, [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = { .name = "DViCO FusionHDTV DVB-T Hybrid", - .tuner_type = TUNER_FE6600, + .tuner_type = TUNER_THOMSON_FE6600, .radio_type = UNSET, .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
drivers/media/video/cx88/cx88-dvb.c +0 -0
drivers/media/video/cx88/cx88-dvb.c +1 -1
@@ -599,7 +599,7 @@ static int dvb_register(struct cx8802_de#ifdef HAVE_ZL10353 case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID : dev->core->pll_addr =0x61 ; - dev->core->pll_desc = &dvb_pll_unknown_fe6600; + dev->core->pll_desc = &dvb_pll_thomson_fe6600; dev->dvb.frontend =zl10353_attach (&dvico_fusionhdtv_hybrid, &dev->core->i2c_adap);break ;
drivers/media/video/tuner-types.c +0 -0
drivers/media/video/tuner-types.c +8 -8
@@ -983,19 +983,19 @@ static struct tuner_params tuner_samsung }, }; -/* ------------ TUNER_FE6600 - DViCO Hybrid PAL ------------ */ +/* ------------ TUNER_THOMSON_FE6600 - DViCO Hybrid PAL ------------ */ -static struct tuner_range tuner_fe6600_ranges[] = { +static struct tuner_range tuner_thomson_fe6600_ranges[] = { {16 *160.00 /*MHz*/ ,0xfe ,0x11 , }, {16 *442.00 /*MHz*/ ,0xf6 ,0x12 , }, {16 *999.99 ,0xf6 ,0x18 , }, }; -static struct tuner_params tuner_fe6600_params[] = { +static struct tuner_params tuner_thomson_fe6600_params[] = { { .type =TUNER_PARAM_TYPE_PAL , - .ranges = tuner_fe6600_ranges, - .count =ARRAY_SIZE (tuner_fe6600_ranges), + .ranges = tuner_thomson_fe6600_ranges, + .count =ARRAY_SIZE (tuner_thomson_fe6600_ranges), }, };
@@ -1370,9 +1370,9 @@ struct tunertype tuners[] = { .name = "Xceive xc3028", /* see xc3028.c for details */ }, - [TUNER_FE6600] = { /* */ - .name = "FE6600", - .params = tuner_fe6600_params, + [TUNER_THOMSON_FE6600] = { /* Thomson PAL / DVB-T */ + .name = "Thomson FE6600", + .params = tuner_thomson_fe6600_params, }, };
include/media/tuner.h +0 -0
include/media/tuner.h +1 -1
@@ -118,7 +118,7 @@#define TUNER_SAMSUNG_TCPN_2121P30A 70/* Hauppauge PVR-500MCE NTSC */ #define TUNER_XCEIVE_XC3028 71 -#define TUNER_FE6600 72/* DViCO FusionHDTV DVB-T Hybrid */ +#define TUNER_THOMSON_FE6600 72/* DViCO FusionHDTV DVB-T Hybrid */ /* tv card specific */ #define TDA9887_PRESENT (1<<0)
PATCH 139/141 V4L/DVB (3413): Typos grab bag of the month
In reply to [email protected]From: Alexey Dobriyan <[email protected]>
Date: 1141780823 -0300
Typos grab bag of the month.
Eyeballed by jmc@ in OpenBSD.
---
drivers/media/dvb/dvb-core/demux.h +0 -0
drivers/media/dvb/dvb-core/demux.h +1 -1
@@ -216,7 +216,7 @@ struct dmx_frontend {/*--------------------------------------------------------------------------*/ /* -* Flags OR'ed in the capabilites field of struct dmx_demux. +* Flags OR'ed in the capabilities field of struct dmx_demux. */ #define DMX_TS_FILTERING 1
drivers/media/dvb/dvb-usb/dvb-usb-init.c +0 -0
drivers/media/dvb/dvb-usb/dvb-usb-init.c +1 -1
@@ -47,7 +47,7 @@ static int dvb_usb_init(struct dvb_usb_d d->state =DVB_USB_STATE_INIT ; -/* check the capabilites and set appropriate variables */ +/* check the capabilities and set appropriate variables */ /* speed - when running at FULL speed we need a HW PID filter */ if (d->udev->speed ==USB_SPEED_FULL && !(d->props.caps &DVB_USB_HAS_PID_FILTER )) {
drivers/media/dvb/dvb-usb/dvb-usb.h +0 -0
drivers/media/dvb/dvb-usb/dvb-usb.h +1 -1
@@ -88,7 +88,7 @@ struct dvb_usb_device;/** * struct dvb_usb_properties - properties of a dvb-usb-device -* @caps: capabilites of the DVB USB device. +* @caps: capabilities of the DVB USB device. * @pid_filter_count: number of PID filter position in the optional hardware * PID-filter. *
drivers/media/dvb/ttpci/av7110.c +0 -0
drivers/media/dvb/ttpci/av7110.c +1 -1
@@ -1441,7 +1441,7 @@ static int check_firmware(struct av7110* len =ntohl (*(u32 *) ptr); ptr +=4 ;if (len >=512 ) { -printk ("dvb-ttpci: dpram file is way to big.\n" ); +printk ("dvb-ttpci: dpram file is way too big.\n" );return -EINVAL ; }if (crc !=crc32_le (0 , ptr, len)) {
drivers/media/video/cpia.c +0 -0
drivers/media/video/cpia.c +1 -1
@@ -3369,7 +3369,7 @@ static int cpia_do_ioctl(struct inode *i//DBG("cpia_ioctl: %u\n", ioctlnr); switch (ioctlnr) { -/* query capabilites */ +/* query capabilities */ case VIDIOCGCAP : {struct video_capability *b = arg;
drivers/media/video/cpia2/cpia2_v4l.c +0 -0
drivers/media/video/cpia2/cpia2_v4l.c +1 -1
@@ -1628,7 +1628,7 @@ static int cpia2_do_ioctl(struct inode * }switch (ioctl_nr) { -case VIDIOCGCAP :/* query capabilites */ +case VIDIOCGCAP :/* query capabilities */ retval =ioctl_cap_query (arg, cam);break ;
drivers/media/video/videocodec.h +0 -0
drivers/media/video/videocodec.h +1 -1
@@ -56,7 +56,7 @@ the slave is bound to it). Otherwise it doesn't need this functions and therfor they may not be initialized. - The other fuctions are just for convenience, as they are for shure used by + The other fuctions are just for convenience, as they are for sure used by most/all of the codecs. The last ones may be ommited, too. See the structure declaration below for more information and which data has
drivers/media/video/zr36050.c +0 -0
drivers/media/video/zr36050.c +1 -1
@@ -159,7 +159,7 @@ zr36050_wait_end (struct zr36050 *ptr)while (!(zr36050_read_status1 (ptr) &0x4 )) {udelay (1 ); -if (i++ >200000 ) {// 200ms, there is for shure something wrong!!! +if (i++ >200000 ) {// 200ms, there is for sure something wrong!!! dprintk (1 ,"%s: timout at wait_end (last status: 0x%02x)\n" , ptr->name, ptr->status1);
drivers/media/video/zr36060.c +0 -0
drivers/media/video/zr36060.c +1 -1
@@ -161,7 +161,7 @@ zr36060_wait_end (struct zr36060 *ptr)while (zr36060_read_status (ptr) & ZR060_CFSR_Busy) {udelay (1 ); -if (i++ >200000 ) {// 200ms, there is for shure something wrong!!! +if (i++ >200000 ) {// 200ms, there is for sure something wrong!!! dprintk (1 ,"%s: timout at wait_end (last status: 0x%02x)\n" , ptr->name, ptr->status);
drivers/media/video/zr36120_i2c.c +0 -0
drivers/media/video/zr36120_i2c.c +1 -1
@@ -65,7 +65,7 @@ void attach_inform(struct i2c_bus *bus,case I2C_DRIVERID_VIDEODECODER :DEBUG (printk (CARD_INFO "decoder attached\n" ,CARD )); -/* fetch the capabilites of the decoder */ +/* fetch the capabilities of the decoder */ rv =i2c_control_device (&ztv->i2c,I2C_DRIVERID_VIDEODECODER ,DECODER_GET_CAPABILITIES , &dc);if (rv) {DEBUG (printk (CARD_DEBUG "decoder is not V4L aware!\n" ,CARD ));
PATCH 140/141 V4L/DVB (3414): Saa7134: document that there's also a 220RF from KWorld
In reply to [email protected]From: Adrian Bunk <[email protected]>
Date: 1141825806 -0300
I have the same card with the same PCI id, but from KWorld. The patch documents that this is the same card.
---
Documentation/video4linux/CARDLIST.saa7134 +0 -0
Documentation/video4linux/CARDLIST.saa7134 +1 -1
@@ -86,6 +86,6 @@ 85 -> AverTV DVB-T 777 [1461:2c05] 86 -> LifeView FlyDVB-T [5168:0301] 87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421] - 88 -> Tevion DVB-T 220RF [17de:7201] + 88 -> Tevion/KWorld DVB-T 220RF [17de:7201] 89 -> ELSA EX-VISION 700TV [1048:226c] 90 -> Kworld ATSC110 [17de:7350]
drivers/media/video/saa7134/saa7134-cards.c +0 -0
drivers/media/video/saa7134/saa7134-cards.c +1 -1
@@ -2706,7 +2706,7 @@ struct saa7134_board saa7134_boards[] = }}, }, [SAA7134_BOARD_TEVION_DVBT_220RF] = { - .name = "Tevion DVB-T 220RF", + .name = "Tevion/KWorld DVB-T 220RF", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_TDA8290, .radio_type = UNSET,
PATCH 141/141 V4L/DVB (3415): Msp3400-kthreads.c: make 3 functions static
In reply to [email protected]From: Adrian Bunk <[email protected]>
Date: 1141825807 -0300
This patch makes three needlessly global functions static.
---
drivers/media/video/msp3400-kthreads.c +0 -0
drivers/media/video/msp3400-kthreads.c +3 -3
@@ -154,7 +154,7 @@ const char *msp_standard_std_name(int streturn "unknown" ; } -void msp_set_source (struct i2c_client *client,u16 src) +static void msp_set_source (struct i2c_client *client,u16 src) {struct msp_state *state =i2c_get_clientdata (client);
@@ -217,7 +217,7 @@ void msp3400c_set_mode(struct i2c_client/* Set audio mode. Note that the pre-'G' models do not support BTSC+SAP, nor do they support stereo BTSC. */ -void msp3400c_set_audmode (struct i2c_client *client) +static void msp3400c_set_audmode (struct i2c_client *client) {static char *strmode[] = {"mono" ,"stereo" ,"lang2" ,"lang1" };struct msp_state *state =i2c_get_clientdata (client);
@@ -944,7 +944,7 @@ static void msp34xxg_detect_stereo(struc status, is_stereo, is_bilingual, state->rxsubchans); } -void msp34xxg_set_audmode (struct i2c_client *client) +static void msp34xxg_set_audmode (struct i2c_client *client) {struct msp_state *state =i2c_get_clientdata (client);int source;
drivers/media/video/msp3400.h +0 -0
drivers/media/video/msp3400.h +0 -1
@@ -104,7 +104,6 @@ int msp_sleep(struct msp_state *state, i/* msp3400-kthreads.c */ const char *msp_standard_std_name (int std); -void msp_set_source (struct i2c_client *client,u16 src);void msp_set_audmode (struct i2c_client *client);void msp_detect_stereo (struct i2c_client *client);int msp3400c_thread (void *data);
Quoted 4 lines · On Mon, 20 Mar 2006 12:08:19 -0300, [email protected] said:
This patch series is also available under v4l-dvb.git tree at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.gitLinus, please pull these from master branch.
141 patchbombs. For part 1.
Can we please have a discussion of what happens for part 2?
Em Seg, 2006-03-20 às 12:51 -0500, [email protected] escreveu:
Quoted 9 lines · On Mon, 20 Mar 2006 12:08:19 -0300, [email protected] said:
Quoted 4 lines
This patch series is also available under v4l-dvb.git tree at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.gitLinus, please pull these from master branch.
141 patchbombs. For part 1.
Can we please have a discussion of what happens for part 2?
I broke into two parts to not scare too much... There are 62 patches remaining.
Maybe I can just send the first email and let people check the patches at -git.
Quoted 5 lines
--
video4linux-list mailing list
Unsubscribe mailto:[email protected]?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list
Cheers,
Mauro.
Quoted 2 lines · On Mon, 20 Mar 2006, [email protected] wrote:
Linus, please pull these from master branch.
No. You have totally destroyed your git tree.
In particular, commit e338b736f1aee59b757130ffdc778538b7db18d6 is crap, crap, CRAP.
It's "Merging Linus tree", but it's not a merge at all: you have just applied the _patch_ to merge the changes in my tree, but you haven't actually told git to do so.
I don't know how/why you did that, but it's totally bogus, and I refuse to pull from that tree. That's a 5000+ line diff, affecting about 180 files!
Now, when I pull from your tree, since the changes are already in mine, git is smart and it will all _merge_ fine, and there are no changes to those files as far as the end result is concerned. But that's still damn bogus.
Have you done things like that before, and I just didn't notice? And why?
Linus
Quoted 3 lines · Linus Torvalds
In particular, commit
e338b736f1aee59b757130ffdc778538b7db18d6is crap, crap, CRAP.
Looking closer, the commit after that is a _real_ merge, and it looks like you did something strange when that at first conflicted in saa7134-dvb.c or something. I just don't even see _how_ you created that bogus non-merge commit. Are you using cogito? It has some problems with conflict resolution, I think. Real git should not even have allowed you to commit something that hadn't been resolved.
Anyway, if you want to fix this up without re-doing _everything_, the way to do so is to just start a new branch, and cherry-pick the non-crap commits. So you can fix it up, largely automatedly, with git.
I'm actually trying to do that right now, to see if I can re-create your tree without the errors.
Linus
Linus,
Em Ter, 2006-03-21 às 08:26 -0800, Linus Torvalds escreveu:
Quoted 2 lines
Quoted 2 lines
In particular, commit
e338b736f1aee59b757130ffdc778538b7db18d6is crap, crap, CRAP.
Sorry for the troubles. I didn't noticed anything here indicating troubles, otherwise I would never asked you to pull it.
Quoted 6 lines
Looking closer, the commit after that is a _real_ merge, and it looks like you did something strange when that at first conflicted in
saa7134-dvb.cor something. I just don't even see _how_ you created that bogus non-merge commit. Are you using cogito? It has some problems with conflict resolution, I think. Real git should not even have allowed you to commit something that hadn't been resolved.
I'm using stgit. It allows me to export the patches from V4L/DVB Mercurial tree, removing backward compatible code and correcting the patches. Is it broken?
Maybe I'm using a bad procedure to keep my -git tree.
My current procedure is:
branch origin - Your tree replica
branch work - my stgit main tree
branch work-fixes - my stgit tree for bug fixes
branch master - patches to current kernel
branch devel - patches to next kernel
All patches are generated against work branch, with stgit. Branch work-fixes receives patches by using:
stg pick <sha>@work
Before commiting to kernel.org, I do:
at origin:
git pull linus_tree
at master:
git pull . origin
git pull . work-fixes
at devel:
git pull . origin
git pull . work
Quoted 7 lines
Anyway, if you want to fix this up without re-doing _everything_, the way to do so is to just start a new branch, and cherry-pick the non-crap commits. So you can fix it up, largely automatedly, with git.
I'm actually trying to do that right now, to see if I can re-create your tree without the errors.
I'll retrieve from your tree and I'll do a double check if something were misapplied.
Quoted 2 lines
Linus
Cheers,
Mauro.
Quoted 11 lines · Mauro Carvalho Chehab
Quoted 7 lines
Looking closer, the commit after that is a _real_ merge, and it looks like you did something strange when that at first conflicted in
saa7134-dvb.cor something. I just don't even see _how_ you created that bogus non-merge commit. Are you using cogito? It has some problems with conflict resolution, I think. Real git should not even have allowed you to commit something that hadn't been resolved.I'm using stgit. It allows me to export the patches from V4L/DVB Mercurial tree, removing backward compatible code and correcting the patches. Is it broken?
Hmm. I don't know if it's stgit per se. Maybe the breakage came from a mercurial merge that got exported to git as a patch, rather than as a merge.
If that's the case, then I'm afraid that the problem is the mercurial part, or at least the hg->git conversion. I have no idea how hg does merges, and maybe the broken merge was done in the hg tree.
The really sad part about this is that it means I have to be much more careful with dvb merges, since I can't trust the tree any more, when it apparently has something strange going on. If things like this keep on happening, I'll have to ask you guys to change your work habits.
That said, I _tried_ to check for similar cases in the past history, and I couldn't find any. So hopefully this was a one-off occurrence.
Linus
Quoted 4 lines
Hmm. I don't know if it's stgit per se. Maybe the breakage came from a mercurial merge that got exported to git as a patch, rather than as a merge.
We can't discard any cause, but, at mercurial, I just export the patches, removing all version-dependent code. After doing, I do a diff between Mercurial and git trees. Only after that, I proceed.
Quoted 4 lines
If that's the case, then I'm afraid that the problem is the mercurial part, or at least the
hg->gitconversion. I have no idea how hg does merges, and maybe the broken merge was done in the hg tree.
Patch generation seems to be ok, since I have the habit to check all patches before commiting. Also, diffstat I sent were generated by looking at the stg exported patches. I dunno if this is common, but running git-fsck-objects after working for a while with stgit generates lots of
Quoted 4 lines
The really sad part about this is that it means I have to be much more careful with dvb merges, since I can't trust the tree any more, when it apparently has something strange going on.
I'll rebuild the entire tree from the beginning, and I'll also update both git and stg version to latest ones.
Quoted 4 lines
If things like this keep on happening, I'll have to ask you guys to change your work habits.
That said, I _tried_ to check for similar cases in the past history, and I couldn't find any. So hopefully this was a one-off occurrence.
I hope this won't happen again.
What is sad is that I can't determinate the root cause of this breakage, but it seemed to be associated with merging handling at stg or git.
One possibility is that stg pick doesn't seem to be preserving commit date, so that patches are compared with the wrong versions.
The first 141 patches were committed in the past, starting from the end of 2.6.15 window and were already committed at stgit. I just did a git pull . prev to retrieve they.
The newer 49, however, were not committed yesterday, but also in the past. Yesterday, I just picked them from work branch. However, stgit marked commit timestamp as if they were just committed. This might have generated some troubles at resolution conflict code on git.
Quoted 2 lines
Linus
Cheers,
Mauro.
Quoted 3 lines · Mauro Carvalho Chehab
What is sad is that I can't determinate the root cause of this breakage, but it seemed to be associated with merging handling at stg or git.
Note that the bad commit has a totally different commit message from any of your other merges. It was this one:
diff-tree e338b736f1aee59b757130ffdc778538b7db18d6 (from cb31c70cdf1ac7034bed5f83d543f4888c39888a) Author: Mauro Carvalho Chehab <[email protected]> AuthorDate: Fri Mar 10 01:30:04 2006 -0300 Commit: Mauro Carvalho Chehab <[email protected]> CommitDate: Fri Mar 10 01:30:04 2006 -0300 Merging Linus tree :100644 100644 be5ae600f5337dbb14daa8d4cace110486e14f79 81bc51369f59a413108fd8b150c3090541ba49f8 M Documentation/feature-removal-schedule.txt :100644 100644 75205391b335f85c9b8a599d0d3b4c0dd1a8b41b fc99075e0af47f0b73a2ae2dfb7d19920c604dea M Documentation/kernel-parameters.txt :100644 100644 9006063e73691da7b68449955a135f7c9317e2cd da677f829f7689966bf09aeda6d89fc4b6a876d1 M arch/alpha/kernel/irq.c ...
ie it does _not_ fit the pattern of your other merges.
Here's an example of a real git merge, with a conflict fixed up:
Merge: 7705a87... 86d720e... Author: Mauro Carvalho Chehab <[email protected]> Date: Mon Mar 20 06:43:08 2006 -0300 Merge branch 'prev' Conflicts: drivers/media/video/em28xx/em28xx-video.c
which is the standard commit message for modern git when a conflict happened that you needed to fix up before committing.
And here's a couple of your non-conflicting merges:
commit 155ec9e63da962bf26ffc65a4088c6cc935f28db Merge: 8e2cc1a... 8a59822... Author: Mauro Carvalho Chehab <[email protected]> Date: Wed Mar 8 12:34:10 2006 -0300 Merge branch 'work-fixes' commit cb31c70cdf1ac7034bed5f83d543f4888c39888a Merge: 06b1c30... 044f324... Author: Mauro Carvalho Chehab <[email protected]> Date: Wed Mar 8 12:33:42 2006 -0300 Merge branch 'work'
which are also clearly generated with git (this is the standard boilerplate git commit message for a merge with no conflict).
So just the merge message tells me that it wasn't a regular git merge, but something else.
Linus
Linus,
Em Ter, 2006-03-21 às 10:42 -0800, Linus Torvalds escreveu:
Quoted 22 lines · Mauro Carvalho Chehab
Quoted 3 lines
What is sad is that I can't determinate the root cause of this breakage, but it seemed to be associated with merging handling at stg or git.
Note that the bad commit has a totally different commit message from any of your other merges. It was this one:
diff-tree e338b736f1aee59b757130ffdc778538b7db18d6 (from cb31c70cdf1ac7034bed5f83d543f4888c39888a) Author: Mauro Carvalho Chehab <[email protected]> AuthorDate: Fri Mar 10 01:30:04 2006 -0300 Commit: Mauro Carvalho Chehab <[email protected]> CommitDate: Fri Mar 10 01:30:04 2006 -0300 Merging Linus tree :100644 100644 be5ae600f5337dbb14daa8d4cace110486e14f79 81bc51369f59a413108fd8b150c3090541ba49f8 M Documentation/feature-removal-schedule.txt :100644 100644 75205391b335f85c9b8a599d0d3b4c0dd1a8b41b fc99075e0af47f0b73a2ae2dfb7d19920c604dea M Documentation/kernel-parameters.txt :100644 100644 9006063e73691da7b68449955a135f7c9317e2cd da677f829f7689966bf09aeda6d89fc4b6a876d1 M arch/alpha/kernel/irq.c ...
Quoted 1 line
ie it does _not_ fit the pattern of your other merges.
Weird, I can't see all those stuff here. It shows something like (running from master copy at kernel.org):
$ git-show e338b736f1aee59b757130ffdc778538b7db18d6 diff-tree e338b736f1aee59b757130ffdc778538b7db18d6 (from cb31c70cdf1ac7034bed5f83d543f4888c39888a) Author: Mauro Carvalho Chehab <[email protected]> Date: Fri Mar 10 01:30:04 2006 -0300
Merging Linus tree
(quoted diff) +0 -0
b/Documentation/feature-removal-schedule.txt
...
So, after the merging message, I have a normal diff with:
179 files changed, 1274 insertions(+), 785 deletions(-)
Seeming all perfect from my knowledge about git.
I don't want to bother you more with this subject. If you don't mind, I'll make a brief from what we've discussed here, and I'll open a thread at git mailing list c/c you.
Quoted 1 line
From my part, I'm not comfortable with a weird situation that generated
such bad merging, so, I'm very concerned about it. I'm here to contribute, not to disturb with bad patches or bad merges. If this issue is not addressed, it may generate troubles in the future.
Quoted 1 line
Linus
Cheers,
Mauro.
Quoted 3 lines · Mauro Carvalho Chehab
Weird, I can't see all those stuff here. It shows something like (running from master copy at kernel.org):
I just did the raw output, so my output was from
git show --pretty=fuller -r e338b7
which isn't the default, but it's useful if you want to see both committer and author information (and the raw format is just because I wasn't interested in the diff itself, just looking at how many files where changed).
Quoted 3 lines
So, after the merging message, I have a normal diff with:
179 files changed, 1274 insertions(+), 785 deletions(-)
Yeah, we're talking about the same commit.
Quoted 1 line
Seeming all perfect from my knowledge about git.
It's a perfectly good commit. BUT IT IS NOT A MERGE, AND IT IS NOT A DIFF THAT I WANT TO SEE COMING IN FROM AN OUTSIDE TREE!
Basically, in the DVB tree you have absolutely _no_ business in "merging" work from my tree as a patch, especially when the patch you merge has absolutely zero to do with DVB. You just applied a 5000-line patch to the tree, with no merge message other than "Merge from Linus tree", and no attribution about what the f*ck was merged, and why.
THAT is the part I'm unhappy with. The git tree is not "corrupt" from a technical standpoint (it passes fsck). It's "corrupt" because it contains a patch that shouldn't be there, that is mis-attributed, and that incorrectly claims to be a merge when it isn't - it's just a random patch generated against my tree.
Linus
Quoted 16 lines · Linus Torvalds
Quoted 3 lines · Mauro Carvalho Chehab
Weird, I can't see all those stuff here. It shows something like (running from master copy at kernel.org):
I just did the raw output, so my output was from
git show --pretty=fuller -r e338b7which isn't the default, but it's useful if you want to see both committer and author information (and the raw format is just because I wasn't interested in the diff itself, just looking at how many files where changed).
Quoted 2 lines
So, after the merging message, I have a normal diff with:
Quoted 8 lines
Quoted 1 line
179 files changed, 1274 insertions(+), 785 deletions(-)Yeah, we're talking about the same commit.
Quoted 1 line
Seeming all perfect from my knowledge about git.
It's a perfectly good commit. BUT IT IS NOT A MERGE, AND IT IS NOT A DIFF THAT I WANT TO SEE COMING IN FROM AN OUTSIDE TREE!
Isn't this what you'd get if you accidentally removed .git/MERGE_HEAD while trying to resolve a merge, and then absent-mindedly described what you'd done in the commit message (forgetting that it ought to have generated the commit message for you in this situation)?
I expect the source of the bad commit is losing that, although I don't know any obvious way to lose it (and still have the index contents which you're merging).
-Daniel
*This .sig left intentionally blank*
Quoted 5 lines · Daniel Barkalow
Isn't this what you'd get if you accidentally removed .git/MERGE_HEAD while trying to resolve a merge, and then absent-mindedly described what you'd done in the commit message (forgetting that it ought to have generated the commit message for you in this situation)?
Yes, exactly. But the point is, that if anybody does something like that, they should be
(a) shot
(b) told that they should never ever do that again
(Not necessarily in that order).
The thing is, the above workflow generates a _buggy_ repository. It will be entirely "correct" in the sense that it passes all git self-consistency checks, but it's not really any different from doing
dd if=/dev/urandom of=Makefile count=2
git commit Makefile
and then asking me to pull from the result.
Quoted 3 lines
I expect the source of the bad commit is losing that, although I don't know any obvious way to lose it (and still have the index contents which you're merging).
Something like "git reset HEAD" + "git commit" might do it.
Linus
Quoted 6 lines · Linus Torvalds
The thing is, the above workflow generates a _buggy_ repository. It will be entirely "correct" in the sense that it passes all git self-consistency checks, but it's not really any different from doing
dd if=/dev/urandom of=Makefile count=2
git commitMakefile
It would be more like
$ dd if=/dev/urandom of=Makefile count=2
$ git commit Makefile
$ git checkout HEAD^ Makefile
$ git commit MakefileQuoted 1 line
and then asking me to pull from the result.
... because the point is that the end-result tree being what is desired is not the only thing that matters, but the history to get there should not have unnecessary garbage.
I am curious how you found it initially. After you pulled but before you did further work on top of the updated HEAD, I am suspecting that there is some sanity check done by you to detect that you pulled a faulty tree and decide to discard the merge. It might help to share that with your subsystem maintainers, so that they can do the same when merging from their feeders.
Quoted 5 lines · Junio C Hamano
I am curious how you found it initially. After you pulled but before you did further work on top of the updated HEAD, I am suspecting that there is some sanity check done by you to detect that you pulled a faulty tree and decide to discard the merge.
I tend to have a two-level safety check. The first is that I just check the diffstat of the result of the pull (I realize that people hate the fact that the diffstat is often the most expensive part of a pull, but to me it's one of the more important things).
So I check the diffstat not only for sanity (if somebody asks me to pull a tree that is ARM-specific, the diffstat should only show ARM files changing), but also tend to match it up against what the "please pull" email _claimed_ the diffstat should look like
This is why I ask people to include the diffstat and shortlog in their "please pull" messages: not only does it mean that I get a high-level idea of what the pull is going to do even before I do it, it also means that if my end result is different from the claimed one, it's likely some confusion with the tree (or I pulled the wrong branch because I didn't notice that it wasn't the main one).
This first-level safety check generally catches any serious mistakes, and it's helped me catch cases where the other end did something really stupid by mistake.
However, in this case, the diffstat didn't actually show anything strange, because the problem was a bogus merge from my own tree, which obviously thus merged perfectly and caused no actual _data_ changes as far as the end result was concerned.
So this one was caught by the fact that I'm just fairly anal about the history being sensible (as the ACPI people may remember ;), so I usually also do
gitk ORIG_HEAD..
after pulling. That gives me a nice overview of what the heck the history looks like, and is what caught this one. I don't _always_ do it, and especially with people who have been merging with me since BK days I sometimes don't bother with this thing, but I do it most of the time.
Finally, I do a "git-fsck-cache" after pretty much every "git pull" sequence just because I'm anal.
Basically, if the history looks sane, and the diffstat doesn't raise any red flags, I'm then usually happy. Of course, since I only really pull from people that I trust _anyway_, none of this is about really trying to find "bad stuff" - it's more about
(a) stupid mistakes. Especially early on, this (and some extra checks, like doing "git-whatchanged ORIG_HEAD.." - which is just a much easier way to scan the commits in more detail without actually seeing the full patches than gitk) caught a number of cases where the other end had simply done a mistake. We had a number of those. Happily, people have clearly gotten more used to git, and I also think that git simply doesn't allow some of those mistakes any more.
(b) keeping the history clean. I _hate_ having an unreadable history. The "whole project" history inevitably gets very complex after a while, but I'm personally convinced that as long as the history makes sense in the "small picture" (ie the "gitk ORIG_HEAD.." kind of thing), it just helps the big picture.
So for _me_, I don't worry so much about the actual patch itself. I seldom have the time to look closely and the actual changed lines, although the merges with Andrew I tend to actually check those (partly because they aren't git merges and so I actually have to check the emails one by one _anyway_, but partly because unlike the git merges, Andrew's stuff tends to be all over the place and often to very core stuff, so I need to be more aware of them).
Linus
Em Ter, 2006-03-21 às 18:53 -0500, Daniel Barkalow escreveu:
Quoted 6 lines · Linus Torvalds
Isn't this what you'd get if you accidentally removed .git/MERGE_HEAD while trying to resolve a merge, and then absent-mindedly described what you'd done in the commit message (forgetting that it ought to have generated the commit message for you in this situation)?
For sure I didn't this by hand. The only possibility is that git, for some unknown reason, decided to remove it by itself. Maybe another git command in-between git pull and git commit might do it, without reverting to its previous state?
Cheers,
Mauro.