Re: + v4l-720-alsa-support-for-saa7134-that-should-work-fix.patch added to -mm tree

Re: + v4l-720-alsa-support-for-saa7134-that-should-work-fix.patch added to -mm tree

[Andrew Morton]

akpm@osdl.org wrote:
>
> 
> The patch titled
> 
>      v4l-720-alsa-support-for-saa7134-that-should-work-fix
> 
> has been added to the -mm tree.  Its filename is
> 
>      v4l-720-alsa-support-for-saa7134-that-should-work-fix.patch
> 
> 
> From: Andrew Morton <akpm@osdl.org>
> 
> *** Warning: "saa7134_irq_alsa_done" [drivers/media/video/saa7134/saa7134.ko] undefined!
> *** Warning: "alsa_card_saa7134_exit" [drivers/media/video/saa7134/saa7134.ko] undefined!
> *** Warning: "alsa_card_saa7134_create" [drivers/media/video/saa7134/saa7134.ko] undefined!
> 
> Cc: Ricardo Cerqueira <v4l@cerqueira.org>
> Cc: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
> Cc: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
> Signed-off-by: Andrew Morton <akpm@osdl.org>

Well that didn't work.  The problem is that
drivers/media/video/saa7134/saa7134-alsa.c doesn't appear to be wired up
into the build system - it simply doesn't get compiled.

Please send a fix against next -mm?

> 
>  drivers/media/video/saa7134/saa7134-alsa.c |    3 +++
>  1 files changed, 3 insertions(+)
> 
> diff -puN drivers/media/video/saa7134/saa7134-alsa.c~v4l-720-alsa-support-for-saa7134-that-should-work-fix drivers/media/video/saa7134/saa7134-alsa.c
> --- devel/drivers/media/video/saa7134/saa7134-alsa.c~v4l-720-alsa-support-for-saa7134-that-should-work-fix	2005-11-05 23:43:39.000000000 -0800
> +++ devel-akpm/drivers/media/video/saa7134/saa7134-alsa.c	2005-11-05 23:43:39.000000000 -0800
> @@ -220,6 +220,7 @@ static int dsp_buffer_init(struct saa713
>                  return err;
>          return 0;
>  }
> +EXPORT_SYMBOL(saa7134_irq_alsa_done);
>  
>  
>  static int snd_card_saa7134_pcm_prepare(snd_pcm_substream_t * substream)
> @@ -811,6 +812,7 @@ __nodev:
>  	kfree(card);
>  	return err;
>  }
> +EXPORT_SYMBOL(alsa_card_saa7134_create);
>  
>  void alsa_card_saa7134_exit(void)
>  {
> @@ -819,3 +821,4 @@ void alsa_card_saa7134_exit(void)
>                  snd_card_free(snd_saa7134_cards[idx]);
>  	}
>  }
> +EXPORT_SYMBOL(alsa_card_saa7134_exit);
> _
> 
> Patches currently in -mm which might be from akpm@osdl.org are
> 
> fec_8xx-build-fix.patch
> posix-timers-smp-race-condition-tidy.patch
> increase-maximum-kmalloc-size-to-256k-fix.patch
> git-acpi-pciehprm_acpi-fix.patch
> git-acpi-update-8250_acpi.patch
> pnpacpi-handle-address-descriptors-in-_prs-fix-for-git-acpi-change.patch
> git-agpgart.patch
> git-alsa.patch
> git-blktrace-fixup.patch
> git-cpufreq.patch
> git-drm-prep.patch
> pci-gart-fix.patch
> git-audit-audit_inode_context-warning-fix.patch
> git-audit-selinux_inode_xattr_getsuffix-warning-fix.patch
> git-input.patch
> git-netdev-all-ieee80211_get_payload-warning-fix.patch
> s2io-warning-fixes.patch
> gregkh-pci-pci-driver-owner-removal-intel-agp-fix.patch
> gregkh-pci-pci-driver-owner-removal-ali-agp-fix.patch
> gregkh-pci-pci-driver-owner-removal-more-agp-borkage.patch
> gregkh-pci-pci-driver-owner-removal-even-more-agp-borkage.patch
> gregkh-pci-pci-driver-owner-removal-even-more-even-more-agp-borkage.patch
> gregkh-pci-pci-driver-owner-removal-fix-lpfc.patch
> gregkh-pci-pci-driver-owner-removal-fix-aic94xx_init.patch
> gregkh-usb-usb-pm-09-fix.patch
> eagle-and-adi-930-usb-adsl-modem-driver-tidies.patch
> dma32-change-zones_shift-back-to-2-gfp_zonemask-too.patch
> x86_64-vect-share-build-fix.patch
> slab-dont-bug-on-duplicated-cache.patch
> mm-poison-struct-page-for-ptlock-rename-private.patch
> mm-implement-swap-prefetching-default-y.patch
> mm-implement-swap-prefetching-tweaks.patch
> swap-migration-v5-lru-operations-tweaks.patch
> irda-donauboe-locking-fix.patch
> acx1xx-wireless-driver-usb-is-bust.patch
> acx1xx-allow-modular-build.patch
> acx1xx-wireless-driver-spy_offset-went-away.patch
> x86_64-div-by-zero-fix.patch
> serial-console-touch-nmi-watchdog.patch
> clear_buffer_uptodate-in-discard_buffer-check.patch
> write_inode_now-write-inode-if-not-bdi_cap_no_writeback.patch
> smbfs-readdir-vs-signal-fix.patch
> process-events-connector-fixes.patch
> rcu-signal-handling-tidies.patch
> additional-catchup-rcu-signal-fixes-for-mm-warning-fix.patch
> readahead-commentary.patch
> ext3_readdir-use-generic-readahead.patch
> slob-introduce-the-slob-allocator-fixes.patch
> cpuset-memory-pressure-meter-gcc-295-fix.patch
> gregkh-pci-pci-driver-owner-removal-synclink_gt-fix.patch
> changing-config_localversion-rebuilds-too-much-for-no-good-reason-ipw2200-fix.patch
> remove-ext2-xattr-permission-checks-warning-fixes.patch
> remove-xfs-xattr-permission-checks-warning-fixes.patch
> replace-inode_update_time-with-file_update_time-switch-ntfs-to-touch_atime.patch
> implement-kmap_atomic_irqsave.patch
> edac-atomic-scrub-operations-fix.patch
> edac-core-edac-support-code-ifdef-warnings.patch
> edac-core-edac-support-code-fixes.patch
> edac-core-edac-support-code-edac_mc_scrub_block-kunmap_atomic-fix.patch
> edac-core-edac-support-code-edac_mc_scrub_block-kunmap_atomic-fix-2.patch
> parport-constification-fix.patch
> kprobes-use-rcu-for-unregister-synchronization-base-changes-vs-remove-hlist_for_each_rcu-api-convert-existing-use-to-hlist_for_each_entry_rcu.patch
> dlm-use-configfs-fix.patch
> dvb-usb-urb-printk-fix.patch
> v4l-720-alsa-support-for-saa7134-that-should-work-fix.patch
> sched-disable-preempt-in-idle-tasks-2-powerpc-fixes.patch
> sched-resched-and-cpu_idle-rework-warning-fix.patch
> reiser4-only.patch
> reiser4-swsusp-build-fix.patch
> reiser4-printk-warning-fix.patch
> reiser4-mm-remove-pg_highmem-fix.patch
> reiser4-page-private-fixes.patch
> reiser4-big-update-div64-fix.patch
> reiser4-remove-c99isms.patch
> reiser4-big-update-update_atime-fixes.patch
> reiser4_releasepage-gfp_t-fixes.patch
> ide-promise-flushing-hang-fix.patch
> nvidiafb-fix-mode-setting-ppc-support-warning-fixes.patch
> nr_blockdev_pages-in_interrupt-warning.patch
> sysfs-crash-debugging.patch
> device-suspend-debug.patch
> ide-kmalloc-memset-kzalloc-conversion-fix.patch
> tty-layer-buffering-revamp-pmac_zilog-warning-fix.patch
> 
> -
> To unsubscribe from this list: send the line "unsubscribe mm-commits" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: + v4l-720-alsa-support-for-saa7134-that-should-work-fix.patch added to -mm tree

