aboutsummaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-dev.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-20 07:12:02 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-23 18:00:17 -0400
commit35ea11ff84719b1bfab2909903a9640a86552fd1 (patch)
tree5dff79cda158d7d2d4c8942d1b781c0108b95159 /include/media/v4l2-dev.h
parente81cf44428b9540d489a12880663488708bbb9c1 (diff)
V4L/DVB (8430): videodev: move some functions from v4l2-dev.h to v4l2-common.h or v4l2-ioctl.h
The functions in a header should not belong to another module. The prio functions belong to v4l2-common.c, so move them to v4l2-common.h. The ioctl functions belong to v4l2-ioctl.c, so create a new v4l2-ioctl.h header and move those functions to it. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media/v4l2-dev.h')
-rw-r--r--include/media/v4l2-dev.h45
1 files changed, 0 insertions, 45 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 185372ffa270..ad62d322e178 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -39,43 +39,6 @@
39#define VFL_TYPE_RADIO 2 39#define VFL_TYPE_RADIO 2
40#define VFL_TYPE_VTX 3 40#define VFL_TYPE_VTX 3
41 41
42/* Video standard functions */
43extern const char *v4l2_norm_to_name(v4l2_std_id id);
44extern int v4l2_video_std_construct(struct v4l2_standard *vs,
45 int id, const char *name);
46/* Prints the ioctl in a human-readable format */
47extern void v4l_printk_ioctl(unsigned int cmd);
48
49/* prority handling */
50struct v4l2_prio_state {
51 atomic_t prios[4];
52};
53int v4l2_prio_init(struct v4l2_prio_state *global);
54int v4l2_prio_change(struct v4l2_prio_state *global, enum v4l2_priority *local,
55 enum v4l2_priority new);
56int v4l2_prio_open(struct v4l2_prio_state *global, enum v4l2_priority *local);
57int v4l2_prio_close(struct v4l2_prio_state *global, enum v4l2_priority *local);
58enum v4l2_priority v4l2_prio_max(struct v4l2_prio_state *global);
59int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority *local);
60
61/* names for fancy debug output */
62extern const char *v4l2_field_names[];
63extern const char *v4l2_type_names[];
64
65/* Compatibility layer interface -- v4l1-compat module */
66typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file,
67 unsigned int cmd, void *arg);
68#ifdef CONFIG_VIDEO_V4L1_COMPAT
69int v4l_compat_translate_ioctl(struct inode *inode, struct file *file,
70 int cmd, void *arg, v4l2_kioctl driver_ioctl);
71#else
72#define v4l_compat_translate_ioctl(inode,file,cmd,arg,ioctl) -EINVAL
73#endif
74
75/* 32 Bits compatibility layer for 64 bits processors */
76extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd,
77 unsigned long arg);
78
79/* 42/*
80 * Newer version of video_device, handled by videodev2.c 43 * Newer version of video_device, handled by videodev2.c
81 * This version moves redundant code from video device code to 44 * This version moves redundant code from video device code to
@@ -352,20 +315,12 @@ extern int video_register_device(struct video_device *vfd, int type, int nr);
352int video_register_device_index(struct video_device *vfd, int type, int nr, 315int video_register_device_index(struct video_device *vfd, int type, int nr,
353 int index); 316 int index);
354void video_unregister_device(struct video_device *); 317void video_unregister_device(struct video_device *);
355extern int video_ioctl2(struct inode *inode, struct file *file,
356 unsigned int cmd, unsigned long arg);
357 318
358/* helper functions to alloc / release struct video_device, the 319/* helper functions to alloc / release struct video_device, the
359 later can be used for video_device->release() */ 320 later can be used for video_device->release() */
360struct video_device *video_device_alloc(void); 321struct video_device *video_device_alloc(void);
361void video_device_release(struct video_device *vfd); 322void video_device_release(struct video_device *vfd);
362 323
363/* Include support for obsoleted stuff */
364extern int video_usercopy(struct inode *inode, struct file *file,
365 unsigned int cmd, unsigned long arg,
366 int (*func)(struct inode *inode, struct file *file,
367 unsigned int cmd, void *arg));
368
369#ifdef CONFIG_VIDEO_V4L1_COMPAT 324#ifdef CONFIG_VIDEO_V4L1_COMPAT
370#include <linux/mm.h> 325#include <linux/mm.h>
371 326