The two quirks PQUIRK_NOTUR and PDQUIRK_NODOORLOCK should be
unnecessary with -current systems.
But before they are deleted, anyone who has one of the following
devices:
USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD,
"Creative Labs", "Nomad",
USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_DNSSF7X,
"Sigmatel", "Datum Networks SSF-7X Multi Players",
USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB,
"Trek Technology", "ThumbDrive 8MB",
USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_ZIOMMC,
"Shuttle Technology", "eUSB MultiMediaCard",
USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB,
"Shuttle Technology", "E-USB Bridge",
USB_VENDOR_PQI, USB_PRODUCT_PQI_TRAVELFLASH,
"PQI", "Travel Flash Drive",
USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY2,
"M-Systems", "DiskOnKey",
USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY,
"M-Systems", "DiskOnKey",
USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_DPCM,
"Microtech", "CameraMate",
USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_3XX,
"iRiver", "iFP-3xx",
USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_1XX,
"iRiver", "iFP-1xx",
USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP250_2,
"Iomega", "Zip 250",
USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP250,
"Iomega", "Zip 250",
USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100,
"Iomega", "Zip 100",
USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_USBCABLE,
"In-System Design", "USB cable",
USB_VENDOR_IMATION, USB_PRODUCT_IMATION_FLASHGO,
"Imation", "Flash Go!",
USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100,
"Fuji Photo Film", "Mass Storage",
USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU,
"Y-E Data", "Flashbuster-U",
and can test a diff against -current is invited to test the diff
below and let me know if behaviour changes. If the behaviour does
change a dmesg and any messages generated during the attach process
would be appreciated.
Unless positive evidence to the contrary is received over the next
few days this diff will be assumed to be good and applied.
Thanks.
.... Ken
Index: umass_quirks.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/umass_quirks.c,v
retrieving revision 1.19
diff -u -r1.19 umass_quirks.c
--- umass_quirks.c 26 May 2005 20:54:39 -0000 1.19
+++ umass_quirks.c 30 May 2005 18:38:14 -0000
@@ -91,7 +91,7 @@
{ { USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100 },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
- PQUIRK_NOTUR | PQUIRK_NOSENSE,
+ PQUIRK_NOSENSE,
UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
NULL, NULL
},
@@ -115,7 +115,7 @@
{ { USB_VENDOR_IMATION, USB_PRODUCT_IMATION_FLASHGO },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
- PQUIRK_NODOORLOCK,
+ 0,
UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
NULL, NULL
},
@@ -153,7 +153,7 @@
{ { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_USBCABLE },
UMASS_WPROTO_CBI, UMASS_CPROTO_ATAPI,
0,
- PQUIRK_NOTUR,
+ 0,
UMATCH_VENDOR_PRODUCT,
umass_init_insystem, NULL
},
@@ -169,7 +169,7 @@
{ { USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100 },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
- PQUIRK_NOTUR,
+ 0,
UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
NULL, NULL
},
@@ -177,7 +177,7 @@
{ { USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP250 },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
- PQUIRK_NOTUR,
+ 0,
UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
NULL, NULL
},
@@ -185,7 +185,7 @@
{ { USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP250_2 },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
- PQUIRK_NOTUR,
+ 0,
UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
NULL, NULL
},
@@ -193,7 +193,7 @@
{ { USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_1XX },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
- PQUIRK_NODOORLOCK | PQUIRK_ONLYBIG,
+ PQUIRK_ONLYBIG,
UMATCH_VENDOR_PRODUCT,
NULL, NULL
},
@@ -201,7 +201,7 @@
{ { USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_3XX },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
- PQUIRK_NODOORLOCK,
+ 0,
UMATCH_VENDOR_PRODUCT,
NULL, NULL
},
@@ -217,7 +217,7 @@
{ { USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_DPCM },
UMASS_WPROTO_CBI, UMASS_CPROTO_ATAPI,
0,
- PQUIRK_NOTUR,
+ 0,
UMATCH_VENDOR_PRODUCT,
NULL, NULL
},
@@ -249,7 +249,7 @@
{ { USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
- PQUIRK_NODOORLOCK,
+ 0,
UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
NULL, NULL
},
@@ -257,7 +257,7 @@
{ { USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY2 },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_ATAPI,
0,
- PQUIRK_NODOORLOCK,
+ 0,
UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
NULL, NULL
},
@@ -353,7 +353,7 @@
{ { USB_VENDOR_PQI, USB_PRODUCT_PQI_TRAVELFLASH },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
- PQUIRK_NODOORLOCK,
+ 0,
UMATCH_VENDOR_PRODUCT,
NULL, NULL
},
@@ -369,7 +369,7 @@
{ { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB },
UMASS_WPROTO_CBI_I, UMASS_CPROTO_ATAPI,
0,
- PQUIRK_NOTUR | PQUIRK_NOSENSE,
+ PQUIRK_NOSENSE,
UMATCH_VENDOR_PRODUCT,
umass_init_shuttle, NULL
},
@@ -377,7 +377,7 @@
{ { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_ZIOMMC },
UMASS_WPROTO_CBI_I, UMASS_CPROTO_ATAPI,
0,
- PQUIRK_NOTUR,
+ 0,
UMATCH_VENDOR_PRODUCT,
NULL, NULL
},
@@ -425,7 +425,7 @@
{ { USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
- PQUIRK_NODOORLOCK,
+ 0,
UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
NULL, NULL
},
@@ -457,7 +457,7 @@
{ { USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_DNSSF7X},
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
- SDEV_NOSYNCCACHE | PQUIRK_NODOORLOCK,
+ SDEV_NOSYNCCACHE,
UMATCH_VENDOR_PRODUCT,
NULL, NULL
},
@@ -465,7 +465,7 @@
{ { USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD},
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
- SDEV_NOSYNCCACHE | PQUIRK_NODOORLOCK,
+ SDEV_NOSYNCCACHE,
UMATCH_VENDOR_PRODUCT,
NULL, NULL
},
@@ -534,11 +534,4 @@
sc->sc_wire = UMASS_WPROTO_CBI;
else
sc->sc_wire = UMASS_WPROTO_CBI_I;
-
- /*
- * Revisions < 1.28 do not have the TEST UNIT READY command
- * Revisions == 1.28 have a broken TEST UNIT READY
- */
- if (UGETW(dd->bcdDevice) <= 0x128)
- sc->sc_busquirks |= PQUIRK_NOTUR;
}
Index: usb_port.h
===================================================================
RCS file: /cvs/src/sys/dev/usb/usb_port.h,v
retrieving revision 1.56
diff -u -r1.56 usb_port.h
--- usb_port.h 25 May 2005 21:12:54 -0000 1.56
+++ usb_port.h 30 May 2005 18:38:14 -0000
@@ -241,8 +241,6 @@
#define UMASS_ATAPISTR "atapiscsi"
/* periph_quirks */
-#define PQUIRK_NOTUR ADEV_NOTUR /* no TEST UNIT READY */
-#define PQUIRK_NODOORLOCK ADEV_NODOORLOCK /* can't lock door */
#define PQUIRK_NOSENSE ADEV_NOSENSE /* can't REQUEST SENSE
*/
#define PQUIRK_ONLYBIG SDEV_ONLYBIG