[Lee Revell]

On Sun, 2005-11-06 at 00:12 -0800, Andrew Morton wrote:
> Well that didn't work.  The problem is that
> drivers/media/video/saa7134/saa7134-alsa.c doesn't appear to be wired
> up into the build system - it simply doesn't get compiled.
> 
> Please send a fix against next -mm? 

Also please send all ALSA related patches to
alsa-devel@lists.sourceforge.net for review.

Lee

Re: + v4l-720-alsa-support-for-saa7134-that-should-work-fix.patch added to -mm tree

[Mauro Carvalho Chehab]

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

Lee,

Em Dom, 2005-11-06 às 13:33 -0500, Lee Revell escreveu:
> On Sun, 2005-11-06 at 00:12 -0800, Andrew Morton wrote:
> > Well that didn't work.  The problem is that
> > drivers/media/video/saa7134/saa7134-alsa.c doesn't appear to be wired
> > up into the build system - it simply doesn't get compiled.
> > 
> > Please send a fix against next -mm? 
> 
> Also please send all ALSA related patches to
> alsa-devel@lists.sourceforge.net for review.

	I'm sending you enclosed saa7134-alsa patch. To make easier to
understand, I've merged all stuff. This is highly dependent of the other
saa7134 parts, since PCI stuff are common to both video and audio
funcion on this device.
	This is meant to replace saa7134-oss (after more tests) that,
currently, is part of saa7134 module.
> 
> Lee
> 
> 
Cheers, 
Mauro.

