summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-07-01merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-no-saa71xxMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-01merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-01v4l2-library: global filesThierry MERLE
From: Hans de Goede <j.w.r.degoede at hhs.nl> Global files to make the libv4l compile, install and exported into a tar.gz file Signed-off-by: Hans de Goede <j.w.r.degoede at hhs.nl> Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
2008-07-01v4l2-library: libv4l1 and v4l1compatThierry MERLE
From: Hans de Goede <j.w.r.degoede at hhs.nl> libv4l1 is the base of the v4l1compat.so wrapper lib, which is a .so which can be LD_PRELOAD-ed and the overrules the libc's open/close/etc, and when opening /dev/videoX calls v4l1_open. Signed-off-by: Hans de Goede <j.w.r.degoede at hhs.nl> Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
2008-07-01v4l2-library: libv4l2 and v4l2convertThierry MERLE
From: Hans de Goede <j.w.r.degoede at hhs.nl> libv4l2 offers v4l2_ prefixed versions of open/close/etc. The API is 100% the same as directly opening /dev/videoX using regular open/close/etc, the big difference is that format conversion is done if necessary when capturing. That is if you (try to) set a capture format which is not supported by the cam, but is supported by libv4lconvert, then the try_fmt / set_fmt will succeed as if the cam supports the format and on dqbuf / read the data will be converted for you and returned in the request format. v4l2convert: open/close/ioctl/mmap/munmap library call wrapper doing format conversion for v4l2 applications which want to be able to simply capture bgr24 / yuv420 from v4l2 devices with more exotic frame formats. Signed-off-by: Hans de Goede <j.w.r.degoede at hhs.nl> Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
2008-07-01v4l2-library: libv4lconvertThierry MERLE
From: Hans de Goede <j.w.r.degoede at hhs.nl> libv4lconvert: video decompression routines Signed-off-by: Hans de Goede <j.w.r.degoede at hhs.nl> Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
2008-07-01saa711x.c: remove obsolete file.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> saa711x.c is no longer used. Remove. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-01Source cleanup - compile error with VIDEO_ADV_DEBUG.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> main, etoms, mars, pac207, pac7311, sonixb, sonixj, spca500, spca505: Cleanup source. sunplus: Compilation error when VIDEO_ADV_DEBUG set. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-01gspca: Fix compilationMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Some callbacks were renamed. Fix it. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-01merge: http://linuxtv.org/hg/~jfrancois/gspca/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-30OV7670: don't reject unsupported settingsMauro Carvalho Chehab
From: Daniel Drake <dsd@laptop.org> For VIDIOC_G_FMT/VIDIOC_TRY_FMT, the V4L2 API spec states: "Drivers should not return an error code unless the input is ambiguous" "Very simple, inflexible devices may even ignore all input and always return the default parameters." "When the requested buffer type is not supported drivers return an EINVAL error code." i.e. returning errors for unsupported fields is bad, and it's ok to unconditionally overwrite user-requested settings This patch makes ov7670 meet that behaviour, and brings it in line with other drivers e.g. stk-webcam. It also fixes compatibility with (unpatched) gstreamer. Signed-off-by: Daniel Drake <dsd@laptop.org> Acked-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-30Sensoray 2255 V4l driver checkpatch fixesMauro Carvalho Chehab
From: Dean Anderson <dean@sensoray.com> This patch fixes some coding style issues. It also fixes a NULL de-reference on driver unload. The permissions for the module parameters were changed to 0644. Signed-off-by: Dean Anderson <dean@sensoray.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-02bt819: Fix a debug messageMauro Carvalho Chehab
From: Jean Delvare <khali@linux-fr.org> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-02zr36067: Delete dead codeMauro Carvalho Chehab
From: Jean Delvare <khali@linux-fr.org> This has been commented out for years, it's about time to get rid of it. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-30ivtv: put back full device name, people relied on it in udev rules.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-30merge...Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-06-30gspca: minor changesJean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> main: V4L2_PIX_FMT_SPCA501 is compressed (thanks to Hans de Goede) main: return 0 when no change on vidioc_s_fmt_cap (thanks to Hans de Goede) pac207: cleanup Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-06-30gspca: all subdriversJean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> - remaning subdrivers added - remove the decoding helper and some specific frame decodings Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-06-29pvrusb2: Update video_gop_sizeMike Isely
From: Mike Isely <isely@pobox.com> When switching video standard, ensure that video GOP size remains appropriately configured. Signed-off-by: Mike Isely <isely@pobox.com>
2008-06-29pvrusb2: Fix misleading source code commentMike Isely
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
2008-06-29Avermedia E506 compositeMauro Carvalho Chehab
From: Tim Farrington <timf@iinet.net.au> Composite was originally mis-labelled as name_comp1, so it should be simply redone as name_comp, with its now corrected attributes. Signed-off-by: Tim Farrington <timf@iinet.net.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-29merge: http://linuxtv.org/hg/~mkrufky/cxusbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-29Fix whitespace diffs between -git and mercurialMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-29v4l2-ctl: improve handling of control names with non-alnum charsHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-29README.patches Add a new practice accepted on kernelMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> On Jun 3, kernel commit adbd5886da5f467148b26cca3728ab0e672b3fcc added a new rule to help patch merging from maintainers, at Documentation/SubmittingPatches: "If you are a subsystem or branch maintainer, sometimes you need to slightly modify patches you receive in order to merge them, because the code is not exactly the same in your tree and the submitters'. If you stick strictly to rule (c), you should ask the submitter to rediff, but this is a totally counter-productive waste of time and energy. Rule (b) allows you to adjust the code, but then it is very impolite to change one submitter's code and make him endorse your bugs. To solve this problem, it is recommended that you add a line between the last Signed-off-by header and yours, indicating the nature of your changes. While there is nothing mandatory about this, it seems like prepending the description with your mail and/or name, all enclosed in square brackets, is noticeable enough to make it obvious that you are responsible for last-minute changes. Example : Signed-off-by: Random J Developer <random@developer.example.org> [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h] Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org> This practise is particularly helpful if you maintain a stable branch and want at the same time to credit the author, track changes, merge the fix, and protect the submitter from complaints. Note that under no circumstances can you change the author's identity (the From header), as it is the one which appears in the changelog." This patch adds a quick description at this rule under README.patches. This is particularly important when merging mercurial tree with -git one. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-29Fix compilation for mt9v022Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-29ttpci: tda827x.h is at drivers/media/commonMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> As reported by Stephen Rothwell <sfr@canb.auug.org.au>: drivers/media/dvb/ttpci/budget-ci.c:50:21: error: tda827x.h: No such file or directory Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-29em28xx-dvb: Fix in-kernel compilationMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-28Fix s2255drv compilation against older kernelsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> As reported by Hermann Pitton: CC [M] /mnt/xfer/mercurial/v4l-dvb-head/v4l-dvb/v4l/s2255drv.o s2255drv.c: In function 'vidioc_querycap': s2255drv.c:809: error: implicit declaration of function 'dev_name' s2255drv.c:809: warning: passing argument 2 of 'strlcpy' makes pointer from integer without a cast Tested with kernel 2.6.25.6 Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-28sms1xxx: add support for Hauppauge WinTV-Nova-T-MiniStickMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-07-01sms1xxx: add firmware filenames to board properties for stellar and novaMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Assign the following firmware filenames: sms1xxx-stellar-dvbt-01.fw sms1xxx-nova-a-dvbt-01.fw sms1xxx-nova-b-dvbt-01.fw Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-07-01sms1xxx: support device-specific firmware filenames on stellar usb1 sticksMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Add the capability to define device-specific firmware filenames for the SMS1010, with a mechanism to fall back to the generic firmware if the device-specific firmware is not present. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-06-29sms1xxx: remove kmutex_t typedefMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> remove typedef struct mutex kmutex_t fix one line > 80 columns Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-06-29sms1xxx: fix OOPS on 64 bit kernels due to a bad castMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Fix the following build warning: smscoreapi.c: In function 'smscore_detect_mode': smscoreapi.c:689: warning: cast from pointer to integer of different size smscoreapi.c:689: warning: cast to pointer from integer of different size smscoreapi.c: In function 'smscore_set_device_mode': smscoreapi.c:820: warning: cast from pointer to integer of different size smscoreapi.c:820: warning: cast to pointer from integer of different size ...and fix the following OOPS on 64bit kernels: [ 717.263667] usb 6-4: new high speed USB device using ehci_hcd and address 2 [ 717.396386] usb 6-4: configuration #1 chosen from 1 choice [ 717.473650] Unable to handle kernel paging request at 0000000000c02000 RIP: [ 717.473657] [<ffffffff88db9edc>] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0 [ 717.473669] PGD 3c6f7067 PUD 3d484067 PMD 0 [ 717.473674] Oops: 0002 [1] SMP [ 717.473678] CPU 0 [Modules linked in snipped] [ 717.473773] Pid: 8380, comm: modprobe Tainted: P 2.6.24-16-generic #1 [ 717.473776] RIP: 0010:[<ffffffff88db9edc>] [<ffffffff88db9edc>] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0 [ 717.473784] RSP: 0018:ffff81003d495ba8 EFLAGS: 00010206 [ 717.473786] RAX: ffff81003d8cd8d0 RBX: ffff81003d8cd800 RCX: ffff81003d8cd8d0 [ 717.473788] RDX: 0000000000000008 RSI: ffff81003f080070 RDI: ffff81003d8cd800 [ 717.473791] RBP: 0000000000000004 R08: ffff81003ec0104b R09: ffffffffffffffff [ 717.473793] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000c02000 [ 717.473796] R13: 00000000fffffff4 R14: ffff810000c02000 R15: ffff81003d8cd878 [ 717.473799] FS: 00007f70a680f6e0(0000) GS:ffffffff805b0000(0000) knlGS:0000000000000000 [ 717.473801] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [ 717.473804] CR2: 0000000000c02000 CR3: 000000003c68b000 CR4: 00000000000006e0 [ 717.473806] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 717.473809] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 717.473812] Process modprobe (pid: 8380, threadinfo ffff81003d494000, task ffff81003d2fc000) [ 717.473814] Stack: ffff81003d8cd800 ffff81003d8cd800 0000000000000000 ffff81003c6d8000 [ 717.473820] ffff81003dcac800 0000000000000008 ffffc20000787bb0 ffffffff88dba16c [ 717.473825] ffff81003dcac800 000000000000000a 0000000000000000 ffffffff88dbb2fa [ 717.473829] Call Trace: [ 717.473866] [<ffffffff88dba16c>] :sms1xxx:smscore_start_device+0x1c/0xb0 [ 717.473885] [<ffffffff88dbb2fa>] :sms1xxx:smsusb_probe+0x29a/0x670 [ 717.473929] [<ffffffff88dbaca0>] :sms1xxx:smsusb_sendrequest+0x0/0x30 [ 717.473965] [<ffffffff804614d9>] mutex_lock+0x9/0x20 [ 717.473998] [<ffffffff8806c42e>] :usbcore:usb_autopm_do_device+0x8e/0x130 [ 717.474040] [<ffffffff8806d33a>] :usbcore:usb_probe_interface+0xda/0x160 [ 717.474067] [<ffffffff803b9f4c>] driver_probe_device+0x9c/0x1b0 [ 717.474091] [<ffffffff803ba219>] __driver_attach+0xc9/0xd0 [ 717.474107] [<ffffffff803ba150>] __driver_attach+0x0/0xd0 [ 717.474115] [<ffffffff803b918d>] bus_for_each_dev+0x4d/0x80 [ 717.474156] [<ffffffff803b959c>] bus_add_driver+0xac/0x220 [ 717.474203] [<ffffffff8806cde9>] :usbcore:usb_register_driver+0xa9/0x120 [ 717.474232] [<ffffffff88dbb00b>] :sms1xxx:smsusb_register+0x1b/0x70 [ 717.474243] [<ffffffff88dba50c>] :sms1xxx:smscore_module_init+0x7c/0xb0 [ 717.474253] [<ffffffff80263b6e>] sys_init_module+0x18e/0x1a90 [ 717.474426] [<ffffffff8020c37e>] system_call+0x7e/0x83 [ 717.474490] [ 717.474491] [ 717.474492] Code: 66 41 c7 04 24 9c 02 41 c6 44 24 02 00 4c 89 e6 41 c6 44 24 [ 717.474506] RIP [<ffffffff88db9edc>] :sms1xxx:smscore_set_device_mode+0x22c/0x4a0 [ 717.474513] RSP <ffff81003d495ba8> [ 717.474515] CR2: 0000000000c02000 [ 717.474521] ---[ end trace 52d9c6f207be106a ]--- Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-06-28sms1xxx: Provide option to support Siano default usb idsMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Provide an option to enable / disable support for Siano's default usb ids. This allows the support for Siano's USB IDs to be disabled, so that Siano's external driver can be used, instead. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-06-28sms1xxx: change smsusb_driver.name to sms1xxxMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-06-28sms1xxx: log firmware download process by defaultMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-06-28cx18: enable TS supportHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-28sms1xxx: fix warning: format '%d' expects type 'int', but argument x has ↵Michael Krufky
type 'size_t' From: Michael Krufky <mkrufky@linuxtv.org> Fix the following 64bit build warning: make[2]: Entering directory `/usr/src/linux-headers-2.6.24-16-generic' CC [M] smscoreapi.o smscoreapi.c: In function 'smscore_load_firmware_from_file': smscoreapi.c:604: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' CC [M] smsusb.o smsusb.c: In function 'smsusb1_load_firmware': smsusb.c:216: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' smsusb.c:223: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-06-28merge: masterMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-06-28Fix callback namesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Callback naming has changed. Fix to the proper convention. CC: Dean Anderson <dean@sensoray.com> CC: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-28Fix hghead to avoid adding bogus SOB'sMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> As reported by Michael Krufky: > sms1xxx: fix Siano board names > > From: Michael Krufky <mkrufky@linuxtv.org> > > Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> > Signed-off-by: <> > > > I have to "hg export tip > file && nano file {remove last line} && hg rollback && hg revert --all && hg import file" to fix it. > > What went wrong? :-/ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-28sms1xxx: update MODULE_DESCRIPTIONMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> set MODULE_DESCRIPTION to "Driver for the Siano SMS1XXX USB dongle" Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-06-28sms1xxx: fix Siano board namesMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-06-28Fix compat with older kernelsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-28cx18: Upgrade to newer firmware & update cx18 documentation.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Conexant graciously gave us permission to redistribute the firmware. Update the documentation where the firmware can be downloaded. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-28cx18: set correct audio inputs for tuner and line-in 2.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-28v4l2-dbg: if only the 'min' value is specified, then set max to min+0xffHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-28cx18: fix v4l-cx23418-dig.fw firmware load.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-28cxusb: add initial support for AVerTVHD VolarMichael Krufky
From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> Add initial support for this device. The AGC and tracking filter settings for the mxl5003 are known to be wrong, but it generally works. Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>