diff options
| -rw-r--r-- | share/man/man4/umass.4 | 7 | ||||
| -rw-r--r-- | sys/dev/usb/umass.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4 index f2ef3d59f8d2..b2298d670ccc 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 59e622570dd8..fc286f16b359 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 464f211fc3eb..d622e6b2781a 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 |