[-- Attachment #2: saa_alsa.patch --]
[-- Type: text/x-patch, Size: 28268 bytes --]

- Adds alsa support for saa7134 video tuner.

 drivers/media/video/saa7134/Makefile |    3
 media/video/saa7134/saa7134-alsa.c   | 1061 +++++++++++++++++++++++++++++++++
 2 files changed, 1063 insertions(+), 1 deletion(-)

--- hg.orig/drivers/media/video/saa7134/Makefile
+++ hg/drivers/media/video/saa7134/Makefile
@@ -3,7 +3,8 @@ saa7134-objs :=	saa7134-cards.o saa7134-
 		saa7134-oss.o saa7134-ts.o saa7134-tvaudio.o	\
 		saa7134-vbi.o saa7134-video.o saa7134-input.o
 
-obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o
+obj-$(CONFIG_VIDEO_SAA7134) +=  saa7134.o saa7134-empress.o \
+				saa6752hs.o saa7134-alsa.o
 obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
 
 EXTRA_CFLAGS += -I$(src)/..
--- /dev/null	2005-11-06 18:35:44.403463432 -0200
+++ drivers/media/video/saa7134/saa7134-alsa.c	2005-11-07 00:53:42.000000000 -0200
@@ -0,0 +1,1061 @@
+/*
+ *   SAA713x ALSA support for V4L
+ *
+ *
+ *   Caveats:
+ *        - Volume doesn't work (it's always at max)
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, version 2
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/time.h>
+#include <linux/wait.h>
+#include <linux/moduleparam.h>
+#include <linux/module.h>
+#include <sound/core.h>
+#include <sound/control.h>
+#include <sound/pcm.h>
+#include <sound/rawmidi.h>
+#include <sound/initval.h>
+
+#include "saa7134.h"
+#include "saa7134-reg.h"
+
+static unsigned int debug  = 0;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug,"enable debug messages [alsa]");
+
+unsigned int dsp_nr = 0;
+module_param(dsp_nr,   int, 0444);
+MODULE_PARM_DESC(dsp_nr,   "alsa device number");
+
+/*
+ * Configuration macros
+ */
+
+/* defaults */
+#define MAX_BUFFER_SIZE		(256*1024)
+#define USE_FORMATS 		SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_U16_BE
+#define USE_RATE		SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000
+#define USE_RATE_MIN		32000
+#define USE_RATE_MAX		48000
+#define USE_CHANNELS_MIN 	1
+#define USE_CHANNELS_MAX 	2
+#ifndef USE_PERIODS_MIN
+#define USE_PERIODS_MIN 	2
+#endif
+#ifndef USE_PERIODS_MAX
+#define USE_PERIODS_MAX 	1024
+#endif
+
+#define MIXER_ADDR_TVTUNER	0
+#define MIXER_ADDR_LINE1	1
+#define MIXER_ADDR_LINE2	2
+#define MIXER_ADDR_LAST		2
+
+
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */
+static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
+
+#define dprintk(fmt, arg...)    if (debug) \
+	printk(KERN_DEBUG "%s/alsa: " fmt, dev->name, ## arg)
+
+
+/*
+ * Main chip structure
+ */
+
+typedef struct snd_card_saa7134 {
+	snd_card_t *card;
+	spinlock_t mixer_lock;
+	int mixer_volume[MIXER_ADDR_LAST+1][2];
+	int capture_source[MIXER_ADDR_LAST+1][2];
+	struct pci_dev *pci;
+	struct saa7134_dev *saadev;
+
+	unsigned long iobase;
+	int irq;
+
+	spinlock_t lock;
+} snd_card_saa7134_t;
+
+
+
+/*
+ * PCM structure
+ */
+
+typedef struct snd_card_saa7134_pcm {
+	struct saa7134_dev *saadev;
+
+	spinlock_t lock;
+	unsigned int pcm_size;		/* buffer size */
+	unsigned int pcm_count;		/* bytes per period */
+	unsigned int pcm_bps;		/* bytes per second */
+	snd_pcm_substream_t *substream;
+} snd_card_saa7134_pcm_t;
+
+static snd_card_t *snd_saa7134_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
+
+
+/*
+ * saa7134 DMA audio stop
+ *
+ *   Called when the capture device is released or the buffer overflows
+ *
+ *   - Copied verbatim from saa7134-oss's dsp_dma_stop. Can be dropped
+ *     if we just share dsp_dma_stop and use it here
+ *
+ */
+
+static void saa7134_dma_stop(struct saa7134_dev *dev)
+
+{
+	dev->oss.dma_blk     = -1;
+	dev->oss.dma_running = 0;
+	saa7134_set_dmabits(dev);
+}
+
+/*
+ * saa7134 DMA audio start
+ *
+ *   Called when preparing the capture device for use
+ *
+ *   - Copied verbatim from saa7134-oss's dsp_dma_start. Can be dropped
+ *     if we just share dsp_dma_start and use it here
+ *
+ */
+
+static void saa7134_dma_start(struct saa7134_dev *dev)
+{
+	dev->oss.dma_blk     = 0;
+	dev->oss.dma_running = 1;
+	saa7134_set_dmabits(dev);
+}
+
+/*
+ * saa7134 audio DMA IRQ handler
+ *
+ *   Called whenever we get an SAA7134_IRQ_REPORT_DONE_RA3 interrupt
+ *   Handles shifting between the 2 buffers, manages the read counters,
+ *  and notifies ALSA when periods elapse
+ *
+ *   - Mostly copied from saa7134-oss's saa7134_irq_oss_done.
+ *
+ */
+
+void saa7134_irq_alsa_done(struct saa7134_dev *dev, unsigned long status)
+{
+	int next_blk, reg = 0;
+
+	spin_lock(&dev->slock);
+	if (UNSET == dev->oss.dma_blk) {
+		dprintk("irq: recording stopped\n");
+		goto done;
+	}
+	if (0 != (status & 0x0f000000))
+		dprintk("irq: lost %ld\n", (status >> 24) & 0x0f);
+	if (0 == (status & 0x10000000)) {
+		/* odd */
+		if (0 == (dev->oss.dma_blk & 0x01))
+			reg = SAA7134_RS_BA1(6);
+	} else {
+		/* even */
+		if (1 == (dev->oss.dma_blk & 0x01))
+			reg = SAA7134_RS_BA2(6);
+	}
+	if (0 == reg) {
+		dprintk("irq: field oops [%s]\n",
+			(status & 0x10000000) ? "even" : "odd");
+		goto done;
+	}
+
+	if (dev->oss.read_count >= dev->oss.blksize * (dev->oss.blocks-2)) {
+		dprintk("irq: overrun [full=%d/%d] - Blocks in %d\n",dev->oss.read_count,
+			dev->oss.bufsize, dev->oss.blocks);
+		saa7134_dma_stop(dev);
+		goto done;
+	}
+
+	/* next block addr */
+	next_blk = (dev->oss.dma_blk + 2) % dev->oss.blocks;
+	saa_writel(reg,next_blk * dev->oss.blksize);
+	if (debug > 2)
+		dprintk("irq: ok, %s, next_blk=%d, addr=%x, blocks=%u, size=%u, read=%u\n",
+			(status & 0x10000000) ? "even" : "odd ", next_blk,
+			next_blk * dev->oss.blksize, dev->oss.blocks, dev->oss.blksize, dev->oss.read_count);
+
+	/* update status & wake waiting readers */
+	dev->oss.dma_blk = (dev->oss.dma_blk + 1) % dev->oss.blocks;
+	dev->oss.read_count += dev->oss.blksize;
+
+	dev->oss.recording_on = reg;
+
+	if (dev->oss.read_count >= snd_pcm_lib_period_bytes(dev->oss.substream)) {
+		spin_unlock(&dev->slock);
+		snd_pcm_period_elapsed(dev->oss.substream);
+		spin_lock(&dev->slock);
+	}
+ done:
+	spin_unlock(&dev->slock);
+
+}
+
+/*
+ * IRQ request handler
+ *
+ *   Runs along with saa7134's IRQ handler, discards anything that isn't
+ *   DMA sound
+ *
+ */
+
+static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs)
+{
+	struct saa7134_dev *dev = (struct saa7134_dev*) dev_id;
+	unsigned long report, status;
+	int loop, handled = 0;
+
+	for (loop = 0; loop < 10; loop++) {
+		report = saa_readl(SAA7134_IRQ_REPORT);
+		status = saa_readl(SAA7134_IRQ_STATUS);
+
+		if (report & SAA7134_IRQ_REPORT_DONE_RA3) {
+			handled = 1;
+			saa_writel(SAA7134_IRQ_REPORT,report);
+			saa7134_irq_alsa_done(dev, status);
+		} else {
+			goto out;
+		}
+	}
+
+	if (loop == 10) {
+		dprintk("error! looping IRQ!");
+	}
+
+out:
+	return IRQ_RETVAL(handled);
+}
+
+/*
+ * ALSA capture trigger
+ *
+ *   - One of the ALSA capture callbacks.
+ *
+ *   Called whenever a capture is started or stopped. Must be defined,
+ *   but there's nothing we want to do here
+ *
+ */
+
+static int snd_card_saa7134_capture_trigger(snd_pcm_substream_t * substream,
+					  int cmd)
+{
+	return 0;
+}
+
+/*
+ * DMA buffer config
+ *
+ *   Sets the values that will later be used as the size of the buffer,
+ *  size of the fragments, and total number of fragments.
+ *   Must be called during the preparation stage, before memory is
+ *  allocated
+ *
+ *   - Copied verbatim from saa7134-oss. Can be dropped
+ *     if we just share dsp_buffer_conf from OSS.
+ */
+
+static int dsp_buffer_conf(struct saa7134_dev *dev, int blksize, int blocks)
+{
+	if (blksize < 0x100)
+		blksize = 0x100;
+	if (blksize > 0x10000)
+		blksize = 0x10000;
+
+	if (blocks < 2)
+		blocks = 2;
+	if ((blksize * blocks) > 1024*1024)
+		blocks = 1024*1024 / blksize;
+
+	dev->oss.blocks  = blocks;
+	dev->oss.blksize = blksize;
+	dev->oss.bufsize = blksize * blocks;
+
+	dprintk("buffer config: %d blocks / %d bytes, %d kB total\n",
+		blocks,blksize,blksize * blocks / 1024);
+	return 0;
+}
+
+/*
+ * DMA buffer initialization
+ *
+ *   Uses V4L functions to initialize the DMA. Shouldn't be necessary in
+ *  ALSA, but I was unable to use ALSA's own DMA, and had to force the
+ *  usage of V4L's
+ *
+ *   - Copied verbatim from saa7134-oss. Can be dropped
+ *     if we just share dsp_buffer_init from OSS.
+ */
+
+static int dsp_buffer_init(struct saa7134_dev *dev)
+{
+	int err;
+
+	if (!dev->oss.bufsize)
+		BUG();
+	videobuf_dma_init(&dev->oss.dma);
+	err = videobuf_dma_init_kernel(&dev->oss.dma, PCI_DMA_FROMDEVICE,
+				       (dev->oss.bufsize + PAGE_SIZE) >> PAGE_SHIFT);
+	if (0 != err)
+		return err;
+	return 0;
+}
+
+/*
+ * ALSA PCM preparation
+ *
+ *   - One of the ALSA capture callbacks.
+ *
+ *   Called right after the capture device is opened, this function configures
+ *  the buffer using the previously defined functions, allocates the memory,
+ *  sets up the hardware registers, and then starts the DMA. When this function
+ *  returns, the audio should be flowing.
+ *
+ */
+
+static int snd_card_saa7134_capture_prepare(snd_pcm_substream_t * substream)
+{
+	snd_pcm_runtime_t *runtime = substream->runtime;
+	int err, bswap, sign;
+	u32 fmt, control;
+	unsigned long flags;
+	snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream);
+	struct saa7134_dev *dev;
+	snd_card_saa7134_pcm_t *saapcm = runtime->private_data;
+	unsigned int bps;
+	unsigned long size;
+	unsigned count;
+
+	size = snd_pcm_lib_buffer_bytes(substream);
+	count = snd_pcm_lib_period_bytes(substream);
+
+	saapcm->saadev->oss.substream = substream;
+	bps = runtime->rate * runtime->channels;
+	bps *= snd_pcm_format_width(runtime->format);
+	bps /= 8;
+	if (bps <= 0)
+		return -EINVAL;
+	saapcm->pcm_bps = bps;
+	saapcm->pcm_size = snd_pcm_lib_buffer_bytes(substream);
+	saapcm->pcm_count = snd_pcm_lib_period_bytes(substream);
+
+
+	dev=saa7134->saadev;
+
+	dsp_buffer_conf(dev,saapcm->pcm_count,(saapcm->pcm_size/saapcm->pcm_count));
+
+	err = dsp_buffer_init(dev);
+	if (0 != err)
+		goto fail2;
+
+	/* prepare buffer */
+	if (0 != (err = videobuf_dma_pci_map(dev->pci,&dev->oss.dma)))
+		return err;
+	if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->oss.pt)))
+		goto fail1;
+	if (0 != (err = saa7134_pgtable_build(dev->pci,&dev->oss.pt,
+					      dev->oss.dma.sglist,
+					      dev->oss.dma.sglen,
+					      0)))
+		goto fail2;
+
+
+
+	switch (runtime->format) {
+	  case SNDRV_PCM_FORMAT_U8:
+	  case SNDRV_PCM_FORMAT_S8:
+		fmt = 0x00;
+		break;
+	  case SNDRV_PCM_FORMAT_U16_LE:
+	  case SNDRV_PCM_FORMAT_U16_BE:
+	  case SNDRV_PCM_FORMAT_S16_LE:
+	  case SNDRV_PCM_FORMAT_S16_BE:
+		fmt = 0x01;
+		break;
+	  default:
+		err = -EINVAL;
+		return 1;
+	}
+
+	switch (runtime->format) {
+	  case SNDRV_PCM_FORMAT_S8:
+	  case SNDRV_PCM_FORMAT_S16_LE:
+	  case SNDRV_PCM_FORMAT_S16_BE:
+		sign = 1;
+		break;
+	  default:
+		sign = 0;
+		break;
+	}
+
+	switch (runtime->format) {
+	  case SNDRV_PCM_FORMAT_U16_BE:
+	  case SNDRV_PCM_FORMAT_S16_BE:
+		bswap = 1; break;
+	  default:
+		bswap = 0; break;
+	}
+
+	switch (dev->pci->device) {
+	  case PCI_DEVICE_ID_PHILIPS_SAA7134:
+		if (1 == runtime->channels)
+			fmt |= (1 << 3);
+		if (2 == runtime->channels)
+			fmt |= (3 << 3);
+		if (sign)
+			fmt |= 0x04;
+
+		fmt |= (MIXER_ADDR_TVTUNER == dev->oss.input) ? 0xc0 : 0x80;
+		saa_writeb(SAA7134_NUM_SAMPLES0, ((dev->oss.blksize - 1) & 0x0000ff));
+		saa_writeb(SAA7134_NUM_SAMPLES1, ((dev->oss.blksize - 1) & 0x00ff00) >>  8);
+		saa_writeb(SAA7134_NUM_SAMPLES2, ((dev->oss.blksize - 1) & 0xff0000) >> 16);
+		saa_writeb(SAA7134_AUDIO_FORMAT_CTRL, fmt);
+
+		break;
+	  case PCI_DEVICE_ID_PHILIPS_SAA7133:
+	  case PCI_DEVICE_ID_PHILIPS_SAA7135:
+		if (1 == runtime->channels)
+			fmt |= (1 << 4);
+		if (2 == runtime->channels)
+			fmt |= (2 << 4);
+		if (!sign)
+			fmt |= 0x04;
+		saa_writel(SAA7133_NUM_SAMPLES, dev->oss.blksize -1);
+		saa_writel(SAA7133_AUDIO_CHANNEL, 0x543210 | (fmt << 24));
+		//saa_writel(SAA7133_AUDIO_CHANNEL, 0x543210);
+		break;
+	}
+
+	dprintk("rec_start: afmt=%d ch=%d  =>  fmt=0x%x swap=%c\n",
+		runtime->format, runtime->channels, fmt,
+		bswap ? 'b' : '-');
+	/* dma: setup channel 6 (= AUDIO) */
+	control = SAA7134_RS_CONTROL_BURST_16 |
+		SAA7134_RS_CONTROL_ME |
+		(dev->oss.pt.dma >> 12);
+	if (bswap)
+		control |= SAA7134_RS_CONTROL_BSWAP;
+
+	/* I should be able to use runtime->dma_addr in the control
+	   byte, but it doesn't work. So I allocate the DMA using the
+	   V4L functions, and force ALSA to use that as the DMA area */
+
+	runtime->dma_area = dev->oss.dma.vmalloc;
+
+	saa_writel(SAA7134_RS_BA1(6),0);
+	saa_writel(SAA7134_RS_BA2(6),dev->oss.blksize);
+	saa_writel(SAA7134_RS_PITCH(6),0);
+	saa_writel(SAA7134_RS_CONTROL(6),control);
+
+	dev->oss.rate = runtime->rate;
+	/* start dma */
+	spin_lock_irqsave(&dev->slock,flags);
+	saa7134_dma_start(dev);
+	spin_unlock_irqrestore(&dev->slock,flags);
+
+	return 0;
+ fail2:
+	saa7134_pgtable_free(dev->pci,&dev->oss.pt);
+ fail1:
+	videobuf_dma_pci_unmap(dev->pci,&dev->oss.dma);
+	return err;
+
+
+}
+
+/*
+ * ALSA pointer fetching
+ *
+ *   - One of the ALSA capture callbacks.
+ *
+ *   Called whenever a period elapses, it must return the current hardware
+ *  position of the buffer.
+ *   Also resets the read counter used to prevent overruns
+ *
+ */
+
+static snd_pcm_uframes_t snd_card_saa7134_capture_pointer(snd_pcm_substream_t * substream)
+{
+	snd_pcm_runtime_t *runtime = substream->runtime;
+	snd_card_saa7134_pcm_t *saapcm = runtime->private_data;
+	struct saa7134_dev *dev=saapcm->saadev;
+
+
+
+	if (dev->oss.read_count) {
+		dev->oss.read_count  -= snd_pcm_lib_period_bytes(substream);
+		dev->oss.read_offset += snd_pcm_lib_period_bytes(substream);
+		if (dev->oss.read_offset == dev->oss.bufsize)
+			dev->oss.read_offset = 0;
+	}
+
+	return bytes_to_frames(runtime, dev->oss.read_offset);
+}
+
+/*
+ * ALSA hardware capabilities definition
+ */
+
+static snd_pcm_hardware_t snd_card_saa7134_capture =
+{
+	.info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+				 SNDRV_PCM_INFO_MMAP_VALID),
+	.formats =		USE_FORMATS,
+	.rates =		USE_RATE,
+	.rate_min =		USE_RATE_MIN,
+	.rate_max =		USE_RATE_MAX,
+	.channels_min =		USE_CHANNELS_MIN,
+	.channels_max =		USE_CHANNELS_MAX,
+	.buffer_bytes_max =	MAX_BUFFER_SIZE,
+	.period_bytes_min =	64,
+	.period_bytes_max =	MAX_BUFFER_SIZE,
+	.periods_min =		USE_PERIODS_MIN,
+	.periods_max =		USE_PERIODS_MAX,
+	.fifo_size =		0x08070503,
+};
+
+static void snd_card_saa7134_runtime_free(snd_pcm_runtime_t *runtime)
+{
+	snd_card_saa7134_pcm_t *saapcm = runtime->private_data;
+
+	kfree(saapcm);
+}
+
+
+/*
+ * ALSA hardware params
+ *
+ *   - One of the ALSA capture callbacks.
+ *
+ *   Called on initialization, right before the PCM preparation
+ *   Usually used in ALSA to allocate the DMA, but since we don't use the
+ *  ALSA DMA it does nothing
+ *
+ */
+
+static int snd_card_saa7134_hw_params(snd_pcm_substream_t * substream,
+				    snd_pcm_hw_params_t * hw_params)
+{
+
+	return 0;
+
+
+}
+
+/*
+ * ALSA hardware release
+ *
+ *   - One of the ALSA capture callbacks.
+ *
+ *   Called after closing the device, but before snd_card_saa7134_capture_close
+ *   Usually used in ALSA to free the DMA, but since we don't use the
+ *  ALSA DMA I'm almost sure this isn't necessary.
+ *
+ */
+
+static int snd_card_saa7134_hw_free(snd_pcm_substream_t * substream)
+{
+	return 0;
+}
+
+/*
+ * DMA buffer release
+ *
+ *   Called after closing the device, during snd_card_saa7134_capture_close
+ *
+ */
+
+static int dsp_buffer_free(struct saa7134_dev *dev)
+{
+	if (!dev->oss.blksize)
+		BUG();
+
+	videobuf_dma_free(&dev->oss.dma);
+
+	dev->oss.blocks  = 0;
+	dev->oss.blksize = 0;
+	dev->oss.bufsize = 0;
+
+	return 0;
+}
+
+/*
+ * ALSA capture finish
+ *
+ *   - One of the ALSA capture callbacks.
+ *
+ *   Called after closing the device. It stops the DMA audio and releases
+ *  the buffers
+ *
+ */
+
+static int snd_card_saa7134_capture_close(snd_pcm_substream_t * substream)
+{
+	snd_card_saa7134_t *chip = snd_pcm_substream_chip(substream);
+	struct saa7134_dev *dev = chip->saadev;
+	unsigned long flags;
+
+	/* stop dma */
+	spin_lock_irqsave(&dev->slock,flags);
+	saa7134_dma_stop(dev);
+	spin_unlock_irqrestore(&dev->slock,flags);
+
+	/* unlock buffer */
+	saa7134_pgtable_free(dev->pci,&dev->oss.pt);
+	videobuf_dma_pci_unmap(dev->pci,&dev->oss.dma);
+
+	dsp_buffer_free(dev);
+	return 0;
+}
+
+/*
+ * ALSA capture start
+ *
+ *   - One of the ALSA capture callbacks.
+ *
+ *   Called when opening the device. It creates and populates the PCM
+ *  structure
+ *
+ */
+
+static int snd_card_saa7134_capture_open(snd_pcm_substream_t * substream)
+{
+	snd_pcm_runtime_t *runtime = substream->runtime;
+	snd_card_saa7134_pcm_t *saapcm;
+	snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream);
+	struct saa7134_dev *dev = saa7134->saadev;
+	int err;
+
+	down(&dev->oss.lock);
+
+	dev->oss.afmt        = SNDRV_PCM_FORMAT_U8;
+	dev->oss.channels    = 2;
+	dev->oss.read_count  = 0;
+	dev->oss.read_offset = 0;
+
+	up(&dev->oss.lock);
+
+	saapcm = kcalloc(1, sizeof(*saapcm), GFP_KERNEL);
+	if (saapcm == NULL)
+		return -ENOMEM;
+	saapcm->saadev=saa7134->saadev;
+
+	spin_lock_init(&saapcm->lock);
+
+	saapcm->substream = substream;
+	runtime->private_data = saapcm;
+	runtime->private_free = snd_card_saa7134_runtime_free;
+	runtime->hw = snd_card_saa7134_capture;
+
+	if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
+		return err;
+
+	return 0;
+}
+
+/*
+ * ALSA capture callbacks definition
+ */
+
+static snd_pcm_ops_t snd_card_saa7134_capture_ops = {
+	.open =			snd_card_saa7134_capture_open,
+	.close =		snd_card_saa7134_capture_close,
+	.ioctl =		snd_pcm_lib_ioctl,
+	.hw_params =		snd_card_saa7134_hw_params,
+	.hw_free =		snd_card_saa7134_hw_free,
+	.prepare =		snd_card_saa7134_capture_prepare,
+	.trigger =		snd_card_saa7134_capture_trigger,
+	.pointer =		snd_card_saa7134_capture_pointer,
+};
+
+/*
+ * ALSA PCM setup
+ *
+ *   Called when initializing the board. Sets up the name and hooks up
+ *  the callbacks
+ *
+ */
+
+static int snd_card_saa7134_pcm(snd_card_saa7134_t *saa7134, int device)
+{
+	snd_pcm_t *pcm;
+	int err;
+
+	if ((err = snd_pcm_new(saa7134->card, "SAA7134 PCM", device, 0, 1, &pcm)) < 0)
+		return err;
+	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_card_saa7134_capture_ops);
+	pcm->private_data = saa7134;
+	pcm->info_flags = 0;
+	strcpy(pcm->name, "SAA7134 PCM");
+	return 0;
+}
+
+#define SAA713x_VOLUME(xname, xindex, addr) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_saa7134_volume_info, \
+  .get = snd_saa7134_volume_get, .put = snd_saa7134_volume_put, \
+  .private_value = addr }
+
+static int snd_saa7134_volume_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
+{
+	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+	uinfo->count = 2;
+	uinfo->value.integer.min = 0;
+	uinfo->value.integer.max = 20;
+	return 0;
+}
+
+static int snd_saa7134_volume_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+	snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol);
+	unsigned long flags;
+	int addr = kcontrol->private_value;
+
+	spin_lock_irqsave(&chip->mixer_lock, flags);
+	ucontrol->value.integer.value[0] = chip->mixer_volume[addr][0];
+	ucontrol->value.integer.value[1] = chip->mixer_volume[addr][1];
+	spin_unlock_irqrestore(&chip->mixer_lock, flags);
+	return 0;
+}
+
+static int snd_saa7134_volume_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+	snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol);
+	unsigned long flags;
+	int change, addr = kcontrol->private_value;
+	int left, right;
+
+	left = ucontrol->value.integer.value[0];
+	if (left < 0)
+		left = 0;
+	if (left > 20)
+		left = 20;
+	right = ucontrol->value.integer.value[1];
+	if (right < 0)
+		right = 0;
+	if (right > 20)
+		right = 20;
+	spin_lock_irqsave(&chip->mixer_lock, flags);
+	change = chip->mixer_volume[addr][0] != left ||
+		 chip->mixer_volume[addr][1] != right;
+	chip->mixer_volume[addr][0] = left;
+	chip->mixer_volume[addr][1] = right;
+	spin_unlock_irqrestore(&chip->mixer_lock, flags);
+	return change;
+}
+
+#define SAA713x_CAPSRC(xname, xindex, addr) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_saa7134_capsrc_info, \
+  .get = snd_saa7134_capsrc_get, .put = snd_saa7134_capsrc_put, \
+  .private_value = addr }
+
+static int snd_saa7134_capsrc_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
+{
+	uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+	uinfo->count = 2;
+	uinfo->value.integer.min = 0;
+	uinfo->value.integer.max = 1;
+	return 0;
+}
+
+static int snd_saa7134_capsrc_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+	snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol);
+	unsigned long flags;
+	int addr = kcontrol->private_value;
+
+	spin_lock_irqsave(&chip->mixer_lock, flags);
+	ucontrol->value.integer.value[0] = chip->capture_source[addr][0];
+	ucontrol->value.integer.value[1] = chip->capture_source[addr][1];
+	spin_unlock_irqrestore(&chip->mixer_lock, flags);
+	return 0;
+}
+
+static int snd_saa7134_capsrc_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+	snd_card_saa7134_t *chip = snd_kcontrol_chip(kcontrol);
+	unsigned long flags;
+	int change, addr = kcontrol->private_value;
+	int left, right;
+	u32 anabar, xbarin;
+	int analog_io, rate;
+	struct saa7134_dev *dev;
+
+	dev = chip->saadev;
+
+	left = ucontrol->value.integer.value[0] & 1;
+	right = ucontrol->value.integer.value[1] & 1;
+	spin_lock_irqsave(&chip->mixer_lock, flags);
+
+	change = chip->capture_source[addr][0] != left ||
+		 chip->capture_source[addr][1] != right;
+	chip->capture_source[addr][0] = left;
+	chip->capture_source[addr][1] = right;
+	dev->oss.input=addr;
+	spin_unlock_irqrestore(&chip->mixer_lock, flags);
+
+
+	if (change) {
+	  switch (dev->pci->device) {
+
+	   case PCI_DEVICE_ID_PHILIPS_SAA7134:
+		switch (addr) {
+			case MIXER_ADDR_TVTUNER:
+				saa_andorb(SAA7134_AUDIO_FORMAT_CTRL, 0xc0, 0xc0);
+				saa_andorb(SAA7134_SIF_SAMPLE_FREQ,   0x03, 0x00);
+				break;
+			case MIXER_ADDR_LINE1:
+			case MIXER_ADDR_LINE2:
+				analog_io = (MIXER_ADDR_LINE1 == addr) ? 0x00 : 0x08;
+				rate = (32000 == dev->oss.rate) ? 0x01 : 0x03;
+				saa_andorb(SAA7134_ANALOG_IO_SELECT,  0x08, analog_io);
+				saa_andorb(SAA7134_AUDIO_FORMAT_CTRL, 0xc0, 0x80);
+				saa_andorb(SAA7134_SIF_SAMPLE_FREQ,   0x03, rate);
+				break;
+		}
+
+		break;
+	   case PCI_DEVICE_ID_PHILIPS_SAA7133:
+	   case PCI_DEVICE_ID_PHILIPS_SAA7135:
+		xbarin = 0x03; // adc
+		anabar = 0;
+		switch (addr) {
+			case MIXER_ADDR_TVTUNER:
+				xbarin = 0; // Demodulator
+				anabar = 2; // DACs
+				break;
+			case MIXER_ADDR_LINE1:
+				anabar = 0;  // aux1, aux1
+				break;
+			case MIXER_ADDR_LINE2:
+				anabar = 9;  // aux2, aux2
+				break;
+		}
+
+	    	/* output xbar always main channel */
+		saa_dsp_writel(dev, SAA7133_DIGITAL_OUTPUT_SEL1, 0xbbbb10);
+
+		if (left || right) { // We've got data, turn the input on
+		  saa_dsp_writel(dev, SAA7133_DIGITAL_INPUT_XBAR1, xbarin);
+		  saa_writel(SAA7133_ANALOG_IO_SELECT, anabar);
+		} else {
+		  saa_dsp_writel(dev, SAA7133_DIGITAL_INPUT_XBAR1, 0);
+		  saa_writel(SAA7133_ANALOG_IO_SELECT, 0);
+		}
+		break;
+	  }
+	}
+
+	return change;
+}
+
+static snd_kcontrol_new_t snd_saa7134_controls[] = {
+SAA713x_VOLUME("Video Volume", 0, MIXER_ADDR_TVTUNER),
+SAA713x_CAPSRC("Video Capture Switch", 0, MIXER_ADDR_TVTUNER),
+SAA713x_VOLUME("Line Volume", 1, MIXER_ADDR_LINE1),
+SAA713x_CAPSRC("Line Capture Switch", 1, MIXER_ADDR_LINE1),
+SAA713x_VOLUME("Line Volume", 2, MIXER_ADDR_LINE2),
+SAA713x_CAPSRC("Line Capture Switch", 2, MIXER_ADDR_LINE2),
+};
+
+/*
+ * ALSA mixer setup
+ *
+ *   Called when initializing the board. Sets up the name and hooks up
+ *  the callbacks
+ *
+ */
+
+static int snd_card_saa7134_new_mixer(snd_card_saa7134_t * chip)
+{
+	snd_card_t *card = chip->card;
+	unsigned int idx;
+	int err;
+
+	snd_assert(chip != NULL, return -EINVAL);
+	strcpy(card->mixername, "SAA7134 Mixer");
+
+	for (idx = 0; idx < ARRAY_SIZE(snd_saa7134_controls); idx++) {
+		if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_saa7134_controls[idx], chip))) < 0)
+			return err;
+	}
+	return 0;
+}
+
+static int snd_saa7134_free(snd_card_saa7134_t *chip)
+{
+	return 0;
+}
+
+static int snd_saa7134_dev_free(snd_device_t *device)
+{
+	snd_card_saa7134_t *chip = device->device_data;
+	return snd_saa7134_free(chip);
+}
+
+/*
+ * ALSA initialization
+ *
+ *   Called by saa7134-core, it creates the basic structures and registers
+ *  the ALSA devices
+ *
+ */
+
+int alsa_card_saa7134_create (struct saa7134_dev *saadev, unsigned int devicenum)
+{
+	static int dev;
+
+	snd_card_t *card;
+	snd_card_saa7134_t *chip;
+	int err;
+	static snd_device_ops_t ops = {
+		.dev_free =     snd_saa7134_dev_free,
+	};
+
+
+	if (dev >= SNDRV_CARDS)
+		return -ENODEV;
+	if (!enable[dev])
+		return -ENODEV;
+
+	if (devicenum) {
+		card = snd_card_new(devicenum, id[dev], THIS_MODULE, 0);
+		dsp_nr++;
+	} else {
+		card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+	}
+	if (card == NULL)
+		return -ENOMEM;
+
+	strcpy(card->driver, "SAA7134");
+
+	/* Card "creation" */
+
+	chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+	if (chip == NULL) {
+		return -ENOMEM;
+	}
+
+	spin_lock_init(&chip->lock);
+
+	chip->saadev = saadev;
+
+	chip->card = card;
+
+	chip->pci = saadev->pci;
+	chip->irq = saadev->pci->irq;
+	chip->iobase = pci_resource_start(saadev->pci, 0);
+
+	err = request_irq(chip->pci->irq, saa7134_alsa_irq,
+				SA_SHIRQ | SA_INTERRUPT, saadev->name, saadev);
+
+	if (err < 0) {
+		printk(KERN_ERR "%s: can't get IRQ %d for ALSA\n",
+			saadev->name, saadev->pci->irq);
+		return err;
+	}
+
+	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
+		snd_saa7134_free(chip);
+		return err;
+	}
+
+	if ((err = snd_card_saa7134_new_mixer(chip)) < 0)
+		goto __nodev;
+
+	if ((err = snd_card_saa7134_pcm(chip, 0)) < 0)
+		goto __nodev;
+
+	spin_lock_init(&chip->mixer_lock);
+
+	snd_card_set_dev(card, &chip->pci->dev);
+
+	/* End of "creation" */
+
+	strcpy(card->shortname, "SAA7134");
+	sprintf(card->longname, "%s at 0x%lx irq %d",
+		chip->saadev->name, chip->iobase, chip->irq);
+
+	if ((err = snd_card_register(card)) == 0) {
+		snd_saa7134_cards[dev] = card;
+		return 0;
+	}
+
+__nodev:
+	snd_card_free(card);
+	kfree(card);
+	return err;
+}
+
+/*
+ * Module initializer
+ *
+ * Loops through present saa7134 cards, and assigns an ALSA device
+ * to each one
+ *
+ */
+
+static int saa7134_alsa_init(void)
+{
+        struct saa7134_dev *saadev = NULL;
+        struct list_head *list;
+
+	printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n");
+
+        list_for_each(list,&saa7134_devlist) {
+                saadev = list_entry(list, struct saa7134_dev, devlist);
+		alsa_card_saa7134_create(saadev,dsp_nr);
+        }
+
+	if (saadev == NULL) 
+		printk(KERN_INFO "saa7134 ALSA: no saa7134 cards found\n");
+
+	return 0;
+
+}
+
+/*
+ * Module destructor
+ */
+
+void saa7134_alsa_exit(void)
+{
+	int idx;
+	for (idx = 0; idx < SNDRV_CARDS; idx++) {
+		snd_card_free(snd_saa7134_cards[idx]);
+	}
+	printk(KERN_INFO "saa7134 ALSA driver for DMA sound unloaded\n");
+	return;
+}
+
+module_init(saa7134_alsa_init);
+module_exit(saa7134_alsa_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Ricardo Cerqueira");

Re: + v4l-720-alsa-support-for-saa7134-that-should-work-fix.patch added to -mm tree

[Mauro Carvalho Chehab]

Em Dom, 2005-11-06 às 00:12 -0800, Andrew Morton escreveu:
> akpm@osdl.org wrote:

> Well that didn't work.  The problem is that
> drivers/media/video/saa7134/saa7134-alsa.c doesn't appear to be wired up
> into the build system - it simply doesn't get compiled.
	In fact, it was meant to be part of saa7134 module. We've changed it on the newer patchsets I've sent to you today. It shoud compile well now.

> Please send a fix against next -mm?

	Only after sending I noticed you've released -mm1 (I'm suffering a long
delay on my current ISP - maybe some greylist policy). I'll apply the
patches I sent you today against -mm and, if something wents wrong, I'll
send you some correcting patches.
	
