aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134.h
diff options
context:
space:
mode:
authorRicardo Cerqueira <v4l@cerqueira.org>2005-11-09 00:37:11 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:15 -0500
commitbd15eba3a0f2b175bd80c21d5fc86c02ed4c56f6 (patch)
tree62890926bf734408e1e4e34f8a1a273974fb984e /drivers/media/video/saa7134/saa7134.h
parent2f8d4f5139fe7817f43202d8ee2f4b68ac53e58f (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.h')
-rw-r--r--drivers/media/video/saa7134/saa7134.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 9dfd45bed92b..7a35ef8fecb7 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -45,6 +45,10 @@
45#endif 45#endif
46#define UNSET (-1U) 46#define UNSET (-1U)
47 47
48#include <sound/driver.h>
49#include <sound/core.h>
50#include <sound/pcm.h>
51
48/* ----------------------------------------------------------- */ 52/* ----------------------------------------------------------- */
49/* enums */ 53/* enums */
50 54
@@ -364,6 +368,7 @@ struct saa7134_oss {
364 unsigned int dma_blk; 368 unsigned int dma_blk;
365 unsigned int read_offset; 369 unsigned int read_offset;
366 unsigned int read_count; 370 unsigned int read_count;
371 snd_pcm_substream_t *substream;
367}; 372};
368 373
369/* IR input */ 374/* IR input */
@@ -644,6 +649,11 @@ int saa7134_input_init1(struct saa7134_dev *dev);
644void saa7134_input_fini(struct saa7134_dev *dev); 649void saa7134_input_fini(struct saa7134_dev *dev);
645void saa7134_input_irq(struct saa7134_dev *dev); 650void saa7134_input_irq(struct saa7134_dev *dev);
646 651
652int alsa_card_saa7134_create(struct saa7134_dev *saadev);
653void alsa_card_saa7134_exit(void);
654void saa7134_irq_alsa_done(struct saa7134_dev *dev, unsigned long status);
655
656
647/* 657/*
648 * Local variables: 658 * Local variables:
649 * c-basic-offset: 8 659 * c-basic-offset: 8