diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-06-03 17:16:28 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 14:05:53 -0300 |
commit | b17b86991a6a17560ddd97ed9a970fc38427217d (patch) | |
tree | 53cc71594e1b762d4977b5a98fb9ace969e7f4b8 /drivers/staging/tm6000 | |
parent | 39e1256bc4b85145b9db392e49a71cad43f6903b (diff) |
V4L/DVB: tm6000: Add a callback code for buffer fill
Implements a callback to be used by tm6000-alsa, in order to allow filling
audio data packets.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/tm6000')
-rw-r--r-- | drivers/staging/tm6000/tm6000-alsa.c | 16 | ||||
-rw-r--r-- | drivers/staging/tm6000/tm6000-core.c | 17 | ||||
-rw-r--r-- | drivers/staging/tm6000/tm6000-video.c | 2 | ||||
-rw-r--r-- | drivers/staging/tm6000/tm6000.h | 4 |
4 files changed, 38 insertions, 1 deletions
diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c index de5e78d4b54a..b14c5b780c96 100644 --- a/drivers/staging/tm6000/tm6000-alsa.c +++ b/drivers/staging/tm6000/tm6000-alsa.c @@ -200,6 +200,21 @@ static int snd_tm6000_close(struct snd_pcm_substream *substream) return 0; } +static int tm6000_fillbuf(struct tm6000_core *core, char *buf, int size) +{ + int i; + + /* Need to add a real code to copy audio buffer */ + printk("Audio (%i bytes): ", size); + for (i = 0; i < size - 3; i +=4) + printk("(0x%04x, 0x%04x), ", + *(u16 *)(buf + i), *(u16 *)(buf + i + 2)); + + printk("\n"); + + return 0; +} + /* * hw_params callback */ @@ -396,6 +411,7 @@ struct tm6000_ops audio_ops = { .name = "TM6000 Audio Extension", .init = tm6000_audio_init, .fini = tm6000_audio_fini, + .fillbuf = tm6000_fillbuf, }; static int __init tm6000_alsa_register(void) diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c index 3d66f9bbfc59..6ddb7465a40c 100644 --- a/drivers/staging/tm6000/tm6000-core.c +++ b/drivers/staging/tm6000/tm6000-core.c @@ -653,6 +653,23 @@ void tm6000_add_into_devlist(struct tm6000_core *dev) static LIST_HEAD(tm6000_extension_devlist); static DEFINE_MUTEX(tm6000_extension_devlist_lock); +int tm6000_call_fillbuf(struct tm6000_core *dev, enum tm6000_ops_type type, + char *buf, int size) +{ + struct tm6000_ops *ops = NULL; + + /* FIXME: tm6000_extension_devlist_lock should be a spinlock */ + + if (!list_empty(&tm6000_extension_devlist)) { + list_for_each_entry(ops, &tm6000_extension_devlist, next) { + if (ops->fillbuf && ops->type == type) + ops->fillbuf(dev, buf, size); + } + } + + return 0; +} + int tm6000_register_extension(struct tm6000_ops *ops) { struct tm6000_core *dev = NULL; diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c index 1e348ac7c63f..c0d6f6a25c17 100644 --- a/drivers/staging/tm6000/tm6000-video.c +++ b/drivers/staging/tm6000/tm6000-video.c @@ -301,7 +301,7 @@ static int copy_streams(u8 *data, unsigned long len, memcpy (&voutp[pos], ptr, cpysize); break; case TM6000_URB_MSG_AUDIO: - /* Need some code to copy audio buffer */ + tm6000_call_fillbuf(dev, TM6000_AUDIO, ptr, cpysize); break; case TM6000_URB_MSG_VBI: /* Need some code to copy vbi buffer */ diff --git a/drivers/staging/tm6000/tm6000.h b/drivers/staging/tm6000/tm6000.h index 8fccf3e4d8f6..db9995914caa 100644 --- a/drivers/staging/tm6000/tm6000.h +++ b/drivers/staging/tm6000/tm6000.h @@ -229,6 +229,7 @@ struct tm6000_ops { enum tm6000_ops_type type; int (*init)(struct tm6000_core *); int (*fini)(struct tm6000_core *); + int (*fillbuf)(struct tm6000_core *, char *buf, int size); }; struct tm6000_fh { @@ -278,6 +279,9 @@ int tm6000_register_extension(struct tm6000_ops *ops); void tm6000_unregister_extension(struct tm6000_ops *ops); void tm6000_init_extension(struct tm6000_core *dev); void tm6000_close_extension(struct tm6000_core *dev); +int tm6000_call_fillbuf(struct tm6000_core *dev, enum tm6000_ops_type type, + char *buf, int size); + /* In tm6000-stds.c */ void tm6000_get_std_res(struct tm6000_core *dev); |