Cheers, 
Mauro.

Re: + v4l-720-alsa-support-for-saa7134-that-should-work-fix.patch added to -mm tree

[Lee Revell]

On Mon, 2005-11-07 at 04:26 -0200, Mauro Carvalho Chehab wrote:
> Lee,
> 
> Em Dom, 2005-11-06 às 13:33 -0500, Lee Revell escreveu:
> > On Sun, 2005-11-06 at 00:12 -0800, Andrew Morton wrote:
> > > Well that didn't work.  The problem is that
> > > drivers/media/video/saa7134/saa7134-alsa.c doesn't appear to be wired
> > > up into the build system - it simply doesn't get compiled.
> > > 
> > > Please send a fix against next -mm? 
> > 
> > Also please send all ALSA related patches to
> > alsa-devel@lists.sourceforge.net for review.
> 
> 	I'm sending you enclosed saa7134-alsa patch. To make easier to
> understand, I've merged all stuff. This is highly dependent of the other
> saa7134 parts, since PCI stuff are common to both video and audio
> funcion on this device.
> 	This is meant to replace saa7134-oss (after more tests) that,
> currently, is part of saa7134 module.

OK, a brief review:

 - Why couldn't you use ALSA's DMA API?

 - The DMA must be stopped and started in the trigger callback, not the
