Commit Graph

7508 Commits

Author SHA1 Message Date
Linus Torvalds
8e9c238c38 Merge master.kernel.org:/home/rmk/linux-2.6-mmc 2006-01-09 15:08:33 -08:00
Russell King
788ee7b098 [MMC] Add DATA_MULTI flag
Some hosts need to know that a transfer will be multi-block.
Add a data flag to indicate multiple data block transfers.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2006-01-09 21:12:17 +00:00
Linus Torvalds
f17578decc Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb 2006-01-09 13:03:58 -08:00
Alexey Dobriyan
682e852e26 [PATCH] Fix more "if ((err = foo() < 0))" typos
Another reason to use:

	ret = foo();
	if (ret < 0)
		goto out;

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-09 13:02:51 -08:00
Hugh Dickins
41ed16fa47 [PATCH] Fix sg_page_malloc() memset
sg_page_malloc should clear the data buffer, not that extent of mem_map.

This fixes Jesper's sg_page_free "Bad page states"

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-09 12:57:05 -08:00
Chris Pascoe
b9f4ad57f7 V4L/DVB (3329): cx88_subids whitespace cleanup
- Clean up a recently introduced spaces vs tabs whitespace problem.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:39 -02:00
Michael Krufky
81481e9e12 V4L/DVB (3328): replace omitted 'TODO:'
- replace omitted 'TODO:'

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:38 -02:00
Patrick Boettcher
f53737882e V4L/DVB (3327): Remove DViCO specific firmware hacks from the generic code.
- Move the code that patches bluebird firmware before upload from the
generic code into the cxusb driver itself.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:38 -02:00
Hans Verkuil
5af0c8f6a0 V4L/DVB (3326): Fix stereo and standard reporting of msp3400 (esp. for radio)
- Add VIDIOC_LOG_STATUS to the radio device ioctl list.
- Reduce the confusion between modes and standards
- Fix stereo reporting for radio.
- Don't set i2c configuration if the chip doesn't support it.
- Fix reporting of current standard for radio.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:37 -02:00
Oliver Endriss
5b0fa4fff1 V4L/DVB (3325): WSS output interface for av7110
- Implemented v4l2 api for sliced vbi data output
to pass WSS data from userspace to the av7110

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:37 -02:00
Hans Verkuil
d312a46e53 V4L/DVB (3324): msp3400 audio handling bug fixes.
- Check capabilities for audio settings (volume, balance,
bass, treble, loudness, mute)
- added loudness support
- added missing VIDEO_AUDIO_BALANCE flags for v4l1 compatibility
- do not call msp_any_detect_stereo for non-autoselect chips to
retrieve the current stereo setting: that will temporarily mute
the sound. It is only needed when the stereo mode might be
changed, and for autoselect msp processors that do not periodically
need to update their stereo setting.
- do not wake up the thread if the standard did not change. Prevents
temporary audio drop-out if the standard is set to the same value.
- fix confused stereo detect code where V4L2_TUNER_SUB_STEREO and
V4L2_TUNER_MODE_STEREO values were used incorrectly.
- stereo mode reporting was broken (v4l2 value used to index a
string array expecting v4l1 mode values).
- do not set dsp register 0x30 in the 3410d thread: that register
does not exist for pre-'G' revision msp chips.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:36 -02:00
Marc Koschewski
1157020d54 V4L/DVB (3323): Add Kconfig option for wrongly programmed devices
- A new Kconfig option makes the user able to select if the dibusb-mb driver shall claim faulty programmed USB devices which are coming with default Cypress USB IDs.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:36 -02:00
Marc Koschewski
00e34579fe V4L/DVB (3322): Whitespace cleanup and unused code removed
- Some whitespaces cleaned up
- unused code removed

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:35 -02:00
Marc Koschewski
5ba4cc9778 V4L/DVB (3321): Indention cleanups
- Indention cleaned for tabsize=8

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:34 -02:00
Patrick Boettcher
a6bab889c4 V4L/DVB (3320): Check if PLL-description is set
- Check if in the dvb-usb-device-structure the dvb_pll_desc is set before use.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:33 -02:00
Marc Koschewski
4e5910e6fe V4L/DVB (3319): Changed indention for define's and their values
- Indention for values of several request defines were not TabSized=8.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:33 -02:00
d binderman
f2a333148c V4L/DVB (3318): Fixes warning: variable "ret" is used before its value is set
- Fixes compiling warning on kernel 2.6.15 with the Intel C compiler. 
- It said drivers/media/dvb/frontends/bcm3510.c(258): 
  warning #592: variable "ret" is used before its value is set

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:32 -02:00
Hans Verkuil
7560d7a4f9 V4L/DVB (3317): msp3400: use v4l2_std_id and determine chip capabilities.
- Replace old norm by the v4l2_std_id values.
- Add code to correctly detect the various capabilities of the
various msp chips. It's not yet used, that's going to be the next step.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:32 -02:00
Chris Pascoe
3d7d027a9b V4L/DVB (3315): Use correct AGC settings for DNTV Live! DVB-T Pro
- My original settings for this board were incorrect and resulted in
an increased number of signal dropouts.  Replace this with the settings
from the Windows driver.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:31 -02:00
Michael Krufky
a07e60961e V4L/DVB (3313): codingstyle cleanups & restore some wrongfully deleted dvb-usb-ids
- codingstyle cleanups & restore some wrongfully deleted dvb-usb-ids

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:31 -02:00
Chris Pascoe
7c239703a9 V4L/DVB (3312): DViCO USB IR Remote support
- Add support for the remote control receiver inside the DViCO FusionHDTV
DVB-T Dual Digital, and a keymap for the MCE remote bundled with it.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:29 -02:00
Chris Pascoe
43eabb4e22 V4L/DVB (3311): DViCO FusionHDTV DVB-T Dual Digital PCI support
- Support for DVB reception on the PCI half of the DViCO DVB-T Dual Digital.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:28 -02:00
Chris Pascoe
0029ee143d V4L/DVB (3310): DViCO Dual Digital DVB-T / USB bluebird updates
- Add support for the USB portion of the DViCO Dual Digital board.
Patch correct "warm" USB IDs into bluebird firmware before download.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:28 -02:00
Peter Missel
0602fbb2c8 V4L/DVB (3309): SAA7134: GPIO IRQ improvements
- Saa7134-core.c saa7134_irq(): Separate GPIO16 and GPIO18 handling. Call
IR-remote-GPIO handler only if the GPIO IRQ is "owned" by it. Added
infrastructure to branch out to a future I2C-IR IRQ handler.
saa7134-core.c saa7134_hwinit2(): Enable only the one GPIO pin and edge to
trigger an IRQ that is wired as keyup/keydown mask. IRQ will only be
generated for an actual key-down event.
saa7134-input.c flyvideo_codes[]: Replace numpad keys with normal ones. Put
meaning to mystery keys. Change some key definitions to have their functions
match their labels better. Fix typos.
saa7134-input.c flydvb_codes[]: Added new table for the larger remote that
comes with the LifeView FlyDVB series.
saa7134-input.c build_key(): In IRQ mode, signal key-down and then key-up
straight in one go.

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:23 -02:00
Linus Torvalds
6150c32589 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge 2006-01-09 10:03:44 -08:00
Knut Petersen
44637a12f8 [PATCH] Update cyblafb driver
This is a major update to the cyblafb framebuffer driver. Most
of the stuff has been tested in the mm tree.

