diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/cam/scsi/scsi_da.c | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index de36121..6c756e1 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -147,6 +147,7 @@ static const char microp[] = "MICROP"; static struct da_quirk_entry da_quirk_table[] = { + /* SPI, FC devices */ { /* * Fujitsu M2513A MO drives. @@ -227,9 +228,8 @@ static struct da_quirk_entry da_quirk_table[] = {T_DIRECT, SIP_MEDIA_FIXED, quantum, "VIKING 2*", "*"}, /*quirks*/ DA_Q_NO_6_BYTE }, - #ifdef DA_OLD_QUIRKS - /* Below a list of quirks for USB devices supported by umass. */ + /* USB floppy devices supported by umass(4) */ { /* * This USB floppy drive uses the UFI command set. This @@ -247,6 +247,24 @@ static struct da_quirk_entry da_quirk_table[] = }, { /* + * The vendor, product and version strings coming from the + * controller are null terminated instead of being padded with + * spaces. The trailing wildcard character '*' is required. + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "SMSC*", "USB FDC*","*"}, + /*quirks*/ DA_Q_NO_SYNC_CACHE + }, + { + /* + * SmartDisk (Mitsumi) USB floppy drive + * PR: kern/50226 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "MITSUMI", "USB FDD", "*"}, + /*quirks*/ DA_Q_NO_SYNC_CACHE + }, + /* USB mass storage devices supported by umass(4) */ + { + /* * Sony Memory Stick adapter MSAC-US1 and * Sony PCG-C1VJ Internal Memory Stick Slot (MSC-U01). * Make all sony MS* products use this quirk. @@ -288,15 +306,6 @@ static struct da_quirk_entry da_quirk_table[] = }, { /* - * The vendor, product and version strings coming from the - * controller are null terminated instead of being padded with - * spaces. The trailing wildcard character '*' is required. - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "SMSC*", "USB FDC*","*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, - { - /* * Olympus digital cameras (C-3040ZOOM, C-2040ZOOM, C-1) */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "C-*", "*"}, @@ -355,14 +364,6 @@ static struct da_quirk_entry da_quirk_table[] = {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "Storage Media", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, - { - /* - * SmartDisk (Mitsumi) USB floppy drive - * PR: kern/50226 - */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "MITSUMI", "USB FDD", "*"}, - /*quirks*/ DA_Q_NO_SYNC_CACHE - }, #endif /* DA_OLD_QUIRKS */ { /* |