prepare callback.

 - If this device lacks a volume control alsa-lib can emulate it in
software, just create a proper /usr/share/alsa/cards/your_card.conf
file.

 - By ALSA convention the acceptable formats, sample rates, etc should
be directly defined in the snd_pcm_hardware_t structure.

 - dev->oss needs to go.

Lee

Re: [Alsa-devel] Re: + v4l-720-alsa-support-for-saa7134-that-should-work-fix.patch added to -mm tree

[Takashi Iwai]

At Mon, 07 Nov 2005 10:33:35 -0500,
Lee Revell wrote:
> 
> On Mon, 2005-11-07 at 04:26 -0200, Mauro Carvalho Chehab wrote:
> > Lee,
> > 
> > Em Dom, 2005-11-06 às 13:33 -0500, Lee Revell escreveu:
> > > On Sun, 2005-11-06 at 00:12 -0800, Andrew Morton wrote:
> > > > Well that didn't work.  The problem is that
> > > > drivers/media/video/saa7134/saa7134-alsa.c doesn't appear to be wired
> > > > up into the build system - it simply doesn't get compiled.
> > > > 
> > > > Please send a fix against next -mm? 
> > > 
> > > Also please send all ALSA related patches to
> > > alsa-devel@lists.sourceforge.net for review.
> > 
> > 	I'm sending you enclosed saa7134-alsa patch. To make easier to
> > understand, I've merged all stuff. This is highly dependent of the other
> > saa7134 parts, since PCI stuff are common to both video and audio
> > funcion on this device.
> > 	This is meant to replace saa7134-oss (after more tests) that,
> > currently, is part of saa7134 module.
> 
> OK, a brief review:
> 
>  - Why couldn't you use ALSA's DMA API?

