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
7cf654b1
Commit
7cf654b1
authored
Feb 10, 2002
by
Greg Kroah-Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
patch by Simon Evans <spse@secret.org.uk> that adds a Konica USB webcam driver
parent
1a3cb06f
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
764 additions
and
4 deletions
+764
-4
drivers/usb/Config.help
drivers/usb/Config.help
+15
-0
drivers/usb/Config.in
drivers/usb/Config.in
+1
-0
drivers/usb/Makefile
drivers/usb/Makefile
+1
-0
drivers/usb/konicawc.c
drivers/usb/konicawc.c
+737
-0
drivers/usb/usbvideo.c
drivers/usb/usbvideo.c
+8
-4
drivers/usb/usbvideo.h
drivers/usb/usbvideo.h
+2
-0
No files found.
drivers/usb/Config.help
View file @
7cf654b1
...
...
@@ -505,6 +505,21 @@ CONFIG_USB_DABUSB
The module will be called dabusb.o. If you want to compile it as a
module, say M here and read <file:Documentation/modules.txt>.
CONFIG_USB_KONICAWC
Say Y here if you want support for webcams based on a Konica
chipset. This is known to work with the Intel YC76 webcam.
This driver uses the Video For Linux API. You must enable
(Y or M in config) Video For Linux (under Character Devices)
to use this driver. Information on this API and pointers to
"v4l" programs may be found on the WWW at
<http://roadrunner.swansea.uk.linux.org/v4l.shtml>.
This code is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called konicawc.o. If you want to compile it as
a module, say M here and read <file:Documentation/modules.txt>.
CONFIG_USB_USBNET
This driver supports network links over USB with USB "Network"
or "data transfer" cables, often used to network laptops to PCs.
...
...
drivers/usb/Config.in
View file @
7cf654b1
...
...
@@ -80,6 +80,7 @@ else
dep_tristate ' USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)' CONFIG_USB_VICAM $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
dep_tristate ' D-Link USB FM radio support (EXPERIMENTAL)' CONFIG_USB_DSBR $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
dep_tristate ' DABUSB driver' CONFIG_USB_DABUSB $CONFIG_USB
dep_tristate ' USB Konica Webcam support' CONFIG_USB_KONICAWC $CONFIG_USB $CONFIG_VIDEO_DEV
fi
comment 'USB Network adaptors'
...
...
drivers/usb/Makefile
View file @
7cf654b1
...
...
@@ -64,6 +64,7 @@ obj-$(CONFIG_USB_ACM) += acm.o
obj-$(CONFIG_USB_PRINTER)
+=
printer.o
obj-$(CONFIG_USB_AUDIO)
+=
audio.o
obj-$(CONFIG_USB_IBMCAM)
+=
ibmcam.o usbvideo.o ultracam.o
obj-$(CONFIG_USB_KONICAWC)
+=
konicawc.o usbvideo.o
obj-$(CONFIG_USB_PWC)
+=
pwc.o
obj-$(CONFIG_USB_DC2XX)
+=
dc2xx.o
obj-$(CONFIG_USB_MDC800)
+=
mdc800.o
...
...
drivers/usb/konicawc.c
0 → 100644
View file @
7cf654b1
This diff is collapsed.
Click to expand it.
drivers/usb/usbvideo.c
View file @
7cf654b1
...
...
@@ -791,6 +791,10 @@ int usbvideo_register(
cams
->
cb
.
getFrame
=
usbvideo_GetFrame
;
if
(
cams
->
cb
.
disconnect
==
NULL
)
cams
->
cb
.
disconnect
=
usbvideo_Disconnect
;
if
(
cams
->
cb
.
startDataPump
==
NULL
)
cams
->
cb
.
startDataPump
=
usbvideo_StartDataPump
;
if
(
cams
->
cb
.
stopDataPump
==
NULL
)
cams
->
cb
.
stopDataPump
=
usbvideo_StopDataPump
;
#if USES_PROC_FS
/*
* If both /proc fs callbacks are NULL then we assume that the driver
...
...
@@ -963,7 +967,7 @@ void usbvideo_Disconnect(struct usb_device *dev, void *ptr)
uvd
->
remove_pending
=
1
;
/* Now all ISO data will be ignored */
/* At this time we ask to cancel outstanding URBs */
usbvideo_StopDataPump
(
uvd
);
GET_CALLBACK
(
uvd
,
stopDataPump
)
(
uvd
);
for
(
i
=
0
;
i
<
USBVIDEO_NUMSBUF
;
i
++
)
usb_free_urb
(
uvd
->
sbuf
[
i
].
urb
);
...
...
@@ -1299,7 +1303,7 @@ int usbvideo_v4l_open(struct video_device *dev, int flags)
if
(
errCode
==
0
)
{
/* Start data pump if we have valid endpoint */
if
(
uvd
->
video_endp
!=
0
)
errCode
=
usbvideo_StartDataPump
(
uvd
);
errCode
=
GET_CALLBACK
(
uvd
,
startDataPump
)
(
uvd
);
if
(
errCode
==
0
)
{
if
(
VALID_CALLBACK
(
uvd
,
setupOnOpen
))
{
if
(
uvd
->
debug
>
1
)
...
...
@@ -1349,8 +1353,8 @@ void usbvideo_v4l_close(struct video_device *dev)
if
(
uvd
->
debug
>
1
)
info
(
"%s($%p)"
,
proc
,
dev
);
down
(
&
uvd
->
lock
);
usbvideo_StopDataPump
(
uvd
);
down
(
&
uvd
->
lock
);
GET_CALLBACK
(
uvd
,
stopDataPump
)
(
uvd
);
usbvideo_rvfree
(
uvd
->
fbuf
,
uvd
->
fbuf_size
);
uvd
->
fbuf
=
NULL
;
RingQueue_Free
(
&
uvd
->
dp
);
...
...
drivers/usb/usbvideo.h
View file @
7cf654b1
...
...
@@ -269,6 +269,8 @@ typedef struct {
int
(
*
getFrame
)(
uvd_t
*
,
int
);
int
(
*
procfs_read
)(
char
*
page
,
char
**
start
,
off_t
off
,
int
count
,
int
*
eof
,
void
*
data
);
int
(
*
procfs_write
)(
struct
file
*
file
,
const
char
*
buffer
,
unsigned
long
count
,
void
*
data
);
int
(
*
startDataPump
)(
uvd_t
*
uvd
);
void
(
*
stopDataPump
)(
uvd_t
*
uvd
);
}
usbvideo_cb_t
;
struct
s_usbvideo_t
{
...
...
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