Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
2a8145d4
Commit
2a8145d4
authored
Oct 25, 2008
by
Mauro Carvalho Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
V4L/DVB (12841): tm6000: Fix compilation with newer v4l2-dev API
Signed-off-by:
Mauro Carvalho Chehab
<
mchehab@redhat.com
>
parent
df7c1d9a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
38 additions
and
34 deletions
+38
-34
drivers/staging/tm6000/tm6000-video.c
drivers/staging/tm6000/tm6000-video.c
+38
-34
No files found.
drivers/staging/tm6000/tm6000-video.c
View file @
2a8145d4
...
@@ -33,6 +33,7 @@
...
@@ -33,6 +33,7 @@
#include <linux/version.h>
#include <linux/version.h>
#include <linux/usb.h>
#include <linux/usb.h>
#include <linux/videodev2.h>
#include <linux/videodev2.h>
#include <media/v4l2-ioctl.h>
#include <linux/interrupt.h>
#include <linux/interrupt.h>
#include <linux/kthread.h>
#include <linux/kthread.h>
#include <linux/highmem.h>
#include <linux/highmem.h>
...
@@ -866,7 +867,7 @@ static int vidioc_querycap (struct file *file, void *priv,
...
@@ -866,7 +867,7 @@ static int vidioc_querycap (struct file *file, void *priv,
return
0
;
return
0
;
}
}
static
int
vidioc_enum_fmt_cap
(
struct
file
*
file
,
void
*
priv
,
static
int
vidioc_enum_fmt_
vid_
cap
(
struct
file
*
file
,
void
*
priv
,
struct
v4l2_fmtdesc
*
f
)
struct
v4l2_fmtdesc
*
f
)
{
{
if
(
unlikely
(
f
->
index
>=
ARRAY_SIZE
(
format
)))
if
(
unlikely
(
f
->
index
>=
ARRAY_SIZE
(
format
)))
...
@@ -877,7 +878,7 @@ static int vidioc_enum_fmt_cap (struct file *file, void *priv,
...
@@ -877,7 +878,7 @@ static int vidioc_enum_fmt_cap (struct file *file, void *priv,
return
0
;
return
0
;
}
}
static
int
vidioc_g_fmt_cap
(
struct
file
*
file
,
void
*
priv
,
static
int
vidioc_g_fmt_
vid_
cap
(
struct
file
*
file
,
void
*
priv
,
struct
v4l2_format
*
f
)
struct
v4l2_format
*
f
)
{
{
struct
tm6000_fh
*
fh
=
priv
;
struct
tm6000_fh
*
fh
=
priv
;
...
@@ -904,7 +905,7 @@ static struct tm6000_fmt* format_by_fourcc(unsigned int fourcc)
...
@@ -904,7 +905,7 @@ static struct tm6000_fmt* format_by_fourcc(unsigned int fourcc)
return
NULL
;
return
NULL
;
}
}
static
int
vidioc_try_fmt_cap
(
struct
file
*
file
,
void
*
priv
,
static
int
vidioc_try_fmt_
vid_
cap
(
struct
file
*
file
,
void
*
priv
,
struct
v4l2_format
*
f
)
struct
v4l2_format
*
f
)
{
{
struct
tm6000_core
*
dev
=
((
struct
tm6000_fh
*
)
priv
)
->
dev
;
struct
tm6000_core
*
dev
=
((
struct
tm6000_fh
*
)
priv
)
->
dev
;
...
@@ -946,12 +947,12 @@ static int vidioc_try_fmt_cap (struct file *file, void *priv,
...
@@ -946,12 +947,12 @@ static int vidioc_try_fmt_cap (struct file *file, void *priv,
}
}
/*FIXME: This seems to be generic enough to be at videodev2 */
/*FIXME: This seems to be generic enough to be at videodev2 */
static
int
vidioc_s_fmt_cap
(
struct
file
*
file
,
void
*
priv
,
static
int
vidioc_s_fmt_
vid_
cap
(
struct
file
*
file
,
void
*
priv
,
struct
v4l2_format
*
f
)
struct
v4l2_format
*
f
)
{
{
struct
tm6000_fh
*
fh
=
priv
;
struct
tm6000_fh
*
fh
=
priv
;
struct
tm6000_core
*
dev
=
fh
->
dev
;
struct
tm6000_core
*
dev
=
fh
->
dev
;
int
ret
=
vidioc_try_fmt_cap
(
file
,
fh
,
f
);
int
ret
=
vidioc_try_fmt_
vid_
cap
(
file
,
fh
,
f
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
(
ret
);
return
(
ret
);
...
@@ -1435,18 +1436,12 @@ static struct file_operations tm6000_fops = {
...
@@ -1435,18 +1436,12 @@ static struct file_operations tm6000_fops = {
.
llseek
=
no_llseek
,
.
llseek
=
no_llseek
,
};
};
static
struct
video_device
tm6000_template
=
{
static
const
struct
v4l2_ioctl_ops
video_ioctl_ops
=
{
.
name
=
"tm6000"
,
.
type
=
VID_TYPE_CAPTURE
,
.
fops
=
&
tm6000_fops
,
.
minor
=
-
1
,
.
release
=
video_device_release
,
.
vidioc_querycap
=
vidioc_querycap
,
.
vidioc_querycap
=
vidioc_querycap
,
.
vidioc_enum_fmt_
cap
=
vidioc_enum_fmt
_cap
,
.
vidioc_enum_fmt_
vid_cap
=
vidioc_enum_fmt_vid
_cap
,
.
vidioc_g_fmt_
cap
=
vidioc_g_fmt
_cap
,
.
vidioc_g_fmt_
vid_cap
=
vidioc_g_fmt_vid
_cap
,
.
vidioc_try_fmt_
cap
=
vidioc_try_fmt
_cap
,
.
vidioc_try_fmt_
vid_cap
=
vidioc_try_fmt_vid
_cap
,
.
vidioc_s_fmt_
cap
=
vidioc_s_fmt
_cap
,
.
vidioc_s_fmt_
vid_cap
=
vidioc_s_fmt_vid
_cap
,
.
vidioc_s_std
=
vidioc_s_std
,
.
vidioc_s_std
=
vidioc_s_std
,
.
vidioc_enum_input
=
vidioc_enum_input
,
.
vidioc_enum_input
=
vidioc_enum_input
,
.
vidioc_g_input
=
vidioc_g_input
,
.
vidioc_g_input
=
vidioc_g_input
,
...
@@ -1467,9 +1462,18 @@ static struct video_device tm6000_template = {
...
@@ -1467,9 +1462,18 @@ static struct video_device tm6000_template = {
#ifdef CONFIG_VIDEO_V4L1_COMPAT
#ifdef CONFIG_VIDEO_V4L1_COMPAT
.
vidiocgmbuf
=
vidiocgmbuf
,
.
vidiocgmbuf
=
vidiocgmbuf
,
#endif
#endif
};
static
struct
video_device
tm6000_template
=
{
.
name
=
"tm6000"
,
.
fops
=
&
tm6000_fops
,
.
ioctl_ops
=
&
video_ioctl_ops
,
.
minor
=
-
1
,
.
release
=
video_device_release
,
.
tvnorms
=
TM6000_STD
,
.
tvnorms
=
TM6000_STD
,
.
current_norm
=
V4L2_STD_NTSC_M
,
.
current_norm
=
V4L2_STD_NTSC_M
,
};
};
/* -----------------------------------------------------------------
/* -----------------------------------------------------------------
Initialization and module stuff
Initialization and module stuff
------------------------------------------------------------------*/
------------------------------------------------------------------*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment