aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@kernellabs.com>2009-11-19 20:52:30 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:10:42 -0500
commit8ef22f794ea5577505bc71e468183585f429afde (patch)
tree1ba805766287d10235edf6c2ad4883a20604f36d
parent4cb565cc2700e6fcd57243cacc4c2826956bc088 (diff)
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 <dheitmueller@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx18/cx18-fileops.c6
-rw-r--r--drivers/media/video/cx18/cx18-fileops.h3
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 @@
40 associated VBI and IDX streams are also automatically claimed. 40 associated VBI and IDX streams are also automatically claimed.
41 Possible error returns: -EBUSY if someone else has claimed 41 Possible error returns: -EBUSY if someone else has claimed
42 the stream or 0 on success. */ 42 the stream or 0 on success. */
43static int cx18_claim_stream(struct cx18_open_id *id, int type) 43int cx18_claim_stream(struct cx18_open_id *id, int type)
44{ 44{
45 struct cx18 *cx = id->cx; 45 struct cx18 *cx = id->cx;
46 struct cx18_stream *s = &cx->streams[type]; 46 struct cx18_stream *s = &cx->streams[type];
@@ -96,10 +96,11 @@ static int cx18_claim_stream(struct cx18_open_id *id, int type)
96 set_bit(CX18_F_S_INTERNAL_USE, &s_assoc->s_flags); 96 set_bit(CX18_F_S_INTERNAL_USE, &s_assoc->s_flags);
97 return 0; 97 return 0;
98} 98}
99EXPORT_SYMBOL(cx18_claim_stream);
99 100
100/* This function releases a previously claimed stream. It will take into 101/* This function releases a previously claimed stream. It will take into
101 account associated VBI streams. */ 102 account associated VBI streams. */
102static void cx18_release_stream(struct cx18_stream *s) 103void cx18_release_stream(struct cx18_stream *s)
103{ 104{
104 struct cx18 *cx = s->cx; 105 struct cx18 *cx = s->cx;
105 struct cx18_stream *s_assoc; 106 struct cx18_stream *s_assoc;
@@ -154,6 +155,7 @@ static void cx18_release_stream(struct cx18_stream *s)
154 } 155 }
155 } 156 }
156} 157}
158EXPORT_SYMBOL(cx18_release_stream);
157 159
158static void cx18_dualwatch(struct cx18 *cx) 160static void cx18_dualwatch(struct cx18 *cx)
159{ 161{
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);
34void cx18_mute(struct cx18 *cx); 34void cx18_mute(struct cx18 *cx);
35void cx18_unmute(struct cx18 *cx); 35void cx18_unmute(struct cx18 *cx);
36 36
37/* Shared with cx18-alsa module */
38int cx18_claim_stream(struct cx18_open_id *id, int type);
39void cx18_release_stream(struct cx18_stream *s);