projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (8092): videodev: simplify and fix standard enumeration
[firefly-linux-kernel-4.4.55.git]
/
include
/
media
/
v4l2-dev.h
diff --git
a/include/media/v4l2-dev.h
b/include/media/v4l2-dev.h
index f2114459995d94826b9530e3a4f9c6feea1e5b00..859f7a6f6f67ab0c5073deb703c928de9f614d2f 100644
(file)
--- a/
include/media/v4l2-dev.h
+++ b/
include/media/v4l2-dev.h
@@
-40,10
+40,9
@@
#define VFL_TYPE_VTX 3
/* Video standard functions */
#define VFL_TYPE_VTX 3
/* Video standard functions */
-extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs);
-extern char *v4l2_norm_to_name(v4l2_std_id id);
+extern const char *v4l2_norm_to_name(v4l2_std_id id);
extern int v4l2_video_std_construct(struct v4l2_standard *vs,
extern int v4l2_video_std_construct(struct v4l2_standard *vs,
- int id, char *name);
+ int id, c
onst c
har *name);
/* Prints the ioctl in a human-readable format */
extern void v4l_printk_ioctl(unsigned int cmd);
/* Prints the ioctl in a human-readable format */
extern void v4l_printk_ioctl(unsigned int cmd);
@@
-318,6
+317,10
@@
struct video_device
int (*vidioc_g_chip_ident) (struct file *file, void *fh,
struct v4l2_chip_ident *chip);
int (*vidioc_g_chip_ident) (struct file *file, void *fh,
struct v4l2_chip_ident *chip);
+ /* For other private ioctls */
+ int (*vidioc_default) (struct file *file, void *fh,
+ int cmd, void *arg);
+
#ifdef OBSOLETE_OWNER /* to be removed soon */
/* obsolete -- fops->owner is used instead */
#ifdef OBSOLETE_OWNER /* to be removed soon */
/* obsolete -- fops->owner is used instead */