5e6b83ed8c
The exported copy of videodev2.h contains this line: #define #include <sys/time.h> This is because for some reason it defines __user for itself -- despite the fact that we remove all instances of __user when exporting headers. _All_ pointers in userspace are user pointers. Fix it by removing the unnecessary '#define __user' from the file. The new headers ivtv.h and ivtvfb.h would have the same problem... if whoever put them there had actually remembered to add them to the Kbuild file while he was at it. Fix those too, and export them as was presumably intended. Note that includes of <linux/compiler.h> are also stripped by the header export process, so those don't need to be conditional. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> Acked-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
69 lines
2.6 KiB
C
69 lines
2.6 KiB
C
/*
|
|
Public ivtv API header
|
|
Copyright (C) 2003-2004 Kevin Thayer <nufan_wfk at yahoo.com>
|
|
Copyright (C) 2004-2007 Hans Verkuil <hverkuil@xs4all.nl>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#ifndef __LINUX_IVTV_H__
|
|
#define __LINUX_IVTV_H__
|
|
|
|
#include <linux/compiler.h>
|
|
#include <linux/types.h>
|
|
|
|
/* ivtv knows several distinct output modes: MPEG streaming,
|
|
YUV streaming, YUV updates through user DMA and the passthrough
|
|
mode.
|
|
|
|
In order to clearly tell the driver that we are in user DMA
|
|
YUV mode you need to call IVTV_IOC_DMA_FRAME with y_source == NULL
|
|
first (althrough if you don't then the first time
|
|
DMA_FRAME is called the mode switch is done automatically).
|
|
|
|
When you close the file handle the user DMA mode is exited again.
|
|
|
|
While in one mode, you cannot use another mode (EBUSY is returned).
|
|
|
|
All this means that if you want to change the YUV interlacing
|
|
for the user DMA YUV mode you first need to do call IVTV_IOC_DMA_FRAME
|
|
with y_source == NULL before you can set the correct format using
|
|
VIDIOC_S_FMT.
|
|
|
|
Eventually all this should be replaced with a proper V4L2 API,
|
|
but for now we have to do it this way. */
|
|
|
|
struct ivtv_dma_frame {
|
|
enum v4l2_buf_type type; /* V4L2_BUF_TYPE_VIDEO_OUTPUT */
|
|
__u32 pixelformat; /* 0 == same as destination */
|
|
void __user *y_source; /* if NULL and type == V4L2_BUF_TYPE_VIDEO_OUTPUT,
|
|
then just switch to user DMA YUV output mode */
|
|
void __user *uv_source; /* Unused for RGB pixelformats */
|
|
struct v4l2_rect src;
|
|
struct v4l2_rect dst;
|
|
__u32 src_width;
|
|
__u32 src_height;
|
|
};
|
|
|
|
#define IVTV_IOC_DMA_FRAME _IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtv_dma_frame)
|
|
|
|
/* These are the VBI types as they appear in the embedded VBI private packets. */
|
|
#define IVTV_SLICED_TYPE_TELETEXT_B (1)
|
|
#define IVTV_SLICED_TYPE_CAPTION_525 (4)
|
|
#define IVTV_SLICED_TYPE_WSS_625 (5)
|
|
#define IVTV_SLICED_TYPE_VPS (7)
|
|
|
|
#endif /* _LINUX_IVTV_H */
|