diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-07-20 15:30:32 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2007-07-20 15:30:32 +0200 |
| commit | ed7f53117ffd06e00be81b95953fb3b619f0b162 (patch) | |
| tree | 0201fd3a8a77d892bb2190bbd8f2cdfe88da7ff1 | |
| parent | 4c8bd6a5bd9db9d363f2b49a6092af8f70cc8f2c (diff) | |
| download | mediapointer-dvb-s2-ed7f53117ffd06e00be81b95953fb3b619f0b162.tar.gz mediapointer-dvb-s2-ed7f53117ffd06e00be81b95953fb3b619f0b162.tar.bz2 | |
ivtv-fb: Use proper ioctl value.
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-fb.c | 6 | ||||
| -rw-r--r-- | linux/include/media/ivtv-fb.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-fb.c b/linux/drivers/media/video/ivtv/ivtv-fb.c index 01cd65328..55265bd5c 100644 --- a/linux/drivers/media/video/ivtv/ivtv-fb.c +++ b/linux/drivers/media/video/ivtv/ivtv-fb.c @@ -424,10 +424,10 @@ static int ivtvfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar finish_wait(&itv->vsync_waitq, &wait); return rc; - case IVTVFB_IOCTL_PREP_FRAME: { - struct ivtvfb_ioctl_dma_host_to_ivtv_args args; + case IVTVFB_IOC_DMA_FRAME: { + struct ivtvfb_dma_frame args; - IVTV_FB_DEBUG_INFO("IVTVFB_IOCTL_PREP_FRAME\n"); + IVTV_FB_DEBUG_INFO("IVTVFB_IOC_DMA_FRAME\n"); if (copy_from_user(&args, (void __user *)arg, sizeof(args))) return -EFAULT; diff --git a/linux/include/media/ivtv-fb.h b/linux/include/media/ivtv-fb.h index 902b2f3d3..3b746f5e3 100644 --- a/linux/include/media/ivtv-fb.h +++ b/linux/include/media/ivtv-fb.h @@ -23,13 +23,12 @@ /* Framebuffer external API */ -struct ivtvfb_ioctl_dma_host_to_ivtv_args { +struct ivtvfb_dma_frame { void __user *source; unsigned long dest_offset; int count; }; -/* Framebuffer ioctls should use the range 1 - 28 */ -#define IVTVFB_IOCTL_PREP_FRAME _IOW('@', 3, struct ivtvfb_ioctl_dma_host_to_ivtv_args) +#define IVTVFB_IOC_DMA_FRAME _IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame) #endif |