aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
AgeCommit message (Collapse)AuthorFilesLines
2010-12-17Merge /home/v4l/v4l/patchworkHEADmasterMauro Carvalho Chehab4-6/+95
* /home/v4l/v4l/patchwork: [media] cx231xx: Fix IR keymap for Pixelview SBTVD Hybrid [media] Add a keymap for Pixelview 002-T remote [media] cx231xx: Fix inverted bits for RC on PV Hybrid
2010-12-17[media] cx231xx: Fix IR keymap for Pixelview SBTVD Hybridold/cs_31e5503c0a5fMauro Carvalho Chehab1-1/+1
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-17[media] Add a keymap for Pixelview 002-T remoteMauro Carvalho Chehab2-0/+78
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-17[media] cx231xx: Fix inverted bits for RC on PV HybridMauro Carvalho Chehab1-5/+16
At Pixelview SBTVD Hybrid, the bits sent by the IR are inverted. Due to that, the existing keytables produce wrong codes. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-11Merge /home/v4l/v4l/patchworkMauro Carvalho Chehab11-55/+427
* /home/v4l/v4l/patchwork: [media] timblogiw: Fix a merge conflict with v4l2_i2c_new_subdev_board changes [media] timblogiw: const and __devinitdata do not mix [media] gspca/sn9c20x: Fix support for mt9m001 (mi1300) sensor [media] gspca core: Fix regressions gspca breaking devices with audio [media] gspca/sn9c20x: Get rid of scale "magic" numbers [media] gspca/sn9c20x: Test if sensor is a OV sensor [media] keycodes for DSR-0112 remote bundled with Haupauge MiniStick [media] media: Remove unnecessary casts of usb_get_intfdata [media] Terratec Cinergy Hybrid T USB XS [media] media: rc: lirc_dev: check kobject_set_name() result [media] rc-core: add loopback driver
2010-12-11[media] timblogiw: Fix a merge conflict with v4l2_i2c_new_subdev_board changesMauro Carvalho Chehab1-2/+1
v4l2_i2c_new_subdev_board() doesn't need the module name anymore. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-11[media] timblogiw: const and __devinitdata do not mixStephen Rothwell1-3/+3
This fixes the following error in PowerPC builds: drivers/media/video/timblogiw.c: In function 'timblogiw_probe': drivers/media/video/timblogiw.c:749: error: timblogiw_ioctl_ops causes a section type conflict Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-11[media] gspca/sn9c20x: Fix support for mt9m001 (mi1300) sensorMauro Carvalho Chehab1-13/+61
Support for mt9m001 (mi1300) is broken: - Table is incomplete; - Only one resolution is currently supported by the driver; - Resolution is incomplete; - it complains about broken JPEG headers. Use the same init found on em28xx driver, and properly report the output format as 8-bits GRAY. Acked-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-11[media] gspca core: Fix regressions gspca breaking devices with audioMauro Carvalho Chehab1-4/+0
Changeset 35680ba broke several devices: - Sony Playstation Eye (1415:2000); - Gigaware model 25-234 (0c45:628f); - Logitech Messenger Plus (046d:08f6). Probably more devices were broken by this change. What happens is that several devices don't need to save some bandwidth for audio. Also, as pointed by Hans de Goede <hdegoede@redhat.com>, the logic that implements the bandwidth reservation for audio is broken, since it will reduce the alt number twice, on devices with audio. So, let's just revert the broken logic, and think on a better solution for usb 1.1 devices with audio that can't use the maximum packetsize. Acked-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-11[media] gspca/sn9c20x: Get rid of scale "magic" numbersMauro Carvalho Chehab1-25/+33
Use macros for the supported scales, instead of using magic numbers from 0 to 3. Code become cleaner by using macros for it. Acked-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-11[media] gspca/sn9c20x: Test if sensor is a OV sensorMauro Carvalho Chehab1-0/+9
Instead of just assuming a ov9650 sensor based on USB ID, double-check it, by reading the sensor ID. Acked-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-03Merge branch 'v4l_for_linus_rm_param' into staging/for_v2.6.38Mauro Carvalho Chehab28-98/+81
* v4l_for_linus_rm_param: [media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions [media] v4l: Remove hardcoded module names passed to v4l2_i2c_new_subdev* (2)
2010-12-03[media] keycodes for DSR-0112 remote bundled with Haupauge MiniStickRichard Zidlicky1-0/+38
Add kycodes for DSR-0112 remote that comes together with Haupauge MiniStick http://lirc.sourceforge.net/remotes/hauppauge/DSR-0112.jpg [mchehab@redhat.com: Fix KEY_PREVIOUS to match the definition for the other model] Signed-off-by: Richard Zidlicky <rz@linux-m68k.org> Acked-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-03[media] media: Remove unnecessary casts of usb_get_intfdataJoe Perches2-7/+4
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-03[media] Terratec Cinergy Hybrid T USB XSPhilippe Bourdin1-2/+2
I found that the problems people have reported with the USB-TV-stick "Terratec Cinergy Hybrid T USB XS" (USB-ID: 0ccd:0042) are coming from a wrong header file in the v4l-sources. Attached is a diff, which fixes the problem (tested successfully here). Obviously the USB-ID has been associated with a wrong chip: EM2880 instead of EM2882, which would be correct. Reported-by: Philippe Bourdin <richel@AngieBecker.ch> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-02[media] media: rc: lirc_dev: check kobject_set_name() resultVasiliy Kulikov1-1/+3
kobject_set_name() may fail with -ENOMEM, check for it. Signed-off-by: Vasiliy Kulikov <segoon@openwall.com> Acked-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-02[media] rc-core: add loopback driverDavid Härdeman3-0/+274
This patch adds a loopback driver to rc-core which I've found useful for running scripted tests of different parts of rc-core without having to fiddle with real hardware. Basically it emulates hardware with a learning and a non-learning receiver and two transmitters (which correspond to the two receivers). TX data that is sent is fed back as input on the corresponding receiver, which allows for debugging of IR decoders, keymaps, etc. Signed-off-by: David Härdeman <david@hardeman.nu> Acked-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-02Merge /home/v4l/v4l/for_upstreamMauro Carvalho Chehab2-12/+12
* /home/v4l/v4l/for_upstream: [media] Don't export format_by_forcc on two different drivers
2010-12-02[media] Don't export format_by_forcc on two different driversMauro Carvalho Chehab2-12/+12
Drivers should append their name on exported symbols, to avoid conflicts with allyesconfig: drivers/staging/built-in.o: In function `format_by_fourcc': /home/v4l/work_trees/linus/drivers/staging/cx25821/cx25821-video.c:96: multiple definition of `format_by_fourcc' drivers/media/built-in.o:/home/v4l/work_trees/linus/drivers/media/common/saa7146_video.c:88: first defined here Let's rename both occurences with a small shellscript: for i in drivers/staging/cx25821/*.[ch]; do sed s,format_by_fourcc,cx25821_format_by_fourcc,g <$i >a && mv a $i; done for i in drivers/media/common/saa7146*.[ch]; do sed s,format_by_fourcc,saa7146_format_by_fourcc,g <$i >a && mv a $i; done for i in include/media/saa7146*.[ch]; do sed s,format_by_fourcc,saa7146_format_by_fourcc,g <$i >a && mv a $i; done Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] timblogiw: Fix a merge conflict with v4l2_i2c_new_subdev_board changesMauro Carvalho Chehab1-2/+1
v4l2_i2c_new_subdev_board() doesn't need the module name anymore. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01Merge branch 'v4l_for_linus_rm_param' of /home/v4l/v4l/patchworkMauro Carvalho Chehab28-98/+81
* 'v4l_for_linus_rm_param' of /home/v4l/v4l/patchwork: [media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions [media] v4l: Remove hardcoded module names passed to v4l2_i2c_new_subdev* (2)
2010-12-01Merge branch 'v4l_for_linus_bkl_removal' of /home/v4l/v4l/patchworkMauro Carvalho Chehab37-324/+409
* 'v4l_for_linus_bkl_removal' of /home/v4l/v4l/patchwork: [media] uvcvideo: Convert to unlocked_ioctl [media] uvcvideo: Lock stream mutex when accessing format-related information [media] uvcvideo: Move mmap() handler to uvc_queue.c [media] uvcvideo: Move mutex lock/unlock inside uvc_free_buffers [media] uvcvideo: Lock controls mutex when querying menus [media] v4l2-dev: fix race condition [media] V4L: improve the BKL replacement heuristic [media] v4l2-dev: use mutex_lock_interruptible instead of plain mutex_lock [media] cx18: convert to unlocked_ioctl [media] radio-timb: convert to unlocked_ioctl [media] sh_vou: convert to unlocked_ioctl [media] cafe_ccic: replace ioctl by unlocked_ioctl [media] et61x251_core: trivial conversion to unlocked_ioctl [media] sn9c102: convert to unlocked_ioctl [media] BKL: trivial ioctl -> unlocked_ioctl video driver conversions [media] typhoon: convert to unlocked_ioctl [media] si4713: convert to unlocked_ioctl [media] tea5764: convert to unlocked_ioctl [media] cadet: use unlocked_ioctl [media] BKL: trivial BKL removal from V4L2 radio drivers Conflicts: drivers/media/video/v4l2-dev.c
2010-12-01[media] Fix some merge conflicts with rc-core renames and technisat usb2Mauro Carvalho Chehab2-8/+8
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] linux-next: Fix technisat-usb2 compilationMauro Carvalho Chehab4-8/+7
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01Merge /home/v4l/v4l/patchworkMauro Carvalho Chehab290-6000/+9116
* /home/v4l/v4l/patchwork: (138 commits) [media] rc-core: Initialize return value to zero [media] bttv: remove custom_irq and gpioq from bttv struct [media] [FOR, 2.6.37] Revert "V4L/DVB: v4l2-dev: remove unnecessary lock around atomic clear_bit" [media] cx231xx: stray unlock on error path [media] rc: fix sysfs entry for mceusb and streamzap [media] streamzap: merge timeout space with trailing space [media] drivers/media: nuvoton: fix chip id probe v2 [media] ngene-core.c: Remove unnecessary casts of pci_get_drvdata [media] drivers/media/video: Remove unnecessary semicolons [media] Patch for cx18 module with added support of GoTView PCI DVD3 Hybrid tuner [media] mx2_camera: fix pixel clock polarity configuration [media] timblogiw: fix kconfig & build error [media] Fix parameter description for disable_ir [media] Fix rc-tbs-nec table after converting the cx88 driver to ir-core [media] lirc_dev: fixes in lirc_dev_fop_read() [media] lirc_dev: add some __user annotations [media] lirc_dev: stray unlock in lirc_dev_fop_poll() [media] rc-core: fix some leftovers from the renaming patches [media] bttv: merge ir decoding timers [media] bttv: rename struct card_ir to bttv_ir ...
2010-12-01[media] technisat-usb2: CodingStyle cleanupsMauro Carvalho Chehab1-7/+6
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] technisat-usb2: added driver for Technisat's USB2.0 DVB-S/S2 receiverPatrick Boettcher6-0/+916
This patch is adding support for Technisat's new USB2.0 DVB-S/S2 receiver device. The development was sponsored by Technisat. The Green led is toggle depending on the frontend-state. The Red LED is turned on all the time. The MAC address reading from the EEPROM along with the LRC-method to check whether its valid. Support for the IR-receiver of the Technisat USB2 box. The keys of small, black remote-control are built-in, repeated key behaviour are simulated. The i2c-mutex of the dvb-usb-structure is used as a general mutex for USB requests, as there are 3 threads racing for atomic requests consisting of multiple usb-requests. A module option is there which disables the toggling of LEDs by the driver on certain triggers. Useful when being used in a "dark" environment. Signed-off-by: Martin Wilks <m.wilks@technisat.com> Signed-off-by: Patrick Boettcher <pboettcher@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] stv090x: add tei-field to config-structurePatrick Boettcher2-0/+11
Some backends want to receive the full transport stream including uncorrected packets. To have that feature this patchs add a field to the config-structure called TEI (transport stream error indicator). [mchehab@redhat.com: a couple CodingStyle fixes] Cc: Manu Abraham <abraham.manu@gmail.com> Signed-off-by: Martin Wilks <m.wilks@technisat.com> Signed-off-by: Patrick Boettcher <pboettcher@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] stv090x: added function to control GPIOs from the outsidePatrick Boettcher2-0/+26
This patch STV090X adds and exports a function to control the GPIOs of the stv090x-devices. Cc: Manu Abraham <abraham.manu@gmail.com> Signed-off-by: Martin Wilks <m.wilks@technisat.com> Signed-off-by: Patrick Boettcher <pboettcher@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] uvcvideo: Convert to unlocked_ioctlLaurent Pinchart1-1/+1
The uvcvideo driver now locks all ioctls correctly on its own, the BKL isn't needed anymore. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] uvcvideo: Lock stream mutex when accessing format-related informationLaurent Pinchart3-27/+58
The stream mutex protects access to the struct uvc_streaming ctrl, cur_format and cur_frame fields as well as to the hardware probe control. Lock it appropriately. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] uvcvideo: Move mmap() handler to uvc_queue.cLaurent Pinchart3-66/+79
The mmap() implementation belongs to the video buffers queue, move it there. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] uvcvideo: Move mutex lock/unlock inside uvc_free_buffersLaurent Pinchart2-25/+34
Callers outside uvc_queue.c should not be forced to lock/unlock the queue mutex manually. Move the mutex operations inside uvc_free_buffers(). Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] uvcvideo: Lock controls mutex when querying menusLaurent Pinchart3-38/+50
uvc_find_control() must be called with the controls mutex locked. Fix uvc_query_v4l2_menu() accordingly. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] v4l2-dev: fix race conditionHans Verkuil1-1/+6
The unregister function had a race condition with the v4l2_open function. Ensure that both functions test and clear the REGISTER flag from within a critical section. Thanks to Laurent Pinchart for finding this race. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] V4L: improve the BKL replacement heuristicHans Verkuil2-3/+29
The BKL replacement mutex had some serious performance side-effects on V4L drivers. It is replaced by a better heuristic that works around the worst of the side-effects. Read the v4l2-dev.c comments for the whole sorry story. This is a temporary measure only until we can convert all v4l drivers to use unlocked_ioctl. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] v4l2-dev: use mutex_lock_interruptible instead of plain mutex_lockHans Verkuil1-14/+17
Where reasonable use mutex_lock_interruptible instead of mutex_lock. Also fix the poll, read and write error codes when called with an unregistered device (e.g. after a USB device was disconnected). Poll must return POLLERR|POLLHUP and read/write must return -ENODEV. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] cx18: convert to unlocked_ioctlHans Verkuil2-2/+8
Also added locking around snd_cx18_pcm_ioctl as a precaution as requested by Andy Walls. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] radio-timb: convert to unlocked_ioctlHans Verkuil1-1/+4
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Acked-by: Richard Röjfors <richard.rojfors@pelagicore.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] sh_vou: convert to unlocked_ioctlHans Verkuil1-5/+8
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] cafe_ccic: replace ioctl by unlocked_ioctlHans Verkuil1-1/+1
Trivial change, approved by Jonathan Corbet <corbet@lwn.net>. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] et61x251_core: trivial conversion to unlocked_ioctlHans Verkuil1-1/+1
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] sn9c102: convert to unlocked_ioctlHans Verkuil1-1/+1
Trivial conversion, this driver used a mutex already. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] BKL: trivial ioctl -> unlocked_ioctl video driver conversionsHans Verkuil6-12/+12
These drivers could be trivially converted to unlocked_ioctl since they already did locking. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] typhoon: convert to unlocked_ioctlHans Verkuil1-8/+8
Convert the typhoon driver from ioctl to unlocked_ioctl. When doing this I noticed a bug where curfreq was not initialized correctly to mutefreq (it wasn't multiplied by 16). The initialization is now also done before the device node is created. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] si4713: convert to unlocked_ioctlHans Verkuil1-1/+2
Convert ioctl to unlocked_ioctl. Note that for this driver the locking is done inside the sub-device. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] tea5764: convert to unlocked_ioctlHans Verkuil1-40/+9
Convert from ioctl to unlocked_ioctl using the v4l2 core lock. Also removed the 'exclusive access' limitation. There was no need for it and it violates the v4l2 spec as well. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] cadet: use unlocked_ioctlHans Verkuil1-3/+9
Converted from ioctl to unlocked_ioctl. This driver already used an internal lock, but it was missing in cadet_open and cadet_release and it was not used correctly in cadet_read. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-01[media] BKL: trivial BKL removal from V4L2 radio driversHans Verkuil13-74/+74
The patch converts a bunch of V4L2 radio drivers to unlocked_ioctl. These are all simple conversions: most already had a lock and so the ioctl fop could simply be replaced by unlocked_ioctl. radio-miropcm20.c was converted to use the new V4L2 core lock. While doing this work I noticed that many of these drivers initialized some more fields or muted audio or something like that *after* creating the device node. This should be done before the device node is created to prevent problems. Especially hal tends to grab a device node as soon as it is created. In one or two cases the mutex_init was even done after the device creation! Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-11-29[media] rc-core: Initialize return value to zeroMauro Carvalho Chehab1-1/+1
At ir_setkeycode, if INPUT_KEYMAP_BY_INDEX is used, the routine may return an invalid value if not error. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Privacy Policy