summaryrefslogtreecommitdiff
path: root/linux
AgeCommit message (Collapse)Author
2007-02-13cafe_ccic: fix compiler warningMichael Krufky
From: Jean Delvare <khali@linux-fr.org> Fix the following warning: drivers/media/video/cafe_ccic.c: In function `cafe_vidioc_reqbufs': drivers/media/video/cafe_ccic.c:1197: warning: 'ret' might be used uninitialized in this function Probably not a real bug, but the warning can be avoided easily. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-02-13Backport: removal of duplicated symbolMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: As pointed by Al Viro, ir_codes_pinnacle_grey had already defined KEY_RECORD on position 0x27. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-12Backport header fix from kernelMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Original patch from Al Viro <viro@ftp.linux.org.uk> usbvision missing __user Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-11merge: http://linuxtv.org/hg/~mkrufky/megasky.devMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-11Last patch removed this by accident - revertingMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-11Sync bt87x and i2c-id filesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Those files are maintained by alsa and i2c teams. Sync their changes into v4l/dvb tree. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-10zl10353: register definitions updateChris Pascoe
From: Chris Pascoe <c.pascoe@itee.uq.edu.au> Update the descriptions of "discovered" registers on the zl10353, using the equivalaent mt352 register names. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
2007-02-10zl10353: Implement TRL nominal rate calculationChris Pascoe
From: Antti Palosaari <crope@iki.fi> Implement trl nominal rate calculation to Zarlink ZL10353 demod, based on calculation used in Zarlink MT352. This adds support for 6 and 8MHz bandwidth transponders. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
2007-02-10zl10353: add i2c_gate_ctrl supportChris Pascoe
From: Antti Palosaari <crope@iki.fi> Implement I2C gate control for Megasky GL861 and SigmaTek AU6610 support. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au> Signed-off-by: Antti Palosaari <crope@iki.fi>
2007-02-10Experimental support for zl10353 signal strength/BER/uncorrectable countChris Pascoe
From: Chris Pascoe <c.pascoe@itee.uq.edu.au> After studying many hours worth of register dumps of MT352 and ZL10353 fed with identically damaged RF signals I have made an educated guess at which registers contain the AGC level, bit error rate and uncorrectable error count values. Implement the IOCTLs that return these values to userspace. Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
2007-02-08merge: http://linuxtv.org/hg/~mcisely/pvrusb2Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-08kthread api conversion for dvb_frontend and av7110 fixMauro Carvalho Chehab
From: akpm@linux-foundation.org <akpm@linux-foundation.org> avoid double-up(), pointed out by Oliver. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-08kthread API conversion for dvb_frontend and av7110Mauro Carvalho Chehab
From: Herbert Poetzl <herbert@13thfloor.at> dvb kernel_thread to kthread API port. It is running fine here, including module load/unload and software suspend (which doesn't work as expected with or without this patch :). I didn't convert the dvb_ca_en50221 as I do not have such an interface, but if the conversion process is fine with the v4l-dvb maintainers, it should not be a problem to send a patch for that too ... Signed-off-by: Herbert Poetzl <herbert@13thfloor.at> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-07pvrusb2: Register I2C adapter (more) correctlyMike Isely
From: Mike Isely <isely@pobox.com> An I2C adapter needs to register an association with the actual parent device. Until 2.6.20, not doing this was a benign problem; now it causes an ugly warning in the system log. This 1-line patch corrects that oversight. Signed-off-by: Mike Isely <isely@pobox.com>
2007-02-07pvrusb2: Be more forgiving about encoder firmware sizeMike Isely
From: Mike Isely <isely@pobox.com> The pvrusb2 driver previously rejected encoder firmware whose size was not a multiple of 8192. But this is a false check because it's possible to find cx23416 firmware whose size doesn't conform to this limit. So change the firmware loader implementation to be more forgiving of the image size. Signed-off-by: Mike Isely <isely@pobox.com>
2007-02-07pvrusb2: Follow coding style convention for "#if 0" blocksMike Isely
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
2007-02-07pvrusb2: Fix printk format typoMike Isely
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
2007-02-07CodingStyle cleanupsMauro Carvalho Chehab
From: Ahmed S. Darwish <darwish.07@gmail.com> After commited at the tree, Ahmed re-sent his patch with some codingstyle cleanups. This diff-patch will be folded with the first one at -git. Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-07Usbvision: set alternate interface modificationMauro Carvalho Chehab
From: Thierry MERLE <thierry.merle@free.fr> - usb alternate selection modified to get the biggest endpoint packet size. - fix sysfs get values for brightness/contrast/hue/saturation Signed-off-by: Thierry MERLE <thierry.merle@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-07Usbvision: dynamic allocation for framesMauro Carvalho Chehab
From: Thierry MERLE <thierry.merle@free.fr> - fix decoder route output - dynamic frame buffer allocation Signed-off-by: Thierry MERLE <thierry.merle@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-07Change videodev2.h licence to dual GPL/BSDMauro Carvalho Chehab
From: Michael Schimek <mschimek@gmx.at> videodev2.h contains just the V4L2 API structs and defines. By allowing this header file to be dual GPL/BSD will enable sharing userspace apps between Linux and *BSD systems. It will also allow developing newer BSD licensed drivers that can be shared on Linux and *BSD. It should be noticed that most of the current V4L drivers, and v4l core itself are GPL only. This won't be changed by this patch. Signed-off-by: Michael H. Schimek <mschimek@gmx.at> Signed-off-by: Gerd Hoffmann <kraxel@suse.de> Signed-off-by: Bill Dirks <bill@thedirks.org> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Martin Rubli <mrubli@gmx.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-07Reverting patch d1bfc4440540ee9f86bff20850ed205d0ddad1bfMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Patch broke pvrusb2 driver. Reverting it. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06DVB: Use ARRAY_SIZE macro when appropriateMauro Carvalho Chehab
From: Ahmed S. Darwish <darwish.07@gmail.com> Use ARRAY_SIZE macro already defined in kernel.h Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06Radio/: Convert to generic boolean-valuesMauro Carvalho Chehab
From: Richard Knutsson <ricknu-0@student.ltu.se> Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06From: Adrian Bunk <bunk@stusta.de>Mauro Carvalho Chehab
v4l_printk_ioctl_arg() is no longer used. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06Cx88-video.c: remove struct radionormsMauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de> This patch removes the unused struct radionorms. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06Cafe_ccic.c fix warningMauro Carvalho Chehab
From: Jonathan Corbet <corbet@lwn.net> Quiet a spurious gcc warning. Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06Convert to generic boolean-valuesMauro Carvalho Chehab
From: Richard Knutsson <ricknu-0@student.ltu.se> Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06VIDEO_BUF depends on PCIMauro Carvalho Chehab
From: Andrew Morton <akpm@osdl.org> m68k allmodconfig: drivers/media/video/video-buf.c: In function 'videobuf_queue_pci': drivers/media/video/video-buf.c:396: error: 'pci_map_sg' undeclared (first use in this function) drivers/media/video/video-buf.c:396: error: (Each undeclared identifier is reported only once drivers/media/video/video-buf.c:396: error: for each function it appears in.) drivers/media/video/video-buf.c:399: error: 'pci_dma_sync_sg_for_cpu' undeclared (first use in this function) drivers/media/video/video-buf.c:401: error: 'pci_unmap_sg' undeclared (first use in this function) drivers/media/video/video-buf.c: In function 'videobuf_pci_dma_map': Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06Frontends/: make 4 functions staticMauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de> This patch makes four needlessly global functions static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06Remove the unused kernel config option VIDEO_VIDEOBUFMauro Carvalho Chehab
From: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06merge: http://linuxtv.org/hg/~mkrufky/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06merge: http://linuxtv.org/hg/~endriss/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06Merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb2Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-06Avoid race when deregistering the IR control for dvb-usbMauro Carvalho Chehab
From: Chris Rankin <rankincj@yahoo.com> The work item function is dvb_usb_read_remote_control(): INIT_WORK(&d->rc_query_work, dvb_usb_read_remote_control, d); and the last piece of work it does is: schedule_delayed_work(&d->rc_query_work,msecs_to_jiffies(d->props.rc_interval)); Hence you need to call "cancel_rearming_delayed_work()" and not "cancel_delayed_work()", correct? I certainly haven't seen this oops reoccur since I applied this patch. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-02-05cx25840 request_firmware failed due to wrong device.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Due to changes in the /sys directory structure a bug in the cx25840 firmware load surfaced in 2.6.20: the device passed to request_firmware was wrong: instead of the i2c device the i2c adapter was passed. Because of this an attemp was made to create a kobject with the adapter name inside the adapter directory, but a kobject with that name already exists. Now pass the i2c device itself so that the correct /sys directory is used. This way the firmware can be loaded again. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-02-05Backed out changeset a829a6ca77529b26451610ec6368ceeaa8103ebdMichael Krufky
From: Chris Rankin <rankincj@yahoo.com> Due to usb_to_input_id(), this change was completely unnecessary. These three lines are trying to do exactly what usb_to_input_id() does already. Remove them. Signed-off-by: Chris Rankin <rankincj@yahoo.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-02-03budget-av: Call saa7146_vv_release on exitOliver Endriss
From: Marco Schluessler <marco@lordzodiac.de> Call saa7146_vv_release on exit. Signed-off-by: Marco Schluessler <marco@lordzodiac.de> Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
2007-02-03Add cx23415 decoder register documentationHans Verkuil
From: Ian Armstrong <ian@iarmst.demon.co.uk> Many thanks to Ian Armstrong for figuring out what all these registers do. Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-02-03Fix CC handling in VIDIOC_INT_G_VBI_DATAHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> When capturing a 60 Hz input the internal field ID is inverted. The VIDIOC_INT_G_VBI_DATA didn't take that into account and so returned XDS instead of CC and vice versa. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-02-03Remove #if 0 section from videodev2.hHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Remove a section containing basically ideas for future sliced VBI standards. This can be resurrected should any of this be actually implemented. For now it only pollutes this header file. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-02-03Sliced VBI API no longer marked experimental.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The Sliced VBI API is no longer marked experimental. Introduced in 2.6.14 and with only a single modification in 2.6.19 I think we can consider this API to be solid. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-02-03Fix cx2584x revision reporting.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Revisions >= 23 were always reported as revision 23. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-02-03cx2341x encoder documentation update.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-02-02budget-ci: Add separate configuration data for subsystem 0x13c2:0x1012Oliver Endriss
From: Oliver Endriss <o.endriss@gmx.de> Fixed problem reported by Teemu Suikki: After a device with subsystem 0x13c2:0x1012 has been installed, devices with subsystem id 0x13c2:0x1011 did not work anymore. Reason: The driver for 0x13c2:0x1012 modified shared configuration data. Fix: Use separate configuration data for those devices. Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
2007-01-27qt1010: use i2c_gate_ctrl where appropriateMichael Krufky
From: Antti Palosaari <crope@iki.fi> This patch adds calls to i2c_gate_ctrl in the qt1010 dvb tuner module, while removing the temporary hack in au6610 and gl861. Tested successfully against fi-Oulu frequencies with MSI Megasky 580 GL861 and Sigmatek DVB-110 AU6610. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-01-21whitespace / 80-column cleanupsMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-01-21kconfig: qt1010 should be selected by gl861 and au6610Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-01-21dvb: add new qt1010 tuner moduleMichael Krufky
From: Antti Palosaari <crope@iki.fi> gl861: (MSI Megasky) - hack for enable ZL10353 / QT1010 I2C gate - use new QT1010 module instead of old code au6610: (Sigmatek DVB-110) - hack for enable ZL10353 / QT1010 I2C gate - use new QT1010 module instead of old code Tested successfully with au6610 and gl861 devices against fi-Yllas frequencies. Now it locks perfectly with both devices. There is a "hack" to enable probable i2c gate in zl10535 demodulator. QT1010 doesn't respond to any i2c messages before we write 0x1a to demodulator register 0x62. In my understanding this should be fixed to demodulator code. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-11-05Initial support for Sigmatek DVB-110 DVB-TMichael Krufky
From: Antti Palosaari <crope@iki.fi> This patch adds driver for Sigmatek DVB-110 USB DVB-T stick. Stick has based on hardware of Qtuantek QT1010 tuner, Zarlink ZL10353 (Intel CE 6353) demodulator and Alcor Micro AU6610 DVB-T USB controller. HW is rather similar as used in MSI Megasky GL861. Currently, the driver works only in USB 2.0. In my understanding USB 1.1 is also supported by hw but I cannot test it due to lack of USB 1.1 port. Device supports only isochronous mode transfers. There is also eeprom in usb controller(at least in address range 0x80 - 0xbf) for storing data, eg. firmware. Anyway, firmware loading is not used / required by the device. There seems to be at least one unknown I2C device in address 0xa0, probably remote control or GPIO. Windows drivers reads registers from 0x00 to 0x07 from this unknown address. Driver is based on gl861 module. Tuner has a lot of problems to lock with megasky qt1010 module with this hardware with some broadcasting standards. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>