Main advantages:
============
  - vxres > xres support
  - ywrap and xpan support
  - much faster for almost all modes (e.g. 1280x1024-16bpp
     draws more than 41 full screens of text instead of about 25
     full screens of text per second on authors Epia 5000)
  - module init/exit code fixed
  - bugs triggered by console rotation fixed
  - lots of minor improvements
  - startup modes suitable for high performance scrolling
     in all directions

This diff  also contains a lot of white space fixes.

No side effects are possible, only one single graphics core is affected.

Signed-off-by: Knut Petersen <Knut_Petersen@t-online.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-09 10:00:36 -08:00
Mauro Carvalho Chehab
cab462f716 V4L/DVB (3307): Some cleanups at I2C modules
- i2c names shorten
- removed obsoleted flags on newer modules
- small cleanups

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:53:26 -02:00
Linus Torvalds
8b78e83bfb Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev 2006-01-09 09:39:55 -08:00
Linus Torvalds
cf10b2853f Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 2006-01-09 09:39:05 -08:00
Mauro Carvalho Chehab
0680481c8e V4L/DVB (3305): Replaces old debug msgs to newer ones
- Replaces old debug msgs from bt832, tda743d and tda9875 to newer ones
  as defined under v4l2-common.h.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:46 -02:00
George Gazurkoff
565f494905 V4L/DVB (3303): Both AverTV Studio 303 cards #6 and #36 use the same IR programming.
- Both AverTV Studio 303 cards, #6 and #36,
use the same remote control programming.

