korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-13 05:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] v4l: 829: fixed user mode compiling

Browse Source 
- Fixed user mode compiling.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Mauro Carvalho Chehab 2005-11-08 21:38:01 -08:00 committed by Linus Torvalds
parent 01cb9633e1
commit f958b68d40
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/linux/videodev.h
View File

@ -27,6 +27,18 @@ video_device_remove_file(struct video_device *vfd,
class_device_remove_file(&vfd->class_dev, attr);
}
#if OBSOLETE_OWNER /* to be removed in 2.6.15 */
/* helper functions to access driver private data. */
static inline void *video_get_drvdata(struct video_device *dev)
{
return dev->priv;
}
static inline void video_set_drvdata(struct video_device *dev, void *data)
{
dev->priv = data;
}
#endif
extern int video_exclusive_open(struct inode *inode, struct file *file);
extern int video_exclusive_release(struct inode *inode, struct file *file);

18
include/linux/videodev2.h
View File

@ -15,12 +15,13 @@
*/
#ifdef __KERNEL__
#include <linux/time.h> /* need struct timeval */
#include <linux/poll.h>
#include <linux/device.h>
#endif
#include <linux/compiler.h> /* need __user */
#include <linux/poll.h>
#include <linux/device.h>
#define OBSOLETE_OWNER 1 /* It will be removed for 2.6.15 */
#define HAVE_V4L2 1
/*
@ -30,6 +31,8 @@
#define VIDEO_MAX_FRAME 32
#ifdef __KERNEL__
#define VFL_TYPE_GRABBER 0
#define VFL_TYPE_VBI 1
#define VFL_TYPE_RADIO 2
@ -50,6 +53,15 @@ struct video_device
void (*release)(struct video_device *vfd);
#if OBSOLETE_OWNER /* to be removed in 2.6.15 */
/* obsolete -- fops->owner is used instead */
struct module *owner;
/* dev->driver_data will be used instead some day.
* Use the video_{get|set}_drvdata() helper functions,
* so the switch over will be transparent for you.
* Or use {pci|usb}_{get|set}_drvdata() directly. */
void *priv;
#endif
/* for videodev.c intenal usage -- please don't touch */
int users; /* video_exclusive_{open|close} ... */
@ -87,6 +99,8 @@ extern int video_usercopy(struct inode *inode, struct file *file,
struct video_device *video_device_alloc(void);
void video_device_release(struct video_device *vfd);
#endif
/*
* M I S C E L L A N E O U S
*/