This is OK, IMO.  Basically, it's up to the driver.


>  - The DMA must be stopped and started in the trigger callback, not the
> prepare callback.
> 
>  - If this device lacks a volume control alsa-lib can emulate it in
> software, just create a proper /usr/share/alsa/cards/your_card.conf
> file.
> 
>  - By ALSA convention the acceptable formats, sample rates, etc should
> be directly defined in the snd_pcm_hardware_t structure.
> 
>  - dev->oss needs to go.

Agreed about the rest.


Takashi

Re: [Alsa-devel] Re: + v4l-720-alsa-support-for-saa7134-that-should-work-fix.patch added to -mm tree

[Andrew Morton]

Takashi Iwai <tiwai@suse.de> wrote:
>
> > OK, a brief review:
>  > 
>  >  - Why couldn't you use ALSA's DMA API?
> 
>  This is OK, IMO.  Basically, it's up to the driver.
> 
> 
>  >  - The DMA must be stopped and started in the trigger callback, not the
>  > prepare callback.
>  > 
>  >  - If this device lacks a volume control alsa-lib can emulate it in
>  > software, just create a proper /usr/share/alsa/cards/your_card.conf
>  > file.
>  > 
>  >  - By ALSA convention the acceptable formats, sample rates, etc should
>  > be directly defined in the snd_pcm_hardware_t structure.
>  > 
>  >  - dev->oss needs to go.
> 
>  Agreed about the rest.

