diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-10 05:31:34 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-10 05:31:34 -0300 |
| commit | ea258810bf8de7d5d78d74aafe44e0ea8e7f8783 (patch) | |
| tree | a75e80be0b2aa5135896dc116d6f60ec7ed6b711 /linux/include | |
| parent | a5f0c1eb5516fb321c59ba6adb6437288b5b20bf (diff) | |
| download | mediapointer-dvb-s2-ea258810bf8de7d5d78d74aafe44e0ea8e7f8783.tar.gz mediapointer-dvb-s2-ea258810bf8de7d5d78d74aafe44e0ea8e7f8783.tar.bz2 | |
avoid loading the entire videodev.h header for drivers that are already V4L2 only
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev.h | 18 | ||||
| -rw-r--r-- | linux/include/media/v4l2-ioctl.h | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/linux/include/linux/videodev.h b/linux/include/linux/videodev.h index 837f392fb..b19eab140 100644 --- a/linux/include/linux/videodev.h +++ b/linux/include/linux/videodev.h @@ -16,6 +16,23 @@ #include <linux/ioctl.h> #include <linux/videodev2.h> +#if defined(__MIN_V4L1) && defined (__KERNEL__) + +/* + * Used by those V4L2 core functions that need a minimum V4L1 support, + * in order to allow V4L1 Compatibilty code compilation. + */ + +struct video_mbuf +{ + int size; /* Total memory to map */ + int frames; /* Frames */ + int offsets[VIDEO_MAX_FRAME]; +}; + +#define VIDIOCGMBUF _IOR('v',20, struct video_mbuf) /* Memory map buffer info */ + +#else #if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__) #define VID_TYPE_CAPTURE 1 /* Can capture */ @@ -312,6 +329,7 @@ struct video_code #define VID_PLAY_END_MARK 14 #endif /* CONFIG_VIDEO_V4L1_COMPAT */ +#endif /* __MIN_V4L1 */ #endif /* __LINUX_VIDEODEV_H */ diff --git a/linux/include/media/v4l2-ioctl.h b/linux/include/media/v4l2-ioctl.h index a8b4c0b67..7a4529def 100644 --- a/linux/include/media/v4l2-ioctl.h +++ b/linux/include/media/v4l2-ioctl.h @@ -15,6 +15,7 @@ #include <linux/mutex.h> #include <linux/compiler.h> /* need __user */ #ifdef CONFIG_VIDEO_V4L1_COMPAT +#define __MIN_V4L1 #include <linux/videodev.h> #else #include <linux/videodev2.h> |