From 8ef22f794ea5577505bc71e468183585f429afde Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Thu, 19 Nov 2009 22:52:30 -0300 Subject: [PATCH] V4L/DVB: cx18: export a couple of symbols so they can be shared with cx18-alsa Expose a couple of symbols in the cx18 module so that locking of the PCM stream can be shared with the cx18-alsa module. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/cx18/cx18-fileops.c | 6 ++++-- drivers/media/video/cx18/cx18-fileops.h | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c index eef842b8765..863ce775823 100644 --- a/drivers/media/video/cx18/cx18-fileops.c +++ b/drivers/media/video/cx18/cx18-fileops.c @@ -40,7 +40,7 @@ associated VBI and IDX streams are also automatically claimed. Possible error returns: -EBUSY if someone else has claimed the stream or 0 on success. */ -static int cx18_claim_stream(struct cx18_open_id *id, int type) +int cx18_claim_stream(struct cx18_open_id *id, int type) { struct cx18 *cx = id->cx; struct cx18_stream *s = &cx->streams[type]; @@ -96,10 +96,11 @@ static int cx18_claim_stream(struct cx18_open_id *id, int type) set_bit(CX18_F_S_INTERNAL_USE, &s_assoc->s_flags); return 0; } +EXPORT_SYMBOL(cx18_claim_stream); /* This function releases a previously claimed stream. It will take into account associated VBI streams. */ -static void cx18_release_stream(struct cx18_stream *s) +void cx18_release_stream(struct cx18_stream *s) { struct cx18 *cx = s->cx; struct cx18_stream *s_assoc; @@ -154,6 +155,7 @@ static void cx18_release_stream(struct cx18_stream *s) } } } +EXPORT_SYMBOL(cx18_release_stream); static void cx18_dualwatch(struct cx18 *cx) { diff --git a/drivers/media/video/cx18/cx18-fileops.h b/drivers/media/video/cx18/cx18-fileops.h index 92e2d5dab93..5c8fcb884f0 100644 --- a/drivers/media/video/cx18/cx18-fileops.h +++ b/drivers/media/video/cx18/cx18-fileops.h @@ -34,3 +34,6 @@ void cx18_stop_capture(struct cx18_open_id *id, int gop_end); void cx18_mute(struct cx18 *cx); void cx18_unmute(struct cx18 *cx); +/* Shared with cx18-alsa module */ +int cx18_claim_stream(struct cx18_open_id *id, int type); +void cx18_release_stream(struct cx18_stream *s); -- 2.11.4.GIT