Thanks, guys.

Despite all that, I am inclined to merge this patch into 2.6.15.  Because
it's in the middle of a 192-patch series and we do need to get the v4l tree
synced up.

Mauro&co, if we do that, do you think the above points can be addressed
inside the next four weeks or so?

Re: [Alsa-devel] Re: + v4l-720-alsa-support-for-saa7134-that-should-work-fix.patch added to -mm tree

[Lee Revell]

On Mon, 2005-11-07 at 11:48 -0800, Andrew Morton wrote:
> Despite all that, I am inclined to merge this patch into 2.6.15.
> Because it's in the middle of a 192-patch series and we do need to get
> the v4l tree synced up.
> 

I think starting the DMA in the prepare callbacks is a major problem.
It should be easy to fix though.

Lee

Re: [Alsa-devel] Re: + v4l-720-alsa-support-for-saa7134-that-should-work-fix.patch added to -mm tree

[Mauro Carvalho Chehab]

Andrew,

Em Seg, 2005-11-07 às 11:48 -0800, Andrew Morton escreveu:
> Takashi Iwai <tiwai@suse.de> wrote:
> >
> > > OK, a brief review:
> >  > 
> >  >  - Why couldn't you use ALSA's DMA API?
> > 
> >  This is OK, IMO.  Basically, it's up to the driver.
> > 
> > 
> >  >  - The DMA must be stopped and started in the trigger callback, not the
> >  > prepare callback.
> >  > 
> >  >  - If this device lacks a volume control alsa-lib can emulate it in
> >  > software, just create a proper /usr/share/alsa/cards/your_card.conf
> >  > file.
> >  > 
> >  >  - By ALSA convention the acceptable formats, sample rates, etc should
> >  > be directly defined in the snd_pcm_hardware_t structure.
> >  > 
> >  >  - dev->oss needs to go.
> > 
> >  Agreed about the rest.
> 
> Thanks, guys.
> 
> Despite all that, I am inclined to merge this patch into 2.6.15.  Because
> it's in the middle of a 192-patch series and we do need to get the v4l tree
> synced up.
> 
> Mauro, if we do that, do you think the above points can be addressed
> inside the next four weeks or so?
	We are, in fact already working on these. We are about to send you a
newer patch addressing most of the points that Takashi and Lee showed.
	You may apply the patches. If they noticed some weird stuff at the
newer patchset, we will have enough time for fix it.
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 
Cheers, 
Mauro.