[GIT,PATCHES,FOR,3.2] cx23885 alsa cleaned and prepaired
Message ID | 201110101752.11536.liplianin@me.by (mailing list archive) |
---|---|
State | Accepted, archived |
Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from <linux-media-owner@vger.kernel.org>) id 1RDHD2-0006IK-Vs; Mon, 10 Oct 2011 16:52:05 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-1) with esmtp id 1RDHD0-0005GO-Jy; Mon, 10 Oct 2011 16:52:02 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751246Ab1JJOwA (ORCPT <rfc822;patchwork@linuxtv.org> + 3 others); Mon, 10 Oct 2011 10:52:00 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:42057 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750919Ab1JJOv7 (ORCPT <rfc822;linux-media@vger.kernel.org>); Mon, 10 Oct 2011 10:51:59 -0400 Received: by ggnv2 with SMTP id v2so4555848ggn.19 for <linux-media@vger.kernel.org>; Mon, 10 Oct 2011 07:51:59 -0700 (PDT) Received: by 10.223.61.211 with SMTP id u19mr32773950fah.29.1318258318618; Mon, 10 Oct 2011 07:51:58 -0700 (PDT) Received: from useri.localnet ([93.125.112.3]) by mx.google.com with ESMTPS id u6sm32020431faf.3.2011.10.10.07.51.55 (version=SSLv3 cipher=OTHER); Mon, 10 Oct 2011 07:51:56 -0700 (PDT) From: "Igor M. Liplianin" <liplianin@me.by> To: Mauro Chehab <mchehab@infradead.org> Subject: [GIT PATCHES FOR 3.2] cx23885 alsa cleaned and prepaired Date: Mon, 10 Oct 2011 17:52:11 +0300 User-Agent: KMail/1.13.6 (Linux/3.1.0-rc6+; KDE/4.5.5; x86_64; ; ) Cc: linux-media@vger.kernel.org, Steven Toth <stoth@linuxtv.org>, Mijhail Moreyra <mijhail.moreyra@gmail.com>, Abylai Ospan <aospan@netup.ru> MIME-Version: 1.0 Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Message-Id: <201110101752.11536.liplianin@me.by> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.10.10.144215 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, BODY_SIZE_4000_4999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, ECARD_WORD 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __DATE_TZ_RU 0, __FRAUD_MONEY 0, __FRAUD_MONEY_VALUE 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __USER_AGENT 0' X-LSpam-Score: 3.2 (+++) X-LSpam-Report: No, score=3.2 required=5.0 tests=BAYES_00=-1.9, FREEMAIL_FROM=0.001, KB_DATE_CONTAINS_TAB=2.751, RCVD_IN_BL_SPAMCOP_NET=1.347, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_SORBS_WEB=0.77, TAB_IN_FROM=2.494 autolearn=no |
Pull-request
git://linuxtv.org/liplianin/media_tree.git cx23885-alsa-clean-2Message
Igor M. Liplianin
Oct. 10, 2011, 2:52 p.m. UTC
Hi Mauro and Steven, It's been a long time since cx23885-alsa pull was requested. To speed things up I created a git branch where I put the patches. Some patches merged, like introduce then correct checkpatch compliance or convert spinlock to mutex and back to spinlock, insert printk then remove printk as well. Minor corrections from me was silently merged, for major I created additional patches. Hope it helps. The following changes since commit e30528854797f057aa6ffb6dc9f890e923c467fd: [media] it913x-fe changes to power up and down of tuner (2011-10-08 08:03:27 -0300) are available in the git repository at: git://linuxtv.org/liplianin/media_tree.git cx23885-alsa-clean-2 Igor M. Liplianin (2): cx23885: videobuf: Remove the videobuf_sg_dma_map/unmap functions cx25840-audio: fix missing state declaration Mijhail Moreyra (6): cx23885: merge mijhail's header changes for alsa cx23885: ALSA support cx23885: core changes requireed for ALSA cx23885: add definitions for HVR1500 to support audio cx23885: correct the contrast, saturation and hue controls cx23885: hooks the alsa changes into the video subsystem Steven Toth (31): cx23885: prepare the cx23885 makefile for alsa support cx23885: convert from snd_card_new() to snd_card_create() cx23885: convert call clients into subdevices cx23885: minor function renaming to ensure uniformity cx23885: setup the dma mapping for raw audio support cx23885: mute the audio during channel change cx23885: add two additional defines to simplify VBI register bitmap handling cx23885: initial support for VBI with the cx23885 cx23885: initialize VBI support in the core, add IRQ support, register vbi device cx23885: minor printk cleanups and device registration cx25840: enable raw cc processing only for the cx23885 hardware cx23885: vbi line window adjustments cx23885: add vbi buffer formatting, window changes and video core changes cx23885: Ensure the VBI pixel format is established correctly. cx23885: ensure video is streaming before allowing vbi to stream cx23885: remove channel dump diagnostics when a vbi buffer times out. cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming. cx23885: Name an internal i2c part and declare a bitfield by name cx25840: Enable support for non-tuner LR1/LR2 audio inputs cx23885: Enable audio line in support from the back panel cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use. cx23885: Initial support for the MPX-885 mini-card cx23885: fixes related to maximum number of inputs and range checking cx23885: add generic functions for dealing with audio input selection cx23885: hook the audio selection functions into the main driver cx23885: v4l2 api compliance, set the audioset field correctly cx23885: Removed a spurious function cx23885_set_scale(). cx23885: Avoid stopping the risc engine during buffer timeout. cx23885: Avoid incorrect error handling and reporting cx23885: Stop the risc video fifo before reconfiguring it. cx23885: Allow the audio mux config to be specified on a per input basis. drivers/media/video/cx23885/Makefile | 2 +- drivers/media/video/cx23885/cx23885-alsa.c | 535 +++++++++++++++++++++++++++ drivers/media/video/cx23885/cx23885-cards.c | 53 +++ drivers/media/video/cx23885/cx23885-core.c | 99 ++++- drivers/media/video/cx23885/cx23885-i2c.c | 1 + drivers/media/video/cx23885/cx23885-reg.h | 3 + drivers/media/video/cx23885/cx23885-vbi.c | 72 +++- drivers/media/video/cx23885/cx23885-video.c | 373 ++++++++++++++++--- drivers/media/video/cx23885/cx23885.h | 56 +++ drivers/media/video/cx25840/cx25840-audio.c | 10 +- drivers/media/video/cx25840/cx25840-core.c | 19 + 11 files changed, 1144 insertions(+), 79 deletions(-) create mode 100644 drivers/media/video/cx23885/cx23885-alsa.c -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Comments
> It's been a long time since cx23885-alsa pull was requested. > To speed things up I created a git branch where I put the patches. > are available in the git repository at: ... > git://linuxtv.org/liplianin/media_tree.git cx23885-alsa-clean-2 Thank you for working on this Igor. I most certainly have some additional patches that will probably no longer apply cleanly. However, given that you've gone to the trouble of building a new tree, assuming we can get these merged, then I'll rebase and regenerate any patches I have to match the current cx23885 driver.
? ????????? ?? 11 ??????? 2011 21:17:57 ????? Steven Toth ???????: > > It's been a long time since cx23885-alsa pull was requested. > > To speed things up I created a git branch where I put the patches. > > > are available in the git repository at: > ... > > > git://linuxtv.org/liplianin/media_tree.git cx23885-alsa-clean-2 > > Thank you for working on this Igor. > > I most certainly have some additional patches that will probably no > longer apply cleanly. However, given that you've gone to the trouble > of building a new tree, assuming we can get these merged, then I'll > rebase and regenerate any patches I have to match the current cx23885 > driver. Thank you for the driver Steven. Is current state of branch good for pulling?
Em 10-10-2011 11:52, Igor M. Liplianin escreveu: > Hi Mauro and Steven, > > It's been a long time since cx23885-alsa pull was requested. > To speed things up I created a git branch where I put the patches. > Some patches merged, like introduce then correct checkpatch compliance > or convert spinlock to mutex and back to spinlock, insert printk then remove printk as well. > Minor corrections from me was silently merged, for major I created additional patches. > > Hope it helps. > > The following changes since commit e30528854797f057aa6ffb6dc9f890e923c467fd: > > [media] it913x-fe changes to power up and down of tuner (2011-10-08 08:03:27 -0300) > > are available in the git repository at: > git://linuxtv.org/liplianin/media_tree.git cx23885-alsa-clean-2 > > Igor M. Liplianin (2): > cx23885: videobuf: Remove the videobuf_sg_dma_map/unmap functions > cx25840-audio: fix missing state declaration > > Mijhail Moreyra (6): > cx23885: merge mijhail's header changes for alsa > cx23885: ALSA support > cx23885: core changes requireed for ALSA > cx23885: add definitions for HVR1500 to support audio > cx23885: correct the contrast, saturation and hue controls > cx23885: hooks the alsa changes into the video subsystem > patches/0009-cx23885-hooks-the-alsa-changes-into-the-video-subsys.patch > From ee1eadb6f02f9c1b6d14e049874ad883d752ea7e Mon Sep 17 00:00:00 2001 > From: Mijhail Moreyra <mijhail.moreyra@gmail.com> > Date: Mon, 10 Oct 2011 17:09:53 +0300 > Subject: cx23885: hooks the alsa changes into the video subsystem > Cc: Linux Media Mailing List <linux-media@vger.kernel.org> > > Priority: normal > > Signed-off-by: Mijhail Moreyra <mijhail.moreyra@gmail.com> > Signed-off-by: Steven Toth <stoth@kernellabs.com> > Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> > --- > drivers/media/video/cx23885/cx23885-video.c | 23 ++++++++++++++++------- > 1 files changed, 16 insertions(+), 7 deletions(-) > > diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c > index 0c463f9..acd6e0c 100644 > --- a/drivers/media/video/cx23885/cx23885-video.c > +++ b/drivers/media/video/cx23885/cx23885-video.c > @@ -37,6 +37,8 @@ > #include "cx23885-ioctl.h" > #include "tuner-xc2028.h" > > +#include <media/cx25840.h> > + > MODULE_DESCRIPTION("v4l2 driver module for cx23885 based TV cards"); > MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>"); > MODULE_LICENSE("GPL"); > @@ -884,8 +886,9 @@ static int cx23885_get_control(struct cx23885_dev *dev, > static int cx23885_set_control(struct cx23885_dev *dev, > struct v4l2_control *ctl) > { > - dprintk(1, "%s() calling cx25840(VIDIOC_S_CTRL)" > - " (disabled - no action)\n", __func__); > + dprintk(1, "%s() calling cx25840(VIDIOC_S_CTRL)\n", __func__); > + call_all(dev, core, s_ctrl, ctl); > + > return 0; > } > > @@ -1220,11 +1223,9 @@ static int vidioc_g_tuner(struct file *file, void *priv, > if (0 != t->index) > return -EINVAL; > > + memset(t, 0, sizeof(*t)); No. The V4L2 core already cleans the parameters that are meant to be returned to userspace. In particular, this will break part of the tuner logic, as now the V4L2 core fills t->type, and tuner-core relies on that. If the rest of the patches are ok, I'll add a patch on the series removing this. Regards, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em 10-10-2011 11:52, Igor M. Liplianin escreveu: > Hi Mauro and Steven, > > It's been a long time since cx23885-alsa pull was requested. > To speed things up I created a git branch where I put the patches. > Some patches merged, like introduce then correct checkpatch compliance > or convert spinlock to mutex and back to spinlock, insert printk then remove printk as well. > Minor corrections from me was silently merged, for major I created additional patches. > > Hope it helps. > > Steven Toth (31): > cx23885: mute the audio during channel change > From 3241f9a7ba2505c48eaa608df7f2bd2a3e79eea0 Mon Sep 17 00:00:00 2001 > From: Steven Toth <stoth@kernellabs.com> > Date: Mon, 10 Oct 2011 11:09:53 -0300 > Subject: [PATCH] [media] cx23885: mute the audio during channel change > > Signed-off-by: Steven Toth <stoth@kernellabs.com> > Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> > > diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c > index 58855b2..7e5342b 100644 > --- a/drivers/media/video/cx23885/cx23885-video.c > +++ b/drivers/media/video/cx23885/cx23885-video.c > @@ -1264,18 +1264,30 @@ static int vidioc_g_frequency(struct file *file, void *priv, > > static int cx23885_set_freq(struct cx23885_dev *dev, struct v4l2_frequency *f) > { > + struct v4l2_control ctrl; > + > if (unlikely(UNSET == dev->tuner_type)) > return -EINVAL; > if (unlikely(f->tuner != 0)) > return -EINVAL; > > + > mutex_lock(&dev->lock); > dev->freq = f->frequency; > > + /* I need to mute audio here */ > + ctrl.id = V4L2_CID_AUDIO_MUTE; > + ctrl.value = 1; > + cx23885_set_control(dev, &ctrl); > + > call_all(dev, tuner, s_frequency, f); > > /* When changing channels it is required to reset TVAUDIO */ > - msleep(10); > + msleep(100); > + > + /* I need to unmute audio here */ > + ctrl.value = 0; > + cx23885_set_control(dev, &ctrl); > > mutex_unlock(&dev->lock); > This patch has a weird side effect: If the user has muted the audio, changing the channel will unmute. The right thing to do here is to do a g_ctrl to check if the device is muted. If it is muted, don't touch at the mute. I'll drop this one from my patch series. Regards, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em 10-10-2011 11:52, Igor M. Liplianin escreveu: > Hi Mauro and Steven, > > It's been a long time since cx23885-alsa pull was requested. > To speed things up I created a git branch where I put the patches. > Some patches merged, like introduce then correct checkpatch compliance > or convert spinlock to mutex and back to spinlock, insert printk then remove printk as well. > Minor corrections from me was silently merged, for major I created additional patches. > > Hope it helps. > > The following changes since commit e30528854797f057aa6ffb6dc9f890e923c467fd: > > [media] it913x-fe changes to power up and down of tuner (2011-10-08 08:03:27 -0300) > > are available in the git repository at: > git://linuxtv.org/liplianin/media_tree.git cx23885-alsa-clean-2 Ok, all the other patches look sane. I just had to do another patchset reorder, moving patch 39 to happen before patch 29, and folding one of the Igor's fixes with a patch sent by Steven. I'm assuming that all of you are ok with that. So, I'm pushing the changeset into my tree. > > Igor M. Liplianin (2): > cx23885: videobuf: Remove the videobuf_sg_dma_map/unmap functions > cx25840-audio: fix missing state declaration > > Mijhail Moreyra (6): > cx23885: merge mijhail's header changes for alsa > cx23885: ALSA support > cx23885: core changes requireed for ALSA > cx23885: add definitions for HVR1500 to support audio > cx23885: correct the contrast, saturation and hue controls > cx23885: hooks the alsa changes into the video subsystem > > Steven Toth (31): > cx23885: prepare the cx23885 makefile for alsa support > cx23885: convert from snd_card_new() to snd_card_create() > cx23885: convert call clients into subdevices > cx23885: minor function renaming to ensure uniformity > cx23885: setup the dma mapping for raw audio support > cx23885: mute the audio during channel change > cx23885: add two additional defines to simplify VBI register bitmap handling > cx23885: initial support for VBI with the cx23885 > cx23885: initialize VBI support in the core, add IRQ support, register vbi device > cx23885: minor printk cleanups and device registration > cx25840: enable raw cc processing only for the cx23885 hardware > cx23885: vbi line window adjustments > cx23885: add vbi buffer formatting, window changes and video core changes > cx23885: Ensure the VBI pixel format is established correctly. > cx23885: ensure video is streaming before allowing vbi to stream > cx23885: remove channel dump diagnostics when a vbi buffer times out. > cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming. > cx23885: Name an internal i2c part and declare a bitfield by name > cx25840: Enable support for non-tuner LR1/LR2 audio inputs > cx23885: Enable audio line in support from the back panel > cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use. > cx23885: Initial support for the MPX-885 mini-card > cx23885: fixes related to maximum number of inputs and range checking > cx23885: add generic functions for dealing with audio input selection > cx23885: hook the audio selection functions into the main driver > cx23885: v4l2 api compliance, set the audioset field correctly > cx23885: Removed a spurious function cx23885_set_scale(). > cx23885: Avoid stopping the risc engine during buffer timeout. > cx23885: Avoid incorrect error handling and reporting > cx23885: Stop the risc video fifo before reconfiguring it. > cx23885: Allow the audio mux config to be specified on a per input basis. > > drivers/media/video/cx23885/Makefile | 2 +- > drivers/media/video/cx23885/cx23885-alsa.c | 535 +++++++++++++++++++++++++++ > drivers/media/video/cx23885/cx23885-cards.c | 53 +++ > drivers/media/video/cx23885/cx23885-core.c | 99 ++++- > drivers/media/video/cx23885/cx23885-i2c.c | 1 + > drivers/media/video/cx23885/cx23885-reg.h | 3 + > drivers/media/video/cx23885/cx23885-vbi.c | 72 +++- > drivers/media/video/cx23885/cx23885-video.c | 373 ++++++++++++++++--- > drivers/media/video/cx23885/cx23885.h | 56 +++ > drivers/media/video/cx25840/cx25840-audio.c | 10 +- > drivers/media/video/cx25840/cx25840-core.c | 19 + > 11 files changed, 1144 insertions(+), 79 deletions(-) > create mode 100644 drivers/media/video/cx23885/cx23885-alsa.c > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
? ????????? ?? 14 ??????? 2011 23:25:07 ????? Mauro Carvalho Chehab ???????: > Em 10-10-2011 11:52, Igor M. Liplianin escreveu: > > Hi Mauro and Steven, > > > > It's been a long time since cx23885-alsa pull was requested. > > To speed things up I created a git branch where I put the patches. > > Some patches merged, like introduce then correct checkpatch compliance > > or convert spinlock to mutex and back to spinlock, insert printk then > > remove printk as well. Minor corrections from me was silently merged, > > for major I created additional patches. > > > > Hope it helps. > > > > The following changes since commit e30528854797f057aa6ffb6dc9f890e923c467fd: > > [media] it913x-fe changes to power up and down of tuner (2011-10-08 > > 08:03:27 -0300) > > > > are available in the git repository at: > > git://linuxtv.org/liplianin/media_tree.git cx23885-alsa-clean-2 > > Ok, all the other patches look sane. I just had to do another patchset > reorder, moving patch 39 to happen before patch 29, and folding one of the > Igor's fixes with a patch sent by Steven. > > I'm assuming that all of you are ok with that. So, I'm pushing the > changeset into my tree. Great. Thank you Mauro. > > > Igor M. Liplianin (2): > > cx23885: videobuf: Remove the videobuf_sg_dma_map/unmap functions > > cx25840-audio: fix missing state declaration > > > > Mijhail Moreyra (6): > > cx23885: merge mijhail's header changes for alsa > > cx23885: ALSA support > > cx23885: core changes requireed for ALSA > > cx23885: add definitions for HVR1500 to support audio > > cx23885: correct the contrast, saturation and hue controls > > cx23885: hooks the alsa changes into the video subsystem > > > > Steven Toth (31): > > cx23885: prepare the cx23885 makefile for alsa support > > cx23885: convert from snd_card_new() to snd_card_create() > > cx23885: convert call clients into subdevices > > cx23885: minor function renaming to ensure uniformity > > cx23885: setup the dma mapping for raw audio support > > cx23885: mute the audio during channel change > > cx23885: add two additional defines to simplify VBI register bitmap > > handling cx23885: initial support for VBI with the cx23885 > > cx23885: initialize VBI support in the core, add IRQ support, > > register vbi device cx23885: minor printk cleanups and device > > registration > > cx25840: enable raw cc processing only for the cx23885 hardware > > cx23885: vbi line window adjustments > > cx23885: add vbi buffer formatting, window changes and video core > > changes cx23885: Ensure the VBI pixel format is established > > correctly. cx23885: ensure video is streaming before allowing vbi > > to stream cx23885: remove channel dump diagnostics when a vbi > > buffer times out. cx23885: Ensure VBI buffers timeout quickly - > > bugfix for vbi hangs during streaming. cx23885: Name an internal > > i2c part and declare a bitfield by name cx25840: Enable support > > for non-tuner LR1/LR2 audio inputs cx23885: Enable audio line in > > support from the back panel > > cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use. > > cx23885: Initial support for the MPX-885 mini-card > > cx23885: fixes related to maximum number of inputs and range > > checking cx23885: add generic functions for dealing with audio > > input selection cx23885: hook the audio selection functions into > > the main driver cx23885: v4l2 api compliance, set the audioset > > field correctly cx23885: Removed a spurious function > > cx23885_set_scale(). > > cx23885: Avoid stopping the risc engine during buffer timeout. > > cx23885: Avoid incorrect error handling and reporting > > cx23885: Stop the risc video fifo before reconfiguring it. > > cx23885: Allow the audio mux config to be specified on a per input > > basis. > > > > drivers/media/video/cx23885/Makefile | 2 +- > > drivers/media/video/cx23885/cx23885-alsa.c | 535 > > +++++++++++++++++++++++++++ drivers/media/video/cx23885/cx23885-cards.c > > | 53 +++ > > drivers/media/video/cx23885/cx23885-core.c | 99 ++++- > > drivers/media/video/cx23885/cx23885-i2c.c | 1 + > > drivers/media/video/cx23885/cx23885-reg.h | 3 + > > drivers/media/video/cx23885/cx23885-vbi.c | 72 +++- > > drivers/media/video/cx23885/cx23885-video.c | 373 ++++++++++++++++--- > > drivers/media/video/cx23885/cx23885.h | 56 +++ > > drivers/media/video/cx25840/cx25840-audio.c | 10 +- > > drivers/media/video/cx25840/cx25840-core.c | 19 + > > 11 files changed, 1144 insertions(+), 79 deletions(-) > > create mode 100644 drivers/media/video/cx23885/cx23885-alsa.c > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-media" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi El 10/10/11 11:52, Igor M. Liplianin escribió: > Hi Mauro and Steven, > > It's been a long time since cx23885-alsa pull was requested. > To speed things up I created a git branch where I put the patches. > Some patches merged, like introduce then correct checkpatch compliance > or convert spinlock to mutex and back to spinlock, insert printk then remove printk as well. > Minor corrections from me was silently merged, for major I created additional patches. > > Hope it helps. > > The following changes since commit e30528854797f057aa6ffb6dc9f890e923c467fd: > > [media] it913x-fe changes to power up and down of tuner (2011-10-08 08:03:27 -0300) > > are available in the git repository at: > git://linuxtv.org/liplianin/media_tree.git cx23885-alsa-clean-2 > > Igor M. Liplianin (2): > cx23885: videobuf: Remove the videobuf_sg_dma_map/unmap functions > cx25840-audio: fix missing state declaration > > Mijhail Moreyra (6): > cx23885: merge mijhail's header changes for alsa > cx23885: ALSA support > cx23885: core changes requireed for ALSA > cx23885: add definitions for HVR1500 to support audio > cx23885: correct the contrast, saturation and hue controls > cx23885: hooks the alsa changes into the video subsystem > > Steven Toth (31): > cx23885: prepare the cx23885 makefile for alsa support > cx23885: convert from snd_card_new() to snd_card_create() > cx23885: convert call clients into subdevices > cx23885: minor function renaming to ensure uniformity > cx23885: setup the dma mapping for raw audio support > cx23885: mute the audio during channel change > cx23885: add two additional defines to simplify VBI register bitmap handling > cx23885: initial support for VBI with the cx23885 > cx23885: initialize VBI support in the core, add IRQ support, register vbi device > cx23885: minor printk cleanups and device registration > cx25840: enable raw cc processing only for the cx23885 hardware > cx23885: vbi line window adjustments > cx23885: add vbi buffer formatting, window changes and video core changes > cx23885: Ensure the VBI pixel format is established correctly. > cx23885: ensure video is streaming before allowing vbi to stream > cx23885: remove channel dump diagnostics when a vbi buffer times out. > cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming. > cx23885: Name an internal i2c part and declare a bitfield by name > cx25840: Enable support for non-tuner LR1/LR2 audio inputs > cx23885: Enable audio line in support from the back panel > cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use. > cx23885: Initial support for the MPX-885 mini-card > cx23885: fixes related to maximum number of inputs and range checking > cx23885: add generic functions for dealing with audio input selection > cx23885: hook the audio selection functions into the main driver > cx23885: v4l2 api compliance, set the audioset field correctly > cx23885: Removed a spurious function cx23885_set_scale(). > cx23885: Avoid stopping the risc engine during buffer timeout. > cx23885: Avoid incorrect error handling and reporting > cx23885: Stop the risc video fifo before reconfiguring it. > cx23885: Allow the audio mux config to be specified on a per input basis. > > drivers/media/video/cx23885/Makefile | 2 +- > drivers/media/video/cx23885/cx23885-alsa.c | 535 +++++++++++++++++++++++++++ > drivers/media/video/cx23885/cx23885-cards.c | 53 +++ > drivers/media/video/cx23885/cx23885-core.c | 99 ++++- > drivers/media/video/cx23885/cx23885-i2c.c | 1 + > drivers/media/video/cx23885/cx23885-reg.h | 3 + > drivers/media/video/cx23885/cx23885-vbi.c | 72 +++- > drivers/media/video/cx23885/cx23885-video.c | 373 ++++++++++++++++--- > drivers/media/video/cx23885/cx23885.h | 56 +++ > drivers/media/video/cx25840/cx25840-audio.c | 10 +- > drivers/media/video/cx25840/cx25840-core.c | 19 + > 11 files changed, 1144 insertions(+), 79 deletions(-) > create mode 100644 drivers/media/video/cx23885/cx23885-alsa.c > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html When compile, I get this error: dhcppc1:/usr/src/linux # make SUBDIRS=drivers/media/video/cx23885 modules -j2 Building modules, stage 2. MODPOST 2 modules WARNING: "cx23885_risc_databuffer" [drivers/media/video/cx23885/cx23885.ko] undefined! dhcppc1:/usr/src/linux # modprobe cx23885 debug=3 v4l_debug=3 i2c_scan=3 FATAL: Error inserting cx23885 (/lib/modules/3.0.6-2-desktop/kernel/drivers/media/video/cx23885/cx23885.ko): Unknown symbol in module, or unknown parameter (see dmesg) dmesg: .... [13447.629867] cx23885: Unknown symbol cx23885_risc_databuffer (err 0) I use kernel 3.0.6 and OpenSuse 11.4 Thank Alfredo
Hi El 17/10/11 11:13, Alfredo Jesús Delaiti escribió: > Hi > > El 10/10/11 11:52, Igor M. Liplianin escribió: >> Hi Mauro and Steven, >> > When compile, I get this error: > > dhcppc1:/usr/src/linux # make SUBDIRS=drivers/media/video/cx23885 > modules -j2 > Building modules, stage 2. > MODPOST 2 modules > WARNING: "cx23885_risc_databuffer" > [drivers/media/video/cx23885/cx23885.ko] undefined! > > dhcppc1:/usr/src/linux # modprobe cx23885 debug=3 v4l_debug=3 i2c_scan=3 > FATAL: Error inserting cx23885 > (/lib/modules/3.0.6-2-desktop/kernel/drivers/media/video/cx23885/cx23885.ko): > Unknown symbol in module, or unknown parameter (see dmesg) > > dmesg: > .... > [13447.629867] cx23885: Unknown symbol cx23885_risc_databuffer (err 0) > > > I use kernel 3.0.6 and OpenSuse 11.4 > > I found the error. There are more spaces in the definition of cx23885_risc_databuffer. Please correct them. They are in: http://git.linuxtv.org/liplianin/media_tree.git/tree/159b64f3415b9882e3391492255a60133b5fd080:/drivers/media/video/cx23885/ Thank Alfredo