Page MenuHomeFreeBSD
Files F143925198

D27434.diff
No OneTemporary
Actions

D27434.diff
View Options

Index: head/sys/dev/usb/quirk/usb_quirk.h
===================================================================
--- head/sys/dev/usb/quirk/usb_quirk.h
+++ head/sys/dev/usb/quirk/usb_quirk.h
@@ -93,6 +93,7 @@
UQ_MSC_FORCE_PROTO_ATAPI, /* force ATAPI command protocol */
UQ_MSC_FORCE_PROTO_UFI, /* force UFI command protocol */
UQ_MSC_FORCE_PROTO_RBC, /* force RBC command protocol */
+ UQ_MSC_IGNORE, /* device should be ignored by umass */
/* Ejection of mass storage (driver disk) */
UQ_MSC_EJECT_HUAWEI, /* ejects after Huawei USB command */
Index: head/sys/dev/usb/quirk/usb_quirk.c
===================================================================
--- head/sys/dev/usb/quirk/usb_quirk.c
+++ head/sys/dev/usb/quirk/usb_quirk.c
@@ -539,6 +539,7 @@
USB_QUIRK(QUALCOMMINC, ZTE_MF730M, 0x0000, 0xffff, UQ_MSC_NO_GETMAXLUN,
UQ_MSC_NO_INQUIRY, UQ_CFG_INDEX_0),
USB_QUIRK(SMART2, G2MEMKEY, 0x0000, 0xffff, UQ_MSC_NO_INQUIRY),
+ USB_QUIRK(RALINK, RT_STOR, 0x0001, 0x0001, UQ_MSC_IGNORE),
/* Non-standard USB MIDI devices */
USB_QUIRK(ROLAND, UM1, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS),
USB_QUIRK(ROLAND, SC8850, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS),
@@ -642,6 +643,7 @@
[UQ_MSC_FORCE_PROTO_ATAPI] = "UQ_MSC_FORCE_PROTO_ATAPI",
[UQ_MSC_FORCE_PROTO_UFI] = "UQ_MSC_FORCE_PROTO_UFI",
[UQ_MSC_FORCE_PROTO_RBC] = "UQ_MSC_FORCE_PROTO_RBC",
+ [UQ_MSC_IGNORE] = "UQ_MSC_IGNORE",
[UQ_MSC_EJECT_HUAWEI] = "UQ_MSC_EJECT_HUAWEI",
[UQ_MSC_EJECT_SIERRA] = "UQ_MSC_EJECT_SIERRA",
[UQ_MSC_EJECT_SCSIEJECT] = "UQ_MSC_EJECT_SCSIEJECT",
Index: head/sys/dev/usb/storage/umass.c
===================================================================
--- head/sys/dev/usb/storage/umass.c
+++ head/sys/dev/usb/storage/umass.c
@@ -784,6 +784,12 @@
memset(&ret, 0, sizeof(ret));
ret.error = BUS_PROBE_GENERIC;
+ /* Check if we should deny probing. */
+ if (usb_test_quirk(uaa, UQ_MSC_IGNORE)) {
+ ret.error = ENXIO;
+ goto done;
+ }
+
/* Search for protocol enforcement */
if (usb_test_quirk(uaa, UQ_MSC_FORCE_WIRE_BBB)) {

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 3, 1:53 AM (19 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28419995
Default Alt Text
D27434.diff (2 KB)

Event Timeline