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
nexedi
linux
Commits
3d00dc9b
Commit
3d00dc9b
authored
May 06, 2002
by
Dave Jones
Committed by
Linus Torvalds
May 06, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] motioneye driver update.
Syncs up with Stelians latest
parent
c153abec
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
3 deletions
+32
-3
Documentation/video4linux/meye.txt
Documentation/video4linux/meye.txt
+9
-1
drivers/media/video/meye.c
drivers/media/video/meye.c
+22
-1
drivers/media/video/meye.h
drivers/media/video/meye.h
+1
-1
No files found.
Documentation/video4linux/meye.txt
View file @
3d00dc9b
...
...
@@ -15,9 +15,17 @@ Grabbing is supported in packed YUV colorspace only.
MJPEG hardware grabbing is supported via a private API (see below).
Module
options:
Driver
options:
---------------
Several options can be passed to the meye driver, either by adding them
to /etc/modules.conf file, when the driver is compiled as a module, or
by adding the following to the kernel command line (in your bootloader):
meye=gbuffers[,gbufsize[,video_nr]]
where:
gbuffers: number of capture buffers, default is 2 (32 max)
gbufsize: size of each capture buffer, default is 614400
...
...
drivers/media/video/meye.c
View file @
3d00dc9b
...
...
@@ -1242,7 +1242,6 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
sonypi_camera_command
(
SONYPI_COMMAND_SETCAMERA
,
1
);
meye
.
mchip_dev
=
pcidev
;
meye
.
mchip_irq
=
pcidev
->
irq
;
memcpy
(
&
meye
.
video_dev
,
&
meye_template
,
sizeof
(
meye_template
));
if
(
mchip_dma_alloc
())
{
...
...
@@ -1256,6 +1255,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
goto
out3
;
}
meye
.
mchip_irq
=
pcidev
->
irq
;
mchip_adr
=
pci_resource_start
(
meye
.
mchip_dev
,
0
);
if
(
!
mchip_adr
)
{
printk
(
KERN_ERR
"meye: mchip has no device base address
\n
"
);
...
...
@@ -1420,6 +1420,27 @@ static void __exit meye_cleanup_module(void) {
pci_unregister_driver
(
&
meye_driver
);
}
#ifndef MODULE
static
int
__init
meye_setup
(
char
*
str
)
{
int
ints
[
4
];
str
=
get_options
(
str
,
ARRAY_SIZE
(
ints
),
ints
);
if
(
ints
[
0
]
<=
0
)
goto
out
;
gbuffers
=
ints
[
1
];
if
(
ints
[
0
]
==
1
)
goto
out
;
gbufsize
=
ints
[
2
];
if
(
ints
[
0
]
==
2
)
goto
out
;
video_nr
=
ints
[
3
];
out:
return
1
;
}
__setup
(
"meye="
,
meye_setup
);
#endif
MODULE_AUTHOR
(
"Stelian Pop <stelian.pop@fr.alcove.com>"
);
MODULE_DESCRIPTION
(
"video4linux driver for the MotionEye camera"
);
MODULE_LICENSE
(
"GPL"
);
...
...
drivers/media/video/meye.h
View file @
3d00dc9b
...
...
@@ -29,7 +29,7 @@
#define _MEYE_PRIV_H_
#define MEYE_DRIVER_MAJORVERSION 1
#define MEYE_DRIVER_MINORVERSION
3
#define MEYE_DRIVER_MINORVERSION
4
/****************************************************************************/
/* Motion JPEG chip registers */
...
...
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