diff options
author | Brandon Philips <brandon@ifup.org> | 2007-11-06 18:02:36 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:02:11 -0500 |
commit | 0fc0686e64d21a6abded96af2b1a895dfa8b2530 (patch) | |
tree | 6c7a696c13bccb98e9b4a95e995b7992605ed419 /include/media/videobuf-core.h | |
parent | 1414becf15da1701b0c45e9c82b1f120cb676a36 (diff) |
V4L/DVB (6600): V4L: videobuf: don't chew up namespace STATE_.*, convert to VIDEOBUF_
s/STATE_NEEDS_INIT/VIDEOBUF_NEEDS_INIT/g
s/STATE_PREPARED/VIDEOBUF_PREPARED/g
s/STATE_QUEUED/VIDEOBUF_QUEUED/g
s/STATE_ACTIVE/VIDEOBUF_ACTIVE/g
s/STATE_DONE/VIDEOBUF_DONE/g
s/STATE_ERROR/VIDEOBUF_ERROR/g
s/STATE_IDLE/VIDEOBUF_IDLE/g
Signed-off-by: Brandon Philips <bphilips@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media/videobuf-core.h')
-rw-r--r-- | include/media/videobuf-core.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 4fd5d0eaa935..567dfe22c07f 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h | |||
@@ -56,13 +56,13 @@ struct videobuf_mapping { | |||
56 | }; | 56 | }; |
57 | 57 | ||
58 | enum videobuf_state { | 58 | enum videobuf_state { |
59 | STATE_NEEDS_INIT = 0, | 59 | VIDEOBUF_NEEDS_INIT = 0, |
60 | STATE_PREPARED = 1, | 60 | VIDEOBUF_PREPARED = 1, |
61 | STATE_QUEUED = 2, | 61 | VIDEOBUF_QUEUED = 2, |
62 | STATE_ACTIVE = 3, | 62 | VIDEOBUF_ACTIVE = 3, |
63 | STATE_DONE = 4, | 63 | VIDEOBUF_DONE = 4, |
64 | STATE_ERROR = 5, | 64 | VIDEOBUF_ERROR = 5, |
65 | STATE_IDLE = 6, | 65 | VIDEOBUF_IDLE = 6, |
66 | }; | 66 | }; |
67 | 67 | ||
68 | struct videobuf_buffer { | 68 | struct videobuf_buffer { |