Signed-off-by: George Gazurkoff <gazurkoff@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:46 -02:00
Guy Martin
009494effc V4L/DVB (3296): Fixes a bug at compat_ioctl32 kernel module
- There is a bug in the ioctl translations from 32bit userspace
to 64bit kernelspace in do_set_window().
- The video window (vw) should be passed to native_ioctl()
instead of the video clip.

Signed-off-by: Guy Martin <gmsoft@tuxicoman.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:45 -02:00
Peter Missel
4aa6ba513e V4L/DVB (3295): Add analog support for LifeView FlyDVB Trio.
- Add support for LifeView FlyDVB Trio.
- all analog inputs are supported and working, including FM radio
- TO DO: dvb & remote control

Signed-off-by: Peter Missel <peter.missel@onlinehome.de>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:45 -02:00
Manenti Marco
f39624fda0 V4L/DVB (3294): Add Kworld/Vstream Xpert DVB-T card with cx22702 tuner.
- Add Kworld/Vstream Xpert DVB-T card with cx22702 tuner.

Signed-off-by: Manenti Marco <marco_manenti@colman.it>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:45 -02:00
Mauro Carvalho Chehab
b7f355d23c V4L/DVB (3293): Added digital support for cx88 (cx88-alsa)
- This module is co-authored by  Ricardo Cerqueira <v4l@cerqueira.org>.

- Added digital audio support for cx88-based boards that have function
  01 enabled. These boards can be identified by having PCI id 1471:8801
  or 1471:8811.

- Increased DMA buffer from 512 to 4096 seems to fix audio distortion.

- Existing audio DMA uses conflict with cx88-alsa. Should be disabled when
  cx88-alsa module is compiled.

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:44 -02:00
Hans Verkuil
0de71224d1 V4L/DVB (3292): Fix signed/unsigned bug in brightness handling of cx25840
- Fix signed/unsigned bug in brightness handling (set to 0 and 128 was returned).

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:44 -02:00
Hans Verkuil
c5099a6481 V4L/DVB (3291): Fix signed/unsigned bug in hue handling
- Fix signed/unsigned bug in hue handling (set to -127 and 129 was returned).

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:43 -02:00
Hans Verkuil
82a1c359e8 V4L/DVB (3195): Fix for 64-bit compile warning
- Add the fix for the saa7146 64-bit compile warning (again). This time with
comments and checked by Johannes Stezenbach.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:43 -02:00
Peter Beutner
400b7083fb V4L/DVB (3194): Revert one 64-bit fix and improved other 64-bit fixes
- Reverted objectionable fix in saa7146_hlp.c
- Merged in improved dvb 64-bit fixes from Peter Beutner.

