diff options
author | Ricardo Cerqueira <v4l@cerqueira.org> | 2005-11-09 00:37:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:15 -0500 |
commit | bd15eba3a0f2b175bd80c21d5fc86c02ed4c56f6 (patch) | |
tree | 62890926bf734408e1e4e34f8a1a273974fb984e /drivers/media/video/saa7134/saa7134-oss.c | |
parent | 2f8d4f5139fe7817f43202d8ee2f4b68ac53e58f (diff) |
[PATCH] v4l: 720: alsa support for saa7134 that should work wonderful
- Alsa support for saa7134 that should work.
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-oss.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-oss.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c index c20630c82f1c..b1dcb4d10788 100644 --- a/drivers/media/video/saa7134/saa7134-oss.c +++ b/drivers/media/video/saa7134/saa7134-oss.c | |||
@@ -44,6 +44,7 @@ MODULE_PARM_DESC(oss_rate,"sample rate (valid are: 32000,48000)"); | |||
44 | #define dprintk(fmt, arg...) if (oss_debug) \ | 44 | #define dprintk(fmt, arg...) if (oss_debug) \ |
45 | printk(KERN_DEBUG "%s/oss: " fmt, dev->name , ## arg) | 45 | printk(KERN_DEBUG "%s/oss: " fmt, dev->name , ## arg) |
46 | 46 | ||
47 | |||
47 | /* ------------------------------------------------------------------ */ | 48 | /* ------------------------------------------------------------------ */ |
48 | 49 | ||
49 | static int dsp_buffer_conf(struct saa7134_dev *dev, int blksize, int blocks) | 50 | static int dsp_buffer_conf(struct saa7134_dev *dev, int blksize, int blocks) |
@@ -173,8 +174,8 @@ static int dsp_rec_start(struct saa7134_dev *dev) | |||
173 | fmt |= (2 << 4); | 174 | fmt |= (2 << 4); |
174 | if (!sign) | 175 | if (!sign) |
175 | fmt |= 0x04; | 176 | fmt |= 0x04; |
176 | saa_writel(0x588 >> 2, dev->oss.blksize -4); | 177 | saa_writel(SAA7133_NUM_SAMPLES, dev->oss.blksize -4); |
177 | saa_writel(0x58c >> 2, 0x543210 | (fmt << 24)); | 178 | saa_writel(SAA7133_AUDIO_CHANNEL, 0x543210 | (fmt << 24)); |
178 | break; | 179 | break; |
179 | } | 180 | } |
180 | dprintk("rec_start: afmt=%d ch=%d => fmt=0x%x swap=%c\n", | 181 | dprintk("rec_start: afmt=%d ch=%d => fmt=0x%x swap=%c\n", |