diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-ioctl.c')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-ioctl.c | 130 |
1 files changed, 67 insertions, 63 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index 52e00a7f3110..61030309d0ad 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/drivers/media/video/ivtv/ivtv-ioctl.c | |||
| @@ -1842,69 +1842,73 @@ int ivtv_v4l2_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, | |||
| 1842 | return res; | 1842 | return res; |
| 1843 | } | 1843 | } |
| 1844 | 1844 | ||
| 1845 | void ivtv_set_funcs(struct video_device *vdev) | 1845 | static const struct v4l2_ioctl_ops ivtv_ioctl_ops = { |
| 1846 | { | 1846 | .vidioc_querycap = ivtv_querycap, |
| 1847 | vdev->vidioc_querycap = ivtv_querycap; | 1847 | .vidioc_g_priority = ivtv_g_priority, |
| 1848 | vdev->vidioc_g_priority = ivtv_g_priority; | 1848 | .vidioc_s_priority = ivtv_s_priority, |
| 1849 | vdev->vidioc_s_priority = ivtv_s_priority; | 1849 | .vidioc_s_audio = ivtv_s_audio, |
| 1850 | vdev->vidioc_s_audio = ivtv_s_audio; | 1850 | .vidioc_g_audio = ivtv_g_audio, |
| 1851 | vdev->vidioc_g_audio = ivtv_g_audio; | 1851 | .vidioc_enumaudio = ivtv_enumaudio, |
| 1852 | vdev->vidioc_enumaudio = ivtv_enumaudio; | 1852 | .vidioc_s_audout = ivtv_s_audout, |
| 1853 | vdev->vidioc_s_audout = ivtv_s_audout; | 1853 | .vidioc_g_audout = ivtv_g_audout, |
| 1854 | vdev->vidioc_g_audout = ivtv_g_audout; | 1854 | .vidioc_enum_input = ivtv_enum_input, |
| 1855 | vdev->vidioc_enum_input = ivtv_enum_input; | 1855 | .vidioc_enum_output = ivtv_enum_output, |
| 1856 | vdev->vidioc_enum_output = ivtv_enum_output; | 1856 | .vidioc_enumaudout = ivtv_enumaudout, |
| 1857 | vdev->vidioc_enumaudout = ivtv_enumaudout; | 1857 | .vidioc_cropcap = ivtv_cropcap, |
| 1858 | vdev->vidioc_cropcap = ivtv_cropcap; | 1858 | .vidioc_s_crop = ivtv_s_crop, |
| 1859 | vdev->vidioc_s_crop = ivtv_s_crop; | 1859 | .vidioc_g_crop = ivtv_g_crop, |
| 1860 | vdev->vidioc_g_crop = ivtv_g_crop; | 1860 | .vidioc_g_input = ivtv_g_input, |
| 1861 | vdev->vidioc_g_input = ivtv_g_input; | 1861 | .vidioc_s_input = ivtv_s_input, |
| 1862 | vdev->vidioc_s_input = ivtv_s_input; | 1862 | .vidioc_g_output = ivtv_g_output, |
| 1863 | vdev->vidioc_g_output = ivtv_g_output; | 1863 | .vidioc_s_output = ivtv_s_output, |
| 1864 | vdev->vidioc_s_output = ivtv_s_output; | 1864 | .vidioc_g_frequency = ivtv_g_frequency, |
| 1865 | vdev->vidioc_g_frequency = ivtv_g_frequency; | 1865 | .vidioc_s_frequency = ivtv_s_frequency, |
| 1866 | vdev->vidioc_s_frequency = ivtv_s_frequency; | 1866 | .vidioc_s_tuner = ivtv_s_tuner, |
| 1867 | vdev->vidioc_s_tuner = ivtv_s_tuner; | 1867 | .vidioc_g_tuner = ivtv_g_tuner, |
| 1868 | vdev->vidioc_g_tuner = ivtv_g_tuner; | 1868 | .vidioc_g_enc_index = ivtv_g_enc_index, |
| 1869 | vdev->vidioc_g_enc_index = ivtv_g_enc_index; | 1869 | .vidioc_g_fbuf = ivtv_g_fbuf, |
| 1870 | vdev->vidioc_g_fbuf = ivtv_g_fbuf; | 1870 | .vidioc_s_fbuf = ivtv_s_fbuf, |
| 1871 | vdev->vidioc_s_fbuf = ivtv_s_fbuf; | 1871 | .vidioc_g_std = ivtv_g_std, |
| 1872 | vdev->vidioc_g_std = ivtv_g_std; | 1872 | .vidioc_s_std = ivtv_s_std, |
| 1873 | vdev->vidioc_s_std = ivtv_s_std; | 1873 | .vidioc_overlay = ivtv_overlay, |
| 1874 | vdev->vidioc_overlay = ivtv_overlay; | 1874 | .vidioc_log_status = ivtv_log_status, |
| 1875 | vdev->vidioc_log_status = ivtv_log_status; | 1875 | .vidioc_enum_fmt_vid_cap = ivtv_enum_fmt_vid_cap, |
| 1876 | vdev->vidioc_enum_fmt_vid_cap = ivtv_enum_fmt_vid_cap; | 1876 | .vidioc_encoder_cmd = ivtv_encoder_cmd, |
| 1877 | vdev->vidioc_encoder_cmd = ivtv_encoder_cmd; | 1877 | .vidioc_try_encoder_cmd = ivtv_try_encoder_cmd, |
| 1878 | vdev->vidioc_try_encoder_cmd = ivtv_try_encoder_cmd; | 1878 | .vidioc_enum_fmt_vid_out = ivtv_enum_fmt_vid_out, |
| 1879 | vdev->vidioc_enum_fmt_vid_out = ivtv_enum_fmt_vid_out; | 1879 | .vidioc_g_fmt_vid_cap = ivtv_g_fmt_vid_cap, |
| 1880 | vdev->vidioc_g_fmt_vid_cap = ivtv_g_fmt_vid_cap; | 1880 | .vidioc_g_fmt_vbi_cap = ivtv_g_fmt_vbi_cap, |
| 1881 | vdev->vidioc_g_fmt_vbi_cap = ivtv_g_fmt_vbi_cap; | 1881 | .vidioc_g_fmt_sliced_vbi_cap = ivtv_g_fmt_sliced_vbi_cap, |
| 1882 | vdev->vidioc_g_fmt_sliced_vbi_cap = ivtv_g_fmt_sliced_vbi_cap; | 1882 | .vidioc_g_fmt_vid_out = ivtv_g_fmt_vid_out, |
| 1883 | vdev->vidioc_g_fmt_vid_out = ivtv_g_fmt_vid_out; | 1883 | .vidioc_g_fmt_vid_out_overlay = ivtv_g_fmt_vid_out_overlay, |
| 1884 | vdev->vidioc_g_fmt_vid_out_overlay = ivtv_g_fmt_vid_out_overlay; | 1884 | .vidioc_g_fmt_sliced_vbi_out = ivtv_g_fmt_sliced_vbi_out, |
| 1885 | vdev->vidioc_g_fmt_sliced_vbi_out = ivtv_g_fmt_sliced_vbi_out; | 1885 | .vidioc_s_fmt_vid_cap = ivtv_s_fmt_vid_cap, |
| 1886 | vdev->vidioc_s_fmt_vid_cap = ivtv_s_fmt_vid_cap; | 1886 | .vidioc_s_fmt_vbi_cap = ivtv_s_fmt_vbi_cap, |
| 1887 | vdev->vidioc_s_fmt_vbi_cap = ivtv_s_fmt_vbi_cap; | 1887 | .vidioc_s_fmt_sliced_vbi_cap = ivtv_s_fmt_sliced_vbi_cap, |
| 1888 | vdev->vidioc_s_fmt_sliced_vbi_cap = ivtv_s_fmt_sliced_vbi_cap; | 1888 | .vidioc_s_fmt_vid_out = ivtv_s_fmt_vid_out, |
| 1889 | vdev->vidioc_s_fmt_vid_out = ivtv_s_fmt_vid_out; | 1889 | .vidioc_s_fmt_vid_out_overlay = ivtv_s_fmt_vid_out_overlay, |
| 1890 | vdev->vidioc_s_fmt_vid_out_overlay = ivtv_s_fmt_vid_out_overlay; | 1890 | .vidioc_s_fmt_sliced_vbi_out = ivtv_s_fmt_sliced_vbi_out, |
| 1891 | vdev->vidioc_s_fmt_sliced_vbi_out = ivtv_s_fmt_sliced_vbi_out; | 1891 | .vidioc_try_fmt_vid_cap = ivtv_try_fmt_vid_cap, |
| 1892 | vdev->vidioc_try_fmt_vid_cap = ivtv_try_fmt_vid_cap; | 1892 | .vidioc_try_fmt_vbi_cap = ivtv_try_fmt_vbi_cap, |
| 1893 | vdev->vidioc_try_fmt_vbi_cap = ivtv_try_fmt_vbi_cap; | 1893 | .vidioc_try_fmt_sliced_vbi_cap = ivtv_try_fmt_sliced_vbi_cap, |
| 1894 | vdev->vidioc_try_fmt_sliced_vbi_cap = ivtv_try_fmt_sliced_vbi_cap; | 1894 | .vidioc_try_fmt_vid_out = ivtv_try_fmt_vid_out, |
| 1895 | vdev->vidioc_try_fmt_vid_out = ivtv_try_fmt_vid_out; | 1895 | .vidioc_try_fmt_vid_out_overlay = ivtv_try_fmt_vid_out_overlay, |
| 1896 | vdev->vidioc_try_fmt_vid_out_overlay = ivtv_try_fmt_vid_out_overlay; | 1896 | .vidioc_try_fmt_sliced_vbi_out = ivtv_try_fmt_sliced_vbi_out, |
| 1897 | vdev->vidioc_try_fmt_sliced_vbi_out = ivtv_try_fmt_sliced_vbi_out; | 1897 | .vidioc_g_sliced_vbi_cap = ivtv_g_sliced_vbi_cap, |
| 1898 | vdev->vidioc_g_sliced_vbi_cap = ivtv_g_sliced_vbi_cap; | 1898 | .vidioc_g_chip_ident = ivtv_g_chip_ident, |
| 1899 | vdev->vidioc_g_chip_ident = ivtv_g_chip_ident; | ||
| 1900 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 1899 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
| 1901 | vdev->vidioc_g_register = ivtv_g_register; | 1900 | .vidioc_g_register = ivtv_g_register, |
| 1902 | vdev->vidioc_s_register = ivtv_s_register; | 1901 | .vidioc_s_register = ivtv_s_register, |
| 1903 | #endif | 1902 | #endif |
| 1904 | vdev->vidioc_default = ivtv_default; | 1903 | .vidioc_default = ivtv_default, |
| 1905 | vdev->vidioc_queryctrl = ivtv_queryctrl; | 1904 | .vidioc_queryctrl = ivtv_queryctrl, |
| 1906 | vdev->vidioc_querymenu = ivtv_querymenu; | 1905 | .vidioc_querymenu = ivtv_querymenu, |
| 1907 | vdev->vidioc_g_ext_ctrls = ivtv_g_ext_ctrls; | 1906 | .vidioc_g_ext_ctrls = ivtv_g_ext_ctrls, |
| 1908 | vdev->vidioc_s_ext_ctrls = ivtv_s_ext_ctrls; | 1907 | .vidioc_s_ext_ctrls = ivtv_s_ext_ctrls, |
| 1909 | vdev->vidioc_try_ext_ctrls = ivtv_try_ext_ctrls; | 1908 | .vidioc_try_ext_ctrls = ivtv_try_ext_ctrls, |
| 1909 | }; | ||
| 1910 | |||
| 1911 | void ivtv_set_funcs(struct video_device *vdev) | ||
| 1912 | { | ||
| 1913 | vdev->ioctl_ops = &ivtv_ioctl_ops; | ||
| 1910 | } | 1914 | } |