summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorflz <flz@FreeBSD.org>2006-01-30 20:27:44 +0000
committerflz <flz@FreeBSD.org>2006-01-30 20:27:44 +0000
commit2d1ec6cb7741d15821119ca1c6a618bbc2db95fc (patch)
tree3d6a751b65c75de020462a267bd21af51918be3d /sys
parent064daa7fd1f81ddf17576c032d4b38011cc39f2d (diff)
downloadFreeBSD-src-2d1ec6cb7741d15821119ca1c6a618bbc2db95fc.zip
FreeBSD-src-2d1ec6cb7741d15821119ca1c6a618bbc2db95fc.tar.gz
- Add a scsi_da.c and a umass.c quirk for Genesys 6-in-1 Card Reader.
Reported by: anders on freebsd-usb@ Tested by: anders Approved by: ssouhlal MFC after: 3 days
Diffstat (limited to 'sys')
-rw-r--r--sys/cam/scsi/scsi_da.c8
-rw-r--r--sys/dev/usb/umass.c4
-rw-r--r--sys/dev/usb/usbdevs1
3 files changed, 13 insertions, 0 deletions
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 71a5900..e31a20a 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -427,6 +427,14 @@ static struct da_quirk_entry da_quirk_table[] =
{T_DIRECT, SIP_MEDIA_REMOVABLE, "*" , "USB DISK*",
"*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
},
+ {
+ /*
+ * Genesys 6-in-1 Card Reader
+ * No PR, reported by anders
+ */
+ {T_DIRECT, SIP_MEDIA_REMOVABLE, "Generic*", "STORAGE DEVICE*",
+ "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+ },
};
static disk_strategy_t dastrategy;
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 29c1bbd..89209861 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -340,6 +340,10 @@ Static struct umass_devdescr_t umass_devdescrs[] = {
UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
FORCE_SHORT_INQUIRY | NO_START_STOP | IGNORE_RESIDUE
},
+ { USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB_2, RID_WILDCARD,
+ UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+ WRONG_CSWSIG
+ },
{ USB_VENDOR_HITACHI, USB_PRODUCT_HITACHI_DVDCAM_USB, RID_WILDCARD,
UMASS_PROTO_ATAPI | UMASS_PROTO_CBI_I,
NO_INQUIRY
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 2c7252c..a7e5b73 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -910,6 +910,7 @@ product GENESYS GL650 0x0604 GL650 Hub
product GENESYS GL641USB 0x0700 GL641USB CompactFlash Card Reader
product GENESYS GL641USB2IDE_2 0x0701 GL641USB USB-IDE Bridge No 2
product GENESYS GL641USB2IDE 0x0702 GL641USB USB-IDE Bridge
+product GENESYS GL641USB_2 0x0760 GL641USB 6-in-1 Card Reader
/* GIGABYTE products */
product GIGABYTE GNBR402W 0x8002 GN-BR402W
OpenPOWER on IntegriCloud