summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoe <joe@FreeBSD.org>2003-05-11 23:55:28 +0000
committerjoe <joe@FreeBSD.org>2003-05-11 23:55:28 +0000
commit190f2bb71dc0963cd6b3a83e85940c1cf3f16ca0 (patch)
tree24b13f60dfd9ede2bf18752d9351cb2dfe5c529c
parente3cf6c3df229ee3628756cd99ef0d8507cef7fb1 (diff)
downloadFreeBSD-src-190f2bb71dc0963cd6b3a83e85940c1cf3f16ca0.zip
FreeBSD-src-190f2bb71dc0963cd6b3a83e85940c1cf3f16ca0.tar.gz
Extend the digital camera support (umass) to the PENTAX Optio 330GS.
Submitted by: Jan-Oliver Neumann <neumannj@arcor.de> By way of: n_hibma Approved by: re (jhb & bmah) MFC After: 7 days
-rw-r--r--share/man/man4/umass.47
-rw-r--r--sys/dev/usb/umass.c5
-rw-r--r--sys/dev/usb/usbdevs1
3 files changed, 13 insertions, 0 deletions
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index f2ef3d5..b2298d6 100644
--- a/share/man/man4/umass.4
+++ b/share/man/man4/umass.4
@@ -69,6 +69,13 @@ SanDisk SDDR-75 (only Compact Flash port works)
Sitecom CN-300 MultiFlash (MMC/SD, SmartMedia, CF, MemoryStick)
.El
.Pp
+Among the supported digital cameras are:
+.Pp
+.Bl -item -compact
+.It
+Asahi Optical (PENTAX) Optio 230 & 330
+.El
+.Pp
.Nm usb
and one of
.Nm uhci
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 59e6225..fc286f1 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -313,6 +313,11 @@ Static struct umass_devdescr_t umass_devdescrs[] = {
UMASS_PROTO_ATAPI | UMASS_PROTO_CBI_I,
RS_NO_CLEAR_UA
},
+ { USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO330,
+ RID_WILDCARD,
+ UMASS_PROTO_ATAPI | UMASS_PROTO_CBI_I,
+ RS_NO_CLEAR_UA
+ },
{ USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100, RID_WILDCARD,
UMASS_PROTO_ATAPI | UMASS_PROTO_CBI_I,
RS_NO_CLEAR_UA
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 464f211..d622e6b 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -455,6 +455,7 @@ product APPLE SPEAKERS 0x1101 Speakers
/* Asahi Optical products */
product ASAHIOPTICAL OPTIO230 0x0004 Digital camera
+product ASAHIOPTICAL OPTIO330 0x0006 Digital camera
/* ASIX Electronics products */
product ASIX AX88172 0x1720 USB 2.0 10/100 ethernet controller
OpenPOWER on IntegriCloud