summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2006-04-05kbuild: drivers/media/video/pvrusb2: remove $(src) from include pathMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> The pvrusb2 driver does not need 'drivers/media/video' in its include path. This patch removes '$(src)/..' from the Makefile Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-05merge from adqMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> merge: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-05Remove DMX_GET_EVENT and associated data structuresMauro Carvalho Chehab
From: Andreas Oberritter <obi@linuxtv.org> The ioctl DMX_GET_EVENT has never been implemented. I guess no software is using it because of its lack of implementation. Future software won't use it, too, because this API doesn't make much sense the way it is: Frontend events have their own different API. Scrambling events can't be generated in a useful way by the hardware I know of. Signed-off-by: Andreas Oberritter <obi@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-05Fix TT budget-ci 1.1 CI slotsAndrew de Quincey
From: Andrew de Quincey <adq_dvb@lidskialf.net> It turns out the firmware on the TT budget-ci 1.1 slots doesn't generate interrupts. This patch adds support for this using polling mode on these slots. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
2006-04-04kbuild: drivers/media/video/bt8xx: remove $(src) from include pathMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - replaced '$(src)/..' with 'drivers/media/video' Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-04kbuild: use relative path to -IMichael Krufky
From: Sam Ravnborg <sam@mars.ravnborg.org> Date: Tue, 4 Apr 2006 14:56:10 +0000 (+0200) Subject: kbuild: use relative path to -I X-Git-Url: http://kernel.org/git/?p=linux/kernel/git/sam/kbuild-bugfix.git;a=commitdiff;h=b46da0567d3baa6783106e7463801292cdc79ddd kbuild: use relative path to -I Using a relative path has the advantage that when the kernel source tree is moved the relevant .o files will not be rebuild just because the path to the kernel src has changed. This also got rid of a user of TOPDIR - which has been deprecated for a long time now. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-04kbuild: fix unneeded rebuilds in drivers/media/video after moving source treeMichael Krufky
From: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Date: Mon, 3 Apr 2006 22:35:36 +0000 (+0200) Subject: kbuild: fix unneeded rebuilds in drivers/media/video after moving source tree X-Git-Url: http://kernel.org/git/?p=linux/kernel/git/sam/kbuild-bugfix.git;a=commitdiff;h=8036dc6bdca0faa981be01377728678a6f6f3fde kbuild: fix unneeded rebuilds in drivers/media/video after moving source tree This fixes some uneeded rebuilds under drivers/media/video after moving the source tree. The makefiles used $(src) and $(srctree) for include paths, which is unnecessary. Changed to use relative paths. Compile tested, produces byte-identical code to the previous makefiles. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-04Fix mutex in dvb_register_device to work.Andrew de Quincey
From: Andrew de Quincey <adq_dvb@lidskialf.net> This mutex is meant to stop two devices getting the same ID. dvbdev_get_free_id() scans the list of already allocated devices to find a free id. Unfortunately, since the mutex is unlocked before the card is added to the above list, it is still possible for two of them to get the same id. Solution: move the mutex after the list_add. Its debatable whether this mutex lock is actually needed, but I'm unwilling to just remove it in case something does depend on it. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
2006-04-04Remove a wee bit of cruftTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> A few lines that do nothing in the or51132 frontend, removed. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
2006-04-04Avoid unnecessary firmware re-loads in or51132 frontendTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> As QAM_64, QAM_256, and QAM_AUTO all use the same firmware, switching between these modulations doesn't require a firmware re-load. This also fixes a mishandled error condition, in which the firmware file is loaded into the kernel, the clock mode is changed, but then the firmware upload to the device fails. The modulation change is aborted, but the clock mode would still be changed. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
2006-04-04merge from http://linuxtv.org/hg/~mkrufky/trivialMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> merge: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-04Fix spellingTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> It's "Terrestrial" Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2006-04-03fix warning: assignment discards qualifiers from pointer target typeMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> The following warning in all kernels < 2.6.17 is caused by changeset a875912f0aada25949e3201bcd97e177040fa782 : http://linuxtv.org/hg/v4l-dvb?cmd=changeset;node=a875912f0aad videodev.c: In function 'video_open': videodev.c:131: warning: assignment discards qualifiers from pointer target type videodev.c:136: warning: assignment discards qualifiers from pointer target type dvbdev.c: In function 'dvb_device_open': dvbdev.c:105: warning: assignment discards qualifiers from pointer target type This changeset restores backwards-compatability. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-03Change all emails to the currently used one.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-03fix spelling error / typo in commentsMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-03merge: from masterMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-02Clean up some cruft in or51132 frontendMauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> There is some old code in the or51133 firmware loading function that has no effect. Left a comment to in case it helps someone trying to reverse engineer the chip. kernel-sync with V4L/DVB (3708a) Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-02removed trailing newlinesMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-02add missing modules to install targetMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - added dib3000-common.ko to inst_frontends - added dvb-usb-dibusb-common.ko to inst_dvb-usb Thanks to: Martin Dauskardt <md001@gmx.de> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-02merge: from masterHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-02Fix video input setting of em28xx, use _INT_S_VIDEO_ROUTING in tvp5150Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> - Use new routing input defines in em28xx-cards.c - Fix S-Video settings for tvp5150-based cards (input was copied from saa7115 based cards and worked only because S-Video was selected in the default: case) - Replace VIDIOC_S_INPUT by VIDIOC_INT_S_VIDEO_ROUTING in em28xx-video.c - Remove the now obsolete VIDIOC_S_INPUT handler in saa7115.c - Add VIDIOC_INT_G/S_VIDEO_ROUTING in tvp5150.c - Add new media/tvp5150.h with the routing defines. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-02Add support for VIDIOC_INT_S_CRYSTAL_FREQ internal command.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Some saa7115-based cards use a different crystal frequency and a different audio clock generation. Add a new VIDIOC_INT_S_CRYSTAL_FREQ command to be able to set these values. Also change the default APLL setting to 0. It makes no sense to have the audio clock independent from the video clock, this can lead to audio/video synchronization problems. Setting this to 0 is also consistent with the old saa7114.c source and the way the Hauppauge Windows driver sets it. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-02Sync I2C ID's Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-02cpia2: fix function prototypeMauro Carvalho Chehab
From: Randy Dunlap <rdunlap@xenotime.net> Fix address space warning (from sparse): drivers/media/video/cpia2/cpia2_core.c:2355:6: error: symbol 'cpia2_read' redeclared with different type (originally declared at drivers/media/video/cpia2/cpia2.h:458) - incompatible argument 2 (different address spaces) kernel-sync Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-02[PATCH] mark f_ops const in the inodeMauro Carvalho Chehab
From: Arjan van de Ven <arjan@infradead.org> Mark the f_ops members of inodes as const, as well as fix the ripple-through this causes by places that copy this f_ops and then "do stuff" with it. kernel-sync Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-04-02Delimit LOG_STATUS output with standardized linesHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Add standard lines before/after the LOG_STATUS output: this allows easy reading and parsing from the kernel log with e.g. ivtvctl (to be added to v4l-dvb at a later date). Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-02Improve line-in handlingHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> - improve handling of the EXTERN input: don't start an unnecessary carrier scan - improve the LOG_STATUS output - ensure that a carrier scan is started again when switching back to the tuner. - set correct prescale for L-NICAM Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-02Kernel-sync patchMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Mostly because of documentation renames from mkfrufy. Also, a small fix at cpia2. kernel-sync Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-02Fix some errors on bttv_risc_overlayMauro Carvalho Chehab
From: Duncan Sands <baldrick@free.fr> There are tree mistakes on bttv_risc_overlay. 1) When skip_odd is true, the number of lines for which instructions are written is (height+1)/2, not height/2. 2) This occurs when clipping: the number of instruction bytes written can be as much as 8 + 12*nclips, not 8 + 8*nclips, as currently estimated. 3) Coverity check were wrong with nskips=0, since it means that it can clipped at most one line. Signed-off-by: Duncan Sands <baldrick@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-02Merge from http://linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> merge: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-02Merge from mkrufky kconfig treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> merge: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-01Move pvrusb2 config switches further down in v4l's MakefileMike Isely
From: Mike Isely <isely@pobox.com> Cosmetic change related to pvrusb2 to ease maintenance of the v4l build. Signed-off-by: Mike Isely <isely@pobox.com>
2006-04-01Split out PVR USB2 model 24xxx hardware support to a config optionMike Isely
From: Mike Isely <isely@pobox.com> Since there are lingering stability problems with support of the newer PVR USB2 model 24xxx series hardware, I have isolate those changes with a config option. This commit leaves that option off. Signed-off-by: Mike Isely <isely@pobox.com>
2006-04-01Make msp3400 routing defines more consistentHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Renamed various msp3400 routing defines to be more consistent and less confusing. Esp. the MSP_DSP_OUT defines were confusing since it is really a DSP input. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-01Kconfig: fix VP-3054 Secondary I2C Bus build configuration menu dependenciesMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> This patch fixes a dependency problem that affected the indentation order within the individual frontend selection support menus for cx88-dvb. - created a boolean dependency link for VIDEO_CX88_VP3054, so that it's tristate value will be the same as that of VIDEO_CX88_DVB. - VIDEO_CX88_VP3054 is automatically selected by VIDEO_CX88_DVB_ALL_FRONTENDS, but is otherwise selected by VIDEO_CX88_DVB_VP3054, offered as an option under VIDEO_CX88_DVB_MT352 Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-01Merge: from masterHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-01Remove obsolete commands from tvp5150.cHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> - Remove old DECODER_ commands from tvp5150.c, replacing them with newer ones if appropriate. - Small VIDIOC_G_TUNER fixes in msp3400 and tuner. - Fix VIDIOC_S_TUNER support in em28xx. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-01Add back the msp_sleep that waits for the tuner to settle downHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> I removed a msp_sleep call that is really needed, otherwise the second carrier is not detected correctly. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-01Keep experimental SLICED_VBI defines under an #if 0Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> As per request by Mauro the experimental SLICED_VBI defines are back under placed under an #if 0. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-01More msp3400 and bttv fixesHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> - remove obsolete VIDIOC_S_INPUT i2c call in bttv - translate VIDIOCSFREQ to VIDIOC_S_FREQUENCY in i2c call - improve muting during carrier scan in msp3400 - don't start scan unless really needed. - no longer reset chip for msp3400c/d. - remove v4l2 check in tuner-core (radio stops after using the TV) - add missing VIDIOC_INT_ strings in v4l2-common.c Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-03-31Kconfig: add menu options for pvrusb2 sysfs and debug interface supportMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-30Clean up comments in pvrusb2-eeprom.cMike Isely
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
2006-03-30Merge from masterMike Isely
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
2006-03-30pvrusb2 driver initialization tweakMike Isely
From: Mike Isely <isely@pobox.com> Make permanent the removal of the call to pvr2_reset_ctl_endpoints(). It is known positively now that this step was both unneeded and caused harm to communication with the hardware during driver initialization. Signed-off-by: Mike Isely <isely@pobox.com>
2006-03-30Make parts of pvrusb2 compile-time options (sysfs and debugifc)Mike Isely
From: Mike Isely <isely@pobox.com> Arrange things in pvrusb2 so that the sysfs-using component doesn't have to be compiled in. Control this with new CONFIG_VIDEO_PVRUSB2_SYSFS variable. This will allow the driver to still be used even if sysfs has not been compiled into the kernel. Also arrange things similarly in pvrusb2 for the debug interface, which is something that normally should not need to be built but is valuable for bug chasing. This is controlled now with CONFIG_VIDEO_PVRUSB2_DEBUGIFC. Signed-off-by: Mike Isely <isely@pobox.com>
2006-03-31Previous change for cx2341X boards broke the remote supportHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Partially revert previous change to fix IR support. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-03-31Move cx2341x.h to media/cx2341x.hHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> This header is used by multiple drivers, so keep it in include/media so all drivers can access it. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-03-30merging from quincy treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> merge: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-31merge: from masterHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-03-31Fix msp3400c and bttv stereo/mono/bilingual detection/handlingHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> - msp3400c did not detect the second carrier, thus being always mono. - properly mute the msp3400c while detecting the carrier. - fix checks on the presence of scart2/3 inputs and scart 2 output. - implement proper audio mode fallbacks for msp3400c/d, identical to the way msp3400g works. - MODE_STEREO no longer produces dual languages when set for a bilingual transmission, instead it falls back to LANG1. Use LANG1_LANG2 to hear both languages of a bilingual transmission. This is much more intuitive for the user and is in accordance with the preferred usage in the v4l2 specification. - bttv tried to implement v4l2 calls with v4l1 calls to the i2c devices, completely mangling the audmode/rxsubchans handling. v4l2 calls now do v4l2 calls to the i2c devices. - fixed broken i2c_vidiocschan in bttv. - add start/end lines to LOG_STATUS. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>