summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2006-03-11Merge in ~mkrufky/pvrusb2-cleanupMike Isely
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
2006-03-11Fix compilation issue involving MODULE_DEVICE_TABLE in pvrusb2Mike Isely
From: Mike Isely <isely@pobox.com> Move MODULE_DEVICE_TABLE to pvrusb2-hdw.c, in order to solve compilation issue where that macro is pointing to an external symbol. I have not seen this problem, but others have and so I'm fixing the code. Different behavior is likely tied to gcc version in use. Signed-off-by: Mike Isely <isely@pobox.com>
2006-03-11pvrusb2: remove "ifdef notdef"Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - Changed all occurances of "#ifdef notdef" to "#if 0" - This code will remain visible in the v4l-dvb repositories, but will be held back from git. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-11add pvrusb2 to MakefileMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - added pvrusb2 to the kernel Makefile Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-11Kconfig: Hauppauge WinTV-PVR USB2 supportMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - add pvrusb2 to the kernel build Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-11pvrusb2: video device register/unregister message conformityMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - device registration messages altered to conform with the other v4l drivers. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-11add colon to messages generated by pvr2_trace macroMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - Add a ':' after 'pvrusb2' for kernel message output. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-03-10Fix const inconsistency in pvrusb2Mike Isely
From: Mike Isely <isely@pobox.com> Clean up a missing const declaration in the initialization pathway of the pvrusb2 driver. Signed-off-by: Mike Isely <isely@pobox.com>
2006-03-10Raise legal maximum frequency to 850MHzMike Isely
From: Mike Isely <isely@pobox.com> The V4L2 control limit for frequency is too low. This change raises the limit to a more reasonable maximum. Signed-off-by: Mike Isely <isely@pobox.com>
2006-03-10Make pvrusb2 aware of alternative hardware typesMike Isely
From: Mike Isely <isely@pobox.com> Notice and track actual hardware type of device. This information is also used now to select the correct FX2 firmware file to load (because they can be different, unfortunately). Signed-off-by: Mike Isely <isely@pobox.com>
2006-03-09Rename FX2 firmware for pvrusb2 (again)Mike Isely
From: Mike Isely <isely@pobox.com> It has been discovered that newer PVR USB2 needs incompatibly different FX2 firmware. The driver therefore needs to make the file name a function of which firmware flavor is required. This rename is part of that work. Signed-off-by: Mike Isely <isely@pobox.com>
2006-03-04Implement new method in pvrusb2 to detect the FX2 firmwareMike Isely
From: Mike Isely <isely@pobox.com> The pvrusb2 driver as part of its initialization might have to load the FX2's firmware image. We must only do this when it is actually needed. The previous method just detected this requirement by noticing something unusual about the USB configuration of the device. Unfortunately with newer PVR USB2 devices this method no longer works. What we do now is also attempt a simple non-destructive endpoint 1 transaction; failure of that transfer will indicate a need to load the firmware. Signed-off-by: Mike Isely <isely@pobox.com>
2006-02-26Merge from v4l-dvb masterMike Isely
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
2006-02-26Merge hhackmann treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Also fixed a missing ; at the end of a function Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-26bttv: correct bttv_risc_packed buffer sizeMauro Carvalho Chehab
From: Duncan Sands <duncan.sands@math.u-psud.fr> 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"). Signed-off-by: Duncan Sands <baldrick@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-26Log a message if a pvrusb2 I2C write is too largeMike Isely
From: Mike Isely <isely@pobox.com> The wire protocol to the PVR USB2 hardware limits the total size of an I2C write transfer (among other things). The driver detects this case and fails the transfer; this change also logs the message. We need this in order to catch V4L modules which might be attempting such transfers and deal with them on a case-by-case basis. Signed-off-by: Mike Isely <isely@pobox.com>
2006-02-26cx88: reduce excessive loggingMichael Krufky
From: Ian Pickworth <ian@pickworth.me.uk> - 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. Signed-off-by: Ian Pickworth <ian@pickworth.me.uk> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-26do a RESYNC for all cardsManu Abraham
From: Manu Abraham <manu@linuxtv.org> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-02-26Documentation updateManu Abraham
From: Uwe Bugla <uwe.bugla@gmx.de> Signed-off-by: Uwe Bugla <uwe.bugla@gmx.de> Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-02-26fix module parametersManu Abraham
Thanks to Edgar Toerning Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-02-26fix broken IF-OUT Relay handlingManu Abraham
Thanks to Edgar Toernig Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-02-26Ignore DiSEqC messages > 6 and < 3Manu Abraham
Thanks to Edgar Toernig Signed-off-by: Manu Abraham <manu@linuxtv.org>
2006-02-26add pvrusb2 to local v4l-dvb buildMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - removed 'make pvrusb2' merge command - created in-kernel Makefile, Kconfig not yet done. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-26moved pvrusb2 driver into the kernel treeMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-26removed old cvs filesMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-26add linux/Documentation/video4linux/README.pvrusb2Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - moved out of v4l_experimental Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-25Implement configurable initialization pause in pvrusb2Mike Isely
From: Mike Isely <isely@pobox.com> This implements a module option which may be used to pause initialization of the driver right after the point where the hardware is reset. The idea here is to provide a means for the driver to stay out of the way until the hardware has finished initializating itself. The default delay is zero, which disables it (at the moment I don't think the delay is needed but it's worth leaving the logic in place to do it). Signed-off-by: Mike Isely <isely@pobox.com>
2006-02-25Change firmware file names in pvrusb2 to conform to v4l standardsMike Isely
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
2006-02-25fix build for older kernelsMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> - killed I2C_ALGO_BIT Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-25Merge from v4l-dvb masterMike Isely
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
2006-02-24Merge from js treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> merge: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-24Merging hhackmann tree.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> merge: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-24Merge mkrufky treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> merge: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-24Merge endriss treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> merge: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-24fix stv0297 for qam128 on tt c1500 (saa7146)Michael Krufky
From: Mattias Nordstrom <nordstrom@realnode.com> 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(), Signed-off-by: Mattias Nordstrom <nordstrom@realnode.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-24Add cpia2 camera supportMauro Carvalho Chehab
From: Alan Cox <alan@redhat.com> There has been a CPIA2 driver out of kernel for a long time and it has been pretty clean for some time too. This is an import of the sourceforge driver which has been stripped of - 2.4 back compatibility - 2.4 old style MJPEG ioctls A couple of functions have been made static and the docs have been repackaged into Documentation/video4linux. The rvmalloc/free functions now match the cpia driver again. Other than that this is the code as is. Tested on x86-64 with a QX5 microscope. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-23Support for Satelco EasyWatch DVB-S lightOliver Endriss
From: Thilo Berger <thilo_berger@gmx.net> Support for Satelco EasyWatch DVB-S light. Signed-off-by: Thilo Berger <thilo_berger@gmx.net> Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
2006-02-22Tweak pvrusb2's I2C adapter to work with cx25840Mike Isely
From: Mike Isely <isely@pobox.com> Modify the I2C adapter implementation in pvrusb2 such that I2C_FUNC_I2C is advertised to clients; this allows cx25840 to attach. Signed-off-by: Mike Isely <isely@pobox.com>
2006-02-22Implement LOG_STATUS in pvrusb2Mike Isely
From: Mike Isely <isely@pobox.com> Implement VIDIOC_LOG_STATUS ioctl() to the application. Implement generation of VIDIOC_LOG_STATUS to the modules. Implement trigger of VIDIOC_LOG_STATUS from sysfs when user cats a few key files, to help with debugging. Signed-off-by: Mike Isely <isely@pobox.com>
2006-02-22Handle eeproms in pvrusb2 with 16 bit addressesMike Isely
From: Mike Isely <isely@pobox.com> Newer PVR USB2 hardware uses a larger eeprom. These changes allow the driver to detect and handle the different eeprom. Signed-off-by: Mike Isely <isely@pobox.com>
2006-02-22Implement pvrusb2 driver function to discover eeprom addressMike Isely
From: Mike Isely <isely@pobox.com> The FX2 firmware in the PVR USB2 device can report the I2C address of the resident eeprom device. Implement code to retrieve this information. Signed-off-by: Mike Isely <isely@pobox.com>
2006-02-22Unexpand all the $Id$ keywords in pvrusb2.Mike Isely
From: Mike Isely <isely@pobox.com> The $Id$ keywords present in the pvrusb2 driver reflect information from the old SCM, useless here. For now, undo all the expansions. Signed-off-by: Mike Isely <isely@pobox.com>
2006-02-23Add DVB-T support for the LifeView DVB Trio PCI cardHartmut Hackmann
From: Nico Sabbi <nsabbi@tiscali.it> This patch adds DVB-T support, no DVB-S yet Signed-off-by: Nico Sabbi <nsabbi@tiscali.it> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-02-23Fixed Pinnacle 300i DVB-T support Hartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> - 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 Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-02-22Restore power on defaults of tda9887 after tda8290 probeHartmut Hackmann
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> 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. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
2006-02-20set 'make ivtv-update' to depend on 'make ivtv' instead of 'make ivtv-checkout'Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> This ensures that ivtv-svnversion.h and the ivtv symlinks are present, in case 'make clean' was run prior to 'make ivtv-update' Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-19TUV1236d: declare buffer as static constMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> On 2/17/06, Darren Salt <linux@youmustbejoking.demon.co.uk> wrote: > + u8 buffer [] = { 0x10,0x12,0x13,0x04,0x16,0x00,0x14,0x04,0x017,0x00 }; > Shouldn't buffer be declared static const? Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-02-19dvb-core: remove dead codeJohannes Stezenbach
From: Peter Beutner <p.beutner@gmx.net> The field "dvr" in struct dmxdev is competely unused. Remove it and code which allocates, initializes and frees it. Signed-off-by: Peter Beutner <p.beutner@gmx.net> Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
2006-02-19add AUDIO_GET_PTS and VIDEO_GET_PTS ioctlsMauro Carvalho Chehab
From: Andreas Oberritter <obi@linuxtv.org> 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. Signed-off-by: Andreas Oberritter <obi@linuxtv.org> Acked-by: Johannes Stezenbach <js@linuxtv.org>
2006-02-19dvb: fix __init/__exit section references in av7110 driverJohannes Stezenbach
From: Johannes Stezenbach <js@linuxtv.org> use __devinit/__devexit/__devexit_p() where appropriate Signed-off-by: Johannes Stezenbach <js@linuxtv.org>