diff options
| author | Thierry MERLE <thierry.merle@free.fr> | 2007-05-08 22:22:29 +0200 |
|---|---|---|
| committer | Thierry MERLE <thierry.merle@free.fr> | 2007-05-08 22:22:29 +0200 |
| commit | 9ca6b3d98b22e2f27cc097f2bf15c999dff237e0 (patch) | |
| tree | d1348e76d647e1453d3f63efa8e108e029633b1c /linux/drivers/media/video/usbvision/usbvision.h | |
| parent | c51cba09e36c2d42943277fde19a035512fdfcb2 (diff) | |
| download | mediapointer-dvb-s2-9ca6b3d98b22e2f27cc097f2bf15c999dff237e0.tar.gz mediapointer-dvb-s2-9ca6b3d98b22e2f27cc097f2bf15c999dff237e0.tar.bz2 | |
usbvision: video_ioctl2 conversion
From: Thierry MERLE <thierry.merle@free.fr>
The ioctl entry point, a big switch/case, is splitted in little functions.
These functions are set as callbacks for the video_ioctl2 video4linux facility.
This improves the driver memory consumption and enables the v4l1 compatibility as a side effect.
Acked-by: Dwaine P. Garden <dwainegarden@rogers.com>
Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
Diffstat (limited to 'linux/drivers/media/video/usbvision/usbvision.h')
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/linux/drivers/media/video/usbvision/usbvision.h b/linux/drivers/media/video/usbvision/usbvision.h index c810a6bda..29971a0a1 100644 --- a/linux/drivers/media/video/usbvision/usbvision.h +++ b/linux/drivers/media/video/usbvision/usbvision.h @@ -222,6 +222,8 @@ enum { #define I2C_USB_ADAP_MAX 16 +#define USBVISION_NORMS (V4L2_STD_PAL | V4L2_STD_NTSC | V4L2_STD_SECAM | V4L2_STD_PAL_M) + /* ----------------------------------------------------------------- */ /* usbvision video structures */ /* ----------------------------------------------------------------- */ @@ -302,14 +304,6 @@ struct usbvision_frame_header { __u16 frameHeight; /* 10 - 11 after endian correction*/ }; -/* tvnorms */ -struct usbvision_tvnorm { - char *name; - v4l2_std_id id; - /* mode for saa7113h */ - int mode; -}; - struct usbvision_frame { char *data; /* Frame buffer */ struct usbvision_frame_header isocHeader; /* Header from stream */ @@ -446,7 +440,7 @@ struct usb_usbvision { struct v4l2_capability vcap; /* Video capabilities */ unsigned int ctl_input; /* selected input */ - struct usbvision_tvnorm *tvnorm; /* selected tv norm */ + v4l2_std_id tvnormId; /* selected tv norm */ unsigned char video_endp; /* 0x82 for USBVISION devices based */ // Decompression stuff: |