diff options
| -rw-r--r-- | sys/cam/scsi/scsi_da.c | 9 | ||||
| -rw-r--r-- | sys/dev/usb/umass.c | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index d1dab09..fed26ba 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -444,6 +444,15 @@ static struct da_quirk_entry da_quirk_table[] = */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "LEXAR", "DIGITAL FILM", "*"}, /*quirks*/ DA_Q_NO_6_BYTE + }, + { + /* + * Pentax USB Optio 230 camera + * PR: kern/46369 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, + "PENTAX", "DIGITAL_CAMERA", "*"}, + /*quirks*/ DA_Q_NO_6_BYTE } }; diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 38ec093..9cd3897 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -322,6 +322,11 @@ struct umass_devdescr_t { }; Static struct umass_devdescr_t umass_devdescrs[] = { + { USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO230, + 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 |
