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
f9df913b
Commit
f9df913b
authored
Mar 06, 2003
by
Alan Cox
Committed by
Linus Torvalds
Mar 06, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] exterminate 2.2 gunk from video stuff
parent
40f4e407
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
15 deletions
+0
-15
drivers/media/video/bw-qcam.c
drivers/media/video/bw-qcam.c
+0
-2
drivers/media/video/planb.c
drivers/media/video/planb.c
+0
-5
drivers/media/video/zoran.h
drivers/media/video/zoran.h
+0
-4
drivers/media/video/zr36120.c
drivers/media/video/zr36120.c
+0
-4
No files found.
drivers/media/video/bw-qcam.c
View file @
f9df913b
...
@@ -83,11 +83,9 @@ static unsigned int maxpoll=250; /* Maximum busy-loop count for qcam I/O */
...
@@ -83,11 +83,9 @@ static unsigned int maxpoll=250; /* Maximum busy-loop count for qcam I/O */
static
unsigned
int
yieldlines
=
4
;
/* Yield after this many during capture */
static
unsigned
int
yieldlines
=
4
;
/* Yield after this many during capture */
static
int
video_nr
=
-
1
;
static
int
video_nr
=
-
1
;
#if LINUX_VERSION_CODE >= 0x020117
MODULE_PARM
(
maxpoll
,
"i"
);
MODULE_PARM
(
maxpoll
,
"i"
);
MODULE_PARM
(
yieldlines
,
"i"
);
MODULE_PARM
(
yieldlines
,
"i"
);
MODULE_PARM
(
video_nr
,
"i"
);
MODULE_PARM
(
video_nr
,
"i"
);
#endif
static
inline
int
read_lpstatus
(
struct
qcam_device
*
q
)
static
inline
int
read_lpstatus
(
struct
qcam_device
*
q
)
{
{
...
...
drivers/media/video/planb.c
View file @
f9df913b
...
@@ -181,12 +181,7 @@ static unsigned char saa_status(int byte, struct planb *pb)
...
@@ -181,12 +181,7 @@ static unsigned char saa_status(int byte, struct planb *pb)
/* Let's wait 30msec for this one */
/* Let's wait 30msec for this one */
current
->
state
=
TASK_INTERRUPTIBLE
;
current
->
state
=
TASK_INTERRUPTIBLE
;
#if LINUX_VERSION_CODE >= 0x02017F
schedule_timeout
(
30
*
HZ
/
1000
);
schedule_timeout
(
30
*
HZ
/
1000
);
#else
current
->
timeout
=
jiffies
+
30
*
HZ
/
1000
;
/* 30 ms */
;
schedule
();
#endif
return
(
unsigned
char
)
in_8
(
&
planb_regs
->
saa_status
);
return
(
unsigned
char
)
in_8
(
&
planb_regs
->
saa_status
);
}
}
...
...
drivers/media/video/zoran.h
View file @
f9df913b
...
@@ -32,10 +32,6 @@
...
@@ -32,10 +32,6 @@
#include <linux/config.h>
#include <linux/config.h>
#if LINUX_VERSION_CODE < 0x20212
typedef
struct
wait_queue
*
wait_queue_head_t
;
#endif
/* The Buz only supports a maximum width of 720, but some V4L
/* The Buz only supports a maximum width of 720, but some V4L
applications (e.g. xawtv are more happy with 768).
applications (e.g. xawtv are more happy with 768).
If XAWTV_HACK is defined, we try to fake a device with bigger width */
If XAWTV_HACK is defined, we try to fake a device with bigger width */
...
...
drivers/media/video/zr36120.c
View file @
f9df913b
...
@@ -943,7 +943,6 @@ long zoran_write(struct video_device* dev, const char* buf, unsigned long count,
...
@@ -943,7 +943,6 @@ long zoran_write(struct video_device* dev, const char* buf, unsigned long count,
return
-
EINVAL
;
return
-
EINVAL
;
}
}
#if LINUX_VERSION_CODE >= 0x020100
static
static
unsigned
int
zoran_poll
(
struct
video_device
*
dev
,
struct
file
*
file
,
poll_table
*
wait
)
unsigned
int
zoran_poll
(
struct
video_device
*
dev
,
struct
file
*
file
,
poll_table
*
wait
)
{
{
...
@@ -964,7 +963,6 @@ unsigned int zoran_poll(struct video_device *dev, struct file *file, poll_table
...
@@ -964,7 +963,6 @@ unsigned int zoran_poll(struct video_device *dev, struct file *file, poll_table
return
mask
;
return
mask
;
}
}
#endif
/* append a new clipregion to the vector of video_clips */
/* append a new clipregion to the vector of video_clips */
static
static
...
@@ -1745,7 +1743,6 @@ long vbi_read(struct video_device* dev, char* buf, unsigned long count, int nonb
...
@@ -1745,7 +1743,6 @@ long vbi_read(struct video_device* dev, char* buf, unsigned long count, int nonb
return
count
;
return
count
;
}
}
#if LINUX_VERSION_CODE >= 0x020100
static
static
unsigned
int
vbi_poll
(
struct
video_device
*
dev
,
struct
file
*
file
,
poll_table
*
wait
)
unsigned
int
vbi_poll
(
struct
video_device
*
dev
,
struct
file
*
file
,
poll_table
*
wait
)
{
{
...
@@ -1766,7 +1763,6 @@ unsigned int vbi_poll(struct video_device *dev, struct file *file, poll_table *w
...
@@ -1766,7 +1763,6 @@ unsigned int vbi_poll(struct video_device *dev, struct file *file, poll_table *w
return
mask
;
return
mask
;
}
}
#endif
static
static
int
vbi_ioctl
(
struct
video_device
*
dev
,
unsigned
int
cmd
,
void
*
arg
)
int
vbi_ioctl
(
struct
video_device
*
dev
,
unsigned
int
cmd
,
void
*
arg
)
...
...
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