Signed-off-by: Peter Beutner <p.beutner@gmx.net>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:43 -02:00
Michael Krufky
d8e6acf2ec V4L/DVB (3287): Add DViCO Bluebird firmware to dvb_get_firmware script
- Add DViCO Bluebird firmware to dvb_get_firmware script,
for FusionHDTV USB devices.
- Use usb alt setting 0 for EP4 transfer (dvb-t),
- Use usb alt setting 7 for EP2 transfer (atsc)
- Added comment to lgdt330x.c to indicate support for
DViCO FusionHDTV5 USB Gold.
Thanks to: Jeff Lee <JeffLee@dvico.com>

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:42 -02:00
Michael Krufky
e71bb548e5 V4L/DVB (3282): rename cxusb_bluebird_atsc_properties to cxusb_bluebird_lgh064f_properties
- This property set is for the LG-H064F (FusionHDTV5 USB Gold)
- There may, in the future, be a bluebird device using a different NIM,
so renaming the struct to somehting NIM-specific is appropriate.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:42 -02:00
Oliver Endriss
66190a2752 V4L/DVB (3281): av7110 driver: improved recovery from ARM crash and crash detection
- Improved recovery from ARM crash and the way a crash is detected.
Minor white space clean-up, debug output fixed.

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:42 -02:00
Hans Verkuil
da4ae5a72b V4L/DVB (3280): Added VIDIOC_QUERYCTRL to saa7115
- Added VIDIOC_QUERYCTRL to saa7115

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:41 -02:00
Hans Verkuil
d92c20e0a5 V4L/DVB (3279): Added VIDIOC_QUERYCTRL to cx25840.
- Added VIDIOC_QUERYCTRL
- Removed unnecessary inlines.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:41 -02:00
Hans Verkuil
fac9e89999 V4L/DVB (3278): convert diagnostics over to the new v4l2-common.h macros.
- Convert diagnostics over to the new v4l2-common.h macros.
- deprecated tuner_debug option, the new option is debug.
- renamed cx25840_debug to debug.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:40 -02:00
Michael Krufky
0e7072ef66 V4L/DVB (3277): Fix incorrect filename reference in top comments
- Fix incorrect filename reference in top comments

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:40 -02:00
Hans Verkuil
7e8b09ea16 V4L/DVB (3276): Added new diagnositics macros, convert msp3400 to the new macros.
- Added new v4l_err, v4l_warn, v4l_info and v4l_dbg macros to
v4l2-common.h for use in v4l-dvb i2c drivers. This ensures
a unique prefix for each device instance.
- At a later stage these macros may be reimplemented using the
device-generic macros from device.h.
- Converted the msp3400 driver to the new macros.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:40 -02:00
Hans Verkuil
53b0a1c60b V4L/DVB (3275): Split msp3400.c into msp3400-driver.c and msp3400-kthreads.c
- Split msp3400.c into msp3400-driver.c and msp3400-kthreads.c.
- Removed experimental DFPREG ioctls. If this is really needed one
day then it should be implemented using VIDIOC_G/S_REGISTER.
- Added missing BALANCE control info for VIDIOC_QUERYCTRL.
- Still more cleanup, clarified some kernel messages.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:39 -02:00
Hans Verkuil
e93fa17eb1 V4L/DVB (3271): more cleanups, simplify volume/balance/bass/treble handling
- Continue cleanup effort:
- more cosmetic changes
- combine volume, balance, bass and treble into one audio
function. Revert old 2.4 code that crept in.
- print internal ioctls using new debug function.
- marked all msp3400c (aka manual) functions as such.
- removed some unused data structures.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:39 -02:00
Michael Krufky
5e453dc757 V4L/DVB (3269): ioctls cleanups.
- Now, all internal ioctls are at v4l2-common.h
- removed unused ioctl at saa6752hs.h
- all debug ioctl code moved to v4l2-common.c
- removed duplicated stuff from other cards

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:31 -02:00