First shoot of the uvideo firmware package.

2 files changed, 36 insertions, 5 deletions

diff --git a/share/man/man4/uvideo.4 b/share/man/man4/uvideo.4
index 8154cb0c3d1..fa07150c2eb 100644
--- a/share/man/man4/uvideo.4
+++ b/share/man/man4/uvideo.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uvideo.4,v 1.20 2008/12/13 17:55:43 ian Exp $
+.\" $OpenBSD: uvideo.4,v 1.21 2008/12/22 20:51:18 mglocker Exp $
 .\"
 .\" Copyright (c) 2008 Ian Darwin.  All rights reserved.
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 13 2008 $
+.Dd $Mdocdate: December 22 2008 $
 .Dt UVIDEO 4
 .Os
 .Sh NAME
@@ -89,6 +89,37 @@ If the
 device attaches successfully, it will attach the
 .Xr video 4
 driver to provide higher-level access.
+.Sh FILES
+The driver needs a set of firmware for some devices which are loaded when
+a device gets attached:
+.Pp
+.Bl -tag -width Ds -offset indent -compact
+.It Pa /etc/firmware/uvideo_isight_05ac-8300
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-1803
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-1810
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-1812
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-1830
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-1832
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-1833
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-1834
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-1835
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-1836
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-1837
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-1839
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-183a
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-183b
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-183e
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-1841
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-1870
+.It Pa /etc/firmware/uvideo_r5u87x_05ca-1870_1
+.El
+.Pp
+A prepackaged version of the firmware, designed to be used with
+.Xr pkg_add 1 ,
+can be found at:
+.Bd -literal -offset indent
+http://www.nazgul.ch/uvideo/uvideo-firmware-1.0.tgz
+.Ed
 .Sh SEE ALSO
 .Xr intro 4 ,
 .Xr usb 4 ,
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index 7d2b4539b2c..71843e1691f 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvideo.c,v 1.113 2008/12/22 13:33:43 mglocker Exp $ */
+/*	$OpenBSD: uvideo.c,v 1.114 2008/12/22 20:51:18 mglocker Exp $ */
 
 /*
  * Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -253,14 +253,14 @@ struct uvideo_devs {
 	{
 	    /* Needs firmware */
 	    { USB_VENDOR_RICOH, USB_PRODUCT_RICOH_VGPVCC7 },
-	    "r5u87x-05ca-183a.fw",
+	    "uvideo_r5u87x_05ca-183a",
 	    uvideo_ucode_loader_ricoh,
 	    0
 	},
 	{
 	    /* Needs firmware */
 	    { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH },
-	    "isight.fw",
+	    "uvideo_isight_05ac-8300",
 	    uvideo_ucode_loader_apple_isight,
 	    0
 	},