V4L/DVB updates
Subsystems (3)
cover V4L/DVB updates
Greg,
Please pull these from "master" branch at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
It contains miscelaneous fixes, mostly related to kernel building and compatibility stuff. Also, one radio device were at the wrong place.
- Videodev.h should be included also when V4L1_COMPAT is selected.
- Fix V4L1 dependencies on compat_ioctl32
- Fix V4L1 dependencies at drivers under sound/oss and sound/pci
- Restore compat_ioctl in pwc driver
- Fix a typo that caused some compat stuff to not work
- Driver dsbr100 is a radio device, not a video one!
- Fix minor errors in build files
- Cx25840_read4 has wrong endianness.
- Fix broken msp3400 module option 'standard'
- Turn on the Low Noise Amplifier of the Samsung tuners.
- Fix V4L1 Compat for VIDIOCGPICT ioctl
- Quickcam_messenger compilation fix
- Add several error checks to dst
- Fix a warning on PPC64
Cheers,
Mauro.
V4L/DVB development is hosted at http://linuxtv.org
---
drivers/media/dvb/bt8xx/dst.c | 58 - drivers/media/dvb/dvb-core/Makefile | 6 drivers/media/radio/Kconfig | 12 drivers/media/radio/Makefile | 1 drivers/media/radio/dsbr100.c | 430 +++++++++++++ drivers/media/video/Kconfig | 12 drivers/media/video/Makefile | 2 drivers/media/video/compat_ioctl32.c | 32 drivers/media/video/cx25840/cx25840-core.c | 4 drivers/media/video/cx88/cx88-video.c | 4 drivers/media/video/dsbr100.c | 430 ------------- drivers/media/video/msp3400-kthreads.c | 4 drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 2 drivers/media/video/pwc/Kconfig | 2 drivers/media/video/pwc/pwc-if.c | 1 drivers/media/video/saa7134/saa7134-video.c | 2 drivers/media/video/tuner-types.c | 14 drivers/media/video/v4l1-compat.c | 4 drivers/media/video/v4l2-common.c | 6 drivers/media/video/videodev.c | 2 drivers/media/video/vivi.c | 4 include/media/v4l2-dev.h | 2 sound/oss/Kconfig | 6 sound/pci/Kconfig | 70 +- 24 files changed, 569 insertions(+), 541 deletions(-)
PATCH 1/14 V4L/DVB (4340): Videodev.h should be included also when V4L1_COMPAT is selected.
From: Mauro Carvalho Chehab <[email protected]>
---
include/media/v4l2-dev.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/media/v4l2-dev.h +1 -1
@@ -16,7 +16,7 @@ #include <linux/fs.h>#include <linux/device.h> #include <linux/mutex.h> #include <linux/compiler.h> /* need __user */ -#ifdef CONFIG_VIDEO_V4L1 +#ifdef CONFIG_VIDEO_V4L1_COMPAT #include <linux/videodev.h> #else #include <linux/videodev2.h>
PATCH 2/14 V4L/DVB (4371a): Fix V4L1 dependencies on compat_ioctl32
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Compat32 should be able to handle V4L1 ioctls if the old API support were selected.
---
drivers/media/video/compat_ioctl32.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-)
drivers/media/video/compat_ioctl32.c +28 -4
@@ -21,7 +21,7 @@ #include <media/v4l2-common.h> #ifdef CONFIG_COMPAT - +#ifdef CONFIG_VIDEO_V4L1_COMPAT struct video_tuner32 { compat_int_t tuner; char name[32];
@@ -107,6 +107,7 @@ struct video_window32 {compat_caddr_t clips; compat_int_t clipcount; }; +#endif static int native_ioctl (struct file *file,unsigned int cmd,unsigned long arg) {
@@ -124,6 +125,7 @@ static int native_ioctl(struct file *fil } +#ifdef CONFIG_VIDEO_V4L1_COMPAT /* You get back everything except the clips... */ static int put_video_window32 (struct video_window *kp,struct video_window32 __user *up) {
@@ -138,6 +140,7 @@ static int put_video_window32(struct vidreturn -EFAULT ;return 0 ; } +#endif struct v4l2_clip32 {
@@ -490,6 +493,7 @@ static inline int put_v4l2_input(structreturn 0 ; } +#ifdef CONFIG_VIDEO_V4L1_COMPAT struct video_code32 { char loadwhat[16]; /* name or tag of file being passed */
@@ -517,6 +521,8 @@ #define VIDIOCGFREQ32 _IOR('v',14, u32)#define VIDIOCSFREQ32 _IOW('v',15, u32)#define VIDIOCSMICROCODE32 _IOW('v',27, struct video_code32) +#endif +/* VIDIOC_ENUMINPUT32 is VIDIOC_ENUMINPUT minus 4 bytes of padding alignement */ #define VIDIOC_ENUMINPUT32 VIDIOC_ENUMINPUT - _IOC(0, 0, 0, 4)#define VIDIOC_G_FMT32 _IOWR ('V', 4, struct v4l2_format32)
@@ -537,6 +543,7 @@ #define VIDIOC_G_INPUT32 _IOR ('V', 38,#define VIDIOC_S_INPUT32 _IOWR ('V', 39, compat_int_t)#define VIDIOC_TRY_FMT32 _IOWR ('V', 64, struct v4l2_format32) +#ifdef CONFIG_VIDEO_V4L1_COMPAT enum { MaxClips = (~0U -sizeof (struct video_window ))/sizeof (struct video_clip ) };
@@ -601,14 +608,17 @@ static int do_set_window(struct file *fireturn native_ioctl (file,VIDIOCSWIN , (unsigned long )vw); } +#endif static int do_video_ioctl (struct file *file,unsigned int cmd,unsigned long arg) {union { +#ifdef CONFIG_VIDEO_V4L1_COMPAT struct video_tuner vt;struct video_buffer vb;struct video_window vw;struct video_code vc; +#endif struct v4l2_format v2f;struct v4l2_buffer v2b;struct v4l2_framebuffer v2fb;
@@ -624,6 +634,7 @@ static int do_video_ioctl(struct file *f/* First, convert the command. */ switch (cmd) { +#ifdef CONFIG_VIDEO_V4L1_COMPAT case VIDIOCGTUNER32 : cmd =VIDIOCGTUNER ;break ;case VIDIOCSTUNER32 : cmd =VIDIOCSTUNER ;break ;case VIDIOCGWIN32 : cmd =VIDIOCGWIN ;break ;
@@ -631,6 +642,8 @@ static int do_video_ioctl(struct file *fcase VIDIOCSFBUF32 : cmd =VIDIOCSFBUF ;break ;case VIDIOCGFREQ32 : cmd =VIDIOCGFREQ ;break ;case VIDIOCSFREQ32 : cmd =VIDIOCSFREQ ;break ; +case VIDIOCSMICROCODE32 : cmd =VIDIOCSMICROCODE ;break ; +#endif case VIDIOC_G_FMT32 : cmd =VIDIOC_G_FMT ;break ;case VIDIOC_S_FMT32 : cmd =VIDIOC_S_FMT ;break ;case VIDIOC_QUERYBUF32 : cmd =VIDIOC_QUERYBUF ;break ;
@@ -647,10 +660,10 @@ static int do_video_ioctl(struct file *fcase VIDIOC_G_INPUT32 : cmd =VIDIOC_G_INPUT ;break ;case VIDIOC_S_INPUT32 : cmd =VIDIOC_S_INPUT ;break ;case VIDIOC_TRY_FMT32 : cmd =VIDIOC_TRY_FMT ;break ; -case VIDIOCSMICROCODE32 : cmd =VIDIOCSMICROCODE ;break ; };switch (cmd) { +#ifdef CONFIG_VIDEO_V4L1_COMPAT case VIDIOCSTUNER :case VIDIOCGTUNER : err =get_video_tuner32 (&karg.vt, up);
@@ -664,6 +677,7 @@ static int do_video_ioctl(struct file *fbreak ;case VIDIOCSFREQ : +#endif case VIDIOC_S_INPUT :case VIDIOC_OVERLAY :case VIDIOC_STREAMON :
@@ -717,18 +731,21 @@ static int do_video_ioctl(struct file *f compatible_arg =0 ;break ; +#ifdef CONFIG_VIDEO_V4L1_COMPAT case VIDIOCGWIN :case VIDIOCGFBUF :case VIDIOCGFREQ : +#endif case VIDIOC_G_FBUF :case VIDIOC_G_INPUT : compatible_arg =0 ; +#ifdef CONFIG_VIDEO_V4L1_COMPAT case VIDIOCSMICROCODE : err =microcode32 (&karg.vc, up); compatible_arg =0 ;break ; +#endif }; -if (err) goto out;
@@ -743,6 +760,7 @@ static int do_video_ioctl(struct file *f }if (err ==0 ) {switch (cmd) { +#ifdef CONFIG_VIDEO_V4L1_COMPAT case VIDIOCGTUNER : err =put_video_tuner32 (&karg.vt, up);break ;
@@ -754,7 +772,7 @@ static int do_video_ioctl(struct file *fcase VIDIOCGFBUF : err =put_video_buffer32 (&karg.vb, up);break ; - +#endif case VIDIOC_G_FBUF : err =put_v4l2_framebuffer32 (&karg.v2fb, up);break ;
@@ -792,7 +810,9 @@ static int do_video_ioctl(struct file *f err =put_v4l2_input32 (&karg.v2i, up);break ; +#ifdef CONFIG_VIDEO_V4L1_COMPAT case VIDIOCGFREQ : +#endif case VIDIOC_G_INPUT : err =put_user (((u32 )karg.vx), (u32 __user *)up);break ;
@@ -810,6 +830,7 @@ long v4l_compat_ioctl32(struct file *filreturn ret;switch (cmd) { +#ifdef CONFIG_VIDEO_V4L1_COMPAT case VIDIOCSWIN32 : ret =do_set_window (file, cmd, arg);break ;
@@ -820,6 +841,7 @@ long v4l_compat_ioctl32(struct file *filcase VIDIOCSFBUF32 :case VIDIOCGFREQ32 :case VIDIOCSFREQ32 : +#endif case VIDIOC_QUERYCAP :case VIDIOC_ENUM_FMT :case VIDIOC_G_FMT32 :
@@ -851,6 +873,7 @@ long v4l_compat_ioctl32(struct file *fil ret =do_video_ioctl (file, cmd, arg);break ; +#ifdef CONFIG_VIDEO_V4L1_COMPAT /* Little v, the video4linux ioctls (conflict?) */ case VIDIOCGCAP :case VIDIOCGCHAN :
@@ -879,6 +902,7 @@ long v4l_compat_ioctl32(struct file *filcase _IOR ('v' ,BASE_VIDIOCPRIVATE +7 , int): ret =native_ioctl (file, cmd, (unsigned long )compat_ptr (arg));break ; +#endif default :v4l_print_ioctl ("compat_ioctl32" , cmd); }
PATCH 3/14 V4L/DVB (4371b): Fix V4L1 dependencies at drivers under sound/oss and sound/pci
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
TVMixer and FM801 Tea5757 are still using V4L1 API.
---
sound/oss/Kconfig | 6 ++--- sound/pci/Kconfig | 70 +++++++++++++++++++++++++++-------------------------- 2 files changed, 39 insertions(+), 37 deletions(-)
sound/oss/Kconfig +3 -3
@@ -31,7 +31,7 @@ config SOUND_EMU10K1 For more information on this driver and the degree of support for the different card models please check: - <http://sourceforge.net/projects/emu10k1/> + <http://sourceforge.net/projects/emu10k1/> It is now possible to load dsp microcode patches into the EMU10K1 chip. These patches are used to implement real time sound
@@ -140,7 +140,7 @@ config SOUND_TRIDENT system support" and "Sysctl support", and after the /proc file system has been mounted, executing the command - command what is enabled + command what is enabled echo 0>/proc/ALi5451 pcm out is also set to S/PDIF out. (Default).
@@ -838,7 +838,7 @@ config SOUND_WAVEARTIST config SOUND_TVMIXER tristate "TV card (bt848) mixer support" - depends on SOUND_PRIME && I2C + depends on SOUND_PRIME && I2C && VIDEO_V4L1 help Support for audio mixer facilities on the BT848 TV frame-grabber card.
sound/pci/Kconfig +36 -34
136 lines not on this page · raw message
Re: [PATCH 03/14] V4L/DVB (4371b): Fix V4L1 dependencies at drivers under sound/oss and sound/pci
sound/oss/Kconfig config SOUND_EMU10K1 · line 34
Quoted 6 lines · On Tue, 2006-08-08 at 18:06 -0300, [email protected] wrote:
From: Mauro Carvalho Chehab <[email protected]>
sound/oss/Kconfig +1
-1For more information on this driver and the degree of support for the different card models please check: - <http://sourceforge.net/projects/emu10k1/> + <http://sourceforge.net/projects/emu10k1/>
This seems to contain a ton of unrelated whitespace changes.
Lee
Re: [PATCH 03/14] V4L/DVB (4371b): Fix V4L1 dependencies at drivers under sound/oss and sound/pci
Em Ter, 2006-08-08 às 17:54 -0400, Lee Revell escreveu:
Quoted 9 lines · On Tue, 2006-08-08 at 18:06 -0300, [email protected] wrote:
sound/oss/Kconfig config SOUND_EMU10K1 · line 34
Quoted 6 lines
From: Mauro Carvalho Chehab <[email protected]>
sound/oss/Kconfig +1
-1For more information on this driver and the degree of support for the different card models please check: - <http://sourceforge.net/projects/emu10k1/> + <http://sourceforge.net/projects/emu10k1/>This seems to contain a ton of unrelated whitespace changes.
Sorry for that.
We have a zero tolerancy for bad whitespacing for the stuff under drivers/media, so, I have a script that do a cleanup on whitespaces for the files I touch, to avoid a propagation of whitespaces.
I didn't realized the script runned against sound/oss, fixed all those bad whitespacing stuff there.
Quoted 2 lines
Lee
Cheers,
Mauro.
PATCH 4/14 V4L/DVB (4395): Restore compat_ioctl in pwc driver
In reply to [email protected]From: Luc Van Oostenryck <[email protected]>
The compat_ioctl support of the pwc driver was dropped during the last update of the driver. I suppose it was by mistake. If yes here is the patch to restore the support.
---
drivers/media/video/pwc/pwc-if.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/media/video/pwc/pwc-if.c +1 -0
@@ -160,6 +160,7 @@ static struct file_operations pwc_fops = .poll = pwc_video_poll, .mmap = pwc_video_mmap, .ioctl = pwc_video_ioctl, + .compat_ioctl = v4l_compat_ioctl32, .llseek = no_llseek, };static struct video_device pwc_template = {
PATCH 5/14 V4L/DVB (4399): Fix a typo that caused some compat stuff to not work
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
Config option typo:
-#ifdef CONFIG_V4L1_COMPAT
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
---
drivers/media/video/cx88/cx88-video.c | 4 ++-- drivers/media/video/saa7134/saa7134-video.c | 2 +- drivers/media/video/v4l2-common.c | 6 +++--- drivers/media/video/videodev.c | 2 +- drivers/media/video/vivi.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)
drivers/media/video/cx88/cx88-video.c +2 -2
@@ -1225,7 +1225,7 @@ static int video_do_ioctl(struct inode *struct v4l2_format *f = arg;return cx8800_try_fmt (dev,fh,f); } -#ifdef CONFIG_V4L1_COMPAT +#ifdef CONFIG_VIDEO_V4L1_COMPAT /* --- streaming capture ------------------------------------- */ case VIDIOCGMBUF : {
@@ -1584,7 +1584,7 @@ static int radio_do_ioctl(struct inode * *id =0 ;return 0 ; } -#ifdef CONFIG_V4L1_COMPAT +#ifdef CONFIG_VIDEO_V4L1_COMPAT case VIDIOCSTUNER : {struct video_tuner *v = arg;
drivers/media/video/saa7134/saa7134-video.c +1 -1
@@ -2087,7 +2087,7 @@ static int video_do_ioctl(struct inode *struct v4l2_format *f = arg;return saa7134_try_fmt (dev,fh,f); } -#ifdef CONFIG_V4L1_COMPAT +#ifdef CONFIG_VIDEO_V4L1_COMPAT case VIDIOCGMBUF : {struct video_mbuf *mbuf = arg;
drivers/media/video/v4l2-common.c +3 -3
@@ -202,7 +202,7 @@ #define prt_names(a,arr) (((a)>=0)&&((a)/* ------------------------------------------------------------------ */ /* debug help functions */ -#ifdef CONFIG_V4L1_COMPAT +#ifdef CONFIG_VIDEO_V4L1_COMPAT static const char *v4l1_ioctls[] = { [_IOC_NR (VIDIOCGCAP )] ="VIDIOCGCAP" , [_IOC_NR(VIDIOCGCHAN)] = "VIDIOCGCHAN",
@@ -301,7 +301,7 @@ #endif#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)static const char *v4l2_int_ioctls[] = { -#ifdef CONFIG_V4L1_COMPAT +#ifdef CONFIG_VIDEO_V4L1_COMPAT [_IOC_NR (DECODER_GET_CAPABILITIES )] ="DECODER_GET_CAPABILITIES" , [_IOC_NR (DECODER_GET_STATUS )] ="DECODER_GET_STATUS" , [_IOC_NR(DECODER_SET_NORM)] = "DECODER_SET_NORM",
@@ -367,7 +367,7 @@ void v4l_printk_ioctl(unsigned int cmd) (_IOC_NR (cmd) <V4L2_INT_IOCTLS ) ? v4l2_int_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd);break ; -#ifdef CONFIG_V4L1_COMPAT +#ifdef CONFIG_VIDEO_V4L1_COMPAT case 'v' : printk("v4l1 ioctl %s, dir=%s (0x%08x)\n", (_IOC_NR(cmd) < V4L1_IOCTLS) ?
drivers/media/video/videodev.c +1 -1
@@ -760,7 +760,7 @@ static int __video_do_ioctl(struct inode ret=vfd->vidioc_overlay (file, fh, *i);break ; } -#ifdef CONFIG_V4L1_COMPAT +#ifdef CONFIG_VIDEO_V4L1_COMPAT /* --- streaming capture ------------------------------------- */ case VIDIOCGMBUF : {
drivers/media/video/vivi.c +2 -2
@@ -986,7 +986,7 @@ static int vidioc_dqbuf (struct file *fi file->f_flags & O_NONBLOCK)); } -#ifdef CONFIG_V4L1_COMPAT +#ifdef CONFIG_VIDEO_V4L1_COMPAT static int vidiocgmbuf (struct file *file,void *priv,struct video_mbuf *mbuf) {struct vivi_fh *fh=priv;
@@ -1328,7 +1328,7 @@ static struct video_device vivi = { .vidioc_s_ctrl = vidioc_s_ctrl, .vidioc_streamon = vidioc_streamon, .vidioc_streamoff = vidioc_streamoff, -#ifdef CONFIG_V4L1_COMPAT +#ifdef CONFIG_VIDEO_V4L1_COMPAT .vidiocgmbuf = vidiocgmbuf, #endif .tvnorms = tvnorms,
PATCH 6/14 V4L/DVB (4407): Driver dsbr100 is a radio device, not a video one!
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
---
drivers/media/radio/Kconfig | 12 + drivers/media/radio/Makefile | 1 drivers/media/radio/dsbr100.c | 430 +++++++++++++++++++++++++++++++++++++++++ drivers/media/video/Kconfig | 12 - drivers/media/video/Makefile | 1 drivers/media/video/dsbr100.c | 430 ----------------------------------------- 6 files changed, 442 insertions(+), 444 deletions(-)
drivers/media/radio/Kconfig +11 -1
@@ -350,5 +350,15 @@ config RADIO_ZOLTRIX_PORT help Enter the I/O port of your Zoltrix radio card. -endmenu +config USB_DSBR + tristate "D-Link USB FM radio support (EXPERIMENTAL)" + depends on USB && VIDEO_V4L1 && EXPERIMENTAL + ---help--- + Say Y here if you want to connect this type of radio to your + computer's USB port. Note that the audio is not digital, and + you must connect the line out connector to a sound card or a + set of speakers. + To compile this driver as a module, choose M here: the + module will be called dsbr100. +endmenu
drivers/media/radio/Makefile +1 -0
@@ -20,5 +20,6 @@ obj-$(CONFIG_RADIO_GEMTEK) += radio-gemt obj-$(CONFIG_RADIO_GEMTEK_PCI) += radio-gemtek-pci.o obj-$(CONFIG_RADIO_TRUST) += radio-trust.o obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o +obj-$(CONFIG_USB_DSBR) += dsbr100.o EXTRA_CFLAGS += -Isound
drivers/media/radio/dsbr100.c new file +430 -0
430 lines not on this page · raw message
drivers/media/video/Kconfig +0 -12
@@ -449,18 +449,6 @@ source "drivers/media/video/pvrusb2/Kcon source "drivers/media/video/em28xx/Kconfig" -config USB_DSBR - tristate "D-Link USB FM radio support (EXPERIMENTAL)" - depends on USB && VIDEO_V4L1 && EXPERIMENTAL - ---help--- - Say Y here if you want to connect this type of radio to your - computer's USB port. Note that the audio is not digital, and - you must connect the line out connector to a sound card or a - set of speakers. - - To compile this driver as a module, choose M here: the - module will be called dsbr100. - source "drivers/media/video/usbvideo/Kconfig" source "drivers/media/video/et61x251/Kconfig"
drivers/media/video/Makefile +0 -1
@@ -77,7 +77,6 @@ obj-$(CONFIG_VIDEO_UPD64083) += upd64083 obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o obj-$(CONFIG_USB_DABUSB) += dabusb.o -obj-$(CONFIG_USB_DSBR) += dsbr100.o obj-$(CONFIG_USB_OV511) += ov511.o obj-$(CONFIG_USB_SE401) += se401.o obj-$(CONFIG_USB_STV680) += stv680.o
drivers/media/video/dsbr100.c deleted +0 -430
430 lines not on this page · raw message
PATCH 7/14 V4L/DVB (4411): Fix minor errors in build files
In reply to [email protected]From: Trent Piepho <[email protected]>
In pwc Kconfig, change 'depends' to 'depends on'
In dvb-core Makefile, change '=' to ':='
---
drivers/media/dvb/dvb-core/Makefile | 6 +++--- drivers/media/video/pwc/Kconfig | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/media/dvb/dvb-core/Makefile +3 -3
@@ -2,8 +2,8 @@ # # Makefile for the kernel DVB device drivers. # -dvb-core-objs = dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o \ - dvb_ca_en50221.o dvb_frontend.o \ - dvb_net.o dvb_ringbuffer.o dvb_math.o +dvb-core-objs := dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o \ + dvb_ca_en50221.o dvb_frontend.o \ + dvb_net.o dvb_ringbuffer.o dvb_math.o obj-$(CONFIG_DVB_CORE) += dvb-core.o
drivers/media/video/pwc/Kconfig +1 -1
@@ -30,7 +30,7 @@ config USB_PWC config USB_PWC_DEBUG bool "USB Philips Cameras verbose debug" - depends USB_PWC + depends on USB_PWC help Say Y here in order to have the pwc driver generate verbose debugging messages.
PATCH 8/14 V4L/DVB (4416): Cx25840_read4 has wrong endianness.
In reply to [email protected]From: Hans Verkuil <[email protected]>
cx25840_read4 assembled the bytes in the wrong order.
---
drivers/media/video/cx25840/cx25840-core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/video/cx25840/cx25840-core.c +2 -2
@@ -104,8 +104,8 @@ u32 cx25840_read4(struct i2c_client * clif (i2c_master_recv (client, buffer,4 ) <4 )return 0 ; -return (buffer[0 ] <<24 ) | (buffer[1 ] <<16 ) | - (buffer[2 ] <<8 ) | buffer[3 ]; +return (buffer[3 ] <<24 ) | (buffer[2 ] <<16 ) | + (buffer[1 ] <<8 ) | buffer[0 ]; } int cx25840_and_or(struct i2c_client *client, u16 addr, unsigned and_mask,
PATCH 9/14 V4L/DVB (4418): Fix broken msp3400 module option 'standard'
In reply to [email protected]From: Hans Verkuil <[email protected]>
Due to a wrong statement order the 'standard' module option didn't work for 'G' model chips.
---
drivers/media/video/msp3400-kthreads.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/video/msp3400-kthreads.c +2 -2
@@ -961,10 +961,10 @@ int msp34xxg_thread(void *data)/* setup the chip*/ msp34xxg_reset (client); state->std = state->radio ?0x40 : msp_standard; -if (state->std !=1 ) - goto unmute;/* start autodetect */ msp_write_dem (client,0x20 , state->std); +if (state->std !=1 ) + goto unmute;/* watch autodetect */ v4l_dbg (1 , msp_debug, client,"started autodetect, waiting for result\n" );
PATCH 10/14 V4L/DVB (4419): Turn on the Low Noise Amplifier of the Samsung tuners.
In reply to [email protected]From: Hans Verkuil <[email protected]>
Without the LNA these tuners perform very poorly (read 'unwatchable') when the signal is weak.
---
drivers/media/video/tuner-types.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)
drivers/media/video/tuner-types.c +8 -6
@@ -1027,10 +1027,11 @@ static struct tuner_params tuner_tnf_533/* 70-79 */ /* ------------ TUNER_SAMSUNG_TCPN_2121P30A - Samsung NTSC ------------ */ +/* '+ 4' turns on the Low Noise Amplifier */ static struct tuner_range tuner_samsung_tcpn_2121p30a_ntsc_ranges[] = { - {16 *130.00 /*MHz*/ ,0xce ,0x01 , }, - {16 *364.50 /*MHz*/ ,0xce ,0x02 , }, - {16 *999.99 ,0xce ,0x08 , }, + {16 *130.00 /*MHz*/ ,0xce ,0x01 +4 , }, + {16 *364.50 /*MHz*/ ,0xce ,0x02 +4 , }, + {16 *999.99 ,0xce ,0x08 +4 , }, };static struct tuner_params tuner_samsung_tcpn_2121p30a_params[] = {
@@ -1060,10 +1061,11 @@ static struct tuner_params tuner_thomson/* ------------ TUNER_SAMSUNG_TCPG_6121P30A - Samsung PAL ------------ */ +/* '+ 4' turns on the Low Noise Amplifier */ static struct tuner_range tuner_samsung_tcpg_6121p30a_pal_ranges[] = { - {16 *146.25 /*MHz*/ ,0xce ,0x01 , }, - {16 *428.50 /*MHz*/ ,0xce ,0x02 , }, - {16 *999.99 ,0xce ,0x08 , }, + {16 *146.25 /*MHz*/ ,0xce ,0x01 +4 , }, + {16 *428.50 /*MHz*/ ,0xce ,0x02 +4 , }, + {16 *999.99 ,0xce ,0x08 +4 , }, };static struct tuner_params tuner_samsung_tcpg_6121p30a_params[] = {
PATCH 11/14 V4L/DVB (4427): Fix V4L1 Compat for VIDIOCGPICT ioctl
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
---
drivers/media/video/v4l1-compat.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/media/video/v4l1-compat.c +4 -0
@@ -599,6 +599,10 @@ v4l_compat_translate_ioctl(struct inodedprintk ("VIDIOCGPICT / VIDIOC_G_FMT: %d\n" ,err);break ; } + + pict->depth = ((fmt2->fmt.pix.bytesperline<<3 ) + + (fmt2->fmt.pix.width-1 ) ) + /fmt2->fmt.pix.width; pict->palette =pixelformat_to_palette ( fmt2->fmt.pix.pixelformat);break ;
PATCH 12/14 V4L/DVB (4430): Quickcam_messenger compilation fix
In reply to [email protected]From: Diego Calleja <[email protected]>
In bugzilla #6943, Maxim Britov reported:
"I can enable Logitech quickcam support in .config, but it want be compile. I have to add into drivers/media/video/Makefile:
obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/"
He's right, just enable that driver as module while disabling every other driver that gets into that directory, nothing will get compiled. This patch fixes the Makefile.
---
drivers/media/video/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/media/video/Makefile +1 -0
@@ -90,6 +90,7 @@ obj-$(CONFIG_USB_ZC0301) += zc030 obj-$(CONFIG_USB_IBMCAM) += usbvideo/ obj-$(CONFIG_USB_KONICAWC) += usbvideo/ obj-$(CONFIG_USB_VICAM) += usbvideo/ +obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/ obj-$(CONFIG_VIDEO_VIVI) += vivi.o
Re: [PATCH 12/14] V4L/DVB (4430): Quickcam_messenger compilation fix
drivers/media/video/Makefile obj-$(CONFIG_USB_ZC0301) += zc030 · line 93
Quoted 7 lines · El Tue, 08 Aug 2006 18:06:54 -0300, [email protected] escribió:
drivers/media/video/Makefile +1
-0@@ -90,6 +90,7 @@ obj-$(CONFIG_USB_ZC0301) += zc030 obj-$(CONFIG_USB_IBMCAM) += usbvideo/ obj-$(CONFIG_USB_KONICAWC) += usbvideo/ obj-$(CONFIG_USB_VICAM) += usbvideo/ +obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/
This one has already been picked up by akpm
PATCH 13/14 V4L/DVB (4431): Add several error checks to dst
In reply to [email protected]From: Yeasah Pell <[email protected]>
---
drivers/media/dvb/bt8xx/dst.c | 58 +++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 31 deletions(-)
drivers/media/dvb/bt8xx/dst.c +27 -31
@@ -393,7 +393,7 @@ static int dst_set_bandwidth(struct dst_ state->bandwidth = bandwidth;if (state->dst_type !=DST_TYPE_IS_TERR ) -return 0 ; +return -EOPNOTSUPP ;switch (bandwidth) {case BANDWIDTH_6_MHZ :
@@ -462,7 +462,7 @@ static int dst_set_symbolrate(struct dst state->symbol_rate = srate;if (state->dst_type ==DST_TYPE_IS_TERR ) { -return 0 ; +return -EOPNOTSUPP ; }dprintk (verbose,DST_INFO ,1 ,"set symrate %u" , srate); srate /=1000 ;
@@ -504,7 +504,7 @@ static int dst_set_symbolrate(struct dststatic int dst_set_modulation (struct dst_state *state,fe_modulation_t modulation) {if (state->dst_type !=DST_TYPE_IS_CABLE ) -return 0 ; +return -EOPNOTSUPP ; state->modulation = modulation;switch (modulation) {
@@ -1234,7 +1234,7 @@ int dst_command(struct dst_state *state, goto error; }if (write_dst (state, data, len)) { -dprintk (verbose,DST_INFO ,1 ,"Tring to recover.. " ); +dprintk (verbose,DST_INFO ,1 ,"Trying to recover.. " );if ((dst_error_recovery (state)) <0 ) {dprintk (verbose,DST_ERROR ,1 ,"Recovery Failed." ); goto error;
@@ -1328,15 +1328,13 @@ static int dst_tone_power_cmd(struct dst {u8 paket[8 ] = {0x00 ,0x09 ,0xff ,0xff ,0x01 ,0x00 ,0x00 ,0x00 }; -if (state->dst_type ==DST_TYPE_IS_TERR ) -return 0 ; +if (state->dst_type !=DST_TYPE_IS_SAT ) +return -EOPNOTSUPP ; paket[4 ] = state->tx_tuna[4 ]; paket[2 ] = state->tx_tuna[2 ]; paket[3 ] = state->tx_tuna[3 ]; paket[7 ] =dst_check_sum (paket,7 ); -dst_command (state, paket,8 ); - -return 0 ; +return dst_command (state, paket,8 ); }static int dst_get_tuna (struct dst_state *state)
@@ -1465,7 +1463,7 @@ static int dst_set_diseqc(struct dvb_frou8 paket[8 ] = {0x00 ,0x08 ,0x04 ,0xe0 ,0x10 ,0x38 ,0xf0 ,0xec };if (state->dst_type !=DST_TYPE_IS_SAT ) -return 0 ; +return -EOPNOTSUPP ;if (cmd->msg_len >0 && cmd->msg_len <5 )memcpy (&paket[3 ], cmd->msg, cmd->msg_len);else if (cmd->msg_len ==5 && state->dst_hw_cap &DST_TYPE_HAS_DISEQC5 )
@@ -1473,18 +1471,17 @@ static int dst_set_diseqc(struct dvb_froelse return -EINVAL ; paket[7 ] =dst_check_sum (&paket[0 ],7 ); -dst_command (state, paket,8 ); -return 0 ; +return dst_command (state, paket,8 ); }static int dst_set_voltage (struct dvb_frontend *fe,fe_sec_voltage_t voltage) { -int need_cmd; +int need_cmd, retval =0 ;struct dst_state *state = fe->demodulator_priv; state->voltage = voltage;if (state->dst_type !=DST_TYPE_IS_SAT ) -return 0 ; +return -EOPNOTSUPP ; need_cmd =0 ;
@@ -1506,9 +1503,9 @@ static int dst_set_voltage(struct dvb_fr }if (need_cmd) -dst_tone_power_cmd (state); + retval =dst_tone_power_cmd (state); -return 0 ; +return retval; }static int dst_set_tone (struct dvb_frontend *fe,fe_sec_tone_mode_t tone)
@@ -1517,7 +1514,7 @@ static int dst_set_tone(struct dvb_front state->tone = tone;if (state->dst_type !=DST_TYPE_IS_SAT ) -return 0 ; +return -EOPNOTSUPP ;switch (tone) {case SEC_TONE_OFF :
@@ -1533,9 +1530,7 @@ static int dst_set_tone(struct dvb_frontdefault :return -EINVAL ; } -dst_tone_power_cmd (state); - -return 0 ; +return dst_tone_power_cmd (state); }static int dst_send_burst (struct dvb_frontend *fe,fe_sec_mini_cmd_t minicmd)
@@ -1543,7 +1538,7 @@ static int dst_send_burst(struct dvb_frostruct dst_state *state = fe->demodulator_priv;if (state->dst_type !=DST_TYPE_IS_SAT ) -return 0 ; +return -EOPNOTSUPP ; state->minicmd = minicmd;switch (minicmd) {case SEC_MINI_A :
@@ -1553,9 +1548,7 @@ static int dst_send_burst(struct dvb_fro state->tx_tuna[3 ] =0xff ;break ; } -dst_tone_power_cmd (state); - -return 0 ; +return dst_tone_power_cmd (state); }
@@ -1608,28 +1601,31 @@ static int dst_read_signal_strength(stru {struct dst_state *state = fe->demodulator_priv; -dst_get_signal (state); +int retval =dst_get_signal (state); *strength = state->decode_strength; -return 0 ; +return retval; }static int dst_read_snr (struct dvb_frontend *fe,u16 *snr) {struct dst_state *state = fe->demodulator_priv; -dst_get_signal (state); +int retval =dst_get_signal (state); *snr = state->decode_snr; -return 0 ; +return retval; }static int dst_set_frontend (struct dvb_frontend *fe,struct dvb_frontend_parameters *p) { +int retval = -EINVAL ;struct dst_state *state = fe->demodulator_priv;if (p !=NULL ) { -dst_set_freq (state, p->frequency); + retval =dst_set_freq (state, p->frequency); +if (retval !=0 ) +return retval;dprintk (verbose,DST_DEBUG ,1 ,"Set Frequency=[%d]" , p->frequency);if (state->dst_type ==DST_TYPE_IS_SAT ) {
@@ -1647,10 +1643,10 @@ static int dst_set_frontend(struct dvb_fdst_set_symbolrate (state, p->u.qam.symbol_rate);dst_set_modulation (state, p->u.qam.modulation); } -dst_write_tuna (fe); + retval =dst_write_tuna (fe); } -return 0 ; +return retval; } static int dst_tune_frontend(struct dvb_frontend* fe,
PATCH 14/14 V4L/DVB (4485): Fix a warning on PPC64
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c: In function 'set_standard':drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c:33: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'v4l2_std_id'
---
drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c +1 -1
@@ -31,7 +31,7 @@ static void set_standard(struct pvr2_hdwv4l2_std_id vs; vs = hdw->std_mask_cur;pvr2_trace (PVR2_TRACE_CHIPS , -"i2c v4l2 set_standard(0x%llx)" ,(__u64 )vs); +"i2c v4l2 set_standard(0x%llx)" ,(long long unsigned )vs);pvr2_i2c_core_cmd (hdw,VIDIOC_S_STD ,&vs); }
Quoted 19 lines · On Tue, Aug 08, 2006 at 06:01:51PM -0300, [email protected] wrote:
---
drivers/media/dvb/bt8xx/dst.c | 58 - drivers/media/dvb/dvb-core/Makefile | 6 drivers/media/radio/Kconfig | 12 drivers/media/radio/Makefile | 1 drivers/media/radio/dsbr100.c | 430 +++++++++++++ drivers/media/video/Kconfig | 12 drivers/media/video/Makefile | 2 drivers/media/video/compat_ioctl32.c | 32 drivers/media/video/cx25840/cx25840-core.c | 4 drivers/media/video/cx88/cx88-video.c | 4 drivers/media/video/dsbr100.c | 430 ------------- drivers/media/video/msp3400-kthreads.c | 4 drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 2 driverg/media/video/pwc/Kconfig | 2 drivers/media/video/pwc/pwc-if.c | 1 drivers/media/video/saa7134/saa7134-video.c | 2 drivers/media/video/tuner-types.c | 14
Quoted 8 lines
drivers/media/video/v4l1-compat.c | 4 drivers/media/video/v4l2-common.c | 6 drivers/media/video/videodev.c | 2 drivers/media/video/vivi.c | 4 include/media/v4l2-dev.h | 2 sound/oss/Kconfig | 6 sound/pci/Kconfig | 70 +- 24 files changed, 569 insertions(+), 541 deletions(-)
In the future (I know Linus has asked me to do this, and it makes sense), can you generate the diffstat with:
git diff -M --stat --summary
so that it shows the renames instead? That way when I (or Linus) pulls, it shows the same thing to me, that you show here. As an example, when I pulled this I got the following:
Merge ad552692a4489917fa4b71f9c6a91baae4aee799, made by recursive.
drivers/media/dvb/bt8xx/dst.c | 58 ++++++++++------------
drivers/media/dvb/dvb-core/Makefile | 6 +-
drivers/media/radio/Kconfig | 12 ++++-
drivers/media/radio/Makefile | 1
drivers/media/{video => radio}/dsbr100.c | 0
drivers/media/video/Kconfig | 12 -----
drivers/media/video/Makefile | 2 -
drivers/media/video/compat_ioctl32.c | 32 +++++++++++-
drivers/media/video/cx25840/cx25840-core.c | 4 +-
drivers/media/video/cx88/cx88-video.c | 4 +-
drivers/media/video/msp3400-kthreads.c | 4 +-
drivers/media/video/pwc/Kconfig | 2 -
drivers/media/video/pwc/pwc-if.c | 1
drivers/media/video/saa7134/saa7134-video.c | 2 -
drivers/media/video/tuner-types.c | 14 +++--
drivers/media/video/v4l1-compat.c | 4 ++
drivers/media/video/v4l2-common.c | 6 +-
drivers/media/video/videodev.c | 2 -
drivers/media/video/vivi.c | 4 +-
include/media/v4l2-dev.h | 2 -
sound/oss/Kconfig | 6 +-
sound/pci/Kconfig | 70 ++++++++++++++-------------
22 files changed, 138 insertions(+), 110 deletions(-)
rename drivers/media/{video/dsbr100.c => radio/dsbr100.c} (100%)Which I'm pretty sure is the same as what you ment me to pull.
thanks,
greg k-h