diff options
| author | Gerd Knorr <devnull@localhost> | 2004-08-25 15:53:14 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-08-25 15:53:14 +0000 |
| commit | 13cc5c3d863d8cd61a10bea470bef19c50730217 (patch) | |
| tree | a88d8189d02769ab095fe1d2d229c9ddbc746c63 /linux/include | |
| parent | 6550ed72a57b714bfb1a718538d1fb5c542aa470 (diff) | |
| download | mediapointer-dvb-s2-13cc5c3d863d8cd61a10bea470bef19c50730217.tar.gz mediapointer-dvb-s2-13cc5c3d863d8cd61a10bea470bef19c50730217.tar.bz2 | |
- merge 2.6.9-rc1 changes (mostly __user stuff).
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev.h | 6 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 4 | ||||
| -rw-r--r-- | linux/include/media/video-buf.h | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/linux/include/linux/videodev.h b/linux/include/linux/videodev.h index 28be56ad5..30ab076ce 100644 --- a/linux/include/linux/videodev.h +++ b/linux/include/linux/videodev.h @@ -1,6 +1,7 @@ #ifndef __LINUX_VIDEODEV_H #define __LINUX_VIDEODEV_H +#include <linux/compiler.h> #include <linux/types.h> #include <linux/version.h> @@ -248,7 +249,7 @@ struct video_window __u32 width,height; /* Its size */ __u32 chromakey; __u32 flags; - struct video_clip *clips; /* Set only */ + struct video_clip __user *clips; /* Set only */ int clipcount; #define VIDEO_WINDOW_INTERLACE 1 #define VIDEO_WINDOW_CHROMAKEY 16 /* Overlay by chromakey */ @@ -455,8 +456,9 @@ struct video_code #define VID_HARDWARE_CPIA2 33 #define VID_HARDWARE_VICAM 34 #define VID_HARDWARE_SF16FMR2 35 -#define VID_HARDWARE_W9968CF 36 +#define VID_HARDWARE_W9968CF 36 #define VID_HARDWARE_SAA7114H 37 +#define VID_HARDWARE_SN9C102 38 #endif /* __LINUX_VIDEODEV_H */ /* diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index ab8727d92..076dd41d5 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -433,9 +433,9 @@ struct v4l2_window struct v4l2_rect w; enum v4l2_field field; __u32 chromakey; - struct v4l2_clip *clips; + struct v4l2_clip __user *clips; __u32 clipcount; - void *bitmap; + void __user *bitmap; }; diff --git a/linux/include/media/video-buf.h b/linux/include/media/video-buf.h index 17b2ae290..3c17bdf0b 100644 --- a/linux/include/media/video-buf.h +++ b/linux/include/media/video-buf.h @@ -226,10 +226,10 @@ int videobuf_streamoff(struct file *file, struct videobuf_queue *q); int videobuf_read_start(struct file *file, struct videobuf_queue *q); void videobuf_read_stop(struct file *file, struct videobuf_queue *q); ssize_t videobuf_read_stream(struct file *file, struct videobuf_queue *q, - char *data, size_t count, loff_t *ppos, + char __user *data, size_t count, loff_t *ppos, int vbihack); ssize_t videobuf_read_one(struct file *file, struct videobuf_queue *q, - char *data, size_t count, loff_t *ppos); + char __user *data, size_t count, loff_t *ppos); unsigned int videobuf_poll_stream(struct file *file, struct videobuf_queue *q, poll_table *wait); |